会员版修改包名

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

@@ -25,8 +25,8 @@ import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
 import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
 import com.sw.plate.utils.comn.SerialApi
 import com.sw.plate.utils.comn.SerialPortManager
-import com.sw.platecabinet.R
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.member.R
+import com.sw.platecabinet.member.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
 import com.sw.platecabinet.ext.setClickListeners
 import com.sw.platecabinet.model.response.EquipmentUserInfo
@@ -394,9 +394,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
     //    private val initialDelay = 5 * 60 * 1000L
 //    private val dealyMillis = 10 * 60 * 1000L
-    private val initialDelay = 1 * 60 * 1000L
-    private val dealyMillis = 1 * 60 * 1000L
-    private var taskPageNo = 1
+    private val initialDelay = 5 * 60 * 1000L
+    private val dealyMillis = 5 * 60 * 1000L
     fun startFaceTask() {
         faceTaskJob =
             intervalExecutor.startIntervalTaskWithInitialDelay(initialDelay, dealyMillis) {
@@ -406,27 +405,27 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
     private var faceTimestamp = 0L
 
-    private fun getFaceIncrementList() {
+    private fun getFaceIncrementList(pageNo: Int = 1) {
         val timestamp = SpTool.getLastFaceTimestamp()
         if (timestamp == 0L) {
             return
         }
         settingViewModel.getFaceIncrementList(
-            pageNo = taskPageNo,
+            pageNo = pageNo,
             timestamp = timestamp
         ) { list ->
             runOnUiThread {
-                if (taskPageNo == 1 && list.isEmpty()) {
+                if (pageNo == 1 && list.isEmpty()) {
                     //未查询到增量数据
                     return@runOnUiThread
                 }
                 updateFaceData(list)
-                if (list.size >= settingViewModel.PAGE_SIZE) {
-                    faceTimestamp = list.last().faceUpdateTimestamp?:0
-                    taskPageNo++
-                    getFaceIncrementList()
-                    return@runOnUiThread
-                }
+//                if (list.size >= settingViewModel.PAGE_SIZE) {
+//                    faceTimestamp = list.last().faceUpdateTimestamp?:0
+//                    taskPageNo++
+//                    getFaceIncrementList()
+//                    return@runOnUiThread
+//                }
                 if (list.isNotEmpty()) {
                     faceTimestamp = list.last().faceUpdateTimestamp?:0
                 }