diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt index eb08364..791eaf1 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt @@ -183,11 +183,11 @@ class HomeActivity : BaseActivity() { // viewModel.getAccessToken(App.deviceId) -// viewModel.getShelfList(deviceId = App.deviceId) + viewModel.getShelfList(deviceId = App.deviceId) - binding.root.postDelayed({ - loadTestData() - }, 30*1000) +// binding.root.postDelayed({ +// loadTestData() +// }, 30*1000) } private fun loadTestData() { diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt b/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt index c96abd4..0c7395b 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt @@ -3,7 +3,7 @@ package com.shuwei.intelligent.shelves.net import com.shuwei.intelligent.shelves.App object UrlConfig { - const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889" +// const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889" // /** // * device获取token // */ @@ -13,9 +13,10 @@ object UrlConfig { // */ // const val DEVICE_CONFIG = "${DEVICE_BASE_URL}/equipment/stEquipment/queryByEquipmentCode" - const val BASE_URL = "http://dev.yixiong-tech.com:8081" + const val BASE_URL = "https://dev.yixiong-tech.com:8081" // const val BASE_URL = "https://yyjk.shuziweidao.com/gateway" // const val BASE_URL = "http://192.168.1.201:14801" + const val DEVICE_BASE_URL = BASE_URL var GET_ACCESS_TOKEN = "${App.configUrl}/restaurant/equipment/stEquipment/getEquipmentToken" var GET_SHELF_LIST =