From daae2f434461da4f6a543c1af4912d88228f4c31 Mon Sep 17 00:00:00 2001 From: wenfei Date: Fri, 29 Aug 2025 11:09:37 +0800 Subject: [PATCH] =?UTF-8?q?aTrust=E9=9B=86=E6=88=90=E6=96=B0=E5=A2=9EAD?= =?UTF-8?q?=E5=9F=9F=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/zhdcoa/Contans.java | 1 + .../zhdcoa/ui/activity/VpnAuthActivity.java | 60 ++++++++++++++----- app/src/main/res/layout/activity_vpn_auth.xml | 42 ++++++++++++- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 88 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 8ab7b1d..2146cb6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -504,6 +504,7 @@ public class Contans { public final static String WIFI_4G = "wifi4g"; public final static String NETWORK_CHECK_TYPE = "NETWORK_CHECK_TYPE"; + public final static String VPN_LOGIN_TYPE = "VPN_LOGIN_TYPE"; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/VpnAuthActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/VpnAuthActivity.java index b9675ab..cb856a9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/VpnAuthActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/VpnAuthActivity.java @@ -15,10 +15,16 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.RadioButton; +import android.widget.RadioGroup; import android.widget.TextView; import android.widget.Toast; + +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import com.rehome.pdf.utils.SPUtils; +import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseActivity; import com.sangfor.sdk.SFUemSDK; @@ -64,6 +70,10 @@ public class VpnAuthActivity extends BaseActivity implements SFAuthResultListene private ProgressDialog mProgressDialog = null; // 进度条对话框 + private RadioGroup rg; + private RadioButton rb1; + private RadioButton rb2; + // @Override // public int getContentViewID() { @@ -115,10 +125,36 @@ public class VpnAuthActivity extends BaseActivity implements SFAuthResultListene mServerAddressEditText = findViewById(R.id.vpn_addr_editView); mUserNameEditView = findViewById(R.id.svpn_username_editView); mUserPasswordEditView = findViewById(R.id.svpn_userPassword_editView); + rg = findViewById(R.id.rg); + rb1 = findViewById(R.id.rb1); + rb2 = findViewById(R.id.rb2); //登录按钮 mLoginButton = findViewById(R.id.svpn_login_button); mLoginButton.setOnClickListener(this); + String vpnLoginType = (String) SPUtils.get(this, Contans.VPN_LOGIN_TYPE, ""); + if (TextUtils.isEmpty(vpnLoginType)) { + rb1.setChecked(true); + rb2.setChecked(false); + }else{ + if("内部员工登录".equals(vpnLoginType)){ + rb1.setChecked(true); + rb2.setChecked(false); + } + if("外部人员认证".equals(vpnLoginType)){ + rb1.setChecked(false); + rb2.setChecked(true); + } + } + rg.setOnCheckedChangeListener((group, checkedId) -> { + if(checkedId==R.id.rb1){ + SPUtils.put(context,Contans.VPN_LOGIN_TYPE,"内部员工登录"); + } + if(checkedId==R.id.rb2){ + SPUtils.put(context,Contans.VPN_LOGIN_TYPE,"外部人员认证"); + } + }); + initToolbar("aTrust 登录", "", new View.OnClickListener() { @Override public void onClick(View v) { @@ -188,23 +224,9 @@ public class VpnAuthActivity extends BaseActivity implements SFAuthResultListene mServerAddress = mServerAddressEditText.getText().toString(); mUserName = mUserNameEditView.getText().toString(); mUserPassword = mUserPasswordEditView.getText().toString(); - //开始主认证 startPrimaryAuth(); } -// switch (v.getId()) { -// case R.id.svpn_login_button: { -// mServerAddress = mServerAddressEditText.getText().toString(); -// mUserName = mUserNameEditView.getText().toString(); -// mUserPassword = mUserPasswordEditView.getText().toString(); -// -// //开始主认证 -// startPrimaryAuth(); -// break; -// } -// default: -// break; -// } } //开始用户名密码认证 @@ -230,7 +252,15 @@ public class VpnAuthActivity extends BaseActivity implements SFAuthResultListene /** * 开始用户名密码认证，认证结果会在认证回调onAuthSuccess,onAuthFailed,onAuthProgress中返回 */ - SFUemSDK.getInstance().startPasswordAuth(mServerAddress, mUserName, mUserPassword); + if(rb1.isChecked()){ + String adUsername = mUserName+"@ad57795"; + //showLog("------adUsername-------"); + //showLog(adUsername); + SFUemSDK.getInstance().startPasswordAuth(mServerAddress, adUsername, mUserPassword); + } + if(rb2.isChecked()){ + SFUemSDK.getInstance().startPasswordAuth(mServerAddress, mUserName, mUserPassword); + } } /** diff --git a/app/src/main/res/layout/activity_vpn_auth.xml b/app/src/main/res/layout/activity_vpn_auth.xml index f648b57..4c73282 100644 --- a/app/src/main/res/layout/activity_vpn_auth.xml +++ b/app/src/main/res/layout/activity_vpn_auth.xml @@ -76,12 +76,52 @@ + + + + + + + + + + +