|
@@ -17,7 +17,6 @@ import com.doverfuelingsolutions.issp.utils.sp.SPUtil
|
|
|
import com.doverfuelingsolutions.issp.view.MainActivity
|
|
|
import com.wayne.www.waynelib.fdc.message.DeviceClass
|
|
|
import com.wayne.www.waynelib.webservice.entity.PosTrx
|
|
|
-import kotlinx.coroutines.launch
|
|
|
import java.math.BigDecimal
|
|
|
|
|
|
class FragmentPayType private constructor(private val dc: DeviceClass): FragmentBasic(), View.OnClickListener {
|
|
@@ -53,7 +52,7 @@ class FragmentPayType private constructor(private val dc: DeviceClass): Fragment
|
|
|
val dialog = loading(R.string.in_process_order)
|
|
|
(requireActivity() as MainActivity).fragmentRouter.stopFragmentToolbarTimer()
|
|
|
|
|
|
- lifecycleScope.launch {
|
|
|
+ lifecycleScope.launchWhenStarted {
|
|
|
// 累计数信息
|
|
|
val resultAccumulationInfo = FuelInfoApi.accumulationInfo(dc)
|
|
|
if (resultAccumulationInfo.success && resultAccumulationInfo.data != null) {
|
|
@@ -64,7 +63,7 @@ class FragmentPayType private constructor(private val dc: DeviceClass): Fragment
|
|
|
dialog.dismiss()
|
|
|
(requireActivity() as MainActivity).fragmentRouter.resumeFragmentToolbarTimer()
|
|
|
DFSToastUtil.fail(R.string.fail_get_accumulation)
|
|
|
- return@launch
|
|
|
+ return@launchWhenStarted
|
|
|
}
|
|
|
|
|
|
// 查询最新的油品ID(非BarcodeId)
|
|
@@ -73,7 +72,7 @@ class FragmentPayType private constructor(private val dc: DeviceClass): Fragment
|
|
|
dialog.dismiss()
|
|
|
// (requireActivity() as MainActivity).fragmentRouter.resumeFragmentToolbarTimer()
|
|
|
DFSToastUtil.fail("查询油品posItemUniqueId失败")
|
|
|
- return@launch
|
|
|
+ return@launchWhenStarted
|
|
|
}
|
|
|
|
|
|
// 获取云订单(本地需要缓存,避免重复生成订单)
|
|
@@ -91,7 +90,7 @@ class FragmentPayType private constructor(private val dc: DeviceClass): Fragment
|
|
|
}
|
|
|
|
|
|
// 锁定订单
|
|
|
- if (posTrx == null) return@launch
|
|
|
+ if (posTrx == null) return@launchWhenStarted
|
|
|
val resultLock = FusionManager.lockOrder(dc, true)
|
|
|
dialog.dismiss()
|
|
|
(requireActivity() as MainActivity).fragmentRouter.resumeFragmentToolbarTimer()
|