From 4017cf541c471e16226c7890da2ee2554178914d Mon Sep 17 00:00:00 2001 From: wenfei Date: Tue, 28 Oct 2025 17:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=20aTrust=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/rehome/zhdcoa/App.java | 18 +++---- .../zhdcoa/ui/activity/LoginActivity.kt | 52 ++++++++++--------- app/src/main/res/layout/activity_login.xml | 1 + .../activity_work_risk_list_hui_bao.xml | 18 ++++--- gradle/wrapper/gradle-wrapper.properties | 3 +- 5 files changed, 50 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/App.java b/app/src/main/java/com/rehome/zhdcoa/App.java index 2e4ac1a..aca6de2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/App.java +++ b/app/src/main/java/com/rehome/zhdcoa/App.java @@ -88,7 +88,7 @@ public class App extends LitePalApplication { //refWatcher = LeakCanary.install(this); NoHttp.initialize(this); - MultiDex.install(this); + //MultiDex.install(this); NoHttp.setDefaultConnectTimeout(6 * 1000); NoHttp.setDefaultReadTimeout(60 * 1000); initUser(); @@ -165,14 +165,14 @@ public class App extends LitePalApplication { * 初始化深信服注销监听回调 * 初始化深信服dp，sp转px的工具类 */ -// if (isApkInDebug(base)) { -// initSdk(base); -// GlobalListenerManager.getInstance().init(base); -// DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); -// } - initSdk(base); - GlobalListenerManager.getInstance().init(base); - DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density); + if (isApkInDebug(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 30178cd..4d838ea 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 @@ -128,21 +128,21 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网 } } else { - binding.rg.check(R.id.rb2) - SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网") - Contans.IP = Contans.IP_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内网 +// binding.rg.check(R.id.rb2) +// SPUtils.put(this, Contans.NETWORK_CHECK_TYPE, "外网") +// Contans.IP = Contans.IP_EXTRANET //运行IP外网 +// Contans.BASE_URL = Contans.BASE_URL_EXTRANET //行政IP外网 // Contans.BASE_URL_COMPANY_SERVER = -// Contans.BASE_URL_COMPANY_SERVER_INTRANET //智慧安防平台登录 电厂内网 +// Contans.BASE_URL_COMPANY_SERVER_EXTRANET //智慧安防平台登录 电厂外网 // Contans.BASE_URL_AI_3D_SERVER = -// Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网 +// 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_INTRANET //智慧安防平台登录 电厂内网 + Contans.BASE_URL_AI_3D_SERVER = + Contans.BASE_URL_AI_3D_SERVER_INTRANET //AI三维可视化安防平台登录 电厂外网 } binding.rg.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { _, checkedId -> @@ -207,15 +207,19 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { SFUemSDK.getInstance().logout() showToast(R.string.str_vpn_logout) } -// if (isApkInDebug(this)) { -// binding.tvVpnLogin.visibility=View.INVISIBLE -// binding.tvVpnLogout.visibility=View.VISIBLE -// binding.rb3.visibility=View.VISIBLE -// }else{ -// binding.tvVpnLogin.visibility=View.GONE -// binding.tvVpnLogout.visibility=View.GONE -// binding.rb3.visibility=View.GONE -// } + if (isApkInDebug(this)) { + binding.tvVpnLogin.visibility=View.INVISIBLE + binding.tvVpnLogout.visibility=View.VISIBLE + binding.rb3.visibility=View.VISIBLE + }else{ + binding.tvVpnLogin.visibility=View.GONE + binding.tvVpnLogout.visibility=View.GONE + binding.rb3.visibility=View.GONE + } + +// binding.tvVpnLogin.visibility=View.INVISIBLE +// binding.tvVpnLogout.visibility=View.VISIBLE +// binding.rb3.visibility=View.VISIBLE } @SuppressLint("SetTextI18n") @@ -237,8 +241,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@996") // binding.etUsername.setText("310249") // binding.etPassword.setText("GZgs#@0249") diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 88a9a9c..fba836e 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -180,6 +180,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="16sp" + android:checked="true" android:text="aTrust" /> diff --git a/app/src/main/res/layout/activity_work_risk_list_hui_bao.xml b/app/src/main/res/layout/activity_work_risk_list_hui_bao.xml index 68b1409..71493e4 100644 --- a/app/src/main/res/layout/activity_work_risk_list_hui_bao.xml +++ b/app/src/main/res/layout/activity_work_risk_list_hui_bao.xml @@ -57,9 +57,9 @@ + android:textSize="14sp" + android:visibility="gone" /> + + android:textSize="14sp" + android:visibility="gone" /> + + android:textSize="14sp" + android:visibility="gone" />