aTrust集成完成,sdk初始化调整

app/src/main/java/com/rehome/zhdcoa/App.java

@@ -165,30 +165,15 @@ public class App extends LitePalApplication {
          * 初始化深信服注销监听回调
          * 初始化深信服dp，sp转px的工具类
          */
-        if (isApkInDebug(base)) {
-            showLog("attachBaseContext base");
-            initSdk(base);
-            GlobalListenerManager.getInstance().init(base);
-            DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density);
-//            String config = "{\"loginAddress\":\"https://vpn.zhp.geg.com.cn:55420\", \"spaSecret\":\"7FFQ-rWE5-V6xX\"}";
-//            SFUemSDK.setSpaConfig(config, new SFSetSpaConfigListener() {
-//                @Override
-//                public void onSetSpaConfig(String result, SFBaseMessage error) {
-//                    SFLogN.info("app", "spa result:"+ result + ", error:" + error);
-//                    Log.i("app", "spa result:"+ result + ", error:" + error);
-//                    if (error.mErrCode != 0) {
-//                        Toast.makeText(mContext,
-//                                        "SPA设置失败"+ ", Error Message:" + error.toString(),
-//                                        Toast.LENGTH_SHORT)
-//                                .show();
-//                    } else {
-//                        Toast.makeText(mContext, "SPA设置成功， result:" + result,
-//                                        Toast.LENGTH_SHORT)
-//                                .show();
-//                    }
-//                }
-//            });
-        }
+//        if (isApkInDebug(base)) {
+//            showLog("attachBaseContext base");
+//            initSdk(base);
+//            GlobalListenerManager.getInstance().init(base);
+//            DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density);
+//        }
+        initSdk(base);
+        GlobalListenerManager.getInstance().init(base);
+        DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density);
     }
 
     public void clearUser() {

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -630,10 +630,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
         if ((!TextUtils.isEmpty(usernameVpnTemp)) && (!TextUtils.isEmpty(pwdVpnTemp))) {
             usernameVpn = RSAUtils.decryptBASE64StrLocal(usernameVpnTemp)
             pwdVpn = RSAUtils.decryptBASE64StrLocal(pwdVpnTemp)
-        }else{
-            usernameVpn = binding.etUsername.text.toString().trim()
-            pwdVpn = binding.etPassword.text.toString().trim()
         }
+//        else{
+//            usernameVpn = binding.etUsername.text.toString().trim()
+//            pwdVpn = binding.etPassword.text.toString().trim()
+//        }
 
         //val intent = Intent(context, VpnLoginActivity::class.java)