优化
This commit is contained in:
@@ -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"
|
||||
|
||||
/**
|
||||
|
||||
@@ -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}")
|
||||
|
||||
Reference in New Issue
Block a user