From 7308373ff3f50d6408dcc7f83d54ca4a9341ef99 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 18 Dec 2024 18:27:22 +0800 Subject: [PATCH] =?UTF-8?q?[6.9.0]=20[fix]=20[=E9=83=A8=E5=88=86db?= =?UTF-8?q?=E8=BF=81=E7=A7=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/common/data/build.gradle | 3 + .../och/data}/db/bean/ContrailDataBean.kt | 2 +- .../mogo/och/data}/db/bean/LineDataBean.kt | 2 +- .../mogo/och/data}/db/bean/SiteDataBean.kt | 2 +- .../mogo/och/data}/db/dao/ContrailDataDao.kt | 4 +- .../com/mogo/och/data}/db/dao/LineDataDao.kt | 4 +- .../com/mogo/och/data}/db/dao/SiteDataDao.kt | 4 +- .../och/data}/db/exception/DbException.kt | 2 +- .../och/data/db/repository/BaseContraiDb.kt | 63 ++++++++ .../mogo/och/data/db/repository/BaseLineDb.kt | 128 ++++++++++++++++ .../mogo/och/data/db/repository/BaseSiteDb.kt | 120 +++++++++++++++ .../mogo/och/weaknet/ShuttleDriverProvider.kt | 2 +- .../response/CarExecutableTaskResponse.kt | 6 +- .../weaknet/callback/IBusLinesCallback.java | 5 - .../com/mogo/och/weaknet/model/LineModel.kt | 2 +- .../com/mogo/och/weaknet/model/OrderModel.kt | 1 + .../weaknet/repository/RepositoryManager.kt | 2 +- .../och/weaknet/repository/db/MyDataBase.kt | 12 +- .../repository/db/bean/TaskSiteDataBean.kt | 1 + .../repository/db/repository/ContraiDb.kt | 59 +------- .../repository/db/repository/LineDb.kt | 140 ++---------------- .../repository/db/repository/SiteDb.kt | 118 +-------------- .../repository/db/repository/TaskDb.kt | 3 +- .../repository/db/repository/TaskSiteDb.kt | 4 +- .../repository/db/repository/WriteOffDb.kt | 1 - .../repository/line/ILineRepository.kt | 2 +- .../repository/line/impl/NormalRepository.kt | 2 +- .../repository/line/impl/WeaknetRepository.kt | 2 +- .../weaknet/repository/net/NetInterface.java | 2 +- .../bean/response/BusQueryLinesResponse.java | 2 +- .../project/dali/bus/DaliBusServiceManager.kt | 2 +- .../project/mogo/bus/MogoBusServiceManager.kt | 2 +- .../mogo/shuttle/MogoShuttleServiceManager.kt | 2 +- .../och/weaknet/ui/bizswitch/SwitchBizView.kt | 10 +- .../{SwtichBizeModel.kt => SwtichBizModel.kt} | 10 +- .../ui/switchline/SwitchLineAdapter.kt | 3 +- .../weaknet/ui/switchline/SwitchLineView.kt | 16 +- .../weaknet/ui/switchline/SwtichLineModel.kt | 8 +- .../weaknet/ui/switchtask/SwitchTaskView.kt | 9 +- .../weaknet/ui/switchtask/SwtichTaskModel.kt | 2 +- .../weaknet/ui/taskrunning/TaskRunningView.kt | 6 +- .../mogo/och/common/module/ExampleUnitTest.kt | 4 +- 42 files changed, 401 insertions(+), 373 deletions(-) rename OCH/{shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository => common/data/src/main/java/com/mogo/och/data}/db/bean/ContrailDataBean.kt (97%) rename OCH/{shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository => common/data/src/main/java/com/mogo/och/data}/db/bean/LineDataBean.kt (97%) rename OCH/{shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository => common/data/src/main/java/com/mogo/och/data}/db/bean/SiteDataBean.kt (98%) rename OCH/{shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository => common/data/src/main/java/com/mogo/och/data}/db/dao/ContrailDataDao.kt (93%) rename OCH/{shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository => common/data/src/main/java/com/mogo/och/data}/db/dao/LineDataDao.kt (93%) rename OCH/{shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository => common/data/src/main/java/com/mogo/och/data}/db/dao/SiteDataDao.kt (95%) rename OCH/{shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository => common/data/src/main/java/com/mogo/och/data}/db/exception/DbException.kt (69%) create mode 100644 OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseContraiDb.kt create mode 100644 OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseLineDb.kt create mode 100644 OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseSiteDb.kt rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/{SwtichBizeModel.kt => SwtichBizModel.kt} (88%) diff --git a/OCH/common/data/build.gradle b/OCH/common/data/build.gradle index c106019e8c..4a6477c295 100644 --- a/OCH/common/data/build.gradle +++ b/OCH/common/data/build.gradle @@ -39,6 +39,9 @@ dependencies { implementation rootProject.ext.dependencies.material implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.androidxroomruntime + implementation project(":OCH:common:common") + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogoutils api rootProject.ext.dependencies.mogo_core_data diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/bean/ContrailDataBean.kt similarity index 97% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/db/bean/ContrailDataBean.kt index beb1f16381..2b1ad6d3eb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/bean/ContrailDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.repository.db.bean +package com.mogo.och.data.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/bean/LineDataBean.kt similarity index 97% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/db/bean/LineDataBean.kt index 69b4d8bc04..f2398be509 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/bean/LineDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.repository.db.bean +package com.mogo.och.data.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/SiteDataBean.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/bean/SiteDataBean.kt similarity index 98% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/SiteDataBean.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/db/bean/SiteDataBean.kt index 2f8858adb9..94cdb8b481 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/SiteDataBean.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/bean/SiteDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.repository.db.bean +package com.mogo.och.data.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/ContrailDataDao.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/dao/ContrailDataDao.kt similarity index 93% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/ContrailDataDao.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/db/dao/ContrailDataDao.kt index 28cf1aec38..856b10ef58 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/ContrailDataDao.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/dao/ContrailDataDao.kt @@ -1,10 +1,10 @@ -package com.mogo.och.weaknet.repository.db.dao +package com.mogo.och.data.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean +import com.mogo.och.data.db.bean.ContrailDataBean @Dao interface ContrailDataDao { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/LineDataDao.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/dao/LineDataDao.kt similarity index 93% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/LineDataDao.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/db/dao/LineDataDao.kt index e727f4acb3..6a673a9e7e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/LineDataDao.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/dao/LineDataDao.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.repository.db.dao +package com.mogo.och.data.db.dao import androidx.room.Dao import androidx.room.Delete @@ -6,7 +6,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import io.reactivex.Observable @Dao diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/dao/SiteDataDao.kt similarity index 95% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/db/dao/SiteDataDao.kt index 1c90459b78..83cd5c2df9 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/dao/SiteDataDao.kt @@ -1,11 +1,11 @@ -package com.mogo.och.weaknet.repository.db.dao +package com.mogo.och.data.db.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.data.db.bean.SiteDataBean @Dao interface SiteDataDao { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/exception/DbException.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/exception/DbException.kt similarity index 69% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/exception/DbException.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/db/exception/DbException.kt index 82958f81a1..2ee4abcf3c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/exception/DbException.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/exception/DbException.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.repository.db.exception +package com.mogo.och.data.db.exception class DbException: RuntimeException { constructor() : super() diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseContraiDb.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseContraiDb.kt new file mode 100644 index 0000000000..b7bf96debd --- /dev/null +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseContraiDb.kt @@ -0,0 +1,63 @@ +package com.mogo.och.data.db.repository + +import com.mogo.eagle.core.network.utils.digest.DigestUtils +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.data.db.bean.ContrailDataBean +import com.mogo.och.data.db.dao.ContrailDataDao + +abstract class BaseContraiDb { + + open var contrailDao: ContrailDataDao?=null + + fun addOrUpdate(contrailDatalist:List){ + val runnable = Runnable { + // 校验数据个数 + contrailDao?.let { contrailDao-> + contrailDatalist.forEach { + val md5Source = it.toString() + val md5Hex = DigestUtils.md5Hex(md5Source) + val queryContrailByMd5 = contrailDao.queryContrailByMd5(md5Hex) + if(queryContrailByMd5.isNullOrEmpty()){// 没有值或者值有变化 + val needUpdate = contrailDao.queryContrailByLineIdOne(it.lineId!!) + it.md5 = md5Hex + if(needUpdate!=null){// 更新 + it.id = needUpdate.id + contrailDao.update(it.csvFileUrl?:"",it.csvFileMd5?:"",it.txtFileUrl?:"",it.txtFileMd5?:"",System.currentTimeMillis(),md5Hex,needUpdate.id) + }else{// 插入新的 + contrailDao.insert(it) + } + } + } + } + } + BizLoopManager.runInIoThread(runnable) + } + + fun deleteByLineId(lineId: Long) { + contrailDao?.deleteByLineId(lineId) + } + + fun queryAutopilotInfoByLineid(lineId: Long): ContrailDataBean? { + return contrailDao?.queryContrailByLineIdOne(lineId) + } + + fun saveRunningInfo( + lineId: Int, + csvFileMd5: String?, + csvFileUrl: String?, + txtFileUrl: String?, + txtFileMd5: String?, + contrailSaveTime: Long + ) { + val runningLine = ContrailDataBean( + lineId = lineId.toLong(), + csvFileUrl = csvFileUrl, + csvFileMd5 = csvFileMd5, + txtFileUrl = txtFileUrl, + txtFileMd5 = txtFileMd5, + contrailSaveTime = contrailSaveTime + ) + addOrUpdate(mutableListOf(runningLine)) + } + +} \ No newline at end of file diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseLineDb.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseLineDb.kt new file mode 100644 index 0000000000..3baa77928b --- /dev/null +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseLineDb.kt @@ -0,0 +1,128 @@ +package com.mogo.och.data.db.repository + +import androidx.room.Transaction +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 +import com.mogo.och.data.db.dao.LineDataDao +import io.reactivex.Observable + +abstract class BaseLineDb { + + open var lineDao: LineDataDao?=null + + + fun cleanWeltData(){ + lineDao?.deleteWeltData() + } + + fun queryCanUserLine(): List? { + return lineDao?.loadData() + } + + /** + * 读取可用线路 + */ + fun queryCanUseLineRx(): Observable?>? { + return lineDao?.loadDataRx() + } + + /** + * 后台line 删除 需要连带着把轨迹信息、站点信息和任务信息删除 + */ + abstract fun deleteSitesTaskAndContraiDb(lineId:Long) + + fun checkAndUpdate(serverDatalist:List){ + val runable = object :Runnable{ + @Transaction + override fun run() { + // 校验数据个数 + lineDao?.let { lineDao-> + val loadData = lineDao.loadData() + if(loadData.isNullOrEmpty()){ + // 插入新的值 + lineDao.insert(*serverDatalist.toTypedArray()) + // TODO: Ui展示需要动态刷新UI去 + return + } + // 后台新增数据 + val needAddDatas = serverDatalist-loadData + // 后台没有本地数据库有的未分配线路 + val needMinusDatas = loadData-serverDatalist + + // TODO: Ui展示需要动态刷新UI去 + + if (needAddDatas.isNotEmpty()) { + // 新增线路 + lineDao.insert(*needAddDatas.toTypedArray()) + } + if (needMinusDatas.isNotEmpty()) { + // 删除线路 + lineDao.delete(*needMinusDatas.toTypedArray()) + needMinusDatas.forEach { minusLine-> + minusLine.lineId?.let { lineId-> + // 删除线路对应的站点 + + deleteSitesTaskAndContraiDb(lineId) + + } + } + } + + // 交集 服务器端 + val needUpdateByMd5 = serverDatalist-needAddDatas + // 交集 本地数据库 + val oldDataList = loadData-needMinusDatas + + val needDelete = mutableListOf() + val needUpDate = mutableListOf() + + needUpdateByMd5.forEach { + val oldList = oldDataList.filter { local -> local.lineId == it.lineId } + if(oldList.isNotEmpty()){ + oldList.forEachIndexed { index, lineBean -> + if(index==0){ + if (lineBean.lineName == it.lineName && lineBean.endStationName == it.endStationName) { + // 数据没有变化 + }else{ + it.id = lineBean.id + needUpDate.add(it) + } + }else{ + // 站点多了 需要删除 + needDelete.add(lineBean) + } + } + } + } + lineDao.delete(*needDelete.toTypedArray()) + + needUpDate.forEach { updateItem-> + // 跟新数据 + lineDao.updateInfo(updateItem.lineName,updateItem.endStationName,updateItem.id) + } + } + } + } + + BizLoopManager.runInIoThread(runable) + } + + fun deleteObsoleteData(){ + lineDao?.deleteObsoleteData()?.let { + OchChainLogManager.writeChainLogDb("删除临时数据","Line删除数量:${it}") + } + } + + /** + * 没有线路就插入线路 + */ + fun saveRunningInfo(lineId: Int, lineName: String?, endStationName: String?) { + val queryByLineId = lineDao?.queryByLineId(lineId) + if(queryByLineId.isNullOrEmpty()){ + lineDao?.insert(LineDataBean(lineId = lineId.toLong(), lineName = lineName, endStationName = endStationName)) + } + } + + +} \ No newline at end of file diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseSiteDb.kt b/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseSiteDb.kt new file mode 100644 index 0000000000..155baf126c --- /dev/null +++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/repository/BaseSiteDb.kt @@ -0,0 +1,120 @@ +package com.mogo.och.data.db.repository + +import androidx.room.Transaction +import com.mogo.eagle.core.network.utils.digest.DigestUtils +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.TAG +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.SiteDataBean +import com.mogo.och.data.db.dao.SiteDataDao + +open class BaseSiteDb { + + open var siteDataDao: SiteDataDao? = null + + fun addOrUpdate(serverDataList: List) { + val runnable = object :Runnable { + @Transaction + override fun run() { + siteDataDao?.let { siteDataDao -> + val localAllSites = siteDataDao.queryAllSites() + if (localAllSites.isNullOrEmpty()) { + // 插入新数据 + siteDataDao.insert(*serverDataList.toTypedArray()) + return + } + // 后台新增数据 + val needAddDatas = serverDataList-localAllSites + // 后台没有本地数据库有的未分配线路 + val needMinusDatas = localAllSites - serverDataList + + if (needAddDatas.isNotEmpty()) { + // 新增线路 + needAddDatas.forEach { + val md5Source = it.toString() + val md5Hex = DigestUtils.md5Hex(md5Source) + it.md5 = md5Hex + } + // 新增插入新数据 + siteDataDao.insert(*needAddDatas.toTypedArray()) + } + + if (needMinusDatas.isNotEmpty()) { + // 删除线路 + siteDataDao.deleteById(*needMinusDatas.toTypedArray()) + } + + // 交集 服务器端 + val needUpdateByMd5 = serverDataList-needAddDatas + // 交集 本地数据库 + val oldDataList = localAllSites-needMinusDatas + + val needDelete = mutableListOf() + val needUpDate = mutableListOf() + + + needUpdateByMd5.forEach { + val md5Source = it.toString() + val md5Hex = DigestUtils.md5Hex(md5Source) + val oldList = + oldDataList.filter { local -> local.siteId == it.siteId && local.lineId == it.lineId } + if(oldList.isNotEmpty()){ + oldList.forEachIndexed { index, siteDataBean -> + if(index==0){ + if (siteDataBean.md5 == md5Hex) { + // 数据没有变化 + }else{ + it.id = siteDataBean.id + it.md5 = md5Hex + needUpDate.add(it) + + } + }else{ + needDelete.add(siteDataBean) + + } + } + } + } + needUpDate.forEach {updateDateItem-> + siteDataDao.updateInfo(updateDateItem.siteId,updateDateItem.lineId,updateDateItem.name,updateDateItem.nameKr, + updateDateItem.seq,updateDateItem.gcjLon,updateDateItem.gcjLat,updateDateItem.lon,updateDateItem.lat, + updateDateItem.introduction,updateDateItem.isPlayTts,updateDateItem.md5,updateDateItem.videoListDB,updateDateItem.id) + } + siteDataDao.deleteById(*needDelete.toTypedArray()) + checkData() + } + } + + } + BizLoopManager.runInIoThread(runnable) + } + + fun checkData() { + CallerLogger.d(TAG,"检测站点数据") + siteDataDao?.checkData()?.let { list -> + list.forEach { + siteDataDao?.deleteById(it) + } + if (list.isNotEmpty()) { + OchChainLogManager.writeChainLogDb("数据检测", "有重复数据${list}") + checkData() + } + } + } + + fun deleteByLineId(lineId: Long) { + siteDataDao?.deleteByLineId(lineId) + } + + fun querySiteByLineId(lineId:Long):List?{ + siteDataDao?.let { siteDataDao-> + return siteDataDao.querySitesByLineId(lineId) + } + return null + } + + + +} \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt index 8a25d49f1d..c1a622a3e4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt @@ -39,7 +39,7 @@ class ShuttleDriverProvider : CommonServiceImpl() { private var busFragment: ShuttleFragment? = null override fun init(context: Context) { - d(SceneConstant.M_TAXI + TAG, "init") + d(TAG, "init") ThreadUtils.getIoPool().submit { LineDb.deleteObsoleteData() TaskDb.deleteObsoleteData() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt index 190deefc95..32f1658328 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt @@ -3,9 +3,9 @@ package com.mogo.och.weaknet.bean.response import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.data.bean.SiteIntroduce -import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean -import com.mogo.och.weaknet.repository.db.bean.LineDataBean -import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.data.db.bean.ContrailDataBean +import com.mogo.och.data.db.bean.LineDataBean +import com.mogo.och.data.db.bean.SiteDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.db.repository.ContraiDb import com.mogo.och.weaknet.repository.db.repository.LineDb diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java index e507fe2631..aa42f23af9 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java @@ -1,10 +1,5 @@ package com.mogo.och.weaknet.callback; -import com.mogo.och.weaknet.repository.db.bean.LineDataBean; -import com.mogo.och.weaknet.repository.db.bean.TaskDataBean; - -import java.util.List; - /** * @author: wangmingjun * @date: 2022/2/9 diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 3a0102681c..12f8725be4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -30,7 +30,7 @@ import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse import com.mogo.och.weaknet.callback.IBusLinesCallback import com.mogo.och.weaknet.model.OrderModel.isGoingToNextStation -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean import com.mogo.och.weaknet.repository.db.repository.EventDb diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index 8038400490..d3af694c21 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -174,6 +174,7 @@ object OrderModel { override fun onError(e: Throwable) { e.printStackTrace() d(TAG, "queryBusRoutes onError${e.printStackTrace()}") + e.printStackTrace() LineModel.haveNoRunningTask() d(TAG, "queryBusRoutes 获取到小巴路线数据:空 ") LineManager.setLineInfo(null) 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 b9be4d96bb..994fb39b28 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 @@ -16,7 +16,7 @@ import com.mogo.och.weaknet.bean.WriteOffPassenger import com.mogo.och.weaknet.bean.request.ShuttleEventRequest import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse import com.mogo.och.weaknet.repository.db.MyDataBase -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.db.repository.EventDb import com.mogo.och.weaknet.repository.line.ILineRepository diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt index 3e38f47065..6159750a02 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt @@ -13,17 +13,17 @@ 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.eagle.core.utilcode.util.FileUtils -import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean +import com.mogo.och.data.db.bean.ContrailDataBean import com.mogo.och.weaknet.repository.db.bean.EventDataBean -import com.mogo.och.weaknet.repository.db.bean.LineDataBean -import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.data.db.bean.LineDataBean +import com.mogo.och.data.db.bean.SiteDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean -import com.mogo.och.weaknet.repository.db.dao.ContrailDataDao +import com.mogo.och.data.db.dao.ContrailDataDao import com.mogo.och.weaknet.repository.db.dao.EventDataDao -import com.mogo.och.weaknet.repository.db.dao.LineDataDao -import com.mogo.och.weaknet.repository.db.dao.SiteDataDao +import com.mogo.och.data.db.dao.LineDataDao +import com.mogo.och.data.db.dao.SiteDataDao import com.mogo.och.weaknet.repository.db.dao.TaskDataDao import com.mogo.och.weaknet.repository.db.dao.TaskSiteDataDao import com.mogo.och.weaknet.repository.db.dao.WriteOffDataDao diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt index 457b9ba23f..e2379e6295 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt @@ -3,6 +3,7 @@ package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey +import com.mogo.och.data.db.bean.SiteDataBean @Entity(tableName = TaskSiteDataBean.tableName) data class TaskSiteDataBean( diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiDb.kt index 90e301ebe7..c46bc2a661 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiDb.kt @@ -1,15 +1,13 @@ package com.mogo.och.weaknet.repository.db.repository -import com.mogo.eagle.core.network.utils.digest.DigestUtils -import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.weaknet.repository.db.IDbRepository import com.mogo.och.weaknet.repository.db.MyDataBase -import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean -import com.mogo.och.weaknet.repository.db.dao.ContrailDataDao +import com.mogo.och.data.db.dao.ContrailDataDao +import com.mogo.och.data.db.repository.BaseContraiDb -object ContraiDb : IDbRepository { +object ContraiDb : IDbRepository, BaseContraiDb() { - private var contrailDao: ContrailDataDao?=null + override var contrailDao: ContrailDataDao?=null get() { if(field==null){ field = MyDataBase.instance?.contrailDataDao @@ -22,55 +20,6 @@ object ContraiDb : IDbRepository { contrailDao = null } - fun addOrUpdate(contrailDatalist:List){ - val runnable = Runnable { - // 校验数据个数 - contrailDao?.let { contrailDao-> - contrailDatalist.forEach { - val md5Source = it.toString() - val md5Hex = DigestUtils.md5Hex(md5Source) - val queryContrailByMd5 = contrailDao.queryContrailByMd5(md5Hex) - if(queryContrailByMd5.isNullOrEmpty()){// 没有值或者值有变化 - val needUpdate = contrailDao.queryContrailByLineIdOne(it.lineId!!) - it.md5 = md5Hex - if(needUpdate!=null){// 更新 - it.id = needUpdate.id - contrailDao.update(it.csvFileUrl?:"",it.csvFileMd5?:"",it.txtFileUrl?:"",it.txtFileMd5?:"",System.currentTimeMillis(),md5Hex,needUpdate.id) - }else{// 插入新的 - contrailDao.insert(it) - } - } - } - } - } - BizLoopManager.runInIoThread(runnable) - } - fun deleteByLineId(lineId: Long) { - contrailDao?.deleteByLineId(lineId) - } - - fun queryAutopilotInfoByLineid(lineId: Long): ContrailDataBean? { - return contrailDao?.queryContrailByLineIdOne(lineId) - } - - fun saveRunningInfo( - lineId: Int, - csvFileMd5: String?, - csvFileUrl: String?, - txtFileUrl: String?, - txtFileMd5: String?, - contrailSaveTime: Long - ) { - val runningLine = ContrailDataBean( - lineId = lineId.toLong(), - csvFileUrl = csvFileUrl, - csvFileMd5 = csvFileMd5, - txtFileUrl = txtFileUrl, - txtFileMd5 = txtFileMd5, - contrailSaveTime = contrailSaveTime - ) - addOrUpdate(mutableListOf(runningLine)) - } } \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineDb.kt index ff793c26fd..05a0538cb3 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineDb.kt @@ -1,17 +1,14 @@ package com.mogo.och.weaknet.repository.db.repository -import androidx.room.Transaction -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 import com.mogo.och.weaknet.repository.db.IDbRepository import com.mogo.och.weaknet.repository.db.MyDataBase -import com.mogo.och.weaknet.repository.db.bean.LineDataBean -import com.mogo.och.weaknet.repository.db.dao.LineDataDao -import io.reactivex.Observable +import com.mogo.och.data.db.dao.LineDataDao +import com.mogo.och.data.db.repository.BaseLineDb -object LineDb: IDbRepository { +object LineDb: IDbRepository, BaseLineDb() { - private var lineDao: LineDataDao?=null + override var lineDao: LineDataDao?=null get() { if(field==null){ field = MyDataBase.instance?.lineDataDao @@ -20,124 +17,19 @@ object LineDb: IDbRepository { return field } + override fun deleteSitesTaskAndContraiDb(lineId: Long) { + SiteDb.deleteByLineId(lineId) + val runingTask = TaskDb.queryRunningTaskByLineId(lineId) + if(runingTask.isNullOrEmpty()){ + // 删除线路对应的自驾信息 + ContraiDb.deleteByLineId(lineId) + TaskDb.deleteByLineId(lineId) + } + } + + override fun release() { lineDao = null } - - fun cleanWeltData(){ - lineDao?.deleteWeltData() - } - - fun queryCanUserLine(): List? { - return lineDao?.loadData() - } - - /** - * 读取可用线路 - */ - fun queryCanUseLineRx(): Observable?>? { - return lineDao?.loadDataRx() - } - - fun checkAndUpdate(serverDatalist:List){ - val runable = object :Runnable{ - @Transaction - override fun run() { - // 校验数据个数 - lineDao?.let { lineDao-> - val loadData = lineDao.loadData() - if(loadData.isNullOrEmpty()){ - // 插入新的值 - lineDao.insert(*serverDatalist.toTypedArray()) - // TODO: Ui展示需要动态刷新UI去 - return - } - // 后台新增数据 - val needAddDatas = serverDatalist-loadData - // 后台没有本地数据库有的未分配线路 - val needMinusDatas = loadData-serverDatalist - - // TODO: Ui展示需要动态刷新UI去 - - if (needAddDatas.isNotEmpty()) { - // 新增线路 - lineDao.insert(*needAddDatas.toTypedArray()) - } - if (needMinusDatas.isNotEmpty()) { - // 删除线路 - lineDao.delete(*needMinusDatas.toTypedArray()) - needMinusDatas.forEach { minusLine-> - minusLine.lineId?.let { lineId-> - // 删除线路对应的站点 - - SiteDb.deleteByLineId(lineId) - val runingTask = TaskDb.queryRunningTaskByLineId(lineId) - if(runingTask.isNullOrEmpty()){ - // 删除线路对应的自驾信息 - - ContraiDb.deleteByLineId(lineId) - - TaskDb.deleteByLineId(lineId) - } - } - } - } - - // 交集 服务器端 - val needUpdateByMd5 = serverDatalist-needAddDatas - // 交集 本地数据库 - val oldDataList = loadData-needMinusDatas - - val needDelete = mutableListOf() - val needUpDate = mutableListOf() - - needUpdateByMd5.forEach { - val oldList = oldDataList.filter { local -> local.lineId == it.lineId } - if(oldList.isNotEmpty()){ - oldList.forEachIndexed { index, lineBean -> - if(index==0){ - if (lineBean.lineName == it.lineName && lineBean.endStationName == it.endStationName) { - // 数据没有变化 - }else{ - it.id = lineBean.id - needUpDate.add(it) - } - }else{ - // 站点多了 需要删除 - needDelete.add(lineBean) - } - } - } - } - lineDao.delete(*needDelete.toTypedArray()) - - needUpDate.forEach { updateItem-> - // 跟新数据 - lineDao.updateInfo(updateItem.lineName,updateItem.endStationName,updateItem.id) - } - } - } - } - - BizLoopManager.runInIoThread(runable) - } - - fun deleteObsoleteData(){ - lineDao?.deleteObsoleteData()?.let { - OchChainLogManager.writeChainLogDb("删除临时数据","Line删除数量:${it}") - } - } - - /** - * 没有线路就插入线路 - */ - fun saveRunningInfo(lineId: Int, lineName: String?, endStationName: String?) { - val queryByLineId = lineDao?.queryByLineId(lineId) - if(queryByLineId.isNullOrEmpty()){ - lineDao?.insert(LineDataBean(lineId = lineId.toLong(), lineName = lineName, endStationName = endStationName)) - } - } - - } \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt index 8051316aa9..7a39927762 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt @@ -1,19 +1,13 @@ package com.mogo.och.weaknet.repository.db.repository -import androidx.room.Transaction -import com.mogo.eagle.core.network.utils.digest.DigestUtils -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.util.TAG -import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager -import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.weaknet.repository.db.IDbRepository import com.mogo.och.weaknet.repository.db.MyDataBase -import com.mogo.och.weaknet.repository.db.bean.SiteDataBean -import com.mogo.och.weaknet.repository.db.dao.SiteDataDao +import com.mogo.och.data.db.dao.SiteDataDao +import com.mogo.och.data.db.repository.BaseSiteDb -object SiteDb: IDbRepository { +object SiteDb: IDbRepository, BaseSiteDb() { - private var siteDataDao: SiteDataDao? = null + override var siteDataDao: SiteDataDao? = null get() { if(field==null){ field = MyDataBase.instance?.siteDataDao @@ -26,108 +20,4 @@ object SiteDb: IDbRepository { siteDataDao = null } - fun addOrUpdate(serverDataList: List) { - val runnable = object :Runnable { - @Transaction - override fun run() { - siteDataDao?.let { siteDataDao -> - val localAllSites = siteDataDao.queryAllSites() - if (localAllSites.isNullOrEmpty()) { - // 插入新数据 - siteDataDao.insert(*serverDataList.toTypedArray()) - return - } - // 后台新增数据 - val needAddDatas = serverDataList-localAllSites - // 后台没有本地数据库有的未分配线路 - val needMinusDatas = localAllSites - serverDataList - - if (needAddDatas.isNotEmpty()) { - // 新增线路 - needAddDatas.forEach { - val md5Source = it.toString() - val md5Hex = DigestUtils.md5Hex(md5Source) - it.md5 = md5Hex - } - // 新增插入新数据 - siteDataDao.insert(*needAddDatas.toTypedArray()) - } - - if (needMinusDatas.isNotEmpty()) { - // 删除线路 - siteDataDao.deleteById(*needMinusDatas.toTypedArray()) - } - - // 交集 服务器端 - val needUpdateByMd5 = serverDataList-needAddDatas - // 交集 本地数据库 - val oldDataList = localAllSites-needMinusDatas - - val needDelete = mutableListOf() - val needUpDate = mutableListOf() - - - needUpdateByMd5.forEach { - val md5Source = it.toString() - val md5Hex = DigestUtils.md5Hex(md5Source) - val oldList = - oldDataList.filter { local -> local.siteId == it.siteId && local.lineId == it.lineId } - if(oldList.isNotEmpty()){ - oldList.forEachIndexed { index, siteDataBean -> - if(index==0){ - if (siteDataBean.md5 == md5Hex) { - // 数据没有变化 - }else{ - it.id = siteDataBean.id - it.md5 = md5Hex - needUpDate.add(it) - - } - }else{ - needDelete.add(siteDataBean) - - } - } - } - } - needUpDate.forEach {updateDateItem-> - siteDataDao.updateInfo(updateDateItem.siteId,updateDateItem.lineId,updateDateItem.name,updateDateItem.nameKr, - updateDateItem.seq,updateDateItem.gcjLon,updateDateItem.gcjLat,updateDateItem.lon,updateDateItem.lat, - updateDateItem.introduction,updateDateItem.isPlayTts,updateDateItem.md5,updateDateItem.videoListDB,updateDateItem.id) - } - siteDataDao.deleteById(*needDelete.toTypedArray()) - checkData() - } - } - - } - BizLoopManager.runInIoThread(runnable) - } - - fun checkData() { - CallerLogger.d(TAG,"检测站点数据") - siteDataDao?.checkData()?.let { list -> - list.forEach { - siteDataDao?.deleteById(it) - } - if (list.isNotEmpty()) { - OchChainLogManager.writeChainLogDb("数据检测", "有重复数据${list}") - checkData() - } - } - } - - fun deleteByLineId(lineId: Long) { - siteDataDao?.deleteByLineId(lineId) - } - - fun querySiteByLineId(lineId:Long):List?{ - siteDataDao?.let { siteDataDao-> - return siteDataDao.querySitesByLineId(lineId) - } - return null - } - - - } \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt index 92312f89b0..20087c9174 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt @@ -1,6 +1,5 @@ package com.mogo.och.weaknet.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.och.common.module.manager.logchainanalytic.OchChainLogManager @@ -10,7 +9,7 @@ import com.mogo.och.weaknet.repository.db.IDbRepository import com.mogo.och.weaknet.repository.db.MyDataBase import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.db.dao.TaskDataDao -import com.mogo.och.weaknet.repository.db.exception.DbException +import com.mogo.och.data.db.exception.DbException import com.mogo.och.weaknet.repository.exception.DataException import io.reactivex.Observable diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt index f7eef5c184..ffe5787330 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt @@ -6,10 +6,10 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.weaknet.repository.db.IDbRepository import com.mogo.och.weaknet.repository.db.MyDataBase -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean import com.mogo.och.weaknet.repository.db.dao.TaskSiteDataDao -import com.mogo.och.weaknet.repository.db.exception.DbException +import com.mogo.och.data.db.exception.DbException object TaskSiteDb : IDbRepository { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/WriteOffDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/WriteOffDb.kt index 769d4a29c6..ac695c9d56 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/WriteOffDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/WriteOffDb.kt @@ -7,7 +7,6 @@ import com.mogo.och.weaknet.repository.db.MyDataBase import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean import com.mogo.och.weaknet.repository.db.dao.WriteOffDataDao - object WriteOffDb: IDbRepository { private var writeOffDataDao: WriteOffDataDao? = null diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/ILineRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/ILineRepository.kt index 5d122f8fd8..e2cbfc3033 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/ILineRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/ILineRepository.kt @@ -5,7 +5,7 @@ import com.mogo.eagle.core.data.BaseData import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.weaknet.bean.request.ShuttleEventRequest import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import io.reactivex.Observable diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt index 30a448a927..62d991a6e4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt @@ -17,7 +17,7 @@ import com.mogo.och.data.bean.LineInfo import com.mogo.och.weaknet.bean.request.ShuttleEventRequest import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse import com.mogo.och.weaknet.model.LineModel -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.line.ILineRepository import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt index c9ef187c91..39621ea1f1 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt @@ -22,7 +22,7 @@ import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse import com.mogo.och.weaknet.constant.BusConst import com.mogo.och.weaknet.model.LineModel import com.mogo.och.weaknet.model.LineModel.currentTask -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean import com.mogo.och.weaknet.repository.db.repository.ContraiDb diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/NetInterface.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/NetInterface.java index 3d8ce68708..2ebcdcfcd8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/NetInterface.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/NetInterface.java @@ -7,7 +7,7 @@ import com.mogo.och.data.bean.BusRoutesResult; import com.mogo.och.weaknet.bean.request.ShuttleEventRequest; import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.weaknet.repository.db.bean.LineDataBean; +import com.mogo.och.data.db.bean.LineDataBean; import com.mogo.och.weaknet.repository.db.bean.TaskDataBean; import com.mogo.och.weaknet.repository.net.bean.request.PassengerWriteOffRequest; import com.mogo.och.weaknet.repository.net.bean.response.PassengerWriteOffResponse; diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bean/response/BusQueryLinesResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bean/response/BusQueryLinesResponse.java index 5d0726f457..9d19d0e2c9 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bean/response/BusQueryLinesResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bean/response/BusQueryLinesResponse.java @@ -1,7 +1,7 @@ package com.mogo.och.weaknet.repository.net.bean.response; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.weaknet.repository.db.bean.LineDataBean; +import com.mogo.och.data.db.bean.LineDataBean; import java.util.List; diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/dali/bus/DaliBusServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/dali/bus/DaliBusServiceManager.kt index 832e005094..96f078184f 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/dali/bus/DaliBusServiceManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/dali/bus/DaliBusServiceManager.kt @@ -8,7 +8,7 @@ import com.mogo.och.common.module.network.OchCommonNet import com.mogo.och.common.module.network.interceptor.transformTry import com.mogo.och.data.bean.BusRoutesResult import com.mogo.och.weaknet.bean.request.BusQueryLineStationsRequest -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.net.NetInterface import com.mogo.och.weaknet.repository.net.bean.request.BusCloseTaskRequest diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/bus/MogoBusServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/bus/MogoBusServiceManager.kt index e8532328c8..f211cc3c08 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/bus/MogoBusServiceManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/bus/MogoBusServiceManager.kt @@ -8,7 +8,7 @@ import com.mogo.och.common.module.network.OchCommonNet import com.mogo.och.common.module.network.interceptor.transformTry import com.mogo.och.data.bean.BusRoutesResult import com.mogo.och.weaknet.bean.request.BusQueryLineStationsRequest -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.net.NetInterface import com.mogo.och.weaknet.repository.net.bean.request.BusCloseTaskRequest diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/shuttle/MogoShuttleServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/shuttle/MogoShuttleServiceManager.kt index ce31bed2b5..4939892a13 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/shuttle/MogoShuttleServiceManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/shuttle/MogoShuttleServiceManager.kt @@ -8,7 +8,7 @@ import com.mogo.och.common.module.network.OchCommonNet import com.mogo.och.common.module.network.interceptor.transformTry import com.mogo.och.data.bean.BusRoutesResult import com.mogo.och.weaknet.bean.request.BusQueryLineStationsRequest -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.net.NetInterface import com.mogo.och.weaknet.repository.net.bean.request.BusCloseTaskRequest diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt index d54815c8b9..796a6cef28 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt @@ -13,14 +13,14 @@ import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.shuttle.weaknet.R -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.shuttle_weak_switch_biz.view.loading_biz import kotlinx.android.synthetic.main.shuttle_weak_switch_biz.view.swtichLine import kotlinx.android.synthetic.main.shuttle_weak_switch_biz.view.swtichTask import kotlinx.android.synthetic.main.shuttle_weak_switch_biz.view.taskRunning -class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallback { +class SwitchBizView: WindowRelativeLayout, SwtichBizModel.SwtichLineViewCallback { constructor(context: Context?) : super(context) @@ -36,7 +36,7 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac const val TAG = M_BUS+"SwitchBizView" } - private var viewModel: SwtichBizeModel?=null + private var viewModel: SwtichBizModel?=null private var queryTimeout: Disposable? = null @@ -54,9 +54,9 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac CallerLogger.d(TAG,"SwitchBizView：onAttachedToWindow") super.onAttachedToWindow() viewModel = findViewTreeViewModelStoreOwner()?.let { - ViewModelProvider(it)[SwtichBizeModel::class.java] + ViewModelProvider(it)[SwtichBizModel::class.java] } - viewModel?.setDistanceCallback(this) + viewModel?.setSwitchBizCallback(this) } override fun onDetachedFromWindow() { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizModel.kt similarity index 88% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizModel.kt index d14ce0b3fe..7de0034dcb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizModel.kt @@ -7,16 +7,16 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.weaknet.callback.IBusLinesCallback import com.mogo.och.weaknet.model.LineModel import com.mogo.och.weaknet.model.OrderModel -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean /** * @author XuXinChao * @description BadCase录包管理页面 * @since: 2022/12/15 */ -class SwtichBizeModel : ViewModel(), IBusLinesCallback { +class SwtichBizModel : ViewModel(), IBusLinesCallback { - private val TAG = M_BUS + SwtichBizeModel::class.java.simpleName + private val TAG = M_BUS + SwtichBizModel::class.java.simpleName private var viewCallback: SwtichLineViewCallback? = null @@ -26,8 +26,8 @@ class SwtichBizeModel : ViewModel(), IBusLinesCallback { LineModel.setBusLinesCallback(TAG, null) } - fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { - d(TAG, "setDistanceCallback") + fun setSwitchBizCallback(viewCallback: SwtichLineViewCallback) { + d(TAG, "setSwitchBizCallback") LineModel.setBusLinesCallback(TAG, this) this.viewCallback = viewCallback this.viewCallback?.showLoadingView() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt index d95b702fa2..21a652ae05 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt @@ -11,8 +11,7 @@ import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS import com.mogo.och.weaknet.ui.switchline.SwitchLineAdapter.SwitchLineViewHolder import com.mogo.och.shuttle.weaknet.R -import com.mogo.och.weaknet.repository.db.bean.LineDataBean -import com.mogo.och.weaknet.repository.db.bean.TaskDataBean +import com.mogo.och.data.db.bean.LineDataBean import me.jessyan.autosize.AutoSizeCompat /** 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 3b8b0ecafa..7f7bedcdff 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 @@ -8,11 +8,7 @@ import android.view.LayoutInflater import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner -import androidx.recyclerview.widget.LinearLayoutManager -import com.mogo.commons.env.ProjectUtils -import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils 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.view.SpacesItemDecoration @@ -23,11 +19,9 @@ import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager import com.mogo.och.common.module.wigets.commonview.ErrorView 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 +import com.mogo.och.data.db.bean.LineDataBean +import com.mogo.och.weaknet.ui.bizswitch.SwtichBizModel import kotlinx.android.synthetic.main.shuttle_weak_switch_line.view.aciv_refresh_task import kotlinx.android.synthetic.main.shuttle_weak_switch_line.view.actv_last_refresh_date import kotlinx.android.synthetic.main.shuttle_weak_switch_line.view.include_empty @@ -53,7 +47,7 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba } private var viewModel:SwtichLineModel?=null - private var viewbizModel:SwtichBizeModel?=null + private var viewbizModel:SwtichBizModel?=null private lateinit var mAdapter: SwitchLineAdapter @@ -125,7 +119,7 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba ViewModelProvider(it).get(SwtichLineModel::class.java) } viewbizModel = findViewTreeViewModelStoreOwner()?.let { - ViewModelProvider(it).get(SwtichBizeModel::class.java) + ViewModelProvider(it).get(SwtichBizModel::class.java) } viewModel?.setDistanceCallback(this) @@ -141,7 +135,7 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba } - override fun onBusLinesChange(data: MutableList?,show:Boolean) { + override fun onBusLinesChange(data: MutableList?, show:Boolean) { if (data.isNullOrEmpty()) { showNoData(true) }else{ diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt index bd1d5c09da..20c95550ae 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt @@ -1,11 +1,7 @@ package com.mogo.och.weaknet.ui.switchline import androidx.lifecycle.ViewModel -import com.mogo.commons.env.ProjectUtils import com.mogo.commons.storage.SharedPrefsMgr -import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger 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.och.common.module.utils.DateTimeUtil @@ -14,7 +10,7 @@ import com.mogo.och.weaknet.callback.IBusLinesCallback import com.mogo.och.weaknet.model.LineModel import com.mogo.och.weaknet.model.LineModel.EXECUTABLECHANGETIME import com.mogo.och.weaknet.repository.RepositoryManager -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import io.reactivex.Observer import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable @@ -93,7 +89,7 @@ class SwtichLineModel : ViewModel(), IBusLinesCallback { interface SwtichLineViewCallback{ fun startTaskState(success: Boolean) - fun onBusLinesChange(data: MutableList?,show:Boolean) + fun onBusLinesChange(data: MutableList?, show:Boolean) fun refreshDate(formatLongToString: String?) fun onBusLinesChangeFaile() } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt index cb80538f01..af90f37929 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt @@ -14,10 +14,9 @@ import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.shuttle.weaknet.R -import com.mogo.och.weaknet.model.LineModel -import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean -import com.mogo.och.weaknet.ui.bizswitch.SwtichBizeModel +import com.mogo.och.weaknet.ui.bizswitch.SwtichBizModel import kotlinx.android.synthetic.main.shuttle_weak_error_view.view.tv_error_msg import kotlinx.android.synthetic.main.shuttle_weak_switch_task.view.actvLineEndStationName import kotlinx.android.synthetic.main.shuttle_weak_switch_task.view.actv_cancle_task @@ -47,7 +46,7 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba } private var viewModel:SwtichTaskModel?=null - private var viewbizModel:SwtichBizeModel?=null + private var viewbizModel:SwtichBizModel?=null private lateinit var mAdapter: SwitchLineTaskAdapter @@ -107,7 +106,7 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba ViewModelProvider(it).get(SwtichTaskModel::class.java) } viewbizModel = findViewTreeViewModelStoreOwner()?.let { - ViewModelProvider(it).get(SwtichBizeModel::class.java) + ViewModelProvider(it).get(SwtichBizModel::class.java) } viewModel?.setDistanceCallback(this) } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt index f21c20a331..c1654f7f92 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt @@ -10,7 +10,7 @@ import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.weaknet.callback.IBusLinesCallback 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.data.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import io.reactivex.Observer import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt index e4a2017c72..ad45cff2ef 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt @@ -17,7 +17,7 @@ import com.mogo.och.common.module.wigets.CommonSlideView 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.ui.bizswitch.SwtichBizeModel +import com.mogo.och.weaknet.ui.bizswitch.SwtichBizModel import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.aciv_task_leave_station_slide_bg import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_arriver_station import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_complete_task @@ -54,7 +54,7 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac } private var viewModel: TaskRunningModel? = null - private var viewbizModel: SwtichBizeModel? = null + private var viewbizModel: SwtichBizModel? = null private lateinit var mAdapter: TaskRunningAdapter @@ -107,7 +107,7 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac ViewModelProvider(it).get(TaskRunningModel::class.java) } viewbizModel = findViewTreeViewModelStoreOwner()?.let { - ViewModelProvider(it).get(SwtichBizeModel::class.java) + ViewModelProvider(it).get(SwtichBizModel::class.java) } viewModel?.setDistanceCallback(this) diff --git a/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index 1872937998..c02fc0d608 100644 --- a/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -5,8 +5,8 @@ import com.mogo.och.weaknet.bean.request.Event import com.mogo.och.weaknet.bean.request.EventData import com.mogo.och.weaknet.bean.request.WriteOffEventData import com.mogo.och.weaknet.repository.db.bean.EventDataBean -import com.mogo.och.weaknet.repository.db.bean.LineDataBean -import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.data.db.bean.LineDataBean +import com.mogo.och.data.db.bean.SiteDataBean import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean import org.junit.Test