diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d9c064b..eb5da4e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
@@ -39,24 +39,24 @@
@@ -66,7 +66,7 @@
diff --git a/app/src/main/java/com/sw/platecabinet/GlobalData.kt b/app/src/main/java/com/sw/platecabinet/GlobalData.kt
index 01c2ba6..2390a88 100644
--- a/app/src/main/java/com/sw/platecabinet/GlobalData.kt
+++ b/app/src/main/java/com/sw/platecabinet/GlobalData.kt
@@ -28,11 +28,12 @@ object GlobalData {
var appId = "Hkz1rBk6PZXbS8KwKr67K2eZtsz8bRoMHLg64bUdgCZj"
var sdkKey = "AabXs3sHM8UhhE7oCGf4LVMLrdkGb1nJNksbjjTdVt7k"
- var activeKey ="085F-118G-Q3J6-35UX" //"085F-118G-Q391-53YL"
+ var activeKey = "085F-118G-Q3Y3-WXXX"//"085F-118G-Q3J6-35UX" //"085F-118G-Q391-53YL"
/**
* 具体业务baseurl
*/
+// var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
/**
diff --git a/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt
index 7706863..fc6bab9 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt
@@ -45,26 +45,29 @@ class DeviceInitActivity : BaseActivity() {
// binding.root.postDelayed({
// goLoginActivity()
// }, 1000)
- showWaitingDialog("加载中……")
- viewModel.getDeviceConfig { deviceConfig ->
- runOnUiThread {
- if (deviceConfig == null) {
- hideWaitingDialog()
- ToastUtils.showToast("获取设备配置数据失败")
- hideWaitingDialog()
- goLoginActivity()
- return@runOnUiThread
- }
- GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
- GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
- GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
- binding.root.postDelayed({
- hideWaitingDialog()
- goLoginActivity()
- }, 500)
- }
- }
-// goLoginActivity()
+// showWaitingDialog("加载中……")
+// viewModel.getDeviceConfig { deviceConfig ->
+// runOnUiThread {
+// if (deviceConfig == null) {
+// hideWaitingDialog()
+// ToastUtils.showToast("获取设备配置数据失败")
+// hideWaitingDialog()
+// goLoginActivity()
+// return@runOnUiThread
+// }
+// GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
+// GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
+// GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
+// binding.root.postDelayed({
+// hideWaitingDialog()
+// goLoginActivity()
+// }, 500)
+// }
+// }
+
+ binding.root.postDelayed({
+ goLoginActivity()
+ }, 500)
}
override fun registerDataChange() {
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
index 45f53e6..6aa4eb9 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -277,7 +277,7 @@ class LoginByFaceActivity : BaseActivity(),
val layoutParams = adjustPreviewViewSize(
binding.dualCameraTexturePreviewRgb,
binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
- previewSizeRgb, displayOrientation, 0.6f
+ previewSizeRgb, displayOrientation, 0.7f
)
Timber.d("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
Timber.d("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a82b98a..ed80ad9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
- 餐盘柜
+ 餐盘柜会员版
Hello blank fragment