yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.8.4]

Browse Source 
[fix]
[shuttle、bus、scheduled]
[离线、ui和日志]
This commit is contained in:
yangyakun
2024-12-27 10:52:54 +08:00
parent 29f3331289
commit af91842dae
24 changed files with 147 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineManager.kt Normal file
View File

@@ -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("初始化信息","离线数据准备")
}
}

11
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/offline/OfflineService.kt Normal file
View File

@@ -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()
}

1
OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
View File

@@ -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"

2
OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt
View File

@@ -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()
}
}

25
OCH/offline/driver/src/main/java/com/mogo/och/offline/OfflineDataProvider.kt Normal file
View File

@@ -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?) {
}
}

24
OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt
View File

@@ -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<String, IBusLinesCallback> = 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()
}
}

5
OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.kt
View File

@@ -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()
}
}

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/model/ThirdDeviceData.kt
View File

@@ -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()

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt
View File

@@ -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<List<LineDataBean>?>? {
return LineDb.queryCanUseLineRx()

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskDataDao.kt
View File

@@ -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
//查询线路对应的轨迹信息 只要一个结果

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/dao/TaskSiteDataDao.kt
View File

@@ -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")

6
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskDb.kt
View File

@@ -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}")
}
}

6
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt
View File

@@ -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}")
}
}

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwitchBizView.kt
View File

@@ -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

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/bizswitch/SwtichBizModel.kt
View File

@@ -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

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflineFragment.kt
View File

@@ -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<OfflineFragment?, OfflinePresenter?>() {
* END
*/
companion object {
private const val TAG = "${M_BUS}BaseBusTabFragment"
private const val TAG = "${M_OFFLINE}BaseBusTabFragment"
}
}

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflinePresenter.kt
View File

@@ -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<OfflineFragment?>(vie
}
companion object {
private const val TAG = M_BUS+"BusPresenter"
private const val TAG = M_OFFLINE+"BusPresenter"
}
}

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineAdapter.kt
View File

@@ -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<LineDataBean>
) : RecyclerView.Adapter<SwitchLineViewHolder>() {
companion object{
const val TAG = M_BUS+"SwitchLineAdapter"
const val TAG = M_OFFLINE+"SwitchLineAdapter"
}
// RecyclerView设置点击事件
private var mItemClickListener: LineItemClickListener? = null

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineView.kt
View File

@@ -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

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt
View File

@@ -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

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningAdapter.kt
View File

@@ -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<TaskRunningAdapter.TaskRunningViewHolder>() {
companion object {
const val TAG = "${M_BUS}TaskRunningAdapter"
const val TAG = "${M_OFFLINE}TaskRunningAdapter"
}
private val argbEvaluator: ArgbEvaluator = ArgbEvaluator()

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningModel.kt
View File

@@ -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

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt
View File

@@ -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

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt
View File

@@ -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