restaurant/IntelligentShelves
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
马增飞
2025-12-30 16:28:35 +08:00
parent aff3d5cc69
commit 5b0b98c8b8
6 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
+19 -2
View File
@@ -183,8 +183,25 @@ class HomeActivity : BaseActivity() {
// viewModel.getAccessToken(App.deviceId)
viewModel.getShelfList(deviceId = App.deviceId)
// viewModel.getShelfList(deviceId = App.deviceId)
binding.root.postDelayed({
loadTestData()
}, 30*1000)
}
private fun loadTestData() {
list.add(ShelfModel(deviceNo = 1, goodsName = "鸡蛋", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 6, goodsName = "", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 2, goodsName = "", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 7, goodsName = "生姜", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 3, goodsName = "黄瓜", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 8, goodsName = "", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 4, goodsName = "梨", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 9, goodsName = "梨", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 5, goodsName = "", deviceId = App.deviceId))
list.add(ShelfModel(deviceNo = 10, goodsName = "", deviceId = App.deviceId))
shelfAdapter.notifyDataSetChanged()
}
private fun getTokenSuccess(data: RespData<*>) {
@@ -318,7 +335,7 @@ class HomeActivity : BaseActivity() {
"0101", "8101" -> {
//心跳0102${p1}${p2}${version}
//心跳81（终端发起，当终端发送此命令时需要服务端存储串口屏显示信息）
val respCmd = "${HEADER}01020906${terminalVersion}$FOOTER"
val respCmd = "${HEADER}01020506${terminalVersion}$FOOTER"
log("${LOG_PREFIX}[心跳]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
sendCmd(respCmd)
heartBeat(data)
app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfActivity.kt
+3
View File
@@ -375,6 +375,9 @@ class ShelfActivity : BaseActivity() {
val zeroClearingCmd = "${HomeActivity.HEADER}0401${hex}${HomeActivity.FOOTER}"
log("编号${shelfNo}货架执行清零指令：${zeroClearingCmd}")
sendCmd(zeroClearingCmd)
sendCmd(
if (shelfNo in 1..5) HomeActivity.LEFT_SHELF_OPEN_CMD else HomeActivity.RIGHT_SHELF_OPEN_CMD
)
//清零
realWeight = 0
// binding.tvFoodWeight.text = "${realWeight}克"