diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 7b8539b..40c5373 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 7b8539b..40c5373 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index ed045fe..376a1f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 7b8539b..40c5373 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index ed045fe..376a1f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index e41f751..bacc6d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.toChinese import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -17,6 +16,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.showRouteOnMap +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -44,7 +44,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 7b8539b..40c5373 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index ed045fe..376a1f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index e41f751..bacc6d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.toChinese import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -17,6 +16,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.showRouteOnMap +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -44,7 +44,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a80f913..6ba3c38 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -20,6 +20,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -57,7 +58,7 @@ } override fun initData() { - args = intent.getStringArrayListExtra(LocaleConstant.INTENT_PARAM)!! + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 7b8539b..40c5373 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index ed045fe..376a1f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index e41f751..bacc6d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.toChinese import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -17,6 +16,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.showRouteOnMap +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -44,7 +44,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a80f913..6ba3c38 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -20,6 +20,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -57,7 +58,7 @@ } override fun initData() { - args = intent.getStringArrayListExtra(LocaleConstant.INTENT_PARAM)!! + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index dcf89b8..b0b8ecf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -20,11 +20,11 @@ userViewModel.userDetailModel.observe(this@SplashScreenActivity, { if (it.code == 200) { navigatePageTo() - } else { - navigatePageTo() + finish() } - finish() }) + navigatePageTo() + finish() } override fun onTick(millisUntilFinished: Long) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 7b8539b..40c5373 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index ed045fe..376a1f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index e41f751..bacc6d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.toChinese import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -17,6 +16,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.showRouteOnMap +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -44,7 +44,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a80f913..6ba3c38 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -20,6 +20,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -57,7 +58,7 @@ } override fun initData() { - args = intent.getStringArrayListExtra(LocaleConstant.INTENT_PARAM)!! + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index dcf89b8..b0b8ecf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -20,11 +20,11 @@ userViewModel.userDetailModel.observe(this@SplashScreenActivity, { if (it.code == 200) { navigatePageTo() - } else { - navigatePageTo() + finish() } - finish() }) + navigatePageTo() + finish() } override fun onTick(millisUntilFinished: Long) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 82ee58e..6d08f45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.combineImagePath import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -17,6 +16,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.showRouteOnMap +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -41,7 +41,7 @@ } override fun initData() { - val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellViewModel.obtainWellDetail(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index cd6438d..f6ff845 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -6,7 +6,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -38,7 +38,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) workOrderViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 7b8539b..40c5373 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index ed045fe..376a1f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -64,7 +65,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index e41f751..bacc6d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.toChinese import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -17,6 +16,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.showRouteOnMap +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -44,7 +44,7 @@ } override fun initData() { - val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a80f913..6ba3c38 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -20,6 +20,7 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -57,7 +58,7 @@ } override fun initData() { - args = intent.getStringArrayListExtra(LocaleConstant.INTENT_PARAM)!! + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index dcf89b8..b0b8ecf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -20,11 +20,11 @@ userViewModel.userDetailModel.observe(this@SplashScreenActivity, { if (it.code == 200) { navigatePageTo() - } else { - navigatePageTo() + finish() } - finish() }) + navigatePageTo() + finish() } override fun onTick(millisUntilFinished: Long) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 82ee58e..6d08f45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.combineImagePath import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter @@ -17,6 +16,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.showRouteOnMap +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -41,7 +41,7 @@ } override fun initData() { - val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellViewModel.obtainWellDetail(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 446b0f0..c16b023 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -7,11 +7,11 @@ import com.casic.app.smartwell.adapter.SensorListAdapter import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.utils.DialogHelper -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_well_monitor.* @@ -35,7 +35,7 @@ } override fun initData() { - wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellViewModel.obtainMonitorResult(wellId)