From 936bf206dc3ff6da59ce2130d54cfb190f949fbd Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Wed, 3 Jun 2026 16:34:16 +0800 Subject: [PATCH] =?UTF-8?q?```=20refactor(env):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E5=92=8C=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将本地环境配置从注释状态启用，并更新对应的IP地址和端口 - 修改环境切换对话框中的文本标签，重新排列环境选项顺序 - 更新全局数据类中的环境URL常量定义，调整测试和UAT环境地址 - 移除未使用的SPUtil导入，改用SpTool工具类 - 修改应用启动时的默认环境判断逻辑，将特定设备指向本地环境 - 调整环境切换对话框中的RadioButton选中状态和URL映射关系 ``` --- app/src/main/java/com/sw/dualscreen/GlobalData.kt | 7 ++++--- app/src/main/java/com/sw/dualscreen/MyApp.kt | 3 +-- .../main/java/com/sw/dualscreen/dialog/EnvSwitchDialog.kt | 8 ++++---- app/src/main/res/layout/dialog_env_switch.xml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/sw/dualscreen/GlobalData.kt b/app/src/main/java/com/sw/dualscreen/GlobalData.kt index 0ce9c31..8ae8cee 100644 --- a/app/src/main/java/com/sw/dualscreen/GlobalData.kt +++ b/app/src/main/java/com/sw/dualscreen/GlobalData.kt @@ -22,9 +22,10 @@ object GlobalData { /** * 具体业务 BaseUrl */ -// const val TEST_BASE_URL = "http://192.168.1.201:14801" - const val TEST_BASE_URL = "http://192.168.10.101:24801" - const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8083" +// const val LOCAL_BASE_URL = "http://192.168.1.201:14801" + const val LOCAL_BASE_URL = "http://192.168.10.101:24801" +// const val TEST_BASE_URL = "https://dev.yixiong-tech.com:8083" + const val TEST_BASE_URL = "https://dev.yixiong-tech.com:8081" const val PROD_BASE_URL = "https://api.dm.yixiong-tech.com:8443" /** diff --git a/app/src/main/java/com/sw/dualscreen/MyApp.kt b/app/src/main/java/com/sw/dualscreen/MyApp.kt index 48e4447..6d8f663 100644 --- a/app/src/main/java/com/sw/dualscreen/MyApp.kt +++ b/app/src/main/java/com/sw/dualscreen/MyApp.kt @@ -6,7 +6,6 @@ import com.sw.dualscreen.objbox.ObjectBox import com.sw.dualscreen.sdk.SensorScaleUtils import com.sw.dualscreen.utils.ActivityManager import com.sw.dualscreen.utils.CrashHandler -import com.sw.dualscreen.utils.SPUtil import com.sw.dualscreen.utils.SpTool import com.sw.plate.App import com.sw.plate.utils.AppUtil @@ -40,7 +39,7 @@ class MyApp : App() { } else { // 未保存过则使用默认逻辑：特定设备走测试环境，其余走 UAT GlobalData.appBaseUrl = - if ("2987f0c5-5754-33e9-b00a-251db5e2e55f" == deviceId) GlobalData.TEST_BASE_URL else GlobalData.PROD_BASE_URL + if ("2987f0c5-5754-33e9-b00a-251db5e2e55f" == deviceId) GlobalData.LOCAL_BASE_URL else GlobalData.PROD_BASE_URL } } diff --git a/app/src/main/java/com/sw/dualscreen/dialog/EnvSwitchDialog.kt b/app/src/main/java/com/sw/dualscreen/dialog/EnvSwitchDialog.kt index 2365276..51f2370 100644 --- a/app/src/main/java/com/sw/dualscreen/dialog/EnvSwitchDialog.kt +++ b/app/src/main/java/com/sw/dualscreen/dialog/EnvSwitchDialog.kt @@ -39,8 +39,8 @@ class EnvSwitchDialog( override fun initView() { // 根据当前 appBaseUrl 预选对应 RadioButton，不匹配则不选 when (GlobalData.appBaseUrl) { - GlobalData.TEST_BASE_URL -> binding.rbTest.isChecked = true - GlobalData.UAT_BASE_URL -> binding.rbUat.isChecked = true + GlobalData.LOCAL_BASE_URL -> binding.rbTest.isChecked = true + GlobalData.TEST_BASE_URL -> binding.rbUat.isChecked = true GlobalData.PROD_BASE_URL -> binding.rbProd.isChecked = true } @@ -55,8 +55,8 @@ class EnvSwitchDialog( return@setOnClickListener } val newUrl = when (binding.rgEnv.checkedRadioButtonId) { - binding.rbTest.id -> GlobalData.TEST_BASE_URL - binding.rbUat.id -> GlobalData.UAT_BASE_URL + binding.rbTest.id -> GlobalData.LOCAL_BASE_URL + binding.rbUat.id -> GlobalData.TEST_BASE_URL binding.rbProd.id -> GlobalData.PROD_BASE_URL else -> return@setOnClickListener } diff --git a/app/src/main/res/layout/dialog_env_switch.xml b/app/src/main/res/layout/dialog_env_switch.xml index 45c6ff8..3a1b686 100644 --- a/app/src/main/res/layout/dialog_env_switch.xml +++ b/app/src/main/res/layout/dialog_env_switch.xml @@ -38,7 +38,7 @@ android:layout_height="72dp" android:gravity="center_vertical" android:paddingStart="16dp" - android:text="测试环境" + android:text="本地环境" android:textColor="#ff141428" android:textSize="28sp" /> @@ -48,7 +48,7 @@ android:layout_height="72dp" android:gravity="center_vertical" android:paddingStart="16dp" - android:text="UAT 环境" + android:text="测试环境" android:textColor="#ff141428" android:textSize="28sp" />