feat(login): 集成PLC控制系统实现餐盘柜硬件交互
- 添加plc_aar_104.aar依赖库支持PLC硬件通信 - 新增PlcCallback、PlcHelper和PlcStatus工具类封装PLC操作接口 - 实现PLC状态查询功能替换原有的模拟检测逻辑 - 集成出盘操作流程,支持真实硬件控制 - 优化餐盘检测逻辑,增加PLC通信异常处理机制 - 统一回调处理确保所有操作在主线程执行
This commit is contained in:
@@ -57,6 +57,9 @@ import com.sw.platecabinet.utils.LogFileUtil
|
||||
import com.sw.platecabinet.utils.PlateUtils
|
||||
import com.sw.platecabinet.utils.RegisterCallbackHandler
|
||||
import com.sw.platecabinet.utils.SoundPoolUtil
|
||||
import com.sw.platecabinet.utils.mego.PlcCallback
|
||||
import com.sw.platecabinet.utils.mego.PlcHelper
|
||||
import com.sw.platecabinet.utils.mego.PlcStatus
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
@@ -386,39 +389,48 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
||||
private var plateEnable = false
|
||||
|
||||
/**
|
||||
* 检测有无餐盘
|
||||
*/
|
||||
private fun checkHasPlate(block: (Boolean) -> Unit) {
|
||||
showWaitingDialog("检测餐盘中,请稍候……")
|
||||
binding.root.postDelayed({
|
||||
hideWaitingDialog()
|
||||
block(true)
|
||||
}, 1500)
|
||||
}
|
||||
|
||||
/**
|
||||
* 打开餐盘柜
|
||||
* 打开餐盘柜:先获取 PLC 状态,有盘则出盘,无盘则播放提示音
|
||||
*/
|
||||
private fun openPlate(userId: String?) {
|
||||
if (plateEnable.not()) return
|
||||
loadLogInfo("collectFace,openPlate: userId=$userId")
|
||||
checkHasPlate { hasPlate ->
|
||||
if (hasPlate.not()) {
|
||||
//暂无餐盘,请联系管理人员
|
||||
loadLogInfo("collectFace,openPlate: 暂无餐盘,请联系管理人员,isCollectFace=$isCollectFace")
|
||||
showWaitingDialog("检测餐盘中,请稍候……")
|
||||
PlcHelper.getInstance(this).getStatus(object : PlcCallback<PlcStatus> {
|
||||
override fun onSuccess(result: PlcStatus) {
|
||||
hideWaitingDialog()
|
||||
if (result.isEmptyPlate) {
|
||||
// 无餐盘,播放提示音并返回首页
|
||||
loadLogInfo("collectFace,openPlate: 暂无餐盘,isEmptyPlate=true,isCollectFace=$isCollectFace")
|
||||
SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0)
|
||||
goInitActivity()
|
||||
return
|
||||
}
|
||||
// 有餐盘,播放识别成功音效并调用出盘
|
||||
loadLogInfo("collectFace,openPlate: 检测到餐盘,开始出盘")
|
||||
SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
|
||||
plateEnable = false
|
||||
recognizeCountDownUtil.cancelCountDown()
|
||||
PlcHelper.getInstance(this@LoginByFaceActivity).outPlate(object : PlcCallback<String> {
|
||||
override fun onSuccess(result: String) {
|
||||
loadLogInfo("collectFace,openPlate: 出盘成功,result=$result")
|
||||
goInitActivity()
|
||||
}
|
||||
|
||||
override fun onError(message: String) {
|
||||
loadLogInfo("collectFace,openPlate: 出盘失败,message=$message")
|
||||
goInitActivity()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
override fun onError(message: String) {
|
||||
hideWaitingDialog()
|
||||
// 状态获取失败,保底播放无盘提示
|
||||
loadLogInfo("collectFace,openPlate: 获取PLC状态失败,message=$message")
|
||||
SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0)
|
||||
goInitActivity()
|
||||
return@checkHasPlate
|
||||
}
|
||||
//取餐盘
|
||||
SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
|
||||
//调用发盘方法
|
||||
PlateUtils.open(this, "", false) {
|
||||
goInitActivity()
|
||||
}
|
||||
plateEnable = false
|
||||
recognizeCountDownUtil.cancelCountDown()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
private val openDebouncer by lazy { Debouncer(5000) }
|
||||
|
||||
Reference in New Issue
Block a user