From d1e9c4d34f6a120f1fe1d85f8ce7aa24f2755295 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Tue, 30 Jun 2026 16:58:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E6=9B=B4=E6=96=B0=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AEURL=E6=98=A0=E5=B0=84=E5=85=B3?= =?UTF-8?q?=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将TEST_BASE_URL替换为LOCAL_BASE_URL作为本地开发地址 - 将UAT_BASE_URL替换为TEST_BASE_URL作为测试环境地址 - 更新环境切换对话框中的单选按钮映射逻辑 - 修改应用启动时的设备ID判断逻辑和默认环境配置 - 移除部分临时测试代码并调整注释状态 --- app/src/main/java/com/sw/platecabinet/GlobalData.kt | 4 ++-- app/src/main/java/com/sw/platecabinet/MyApp.kt | 8 ++++++-- .../java/com/sw/platecabinet/dialog/EnvSwitchDialog.kt | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/sw/platecabinet/GlobalData.kt b/app/src/main/java/com/sw/platecabinet/GlobalData.kt index 4ad2c7a..de0e90a 100644 --- a/app/src/main/java/com/sw/platecabinet/GlobalData.kt +++ b/app/src/main/java/com/sw/platecabinet/GlobalData.kt @@ -38,8 +38,8 @@ object GlobalData { /** * 具体业务 BaseUrl */ - const val TEST_BASE_URL: String = "http://192.168.1.201:14801" - const val UAT_BASE_URL: String = "https://dev.yixiong-tech.com:8083" + const val LOCAL_BASE_URL: String = "http://192.168.10.101:24801" + const val TEST_BASE_URL: String = "https://dev.yixiong-tech.com:8081" const val PROD_BASE_URL: String = "https://api.dm.yixiong-tech.com:8443" /** diff --git a/app/src/main/java/com/sw/platecabinet/MyApp.kt b/app/src/main/java/com/sw/platecabinet/MyApp.kt index a7c4e8c..53a863d 100644 --- a/app/src/main/java/com/sw/platecabinet/MyApp.kt +++ b/app/src/main/java/com/sw/platecabinet/MyApp.kt @@ -42,12 +42,15 @@ class MyApp : App() { } else { GlobalData.appBaseUrl = if ("14d2dad5-7d33-3ced-8a59-f14cb1ef2d21" == deviceId) - GlobalData.TEST_BASE_URL + GlobalData.LOCAL_BASE_URL else - GlobalData.PROD_BASE_URL +// GlobalData.PROD_BASE_URL + GlobalData.TEST_BASE_URL } // TODO: 临时测试---------------- +// GlobalData.appBaseUrl = GlobalData.TEST_BASE_URL +// GlobalData.deviceId = "79814f20-f253-397c-9da7-8430ffa5ef00" // if ("2987f0c5-5754-33e9-b00a-251db5e2e55f" == deviceId) { // GlobalData.deviceId = "79814f20-f253-397c-9da7-8430ffa5ef00" // } @@ -55,6 +58,7 @@ class MyApp : App() { GlobalData.appVersion = AppUtil.getAppVersionCode(this).toString() GlobalData.globalEquipmentCode = "202501171634" + // GlobalData.appBaseUrl = "http://192.168.1.201:14801" } } \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/dialog/EnvSwitchDialog.kt b/app/src/main/java/com/sw/platecabinet/dialog/EnvSwitchDialog.kt index ed1ce91..537c2dc 100644 --- a/app/src/main/java/com/sw/platecabinet/dialog/EnvSwitchDialog.kt +++ b/app/src/main/java/com/sw/platecabinet/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 }