This commit is contained in:
mazengfei
2026-03-02 16:35:36 +08:00
parent 147fa08e9b
commit 5b8db65fa2
5 changed files with 35 additions and 31 deletions
@@ -45,26 +45,29 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
// 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() {
@@ -277,7 +277,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
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}")