diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ca1728b..30198e3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,26 +29,25 @@ + android:theme="@style/DialogActivity" /> + android:exported="false"> + + + - - - - diff --git a/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt index d49a9fb..ddce89b 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt @@ -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() { override fun initialize() { binding.main.setOnClickListener { - val intent = Intent(this, LoginByFaceActivity::class.java) - startActivity(intent) + finish() } } 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 d122c46..ae0b3d0 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -60,8 +60,8 @@ class LoginByFaceActivity : BaseActivity(), companion object { private var instance: LoginByFaceActivity? = null - fun finishActivity() { - instance?.finish() + fun goInitActivity() { + instance?.goInitActivity() } } @@ -167,6 +167,7 @@ class LoginByFaceActivity : BaseActivity(), } override fun onDestroy() { + Timber.d("onDestroy") instance = null if (rgbCameraHelper != null) { rgbCameraHelper!!.release() @@ -388,6 +389,7 @@ class LoginByFaceActivity : BaseActivity(), protected override fun onPause() { pauseCamera() super.onPause() + countDownTimer?.cancel() } private fun pauseCamera() { @@ -398,19 +400,27 @@ class LoginByFaceActivity : BaseActivity(), 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) + } + + } \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt index 137f498..e8fa9e4 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt @@ -41,7 +41,7 @@ class LoginByPwdActivity : BaseActivity() { override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) { super.handleLoginSuccess(equipmentUserInfo, isAdmin) - LoginByFaceActivity.finishActivity() + LoginByFaceActivity.goInitActivity() finish() } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_unbind_plate.xml b/app/src/main/res/layout/fragment_unbind_plate.xml index 2451a68..e7800c4 100644 --- a/app/src/main/res/layout/fragment_unbind_plate.xml +++ b/app/src/main/res/layout/fragment_unbind_plate.xml @@ -13,7 +13,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="80dp" - android:src="@drawable/ic_unbind_img" /> + android:rotation="180" + android:src="@drawable/ic_bind_img" /> false - \ No newline at end of file