配置接口新增结算模式字段;优化页面刷新;

This commit is contained in:
2026-03-27 17:21:45 +08:00
parent 57f8920442
commit 10d1f966da
4 changed files with 27 additions and 5 deletions
@@ -41,6 +41,7 @@ import com.sw.dualscreen.model.response.ChargeModeEvent
import com.sw.dualscreen.model.response.FoodInfo
import com.sw.dualscreen.model.response.FoodOrder
import com.sw.dualscreen.model.response.PaySuccessEvent
import com.sw.dualscreen.model.response.ResetRecognizeEvent
import com.sw.dualscreen.model.response.UpdateRefreshEvent
import com.sw.dualscreen.model.response.UserFaceModel
import com.sw.dualscreen.objbox.Food
@@ -190,6 +191,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
ToastUtils.showToast("获取设备配置数据失败")
return@runOnUiThread
}
//结算模式:1-独立支付,2-联合结算
val settlementMode = if (deviceConfig.payType == 2) 0 else 1
SPUtil.getInstance().put(GlobalKey.KEY_SETTLEMENT_MODE, settlementMode)
GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
@@ -688,6 +693,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
presentation?.hideRecImage()
presentation?.step1FoodRecognizing()
log("onResume-recognizeByWeight")
binding.root.postDelayed({
recognizeByWeight(weight, true)
}, 500)
@@ -833,17 +839,27 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
@Subscribe(threadMode = ThreadMode.MAIN)
fun onUpdateRefreshEvent(event: UpdateRefreshEvent) {
isRefreshPage = true
checkedItem = null
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onPaySuccessEvent(event: PaySuccessEvent) {
isRefreshPage = true
checkedItem = null
//0-计费,1-不计费
val chargeMode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0) ?: 0
presentation?.hideNutritionView(chargeMode)
presentation?.cancel()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onResetRecognizeState(event: ResetRecognizeEvent) {
// presentation?.step1FoodRecognizing()
isRefreshPage = true
checkedItem = null
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onChargeModeEvent(event: ChargeModeEvent) {
isRefreshPage = true