restaurant/SmartPlateCabinet
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(base): 优化协程作用域和空安全处理

Browse Source 
- 将自定义CoroutineScope替换为lifecycleScope以避免内存泄漏
- 添加runCatching包装器处理潜在异常并记录错误日志
- 使用安全调用操作符替代强制调用防止空指针异常
- 在CountDownTimer中正确管理生命周期以避免内存泄漏
- 修复设备信息获取中的数组越界风险
- 统一异步操作的线程切换方式
- 保护Fragment中的_binding访问权限
- 改进相机助手对象引用的安全性检查
This commit is contained in:
mazengfei
2026-03-31 17:12:14 +08:00
parent df9212d2dd
commit 0a193ed84e
6 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
+8 -7
View File
@@ -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<VB : ViewBinding> : 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<VB : ViewBinding> : 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<VB : ViewBinding> : 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
app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+14 -10
View File
@@ -238,7 +238,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
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<ActivityLoginFaceBinding>(),
}
}
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<ActivityLoginFaceBinding>(),
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<ActivityLoginFaceBinding>(),
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)
app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt
+1 -1
View File
@@ -15,7 +15,7 @@ import com.sw.platecabinet.view.CustomLoadingDialog
abstract class BaseFragment<VB : ViewBinding>(
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
app/src/main/java/com/sw/platecabinet/fragment/PlateCabinetFullFragment.kt
+11 -3
View File
@@ -11,6 +11,7 @@ import timber.log.Timber
class PlateCabinetFullFragment :
BaseFragment<FragmentPlateCabinetFullBinding>(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()
}
}
app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt
+13 -8
View File
@@ -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()
}
}
app/src/main/java/com/sw/platecabinet/utils/CrashHandler.kt
+1 -1
View File
@@ -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")