diff --git a/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt index 0bc20e8..edcbfad 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt @@ -112,9 +112,9 @@ class InitActivity : BaseActivity() { override fun initialize() { super.initialize() - // TODO: 暂时写死,后续改为从接口获取结算类型 ------------------------------------------ - val settlementMode = 0 - SPUtil.getInstance().put(GlobalKey.KEY_SETTLEMENT_MODE, settlementMode) + //写死,后续改为从接口获取结算类型 ------------------------------------------ + //val settlementMode = 1 + //SPUtil.getInstance().put(GlobalKey.KEY_SETTLEMENT_MODE, settlementMode) registerKeyEvent() initNetworkTimer() diff --git a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt index cb39387..b6b460c 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt @@ -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() { 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() { presentation?.hideRecImage() presentation?.step1FoodRecognizing() + log("onResume-recognizeByWeight") binding.root.postDelayed({ recognizeByWeight(weight, true) }, 500) @@ -833,17 +839,27 @@ class MainActivity : BaseActivity() { @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 diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt index 5624efb..4e93aef 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt @@ -6,6 +6,7 @@ import com.sw.dualscreen.R import com.sw.dualscreen.activity.SettingActivity import com.sw.dualscreen.databinding.FragmentBusinessBinding import com.sw.dualscreen.model.response.ChargeModeEvent +import com.sw.dualscreen.model.response.ResetRecognizeEvent import com.sw.dualscreen.sdk.SensorScaleUtils import com.sw.dualscreen.utils.SPUtil import com.sw.plate.utils.ToastUtils @@ -66,7 +67,7 @@ class BusinessFragment: BaseFragment() { val pickupMode = if (binding.rgTakeFood.checkedRadioButtonId == R.id.rbPickAndPlace) 0 else 1 SPUtil.getInstance().put(GlobalKey.KEY_PICKUP_MODE, pickupMode) - + EventBus.getDefault().post(ResetRecognizeEvent()) //ToastUtils.showToast("设置已保存") (activity as SettingActivity).let { it.showWaitingDialog("设置保存中") diff --git a/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt b/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt index e0d72be..3effcbb 100644 --- a/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt +++ b/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt @@ -135,6 +135,9 @@ data class PaySuccessEvent( data class ChargeModeEvent( var chargeMode: Int = 0 ) +data class ResetRecognizeEvent( + var state: Int = 0 +) data class ClickBackEvent( var name: String = "" @@ -143,7 +146,9 @@ data class ClickBackEvent( data class DeviceConfig( var arcsoftAppId: String? = null, var arcsoftSdkKey: String? = null, - var arcsoftActiveKey: String? = null + var arcsoftActiveKey: String? = null, + //结算模式:1-独立支付模式,2-联合结算模式 + var payType: Int = 1 ) data class FoodVector(