chore: 补充 SCALE_ORDER_1 配置、Weigher2 unInit 修复及调料列表模拟数据
- ScaleDeviceConfig:新增 SCALE_ORDER_1 单秤地址列表 - Weigher2:unInit() 补充调用 Weigher.unInit(),确保串口资源正确释放 - SeasoningSelectDialog:getGoodsList 临时改为模拟数据,待联调时切回真实接口 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -186,12 +186,25 @@ class SeasoningSelectDialog(
|
|||||||
* 请求调料列表
|
* 请求调料列表
|
||||||
*/
|
*/
|
||||||
private fun getGoodsList() {
|
private fun getGoodsList() {
|
||||||
activity.netViewModel.queryGoodsList(
|
// activity.netViewModel.queryGoodsList(
|
||||||
goodsType = "1",
|
// goodsType = "1",
|
||||||
pageNum = pageNo,
|
// pageNum = pageNo,
|
||||||
pageSize = PAGE_SIZE,
|
// pageSize = PAGE_SIZE,
|
||||||
goodsName = goodsName.takeUnless { it.isNullOrBlank() }
|
// goodsName = goodsName.takeUnless { it.isNullOrBlank() }
|
||||||
|
// )
|
||||||
|
|
||||||
|
// TODO: 联调时注释掉下方模拟数据,改为真实接口调用
|
||||||
|
val nameList = listOf(
|
||||||
|
"盐", "白砂糖","冰糖", "鸡精", "味精", "陈醋", "老抽", "生抽", "番茄酱", "胡椒粉", "孜然", "十三香",
|
||||||
|
"料酒", "白醋", "蚝油", "辣椒面", "辣椒酱", "豆瓣酱", "淀粉", "葱", "蒜", "姜", "香菜", "油"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val mockData = mutableListOf<GoodsItem>()
|
||||||
|
nameList.forEachIndexed { index, name ->
|
||||||
|
val padString = "${index + 1}".padStart(2, '0')
|
||||||
|
mockData.add(GoodsItem(goodsId = "1000$padString", goodsName = name))
|
||||||
|
}
|
||||||
|
loadGoodsList(mockData)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -17,6 +17,9 @@ object ScaleDeviceConfig {
|
|||||||
/** 18个秤的显示顺序(按物理位置排列) */
|
/** 18个秤的显示顺序(按物理位置排列) */
|
||||||
val SCALE_ORDER_18 = listOf(6, 5, 4, 3, 2, 1, 12, 11, 10, 9, 8, 7, 18, 17, 16, 15, 14, 13)
|
val SCALE_ORDER_18 = listOf(6, 5, 4, 3, 2, 1, 12, 11, 10, 9, 8, 7, 18, 17, 16, 15, 14, 13)
|
||||||
|
|
||||||
|
/** 1个秤的地址列表 */
|
||||||
|
val SCALE_ORDER_1 = listOf(1)
|
||||||
|
|
||||||
/** 设备在列表中的显示顺序 */
|
/** 设备在列表中的显示顺序 */
|
||||||
val DEVICE_ORDER = listOf(DEVICE_ID_2, DEVICE_ID_22, DEVICE_ID_18, DEVICE_ID_1)
|
val DEVICE_ORDER = listOf(DEVICE_ID_2, DEVICE_ID_22, DEVICE_ID_18, DEVICE_ID_1)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ package com.shuwei.dish.match.utils;
|
|||||||
|
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.aithings.Weigher;
|
||||||
import com.blankj.utilcode.util.Utils;
|
import com.blankj.utilcode.util.Utils;
|
||||||
import com.t507.System;
|
import com.t507.System;
|
||||||
import com.wabon.wbintelligenthardwaresdk.api.SensorScale;
|
import com.wabon.wbintelligenthardwaresdk.api.SensorScale;
|
||||||
@@ -73,6 +75,7 @@ public class Weigher2 {
|
|||||||
|
|
||||||
public static void unInit() {
|
public static void unInit() {
|
||||||
// $FF: Couldn't be decompiled
|
// $FF: Couldn't be decompiled
|
||||||
|
Weigher.unInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void config() {
|
public static void config() {
|
||||||
|
|||||||
Reference in New Issue
Block a user