From af91842dae81de2d2eb4c7ef0ae33fddcdea0a16 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 27 Dec 2024 10:52:54 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.4]=20[fix]=20[shuttle=E3=80=81bus=E3=80=81?= =?UTF-8?q?scheduled]=20[=E7=A6=BB=E7=BA=BF=E3=80=81ui=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/offline/OfflineManager.kt | 52 +++++++++++++++++++ .../module/biz/offline/OfflineService.kt | 11 ++++ .../common/module/constant/OchCommonConst.kt | 1 + .../och/facade/route/FacadeDriverProvider.kt | 2 + .../mogo/och/offline/OfflineDataProvider.kt | 25 +++++++++ .../com/mogo/och/offline/model/LineModel.kt | 24 ++++++--- .../com/mogo/och/offline/model/OrderModel.kt | 5 +- .../mogo/och/offline/model/ThirdDeviceData.kt | 4 +- .../offline/repository/RepositoryManager.kt | 4 +- .../offline/repository/db/dao/TaskDataDao.kt | 4 +- .../repository/db/dao/TaskSiteDataDao.kt | 4 +- .../repository/db/repository/TaskDb.kt | 6 +-- .../repository/db/repository/TaskSiteDb.kt | 6 +-- .../och/offline/ui/bizswitch/SwitchBizView.kt | 4 +- .../offline/ui/bizswitch/SwtichBizModel.kt | 4 +- .../offline/ui/fragment/OfflineFragment.kt | 4 +- .../offline/ui/fragment/OfflinePresenter.kt | 4 +- .../ui/switchline/SwitchLineAdapter.kt | 4 +- .../offline/ui/switchline/SwitchLineView.kt | 4 +- .../offline/ui/switchline/SwtichLineModel.kt | 4 +- .../ui/taskrunning/TaskRunningAdapter.kt | 4 +- .../ui/taskrunning/TaskRunningModel.kt | 4 +- .../offline/ui/taskrunning/TaskRunningView.kt | 4 +- .../offline/util/OffLineTrajectoryManager.kt | 4 +- 24 files changed, 147 insertions(+), 45 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineManager.kt create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineService.kt create mode 100644 OCH/offline/driver/src/main/java/com/mogo/och/offline/OfflineDataProvider.kt diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineManager.kt new file mode 100644 index 0000000000..41675a443d --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineManager.kt @@ -0,0 +1,52 @@ +package com.mogo.och.common.module.biz.offline + +import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE +import com.mogo.och.common.module.biz.login.ILoginCallback +import com.mogo.och.common.module.biz.login.LoginStatusEnum +import com.mogo.och.common.module.biz.login.LoginStatusManager +import com.mogo.och.common.module.constant.OchCommonConst +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager + +object OfflineManager : ILoginCallback { + + private val TAG = M_OFFLINE+"OfflineManager" + + private var offlineService: OfflineService? = ARouter.getInstance().build(OchCommonConst.BIZ_OFFLINE).navigation() as OfflineService + + init { + LoginStatusManager.addListener(TAG,this) + } + + override fun onStatusChange(currentStatus: LoginStatusEnum?) { + if(!FunctionBuildConfig.isOffLine){ + if(currentStatus==LoginStatusEnum.Login) { + // 同步数据 + synergyBaseData() + // 删除正在运行的数据 + deleteObsoleteData() + } + } + } + + /** + * 同步数据 + */ + fun synergyBaseData(){ + CallerLogger.d(TAG,"开始同步离线数据") + offlineService?.synergyBaseData() + } + + /** + * 删除执行的任务 + */ + fun deleteObsoleteData(){ + offlineService?.deleteObsoleteData() + } + + fun load() { + OchChainLogManager.writeChainLogInit("初始化信息","离线数据准备") + } +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineService.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineService.kt new file mode 100644 index 0000000000..e33b176207 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineService.kt @@ -0,0 +1,11 @@ +package com.mogo.och.common.module.biz.offline + +import com.alibaba.android.arouter.facade.template.IProvider + +interface OfflineService: IProvider { + + fun synergyBaseData() + + fun deleteObsoleteData() + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt index c6cb524183..f7bbf5f1d0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt @@ -30,6 +30,7 @@ class OchCommonConst { const val BIZ_LOGIN = "/ochbiz/common/login" const val BIZ_SKIN = "/ochbiz/common/skin" + const val BIZ_OFFLINE = "/offlinedriver/offlinedata" const val BUS_DRIVER = "/busdriver/busdriver" const val BUS_PASSENGER = "/buspassenger/buspassenger" diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt index 861b870117..145eec3913 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt @@ -10,6 +10,7 @@ import com.mogo.och.bridge.device.checkvin.CheckVinManager import com.mogo.och.common.module.biz.lansocket.LoginLanDriverSocket import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.login.LoginStatusManager +import com.mogo.och.common.module.biz.offline.OfflineManager import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.facade.constant.FacadeConst @@ -39,6 +40,7 @@ class FacadeDriverProvider : FacadeProvider() { LanSocketManager.load() LoginLanDriverSocket.load() CheckVinManager.load() + OfflineManager.load() } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/OfflineDataProvider.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/OfflineDataProvider.kt new file mode 100644 index 0000000000..be7b2e76e9 --- /dev/null +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/OfflineDataProvider.kt @@ -0,0 +1,25 @@ +package com.mogo.och.offline + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.och.common.module.biz.offline.OfflineService +import com.mogo.och.common.module.constant.OchCommonConst +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.offline.model.LineModel + +@Route(path = OchCommonConst.BIZ_OFFLINE) +class OfflineDataProvider: OfflineService { + override fun synergyBaseData() { + LineModel.refreshTask() + } + + override fun deleteObsoleteData() { + BizLoopManager.runInIoThread{ + LineModel.deleteObsoleteData() + } + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt index 6fff4fbb99..cf04884b36 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt @@ -12,7 +12,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener import com.mogo.eagle.core.network.utils.digest.DigestUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bridge.autopilot.line.LineManager @@ -33,6 +33,8 @@ import com.mogo.och.offline.repository.RepositoryManager import com.mogo.och.offline.repository.db.bean.TaskDataBean import com.mogo.och.offline.repository.db.bean.TaskSiteDataBean import com.mogo.och.offline.repository.db.repository.SiteDb +import com.mogo.och.offline.repository.db.repository.TaskDb +import com.mogo.och.offline.repository.db.repository.TaskSiteDb import com.mogo.och.offline.repository.exception.DataException import com.mogo.och.offline.repository.net.bean.BindLineListResponse import com.mogo.och.offline.util.ShuttleVoiceManager @@ -53,7 +55,7 @@ object LineModel { private val mBusLinesCallbackMap: MutableMap = ConcurrentHashMap() - const val TAG = "${M_BUS}BusLineModel" + const val TAG = "${M_OFFLINE}BusLineModel" private val context = AbsMogoApplication.getApp() @@ -130,7 +132,7 @@ object LineModel { isRequesting.set(false) d(TAG, "同步数据成功") RxUtils.disposeSubscribe(queryCarInfo) - queryCarInfo = RxUtils.createSubscribe(60_000) { + queryCarInfo = RxUtils.createSubscribe(600_000) { queryCarExecutableTaskList(true) } // 第一次过滤 请求返回值的md5 @@ -170,11 +172,11 @@ object LineModel { isRequesting.set(false) d(TAG, "同步数据失败 onError") RxUtils.disposeSubscribe(queryCarInfo) - queryCarInfo = RxUtils.createSubscribe(60_000) { + queryCarInfo = RxUtils.createSubscribe(600_000) { queryCarExecutableTaskList(true) } if (!isBackground) { - if (!NetworkUtils.isConnected(mContext)) { + if (!NetworkUtils.isConnected(AbsMogoApplication.getApp())) { ToastUtils.showShort(ResourcesUtils.getString(R.string.network_error_tip)) } else { ToastUtils.showShort(ResourcesUtils.getString(R.string.request_error_tip)) @@ -186,11 +188,11 @@ object LineModel { isRequesting.set(false) d(TAG, "同步数据失败 onFail") RxUtils.disposeSubscribe(queryCarInfo) - queryCarInfo = RxUtils.createSubscribe(60_000) { + queryCarInfo = RxUtils.createSubscribe(600_000) { queryCarExecutableTaskList(true) } if (!isBackground) { - if (!NetworkUtils.isConnected(mContext)) { + if (!NetworkUtils.isConnected(AbsMogoApplication.getApp())) { ToastUtils.showShort("网络异常，请稍后重试") } else { ToastUtils.showShort(failMsg) @@ -506,4 +508,12 @@ object LineModel { } } + /** + * 登录成功后删除过期数据和正在执行的任务 + */ + fun deleteObsoleteData() { + TaskDb.deleteObsoleteData() + TaskSiteDb.deleteObsoleteData() + } + } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.kt index d7fb2c62d3..6124877846 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.kt @@ -9,7 +9,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.biz.login.LoginStatusManager @@ -50,7 +50,7 @@ import io.reactivex.schedulers.Schedulers */ @SuppressLint("StaticFieldLeak") object OrderModel { - private val TAG: String = M_BUS+OrderModel::class.java.simpleName + private val TAG: String = M_OFFLINE+OrderModel::class.java.simpleName private var mContext: Context? = null @@ -443,6 +443,7 @@ object OrderModel { // } MapMakerManager.removeAllMapMarkerByOwner(TAG) OffLineTrajectoryManager.stopTrajReqLoop() + FunctionBuildConfig.isOffLine = false LoginStatusManager.loginOut() } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/ThirdDeviceData.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/ThirdDeviceData.kt index bdf4647540..92cf7bd6be 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/ThirdDeviceData.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/ThirdDeviceData.kt @@ -2,7 +2,7 @@ package com.mogo.och.offline.model import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.biz.login.LoginStatusManager @@ -25,7 +25,7 @@ import com.mogo.och.offline.util.ShuttleVoiceManager object ThirdDeviceData { - const val TAG = M_BUS+"ThirdDeviceData" + const val TAG = M_OFFLINE+"ThirdDeviceData" @JvmStatic val busRoutesResult: BusRoutesResult = BusRoutesResult() diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt index f0bb9e89c0..120c014415 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt @@ -2,7 +2,7 @@ package com.mogo.och.offline.repository import com.google.gson.reflect.TypeToken import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bridge.autopilot.line.LineManager @@ -28,7 +28,7 @@ import io.reactivex.Observable object RepositoryManager { - const val TAG = "${M_BUS}RepositoryManager" + const val TAG = "${M_OFFLINE}RepositoryManager" fun queryCanUseLine(): Observable?>? { return LineDb.queryCanUseLineRx() diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskDataDao.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskDataDao.kt index 68e4857219..1395428c9a 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskDataDao.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskDataDao.kt @@ -69,8 +69,8 @@ interface TaskDataDao { // 删除过时数据 - @Query("DELETE FROM ${TaskDataBean.tableName} WHERE start_time < :zeroTime") - fun deleteObsoleteData(zeroTime: Long = DateTimeUtil.getCurrentDateZero()): Int + @Query("DELETE FROM ${TaskDataBean.tableName}") + fun deleteObsoleteData(): Int //查询线路对应的轨迹信息 只要一个结果 diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskSiteDataDao.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskSiteDataDao.kt index 2e64de4490..0cea155603 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskSiteDataDao.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskSiteDataDao.kt @@ -27,8 +27,8 @@ interface TaskSiteDataDao { fun updateDrivingStatus(taskId: Long, siteId: Long, drivingStatusCurrent: Int) // 删除过时数据 - @Query("DELETE FROM ${TaskSiteDataBean.tableName} WHERE event_save_time < :zeroTime") - fun deleteObsoleteData(zeroTime: Long = DateTimeUtil.getCurrentDateZero()):Int + @Query("DELETE FROM ${TaskSiteDataBean.tableName}") + fun deleteObsoleteData():Int // 根据taskId删除所属站点信息 @Query("DELETE FROM ${TaskSiteDataBean.tableName} WHERE task_id = :taskId") diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskDb.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskDb.kt index 986833dd86..c7a1b81d9d 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskDb.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskDb.kt @@ -1,7 +1,7 @@ package com.mogo.och.offline.repository.db.repository import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.DateTimeUtil @@ -15,7 +15,7 @@ import io.reactivex.Observable object TaskDb : IDbRepository { - private const val TAG = "${M_BUS}TaskDb" + private const val TAG = "${M_OFFLINE}TaskDb" private var taskDataDao: TaskDataDao? = null get() { @@ -185,7 +185,7 @@ object TaskDb : IDbRepository { fun deleteObsoleteData() { taskDataDao?.deleteObsoleteData()?.let { - OchChainLogManager.writeChainLogDb("删除临时数据", "Task删除数量:${it}") + OchChainLogManager.writeChainLogDb("offline 删除临时数据", "Task删除数量:${it}") } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt index 96e15bc2aa..684b7a539d 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt @@ -1,7 +1,7 @@ package com.mogo.och.offline.repository.db.repository import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.data.db.bean.LineDataBean @@ -13,7 +13,7 @@ import com.mogo.och.offline.repository.db.dao.TaskSiteDataDao object TaskSiteDb : IDbRepository { - private const val TAG = "${M_BUS}TaskSiteDb" + private const val TAG = "${M_OFFLINE}TaskSiteDb" private var taskSiteDataDao: TaskSiteDataDao? = null get() { @@ -102,7 +102,7 @@ object TaskSiteDb : IDbRepository { fun deleteObsoleteData() { taskSiteDataDao?.deleteObsoleteData()?.let { - OchChainLogManager.writeChainLogDb("删除临时数据", "rurnning Task删除数量:${it}") + OchChainLogManager.writeChainLogDb("offline删除临时数据", "rurnning Task删除数量:${it}") } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwitchBizView.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwitchBizView.kt index c7db418ab5..7bfd775dbe 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwitchBizView.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwitchBizView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.ResourcesUtils @@ -31,7 +31,7 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizModel.SwtichLineViewCallback companion object { - const val TAG = M_BUS+"SwitchBizView" + const val TAG = M_OFFLINE+"SwitchBizView" } private var viewModel: SwtichBizModel?=null diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwtichBizModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwtichBizModel.kt index 3ab7ff601e..3b329d623d 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwtichBizModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwtichBizModel.kt @@ -2,7 +2,7 @@ package com.mogo.och.offline.ui.bizswitch import androidx.lifecycle.ViewModel import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.offline.callback.IBusLinesCallback import com.mogo.och.offline.model.LineModel @@ -15,7 +15,7 @@ import com.mogo.och.offline.model.OrderModel */ class SwtichBizModel : ViewModel(), IBusLinesCallback { - private val TAG = M_BUS + SwtichBizModel::class.java.simpleName + private val TAG = M_OFFLINE + SwtichBizModel::class.java.simpleName private var viewCallback: SwtichLineViewCallback? = null diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflineFragment.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflineFragment.kt index bade145d39..e0ba1c7c4b 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflineFragment.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflineFragment.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.bridge.ui.drawline.LineView import com.mogo.och.offline.R import com.mogo.och.offline.ui.sattusbar.OfflineStateView @@ -100,6 +100,6 @@ class OfflineFragment : MvpFragment() { * END */ companion object { - private const val TAG = "${M_BUS}BaseBusTabFragment" + private const val TAG = "${M_OFFLINE}BaseBusTabFragment" } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflinePresenter.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflinePresenter.kt index d92f5fea09..b1bc5db7bc 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflinePresenter.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflinePresenter.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.LifecycleOwner import com.mogo.commons.AbsMogoApplication import com.mogo.commons.mvp.Presenter import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.common.module.biz.login.ILoginCallback import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.login.LoginStatusManager @@ -52,6 +52,6 @@ class OfflinePresenter(view: OfflineFragment?) : Presenter(vie } companion object { - private const val TAG = M_BUS+"BusPresenter" + private const val TAG = M_OFFLINE+"BusPresenter" } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineAdapter.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineAdapter.kt index 4db1eebff4..4de646a28b 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineAdapter.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineAdapter.kt @@ -8,7 +8,7 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil.Callback import androidx.recyclerview.widget.RecyclerView -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.offline.ui.switchline.SwitchLineAdapter.SwitchLineViewHolder import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.offline.R @@ -22,7 +22,7 @@ class SwitchLineAdapter( val mData: MutableList ) : RecyclerView.Adapter() { companion object{ - const val TAG = M_BUS+"SwitchLineAdapter" + const val TAG = M_OFFLINE+"SwitchLineAdapter" } // RecyclerView设置点击事件 private var mItemClickListener: LineItemClickListener? = null diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineView.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineView.kt index 720d6e49a7..56f48de9d3 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineView.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineView.kt @@ -11,7 +11,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -43,7 +43,7 @@ class SwitchLineView: ConstraintLayout, SwtichLineModel.SwtichLineViewCallback { companion object { - const val TAG = "${M_BUS}SwitchLineView" + const val TAG = "${M_OFFLINE}SwitchLineView" } private var viewModel: SwtichLineModel?=null diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt index f72b35848d..142a3c8804 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt @@ -3,7 +3,7 @@ package com.mogo.och.offline.ui.switchline import androidx.lifecycle.ViewModel import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.RxUtils @@ -25,7 +25,7 @@ import io.reactivex.schedulers.Schedulers */ class SwtichLineModel : ViewModel(), IBusLinesCallback { - private val TAG = M_BUS+ SwtichLineModel::class.java.simpleName + private val TAG = M_OFFLINE+ SwtichLineModel::class.java.simpleName private var viewCallback: SwtichLineViewCallback?=null diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningAdapter.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningAdapter.kt index 928ca2e0bf..4ce38d88fb 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningAdapter.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningAdapter.kt @@ -11,7 +11,7 @@ import androidx.appcompat.widget.AppCompatImageView import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.data.bean.BusStationBean import com.mogo.och.offline.R @@ -27,7 +27,7 @@ class TaskRunningAdapter( ) : RecyclerView.Adapter() { companion object { - const val TAG = "${M_BUS}TaskRunningAdapter" + const val TAG = "${M_OFFLINE}TaskRunningAdapter" } private val argbEvaluator: ArgbEvaluator = ArgbEvaluator() diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningModel.kt index 7632f0a22a..178a3a74b1 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningModel.kt @@ -1,7 +1,7 @@ package com.mogo.och.offline.ui.taskrunning import androidx.lifecycle.ViewModel -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.offline.callback.IBusLinesCallback import com.mogo.och.offline.model.LineModel @@ -14,7 +14,7 @@ import com.mogo.och.offline.model.OrderModel */ class TaskRunningModel : ViewModel(), IBusLinesCallback { - private val TAG = M_BUS + TaskRunningModel::class.java.simpleName + private val TAG = M_OFFLINE + TaskRunningModel::class.java.simpleName private var viewCallback: SwtichLineViewCallback? = null diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt index ad9602a4de..95a6584fa2 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.ResourcesUtils @@ -50,7 +50,7 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac companion object { - const val TAG = M_BUS + "TaskRunningView" + const val TAG = M_OFFLINE + "TaskRunningView" } private var viewModel: TaskRunningModel? = null diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt index 1f6e129108..11f4d41c47 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt @@ -4,7 +4,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.biz.login.LoginStatusManager.isLogin @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit */ object OffLineTrajectoryManager : ITrajectoryListListener { - private val TAG: String = M_BUS + OffLineTrajectoryManager::class.java.simpleName + private val TAG: String = M_OFFLINE + OffLineTrajectoryManager::class.java.simpleName private var mAutopilotControlParameters: AutopilotControlParameters? = null private var mSendReqDisposable: Disposable? = null