diff --git a/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt index 9aa5bdd..bfca473 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt @@ -85,12 +85,12 @@ class InitActivity : BaseActivity() { getCollectedFoodVector { runOnUiThread { hideWaitingDialog() - binding.root.postDelayed({ - checkCameraPermissionAndGo() - }, 1000) } } } + binding.root.postDelayed({ + checkCameraPermissionAndGo() + }, 1000) } } @@ -173,9 +173,9 @@ class InitActivity : BaseActivity() { } } - var arcsoftAppId = "Hkz1rBk6PZXbS8KwKr67K2eZtsz8bRoMHLg64bUdgCZj" - var arcsoftSdkKey = "AabXs3sHM8UhhE7oCGf4LVMLrdkGb1nJNksbjjTdVt7k" - var arcsoftActiveKey = "085F-118G-Q4GH-B2YH" +// var arcsoftAppId = "Hkz1rBk6PZXbS8KwKr67K2eZtsz8bRoMHLg64bUdgCZj" +// var arcsoftSdkKey = "AabXs3sHM8UhhE7oCGf4LVMLrdkGb1nJNksbjjTdVt7k" +// var arcsoftActiveKey = "085F-118G-Q4GH-B2YH" private fun getDeviceConfig() { userViewModel.getDeviceConfig( @@ -188,11 +188,11 @@ class InitActivity : BaseActivity() { val settlementMode = if (deviceConfig.payType == 2) 0 else 1 SpTool.settlementMode = settlementMode - // TODO: 临时写死用于测试---------------------------------------- - deviceConfig.arcsoftAppId = arcsoftAppId - deviceConfig.arcsoftSdkKey = arcsoftSdkKey - deviceConfig.arcsoftActiveKey = arcsoftActiveKey - // TODO: 临时写死用于测试---------------------------------------- +// // TODO: 临时写死用于测试---------------------------------------- +// deviceConfig.arcsoftAppId = arcsoftAppId +// deviceConfig.arcsoftSdkKey = arcsoftSdkKey +// deviceConfig.arcsoftActiveKey = arcsoftActiveKey +// // TODO: 临时写死用于测试---------------------------------------- GlobalData.appId = deviceConfig.arcsoftAppId ?: "" GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: "" diff --git a/app/src/main/java/com/sw/dualscreen/network/ApiClient.kt b/app/src/main/java/com/sw/dualscreen/network/ApiClient.kt index 9026ef7..5cd3b89 100644 --- a/app/src/main/java/com/sw/dualscreen/network/ApiClient.kt +++ b/app/src/main/java/com/sw/dualscreen/network/ApiClient.kt @@ -32,7 +32,7 @@ object ApiClient { val url = request.url.toString() val tag = if ( url.contains("terminal/neglect/common/app/faceFeature/increment/list") || - url.contains("nutrition/neglect/booth/face/increment") + url.contains("nutrition/neglect/serve/face/increment") ) "faceIncrement" else if (url.contains("terminal/neglect/pay/app/turnOrderInfo")) "turnOrderInfo" else if(url.contains("nutrition/neglect")) "V2"