调整了初始化界面逻辑

This commit is contained in:
zxj
2025-08-14 13:36:45 +08:00
parent b83a442fe3
commit 7a832ec40d
6 changed files with 37 additions and 29 deletions
@@ -1,6 +1,5 @@
package com.sw.platecabinet.activity
import android.content.Intent
import com.sw.platecabinet.databinding.ActivityInitBinding
import com.sw.platecabinet.databinding.ItemTitleTimeBinding
@@ -15,8 +14,7 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
override fun initialize() {
binding.main.setOnClickListener {
val intent = Intent(this, LoginByFaceActivity::class.java)
startActivity(intent)
finish()
}
}
@@ -60,8 +60,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
companion object {
private var instance: LoginByFaceActivity? = null
fun finishActivity() {
instance?.finish()
fun goInitActivity() {
instance?.goInitActivity()
}
}
@@ -167,6 +167,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
}
override fun onDestroy() {
Timber.d("onDestroy")
instance = null
if (rgbCameraHelper != null) {
rgbCameraHelper!!.release()
@@ -388,6 +389,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
protected override fun onPause() {
pauseCamera()
super.onPause()
countDownTimer?.cancel()
}
private fun pauseCamera() {
@@ -398,19 +400,27 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
super.handleLoginSuccess(equipmentUserInfo, isAdmin)
finish()
goInitActivity()
}
fun initCountTime() {
val totalTimeInMillis = 30L * 1000
countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) {
override fun onTick(millisUntilFinished: Long) {
Timber.d("initCountTime onTick = ${(millisUntilFinished / 1000).toInt()}")
binding.tvToInit.text = "${(millisUntilFinished / 1000).toInt() + 1}"
}
override fun onFinish() {
finish()
goInitActivity()
}
}.start()
}
fun goInitActivity() {
val intent = Intent(context, InitActivity::class.java)
startActivity(intent)
}
}
@@ -41,7 +41,7 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
super.handleLoginSuccess(equipmentUserInfo, isAdmin)
LoginByFaceActivity.finishActivity()
LoginByFaceActivity.goInitActivity()
finish()
}
}