优化

app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt

@@ -419,16 +419,17 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 //    private val dealyMillis = 10 * 60 * 1000L
     private val initialDelay = 5 * 60 * 1000L
     private val dealyMillis = 5 * 60 * 1000L
-    fun startFaceTask() {
+    fun startFaceTask(block: (List<String?>) -> Unit) {
         faceTaskJob =
             intervalExecutor.startIntervalTaskWithInitialDelay(initialDelay, dealyMillis) {
-                getFaceIncrementList()
+                getFaceIncrementList(action = block)
             }
     }
 
     private var faceTimestamp = 0L
+
     //private var taskPageNo = 1
-    private fun getFaceIncrementList(pageNo: Int = 1) {
+    private fun getFaceIncrementList(pageNo: Int = 1, action:(List<String?>)-> Unit) {
         val timestamp = SpTool.lastFaceTimestamp
         if (timestamp == 0L) {
             return
@@ -443,6 +444,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
                     return@runOnUiThread
                 }
                 updateFaceData(list)
+                val userIdList = list.map { it.userId }
+                action(userIdList)
                 //if (list.size >= settingViewModel.PAGE_SIZE) {
                 //    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
                 //    taskPageNo++
@@ -461,22 +464,26 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     private fun updateFaceData(list: List<UserFaceModel>) {
         Thread {
             val faceList = mutableListOf<FaceEntity>()
+            val faceDao = FaceDatabase.getInstance(this).faceDao()
             try {
                 list.forEach { model ->
                     if (model.faceDeleted == true) {
                         //删除数据
-                        FaceDatabase.getInstance(this).faceDao().deleteFaceById(model.userId)
+                        faceDao.deleteFaceById(model.userId)
                     } else {
-                        //保存数据
-                        val faceEntity = FaceEntity(
-                            model.userId,
-                            null,
-                            Base64.decode(model.faceFeatureStr)
-                        ).also {
-                            //1-会员、2-临时用户
-                            it.userType = if (model.isMember) "1" else "2"
+                        val faceData = faceDao.queryByUserName(model.userId)
+                        if (faceData == null) {
+                            //保存数据
+                            val faceEntity = FaceEntity(
+                                model.userId,
+                                null,
+                                Base64.decode(model.faceFeatureStr)
+                            ).also {
+                                //1-会员、2-临时用户
+                                it.userType = if (model.isMember) "1" else "2"
+                            }
+                            faceList.add(faceEntity)
                         }
-                        faceList.add(faceEntity)
                     }
                 }
             } catch (e: Exception) {

app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt

@@ -53,10 +53,11 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
                     userViewModel.getUserFaceCache { status, msg ->
                         getDeviceConfig()
                     }
+                } else {
+                    getDeviceConfig()
                 }
             }
         }
-        getDeviceConfig()
     }
 
     private fun getDeviceConfig() {

app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt

@@ -138,7 +138,9 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 //        }
 
         //开启人脸增量数据定时任务
-        startFaceTask()
+        startFaceTask {
+            loadLogInfo("collectFace增量接口数据用户id:${Gson().toJson(it)}")
+        }
 
         val soundMap = hashMapOf<String, Int>()
         soundMap[COLLECT_SUCCESS] = R.raw.collect_success
@@ -827,31 +829,33 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     private var currentUserId: String? = null
 
     private fun saveFaceInfo(faceModel: UserFaceModel) {
-        try {
-            loadLogInfo("collectFace,saveFaceInfo: ----------8,保存人脸取特征数据-----------")
-            val faceDao = FaceDatabase.getInstance(this).faceDao()
-            val faceEntity = FaceEntity(
-                faceModel.userId,
-                null,
-                Base64.decode(faceModel.faceFeatureStr)
-            ).also {
-                //1-会员、2-临时用户
-                it.userType = if (faceModel.isMember) "1" else "2"
+        Thread {
+            try {
+                loadLogInfo("collectFace,saveFaceInfo: ----------8,保存人脸取特征数据-----------")
+                val faceDao = FaceDatabase.getInstance(this).faceDao()
+                val faceEntity = FaceEntity(
+                    faceModel.userId,
+                    null,
+                    Base64.decode(faceModel.faceFeatureStr)
+                ).also {
+                    //1-会员、2-临时用户
+                    it.userType = if (faceModel.isMember) "1" else "2"
+                }
+                faceDao.insert(faceEntity)
+                loadLogInfo("collectFace,saveFaceInfo: ----------10,人脸数据保存完成-----------")
+                recognizeViewModel.refreshFaceList()
+                loadLogInfo("collectFace,saveFaceInfo: ----------11,刷新人脸数据-----------")
+                runOnUiThread { recognizeViewModel.onPreviewFrame(ByteArray(1382400), true) }
+                loadLogInfo("---------------------------------")
+                collectCount = 0
+            } catch (e: Exception) {
+                e.printStackTrace()
+                loadLogInfo("collectFace,saveFaceInfo: ----------13,人脸采集异常:${e.message}-----------")
+                collectCount++
+                loadLogInfo("collectFace,saveFaceInfo: ----------14,${collectCount}次人脸采集异常:${e.message}-----------")
+                ToastUtils.showToast("人脸采集异常:${e.message}")
             }
-            faceDao.insert(faceEntity)
-            loadLogInfo("collectFace,saveFaceInfo: ----------10,人脸数据保存完成-----------")
-            recognizeViewModel.refreshFaceList()
-            loadLogInfo("collectFace,saveFaceInfo: ----------11,刷新人脸数据-----------")
-            runOnUiThread { recognizeViewModel.onPreviewFrame(ByteArray(1382400), true) }
-            loadLogInfo("---------------------------------")
-            collectCount = 0
-        } catch (e: Exception) {
-            e.printStackTrace()
-            loadLogInfo("collectFace,saveFaceInfo: ----------13,人脸采集异常:${e.message}-----------")
-            collectCount++
-            loadLogInfo("collectFace,saveFaceInfo: ----------14,${collectCount}次人脸采集异常:${e.message}-----------")
-            ToastUtils.showToast("人脸采集异常:${e.message}")
-        }
+        }.start()
     }
 
     private var collectCount = 0

app/src/main/res/layout/dialog_custom.xml

@@ -26,9 +26,11 @@
 
     <TextView
         android:id="@+id/tvContent"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
+        android:layout_marginHorizontal="50dp"
+        android:gravity="center"
         tools:text="解绑后该用户将无法使用餐盘柜"
         android:textColor="#ff999999"
         android:textSize="24sp"/>

app/src/main/res/layout/dialog_waiting.xml

@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="240dp"
         android:layout_height="80dp"
+        android:gravity="center_vertical"
         android:background="@drawable/dialog_waiting">
 
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:indeterminateTint="@color/teal_200"
+            android:indeterminateTintMode="src_atop" />
 
         <TextView
             android:id="@+id/tvTip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_marginStart="30dp"
             android:textColor="@color/white"
             android:text="请稍等"
             android:textSize="22sp" />
 
-        <ProgressBar
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="30dp"
-            android:layout_toLeftOf="@id/tvTip"
-            android:indeterminateTint="@color/teal_200"
-            android:indeterminateTintMode="src_atop" />
-
-    </RelativeLayout>
+    </LinearLayout>
 </FrameLayout>