会员版修改包名

app/build.gradle.kts

@@ -14,11 +14,11 @@ android {
             keyPassword = "123456"
         }
     }
-    namespace = "com.sw.platecabinet"
+    namespace = "com.sw.platecabinet.member"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.sw.platecabinet"
+        applicationId = "com.sw.platecabinet.member"
         minSdk = 24
         targetSdk = 35
         versionCode = 1

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.member.R
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+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 initialDelay = 5 * 60 * 1000L
-    private val dealyMillis = 1 * 60 * 1000L
+    private val dealyMillis = 5 * 60 * 1000L
-    private var taskPageNo = 1
     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) {
+//                if (list.size >= settingViewModel.PAGE_SIZE) {
-                    faceTimestamp = list.last().faceUpdateTimestamp?:0
+//                    faceTimestamp = list.last().faceUpdateTimestamp?:0
-                    taskPageNo++
+//                    taskPageNo++
-                    getFaceIncrementList()
+//                    getFaceIncrementList()
-                    return@runOnUiThread
+//                    return@runOnUiThread
-                }
+//                }
                 if (list.isNotEmpty()) {
                     faceTimestamp = list.last().faceUpdateTimestamp?:0
                 }

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

@@ -6,8 +6,8 @@ import androidx.activity.viewModels
 import com.sw.plate.utils.AppUtil
 import com.sw.plate.utils.ToastUtils
 import com.sw.platecabinet.GlobalData
-import com.sw.platecabinet.databinding.ActivityDeviceInitBinding
+import com.sw.platecabinet.member.databinding.ActivityDeviceInitBinding
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.member.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.ext.gone
 import com.sw.platecabinet.ext.invisible
 import com.sw.platecabinet.viewmodel.SettingViewModel

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

@@ -3,8 +3,8 @@ package com.sw.platecabinet.activity
 import androidx.lifecycle.lifecycleScope
 import com.sw.plate.utils.arcface.FaceApi
 import com.sw.plate.utils.arcface.faceserver.FaceServer
-import com.sw.platecabinet.databinding.ActivityInitBinding
+import com.sw.platecabinet.member.databinding.ActivityInitBinding
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.member.databinding.ItemTitleTimeBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 

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

@@ -29,9 +29,9 @@ import com.sw.plate.utils.arcface.face.model.RecognizeConfiguration
 import com.sw.plate.utils.arcface.faceserver.FaceServer
 import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
 import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
-import com.sw.platecabinet.databinding.ActivityLoginFaceBinding
+import com.sw.platecabinet.member.databinding.ActivityLoginFaceBinding
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.member.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.network.task.TaskManager
 import com.sw.platecabinet.utils.PermissionHelper

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

@@ -2,8 +2,8 @@ package com.sw.platecabinet.activity
 
 import android.content.Intent
 import com.sw.plate.utils.ToastUtils
-import com.sw.platecabinet.databinding.ActivityLoginByPwdBinding
+import com.sw.platecabinet.member.databinding.ActivityLoginByPwdBinding
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.member.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
 import com.sw.platecabinet.model.request.LoginParam
 import com.sw.platecabinet.model.response.EquipmentUserInfo

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

@@ -2,9 +2,9 @@ package com.sw.platecabinet.activity
 
 import android.content.Context
 import android.content.Intent
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
-import com.sw.platecabinet.databinding.ActivityMainBinding
+import com.sw.platecabinet.member.databinding.ActivityMainBinding
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.member.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.fragment.BindPlateFragment
 import com.sw.platecabinet.fragment.PlateCabinetFullFragment
 import com.sw.platecabinet.fragment.PlateOpenFragment

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

@@ -10,7 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
 import kotlin.math.ceil
 
 class TestActivity : AppCompatActivity() {

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

@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.WindowCompat
 import com.sw.platecabinet.GlobalKey
-import com.sw.platecabinet.databinding.ActivityUnbindDialogBinding
+import com.sw.platecabinet.member.databinding.ActivityUnbindDialogBinding
-import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.member.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.ext.dp
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 

app/src/main/java/com/sw/platecabinet/adapter/GenericPageAdapter.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
 
 /**
  * 通用分页适配器（支持ViewBinding）

app/src/main/java/com/sw/platecabinet/dialog/BalanceNotEnoughDialog.kt

@@ -5,7 +5,7 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.Window
 import androidx.fragment.app.FragmentActivity
-import com.sw.platecabinet.databinding.DialogBalanceNotEnoughBinding
+import com.sw.platecabinet.member.databinding.DialogBalanceNotEnoughBinding
 import com.sw.platecabinet.ext.dp
 
 open class BalanceNotEnoughDialog(

app/src/main/java/com/sw/platecabinet/dialog/UserBindRemindDialog.kt

@@ -5,7 +5,7 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.Window
 import androidx.fragment.app.FragmentActivity
-import com.sw.platecabinet.databinding.DialogUserBindRemindBinding
+import com.sw.platecabinet.member.databinding.DialogUserBindRemindBinding
 import com.sw.platecabinet.ext.dp
 
 open class UserBindRemindDialog(

app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt

@@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
 import com.sw.platecabinet.view.CustomLoadingDialog
 import com.sw.platecabinet.viewmodel.SettingViewModel
 import kotlinx.coroutines.launch

app/src/main/java/com/sw/platecabinet/fragment/BindPlateFragment.kt

@@ -14,14 +14,14 @@ import androidx.recyclerview.widget.RecyclerView
 import com.sw.plate.utils.ToastUtils
 import com.sw.plate.utils.comn.SerialApi
 import com.sw.plate.utils.comn.SerialPortManager
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
 import com.sw.platecabinet.activity.MainActivity
 import com.sw.platecabinet.activity.PageType
 import com.sw.platecabinet.adapter.GenericItemAdapter
 import com.sw.platecabinet.adapter.GridSpacingItemDecoration
 import com.sw.platecabinet.adapter.dpToPx
-import com.sw.platecabinet.databinding.FragmentBindPlateBinding
+import com.sw.platecabinet.member.databinding.FragmentBindPlateBinding
-import com.sw.platecabinet.databinding.ItemSearchUserInfoBinding
+import com.sw.platecabinet.member.databinding.ItemSearchUserInfoBinding
 import com.sw.platecabinet.dialog.UserBindRemindDialog
 import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.ext.maskPhone

app/src/main/java/com/sw/platecabinet/fragment/PlateCabinetFullFragment.kt

@@ -2,7 +2,7 @@ package com.sw.platecabinet.fragment
 
 import android.os.CountDownTimer
 import com.sw.platecabinet.Constants
-import com.sw.platecabinet.databinding.FragmentPlateCabinetFullBinding
+import com.sw.platecabinet.member.databinding.FragmentPlateCabinetFullBinding
 import timber.log.Timber
 
 /**

app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt

@@ -4,9 +4,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import com.sw.platecabinet.Constants
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
 import com.sw.platecabinet.activity.InitActivity
-import com.sw.platecabinet.databinding.FragmentPlateOpenBinding
+import com.sw.platecabinet.member.databinding.FragmentPlateOpenBinding
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 
 /**

app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt

@@ -11,15 +11,15 @@ import com.sw.plate.utils.ToastUtils
 import com.sw.plate.utils.comn.SerialApi
 import com.sw.plate.utils.comn.SerialPortManager
 import com.sw.platecabinet.GlobalData
-import com.sw.platecabinet.R
+import com.sw.platecabinet.member.R
 import com.sw.platecabinet.activity.MainActivity
 import com.sw.platecabinet.activity.PageType
 import com.sw.platecabinet.adapter.GenericItemAdapter
 import com.sw.platecabinet.adapter.GenericPageAdapter
 import com.sw.platecabinet.adapter.GridSpacingItemDecoration
 import com.sw.platecabinet.adapter.dpToPx
-import com.sw.platecabinet.databinding.FragmentSettingListBinding
+import com.sw.platecabinet.member.databinding.FragmentSettingListBinding
-import com.sw.platecabinet.databinding.ItemBindViewBinding
+import com.sw.platecabinet.member.databinding.ItemBindViewBinding
 import com.sw.platecabinet.ext.formatNumber
 import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.model.response.EquipmentUserInfo

app/src/main/java/com/sw/platecabinet/fragment/UnBindPlateFragment.kt

@@ -9,7 +9,7 @@ import com.sw.inbound.utils.DateTimeUtils
 import com.sw.plate.utils.ToastUtils
 import com.sw.platecabinet.GlobalKey
 import com.sw.platecabinet.activity.UnBindDialogActivity
-import com.sw.platecabinet.databinding.FragmentUnbindPlateBinding
+import com.sw.platecabinet.member.databinding.FragmentUnbindPlateBinding
 import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.ext.maskPhone
 import com.sw.platecabinet.model.ErrorInfo

app/src/main/java/com/sw/platecabinet/network/task/HeartBeatTask.kt

@@ -1,23 +1,11 @@
 package com.sw.platecabinet.network.task
 
 import android.content.Context
-import android.util.Log
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.arcsoft.face.FaceEngine
-import com.sw.inbound.utils.GsonUtils
-import com.sw.plate.App
-import com.sw.plate.utils.Base64
-import com.sw.plate.utils.PrefUtils
 import com.sw.plate.utils.arcface.FaceApi
-import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
-import com.sw.plate.utils.arcface.faceserver.FaceServer
 import com.sw.platecabinet.network.ApiClient
 import com.sw.platecabinet.repository.RemoteRepository
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.greenrobot.eventbus.EventBus
-import timber.log.Timber
 
 class HeartBeatTask(appContext: Context, workerParams: WorkerParameters) :
     CoroutineWorker(appContext, workerParams) {

app/src/main/java/com/sw/platecabinet/repository/RemoteRepository.kt

@@ -1,13 +1,10 @@
 package com.sw.platecabinet.repository
 
-import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.model.DeviceConfig
 import com.sw.platecabinet.model.request.BindParam
-import com.sw.platecabinet.model.request.EquipmentParam
 import com.sw.platecabinet.model.request.LoginParam
 import com.sw.platecabinet.model.request.SearchParam
 import com.sw.platecabinet.model.response.ApiResponse
-import com.sw.platecabinet.model.response.EquipmentInfo
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.SearchResult
 import com.sw.platecabinet.model.response.UserFaceModel

app/src/main/java/com/sw/platecabinet/viewmodel/BaseViewModel.kt

@@ -3,7 +3,6 @@ package com.sw.platecabinet.viewmodel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sw.plate.utils.ToastUtils
-import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.model.response.ApiResponse
 import com.sw.platecabinet.model.response.EquipmentInfo
 import com.sw.platecabinet.network.ApiClient