From 3d009ef50d5ed3e00ce3a19ed8b6616e991e17c2 Mon Sep 17 00:00:00 2001 From: wenfei Date: Thu, 28 Aug 2025 14:45:44 +0800 Subject: [PATCH] =?UTF-8?q?aTrust=E9=9B=86=E6=88=90=E5=AE=8C=E6=88=90,sdk?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/rehome/zhdcoa/App.java | 33 +++++-------------- .../zhdcoa/ui/activity/LoginActivity.kt | 7 ++-- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/App.java b/app/src/main/java/com/rehome/zhdcoa/App.java index 8ed6933..f974fcb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/App.java +++ b/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() { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 740177c..b8c90ae 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -630,10 +630,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { 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)