From ca44fc3724a972029350cf70009be09155e7f19f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 25 Oct 2024 14:27:00 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E6=A0=B8=E9=94=80=E6=94=AF?= =?UTF-8?q?=E6=8C=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/weaknet/model/TicketModel.kt | 4 ++-- .../com/mogo/och/weaknet/repository/RepositoryManager.kt | 7 +++++++ .../com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt | 3 ++- .../java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt | 5 +++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt index c414506cbe..238f21b80c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt @@ -54,7 +54,7 @@ object TicketModel : IOchOnMessageListener{ fun load(){ // 3s轮训站点核销人数 - if(!ProjectUtils.isMogo()) { + if(RepositoryManager.supportWriteOff()) { BizLoopManager.setLoopFunction( SELECTWRITEOFFCOUNT, LoopInfo(3, TicketModel::selectWriteOffCount, scheduler = Schedulers.io()) @@ -69,7 +69,7 @@ object TicketModel : IOchOnMessageListener{ } fun release(){ - if(!ProjectUtils.isMogo()) { + if(RepositoryManager.supportWriteOff()) { BizLoopManager.removeLoopFunction(SELECTWRITEOFFCOUNT) } LanSocketManager.unRegisterSocketMessageListener(DPMsgType.TYPE_WRITEOFF_INFO.type,writeOffMsg) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt index d4cea6a280..4ca999d7d6 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt @@ -131,6 +131,13 @@ object RepositoryManager { return false } + fun supportWriteOff():Boolean{ + if(ProjectUtils.isSaas()||(ProjectUtils.isDali())) { + return true + } + return false + } + fun queryCarExecutableTaskList( ochCommonServiceCallback: OchCommonServiceCallback ) { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt index e1ef814856..5f23049ae2 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt @@ -22,6 +22,7 @@ import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.model.LineModel +import com.mogo.och.weaknet.repository.RepositoryManager import com.mogo.och.weaknet.repository.db.bean.LineDataBean import com.mogo.och.weaknet.ui.bizswitch.SwtichBizeModel import kotlinx.android.synthetic.main.shuttle_wadk_task_running.view.no_order_data_view @@ -84,7 +85,7 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba }) aciv_refresh_task.onClick { - if(ProjectUtils.isSaas()&& AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { + if(RepositoryManager.supportDb()) { viewModel?.refreshTask() }else{ loadingDatas() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt index a1d8b41958..22d3e2efa5 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt @@ -10,6 +10,7 @@ import com.mogo.commons.env.ProjectUtils import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.och.shuttle.weaknet.R +import com.mogo.och.weaknet.repository.RepositoryManager class WriteOffView : AppCompatTextView, WriteOffViewModel.IwriteOffViewCallback { @@ -28,7 +29,7 @@ class WriteOffView : AppCompatTextView, WriteOffViewModel.IwriteOffViewCallback override fun onAttachedToWindow() { super.onAttachedToWindow() - if(ProjectUtils.isDali()&& AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)) { + if(RepositoryManager.supportWriteOff()) { val showText = AbsMogoApplication.getApp().getString(R.string.shuttle_write_off_count,0) text = showText @@ -45,7 +46,7 @@ class WriteOffView : AppCompatTextView, WriteOffViewModel.IwriteOffViewCallback private fun stopListenerWriteOff(){ viewModel?.setWriteOffCallback(null) visibility = GONE - if(ProjectUtils.isDali()&& AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)) { + if(RepositoryManager.supportWriteOff()) { val showText = AbsMogoApplication.getApp().getString(R.string.shuttle_write_off_count, 0) text = showText