diff --git a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt index 965a3c9..6f6d081 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt @@ -30,10 +30,10 @@ import com.sw.platecabinet.utils.IntervalExecutor import com.sw.platecabinet.utils.SpTool import com.sw.platecabinet.view.CustomLoadingDialog import com.sw.platecabinet.viewmodel.UserViewModel -import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import timber.log.Timber /** @@ -142,8 +142,7 @@ abstract class BaseActivity : AppCompatActivity() { onRightDoubleClick() } ) - val scope = CoroutineScope(Dispatchers.Main) - timeJob = scope.launch { + timeJob = lifecycleScope.launch { DateTimeUtils.realTimeChineseDateFlow() .collect { date -> it.tvRightTime.text = date @@ -347,7 +346,9 @@ abstract class BaseActivity : AppCompatActivity() { val alreadyExists = featureMatches.any { it } if (!alreadyExists) { //当前特征不存在，保存 - faceList.add(getNewFaceEntity(model)) + runCatching { getNewFaceEntity(model) } + .onSuccess { faceList.add(it) } + .onFailure { Timber.e(it, "人脸特征解码失败: userId=${model.userId}") } } } } @@ -378,13 +379,13 @@ abstract class BaseActivity : AppCompatActivity() { } fun clearAllFace(block: () -> Unit) { - Thread { + lifecycleScope.launch(Dispatchers.IO) { val faceDao = FaceDatabase.getInstance(App.getContext()).faceDao() faceDao.deleteAll() faceDao.resetId() recognizeViewModel.refreshFaceList() - runOnUiThread { block() } - }.start() + withContext(Dispatchers.Main) { block() } + } } private var permissionCallback: ((isGranted: Boolean) -> Unit)? = null 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 b4a1aa7..66abbe0 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -238,7 +238,10 @@ class LoginByFaceActivity : BaseActivity(), return@setCallback } if (this.userFaceInfo == null && isFitData(userFaceInfo)) { - val headBmp = userFaceInfo.headBmp + val headBmp = userFaceInfo.headBmp ?: run { + loadLogInfo("collectFace,isFitData:headBmp 为 null，跳过") + return@setCallback + } if (headBmp.width <= 200 || headBmp.height <= 200) { loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小w:${headBmp.width},h:${headBmp.height}-----------") binding.llCollectButton.visible() @@ -253,30 +256,30 @@ class LoginByFaceActivity : BaseActivity(), } } recognizeViewModel.ftInitCode.observe(this) { ftInitCode: Int? -> - if (ftInitCode != ErrorInfo.MOK) { + if (ftInitCode != null && ftInitCode != ErrorInfo.MOK) { val error: String? = getString( R.string.specific_engine_init_failed, "ftEngine", - ftInitCode, ErrorCodeUtil.arcFaceErrorCodeToFieldName(ftInitCode!!) + ftInitCode, ErrorCodeUtil.arcFaceErrorCodeToFieldName(ftInitCode) ) Timber.e("ftInitCode observe = $error") ToastUtils.showToast(error) } } recognizeViewModel.frInitCode.observe(this) { frInitCode: Int? -> - if (frInitCode != ErrorInfo.MOK) { + if (frInitCode != null && frInitCode != ErrorInfo.MOK) { val error: String? = getString( R.string.specific_engine_init_failed, "frEngine", - frInitCode, ErrorCodeUtil.arcFaceErrorCodeToFieldName(frInitCode!!) + frInitCode, ErrorCodeUtil.arcFaceErrorCodeToFieldName(frInitCode) ) Timber.e("frInitCode observe = $error") ToastUtils.showToast(error) } } recognizeViewModel.flInitCode.observe(this) { flInitCode: Int? -> - if (flInitCode != ErrorInfo.MOK) { + if (flInitCode != null && flInitCode != ErrorInfo.MOK) { val error: String? = getString( R.string.specific_engine_init_failed, "flEngine", - flInitCode, ErrorCodeUtil.arcFaceErrorCodeToFieldName(flInitCode!!) + flInitCode, ErrorCodeUtil.arcFaceErrorCodeToFieldName(flInitCode) ) Timber.e("flInitCode observe = $error") ToastUtils.showToast(error) @@ -615,7 +618,7 @@ class LoginByFaceActivity : BaseActivity(), override fun onCameraConfigurationChanged(cameraID: Int, displayOrientation: Int) { Timber.i("initRgbCamera onCameraConfigurationChanged: threadName = ${Thread.currentThread().name}") if (rgbFaceRectTransformer != null) { - rgbFaceRectTransformer!!.cameraDisplayOrientation = displayOrientation + rgbFaceRectTransformer?.cameraDisplayOrientation = displayOrientation } Timber.i("initRgbCamera onCameraConfigurationChanged: $cameraID $displayOrientation") } @@ -672,10 +675,11 @@ class LoginByFaceActivity : BaseActivity(), private fun resumeCamera() { // isRecognition = true - if (rgbCameraHelper != null && rgbCameraHelper!!.isStopped) { + val helper = rgbCameraHelper + if (helper != null && helper.isStopped) { loadLogInfo("collectFace,resumeCamera: ") isRecognition = true - rgbCameraHelper!!.start() + helper.start() } else { //recognizeViewModel.onPreviewFrame(ByteArray(1382400), true) diff --git a/app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt b/app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt index b06321c..9533c13 100644 --- a/app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt +++ b/app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt @@ -15,7 +15,7 @@ import com.sw.platecabinet.view.CustomLoadingDialog abstract class BaseFragment( private val bindingInflater: (inflater: LayoutInflater, parent: ViewGroup?, attachToParent: Boolean) -> VB ) : Fragment() { - private var _binding: VB? = null + protected var _binding: VB? = null protected val binding get() = _binding!! private var mDialogWaiting: CustomLoadingDialog? = null diff --git a/app/src/main/java/com/sw/platecabinet/fragment/PlateCabinetFullFragment.kt b/app/src/main/java/com/sw/platecabinet/fragment/PlateCabinetFullFragment.kt index f1570dd..8851d1f 100644 --- a/app/src/main/java/com/sw/platecabinet/fragment/PlateCabinetFullFragment.kt +++ b/app/src/main/java/com/sw/platecabinet/fragment/PlateCabinetFullFragment.kt @@ -11,6 +11,7 @@ import timber.log.Timber class PlateCabinetFullFragment : BaseFragment(FragmentPlateCabinetFullBinding::inflate) { private var totalTimeInMillis: Long = Constants.AUTO_CLOSE_TIME * 1000 + private var countDownTimer: CountDownTimer? = null override fun initialize() { Timber.d("initialize") @@ -18,15 +19,22 @@ class PlateCabinetFullFragment : } fun initCountTime() { - object : CountDownTimer(totalTimeInMillis, 1000) { + countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) { override fun onTick(millisUntilFinished: Long) { - binding.tvAutoClose.text = "${(millisUntilFinished / 1000).toInt() + 1}秒后返回主屏" + _binding?.tvAutoClose?.text = "${(millisUntilFinished / 1000).toInt() + 1}秒后返回主屏" } override fun onFinish() { activity?.finish() } - }.start() + } + countDownTimer?.start() + } + + override fun onDestroyView() { + countDownTimer?.cancel() + countDownTimer = null + super.onDestroyView() } } \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt b/app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt index 061ee1e..40942a4 100644 --- a/app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt +++ b/app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt @@ -20,6 +20,7 @@ class PlateOpenFragment : // private var isAdmin: Boolean = false private var isScanCode = false + private var countDownTimer: CountDownTimer? = null companion object { const val IS_SCAN_CODE = "isScanCode" // @JvmStatic @@ -75,19 +76,23 @@ class PlateOpenFragment : } fun initCountTime() { - object : CountDownTimer(totalTimeInMillis, 1000) { + countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) { override fun onTick(millisUntilFinished: Long) { - binding.tvAutoClose.text = ((millisUntilFinished / 1000).toInt() + 1).toString() + _binding?.tvAutoClose?.text = ((millisUntilFinished / 1000).toInt() + 1).toString() } override fun onFinish() { + val ctx = context ?: return activity?.finish() -// if (!isAdmin) { - val intent = Intent(context, InitActivity::class.java) - startActivity(intent) -// } - + ctx.startActivity(Intent(ctx, InitActivity::class.java)) } - }.start() + } + countDownTimer?.start() + } + + override fun onDestroyView() { + countDownTimer?.cancel() + countDownTimer = null + super.onDestroyView() } } \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/utils/CrashHandler.kt b/app/src/main/java/com/sw/platecabinet/utils/CrashHandler.kt index 78063b7..fe04b43 100644 --- a/app/src/main/java/com/sw/platecabinet/utils/CrashHandler.kt +++ b/app/src/main/java/com/sw/platecabinet/utils/CrashHandler.kt @@ -154,7 +154,7 @@ class CrashHandler private constructor(private val context: Context) : // 设备信息 sb.append("Vendor: ${Build.MANUFACTURER}\n") sb.append("Model: ${Build.MODEL}\n") - sb.append("CPU ABI: ${Build.SUPPORTED_ABIS[0]}\n") + sb.append("CPU ABI: ${Build.SUPPORTED_ABIS.firstOrNull() ?: "unknown"}\n") // 其他信息 sb.append("Locale: ${Locale.getDefault()}\n")