diff --git a/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt b/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt index 901b4e7..83a477d 100644 --- a/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt +++ b/app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt @@ -8,14 +8,14 @@ package com.shuwei.dish.match.base enum class DeviceRole { MASTER, SLAVE } object GlobalData { - var appBaseUrl: String = UAT_BASE_URL + var appBaseUrl: String = PROD_BASE_URL /** * 具体业务 BaseUrl */ const val TEST_BASE_URL = "http://192.168.10.101:24801" const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8081" - const val PROD_BASE_URL = "https://api.dm.yixiong-tech.com:8443" + const val PROD_BASE_URL = "https://platform-api.uat.shuziweidao.com" /** * 设备id */ diff --git a/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt b/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt index 8c42655..16f57a2 100644 --- a/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt +++ b/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt @@ -6,7 +6,7 @@ package com.shuwei.dish.match.scale */ object ScaleDeviceConfig { - const val DEVICE_ID_2 = "0bd74d78-c221-3182-b5ee-55d86dd79283"//测试0bd74d78-c221-3182-b5ee-55d86dd79283 正式8fc2ab34-2137-3112-acca-f884ea8736d4 + const val DEVICE_ID_2 = "8fc2ab34-2137-3112-acca-f884ea8736d4"//测试0bd74d78-c221-3182-b5ee-55d86dd79283 正式8fc2ab34-2137-3112-acca-f884ea8736d4 const val DEVICE_ID_22 = "a46fa55c-113c-3511-bb1f-41e5eff77c4b" const val DEVICE_ID_18 = "1038da9f-c6eb-326e-a1d9-d6d3af978b22" const val DEVICE_ID_1 = "7cc0f6ea-f13d-3013-a867-fc998eb554ac"