增加人脸采集功能；
识别人脸成功后打开有餐盘的第一个柜子； 扫码打开已绑定的柜子，无则打开第一个空柜子并放入餐盘； 设置页面问题优化；
This commit is contained in:
mazengfei
@@ -25,6 +25,7 @@ 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.MyApp
|
||||
import com.sw.platecabinet.R
|
||||
import com.sw.platecabinet.databinding.ItemTitleTimeBinding
|
||||
import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
|
||||
@@ -33,6 +34,7 @@ import com.sw.platecabinet.model.response.EquipmentUserInfo
|
||||
import com.sw.platecabinet.model.response.UserFaceModel
|
||||
import com.sw.platecabinet.utils.IntervalExecutor
|
||||
import com.sw.platecabinet.utils.PermissionHelper
|
||||
import com.sw.platecabinet.utils.PlateUtils
|
||||
import com.sw.platecabinet.utils.SpTool
|
||||
import com.sw.platecabinet.view.CustomLoadingDialog
|
||||
import com.sw.platecabinet.viewmodel.SettingViewModel
|
||||
@@ -106,7 +108,34 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
* 处理扫描枪数据
|
||||
*/
|
||||
protected open fun handleScanKeyInfo(scanInfo: String) {
|
||||
settingViewModel.findByPlateNumber(plateNumber = scanInfo)
|
||||
// settingViewModel.findByPlateNumber(plateNumber = scanInfo)
|
||||
var plateNumber = scanInfo
|
||||
if (scanInfo.length > 6) {
|
||||
plateNumber = scanInfo.take(6)
|
||||
}
|
||||
// ToastUtils.showToast(plateNumber)
|
||||
var item = MyApp.plateList?.firstOrNull { it.plateNumber == plateNumber }
|
||||
if (item == null) {
|
||||
//柜子未关联该餐盘，直接找空位置放入盘子
|
||||
item = MyApp.plateList?.firstOrNull { it.plateNumber.isNullOrBlank() }
|
||||
if (item ==null) {
|
||||
//柜子已满
|
||||
MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
|
||||
return
|
||||
}
|
||||
//找到位置，放入餐盘，清除已有id和时间
|
||||
item.plateNumber = plateNumber
|
||||
item.faceId = null
|
||||
item.updateTime = null
|
||||
PlateUtils.open(this, item.equipmentBoxCode)
|
||||
return
|
||||
}
|
||||
//放入餐盘，清除已有id和时间
|
||||
item.plateNumber = plateNumber
|
||||
item.faceId = null
|
||||
item.updateTime = null
|
||||
PlateUtils.open(this, item.equipmentBoxCode)
|
||||
SpTool.savePlateData(MyApp.plateList!!)
|
||||
}
|
||||
|
||||
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
|
||||
@@ -279,7 +308,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
lifecycleScope.launch {
|
||||
viewModel.currentUserInfo.collect {
|
||||
if (it == null) return@collect
|
||||
it.showBalanceNotEnoughDialog = true
|
||||
// it.showBalanceNotEnoughDialog = true
|
||||
handleLoginSuccess(it, false)
|
||||
}
|
||||
}
|
||||
@@ -329,57 +358,57 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
* @param isAdmin true 管理员 执行绑盘此操作 false 用户，提示错误
|
||||
*/
|
||||
open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
|
||||
Timber.d("handleLoginSuccess isAdmin = $isAdmin")
|
||||
equipmentUserInfo.isIntercept = false
|
||||
val cardBalance = equipmentUserInfo.cardBalance ?: 0.toDouble()
|
||||
val balanceIsNotEnough = cardBalance <= 0.toDouble()
|
||||
if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) {
|
||||
//提示余额不足弹窗
|
||||
equipmentUserInfo.isIntercept = true
|
||||
BalanceNotEnoughDialog(this).show()
|
||||
return
|
||||
}
|
||||
viewModel.resetUserInfo()
|
||||
// if (equipmentUserInfo.isOtherEquipment()) {
|
||||
// MainActivity.start(
|
||||
// context,
|
||||
// pageType = PageType.PLATE_TIP,
|
||||
// equipmentUserInfo = equipmentUserInfo,
|
||||
// isAdmin
|
||||
// )
|
||||
// Timber.d("handleLoginSuccess isAdmin = $isAdmin")
|
||||
// equipmentUserInfo.isIntercept = false
|
||||
// val cardBalance = equipmentUserInfo.cardBalance ?: 0.toDouble()
|
||||
// val balanceIsNotEnough = cardBalance <= 0.toDouble()
|
||||
// if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) {
|
||||
// //提示余额不足弹窗
|
||||
// equipmentUserInfo.isIntercept = true
|
||||
// BalanceNotEnoughDialog(this).show()
|
||||
// return
|
||||
// }
|
||||
if (equipmentUserInfo.equipmentBoxCode?.isNotEmpty() == true) {
|
||||
SerialApi.openPlate(
|
||||
equipmentUserInfo.equipmentBoxCode!!.toInt(),
|
||||
object : SerialPortManager.SendCallback {
|
||||
override fun onSuccess() {
|
||||
MainActivity.start(
|
||||
context,
|
||||
pageType = PageType.PLATE_TIP,
|
||||
isAdmin = isAdmin
|
||||
)
|
||||
}
|
||||
|
||||
override fun onFail(e: Exception?) {
|
||||
ToastUtils.showToast("柜门打开失败")
|
||||
}
|
||||
})
|
||||
} else {
|
||||
if (isAdmin) {
|
||||
settingViewModel.getEquipmentList {
|
||||
loadEquipmentList(it)
|
||||
}
|
||||
} else {
|
||||
Timber.d("无餐盘信息")
|
||||
MainActivity.start(
|
||||
context,
|
||||
pageType = PageType.PLATE_TIP,
|
||||
equipmentUserInfo = equipmentUserInfo,
|
||||
isAdmin = isAdmin
|
||||
)
|
||||
}
|
||||
}
|
||||
// viewModel.resetUserInfo()
|
||||
//// if (equipmentUserInfo.isOtherEquipment()) {
|
||||
//// MainActivity.start(
|
||||
//// context,
|
||||
//// pageType = PageType.PLATE_TIP,
|
||||
//// equipmentUserInfo = equipmentUserInfo,
|
||||
//// isAdmin
|
||||
//// )
|
||||
//// return
|
||||
//// }
|
||||
// if (equipmentUserInfo.equipmentBoxCode?.isNotEmpty() == true) {
|
||||
// SerialApi.openPlate(
|
||||
// equipmentUserInfo.equipmentBoxCode!!.toInt(),
|
||||
// object : SerialPortManager.SendCallback {
|
||||
// override fun onSuccess() {
|
||||
// MainActivity.start(
|
||||
// context,
|
||||
// pageType = PageType.PLATE_TIP,
|
||||
// isAdmin = isAdmin
|
||||
// )
|
||||
// }
|
||||
//
|
||||
// override fun onFail(e: Exception?) {
|
||||
// ToastUtils.showToast("柜门打开失败")
|
||||
// }
|
||||
// })
|
||||
// } else {
|
||||
// if (isAdmin) {
|
||||
// settingViewModel.getEquipmentList {
|
||||
// loadEquipmentList(it)
|
||||
// }
|
||||
// } else {
|
||||
// Timber.d("无餐盘信息")
|
||||
// MainActivity.start(
|
||||
// context,
|
||||
// pageType = PageType.PLATE_TIP,
|
||||
// equipmentUserInfo = equipmentUserInfo,
|
||||
// isAdmin = isAdmin
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
@@ -407,7 +436,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
private var faceTimestamp = 0L
|
||||
|
||||
private fun getFaceIncrementList() {
|
||||
val timestamp = SpTool.getLastFaceTimestamp()
|
||||
val timestamp = SpTool.lastFaceTimestamp
|
||||
if (timestamp == 0L) {
|
||||
return
|
||||
}
|
||||
@@ -422,15 +451,15 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
}
|
||||
updateFaceData(list)
|
||||
if (list.size >= settingViewModel.PAGE_SIZE) {
|
||||
faceTimestamp = list.last().faceUpdateTimestamp?:0
|
||||
faceTimestamp = list.last().faceUpdateTimestamp ?: 0
|
||||
taskPageNo++
|
||||
getFaceIncrementList()
|
||||
return@runOnUiThread
|
||||
}
|
||||
if (list.isNotEmpty()) {
|
||||
faceTimestamp = list.last().faceUpdateTimestamp?:0
|
||||
faceTimestamp = list.last().faceUpdateTimestamp ?: 0
|
||||
}
|
||||
SpTool.setLastFaceTimestamp(faceTimestamp)
|
||||
SpTool.lastFaceTimestamp = faceTimestamp
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user