aTrust集成完成

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

@@ -29,6 +29,7 @@ import com.rehome.zhdcoa.utils.SPUtils;
 import com.rehome.zhdcoa.vpn.GlobalListenerManager;
 import com.sangfor.sdk.SFUemSDK;
 import com.sangfor.sdk.base.SFBaseMessage;
+import com.sangfor.sdk.base.SFSDKExtras;
 import com.sangfor.sdk.base.SFSDKFlags;
 import com.sangfor.sdk.base.SFSDKMode;
 import com.sangfor.sdk.base.SFSetSpaConfigListener;
@@ -40,6 +41,9 @@ import com.zhy.autolayout.config.AutoLayoutConifg;
 
 import org.litepal.LitePalApplication;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class App extends LitePalApplication {
 
     private UserInfoBean.UserInfo userInfo;
@@ -255,12 +259,13 @@ public class App extends LitePalApplication {
     }
 
     void initSdk(Context context) {
+        Map<SFSDKExtras, String> extra = new HashMap<>();
         SFSDKMode sdkMode = SFSDKMode.MODE_SUPPORT_MUTABLE;            // 表明启用可变授权功能,详情参考集成指导文档
         switch (sdkMode) {
             case MODE_SUPPORT_MUTABLE:{
                 int sdkFlags =  SFSDKFlags.FLAGS_HOST_APPLICATION;      //表明是单应用或者是主应用
                 sdkFlags |= SFSDKFlags.FLAGS_VPN_MODE_TCP;              //表明使用VPN功能中的TCP模式
-                SFUemSDK.getInstance().initSDK(this, sdkMode,sdkFlags,null);
+                SFUemSDK.getInstance().initSDK(this, sdkMode,sdkFlags,extra);
                 break;
             }
             case MODE_VPN: {    //只使用VPN功能场景

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

@@ -119,14 +119,21 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                     Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网
             }
         } else {
-            binding.rg.check(R.id.rb2)
+//            binding.rg.check(R.id.rb2)
-            SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网")
+//            SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网")
-            Contans.IP = Contans.IP_EXTRANET //运行IP外网
+//            Contans.IP = Contans.IP_EXTRANET //运行IP外网
-            Contans.BASE_URL = Contans.BASE_URL_EXTRANET //行政IP外网
+//            Contans.BASE_URL = Contans.BASE_URL_EXTRANET //行政IP外网
+//            Contans.BASE_URL_COMPANY_SERVER =
+//                Contans.BASE_URL_COMPANY_SERVER_EXTRANET //智慧安防平台登录 电厂外网
+//            Contans.BASE_URL_AI_3D_SERVER =
+//                Contans.BASE_URL_AI_3D_SERVER_EXTRANET //AI三维可视化安防平台登录 电厂外网
+            binding.rg.check(R.id.rb3)
+            Contans.IP = Contans.IP_INTRANET //运行IP内网
+            Contans.BASE_URL = Contans.BASE_URL_INTRANET //行政IP内网
             Contans.BASE_URL_COMPANY_SERVER =
-                Contans.BASE_URL_COMPANY_SERVER_EXTRANET //智慧安防平台登录 电厂外网
+                Contans.BASE_URL_COMPANY_SERVER_INTRANET //智慧安防平台登录 电厂内网
             Contans.BASE_URL_AI_3D_SERVER =
-                Contans.BASE_URL_AI_3D_SERVER_EXTRANET //AI三维可视化安防平台登录 电厂外网
+                Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网
         }
 
         binding.rg.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { _, checkedId ->
@@ -182,8 +189,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
             startActivity(intent)
         }
         //vpn登录
-        binding.tvVpn.setOnClickListener {
+        binding.tvVpnLogin.setOnClickListener {
-            goToVpnLogin()
+
         }
         //vpn注销
         binding.tvVpnLogout.setOnClickListener {
@@ -212,8 +219,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (isApkInDebug(context)) {
             //        管理员
-            binding.etUsername.setText("ZHPS_Admin")
+//            binding.etUsername.setText("ZHPS_Admin")
-            binding.etPassword.setText("Rehome.zhps@996")
+//            binding.etPassword.setText("Rehome.zhps@996")
 
 
             //公司内网215管理员
@@ -318,7 +325,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                 toastviewbymyself.makeText(context, "密码不能为空", Toast.LENGTH_LONG).show()
                 return@OnClickListener
             }
-            appLogin() //登录
+            if(binding.rb3.isChecked){
+                goToVpnLogin()
+            }else{
+                appLogin() //登录
+            }
         })
     }
 
@@ -619,6 +630,9 @@ 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()
         }
 
         //val intent = Intent(context, VpnLoginActivity::class.java)
@@ -642,8 +656,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                 if (data != null) {
                     usernameVpn = data.getStringExtra("usernameVpn").toString()
                     pwdVpn = data.getStringExtra("pwdVpn").toString()
-                    showLog(usernameVpn)
+//                    showLog(usernameVpn)
-                    showLog(pwdVpn)
+//                    showLog(pwdVpn)
                     SPUtils.put(
                         context,
                         Contans.USER_NAME_VPN,
@@ -657,7 +671,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                     if(checkInput()){
                         //登录
                         appLogin()
-
 //                        val intent = Intent(context, AuthSuccessActivity::class.java)
 //                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
 //                        startActivity(intent)

app/src/main/java/com/rehome/zhdcoa/ui/activity/VpnAuthActivity.java

@@ -119,7 +119,7 @@ public class VpnAuthActivity extends BaseActivity implements SFAuthResultListene
         mLoginButton = findViewById(R.id.svpn_login_button);
         mLoginButton.setOnClickListener(this);
 
-        initToolbar("VPN登录", "", new View.OnClickListener() {
+        initToolbar("aTrust 登录", "", new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
@@ -132,16 +132,10 @@ public class VpnAuthActivity extends BaseActivity implements SFAuthResultListene
             @Override
             public void onSetSpaConfig(String result, SFBaseMessage error) {
                 SFLogN.info(TAG, "spa result:"+ result + ", error:" + error);
-                Log.i(TAG, "spa result:"+ result + ", error:" + error);
                 if (error.mErrCode != 0) {
-                    Toast.makeText(VpnAuthActivity.this,
+                    showLog("SPA设置失败"+ ", Error Message:" + error.toString());
-                                    "SPA设置失败"+ ", Error Message:" + error.toString(),
-                                    Toast.LENGTH_SHORT)
-                            .show();
                 } else {
-                    Toast.makeText(VpnAuthActivity.this, "SPA设置成功， result:" + result,
+                    showLog("SPA设置成功， result:" + result);
-                                    Toast.LENGTH_SHORT)
-                            .show();
                 }
             }
         });
@@ -149,10 +143,6 @@ public class VpnAuthActivity extends BaseActivity implements SFAuthResultListene
         //加载上次登录信息
         setLoginInfo();
 
-        mUserNameEditView.setText("rehome5");
-        mUserPasswordEditView.setText("452131wW,./");
-
-
         /**
          * 设置认证回调,认证结果在SFAuthResultListener的onAuthSuccess、onAuthFailed、onAuthProgress中返回
          * 如果不设置，将接收不到认证结果回调

app/src/main/res/layout/activity_login.xml

@@ -201,23 +201,24 @@
             android:layout_marginBottom="10dp"
             android:orientation="horizontal">
             <TextView
-                android:id="@+id/tv_vpn_logout"
+                android:id="@+id/tv_vpn_login"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 android:gravity="center|start"
-                android:text="aTrust注销>>"
+                android:visibility="invisible"
+                android:text="aTrust登录>>"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="16sp" />
             <TextView
-                android:id="@+id/tv_vpn"
+                android:id="@+id/tv_vpn_logout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="15dp"
                 android:gravity="center"
-                android:text="aTrust登录>>"
+                android:text="aTrust注销>>"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="16sp" />
         </LinearLayout>

app/src/main/res/layout/activity_vpn_auth.xml

@@ -85,6 +85,7 @@
             android:layout_marginLeft="30dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="30dp"
+            android:padding="6dp"
             android:background="@drawable/auth_button_login"
             android:text="登 录"
             android:textColor="#ffffff"