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

[6.9.0]

Browse Source 
[fea]
[offline bus shuttle Scheduled]
[db bean 分离]
This commit is contained in:
yangyakun
2025-01-02 10:17:16 +08:00
parent d1e57cb610
commit 434ea16e63
49 changed files with 315 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.offline.R
import com.mogo.och.offline.callback.IBusLinesCallback
import com.mogo.och.offline.model.OrderModel.isGoingToNextStation

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

@@ -12,7 +12,7 @@ import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.bean.ContraiInfo
import com.mogo.och.data.bean.LineInfo
import com.mogo.och.data.bean.SiteIntroduce
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.offline.model.LineModel
import com.mogo.och.offline.model.LineModel.currentTask
import com.mogo.och.offline.repository.db.bean.TaskDataBean

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

@@ -8,9 +8,9 @@ import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.env.Project
import com.mogo.commons.env.ProjectUtils
import com.mogo.eagle.core.data.config.FunctionBuildConfig
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.offline.repository.db.bean.ContrailDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.SiteDataBean
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.dao.ContrailDataDao

2
OCH/common/data/src/main/java/com/mogo/och/data/db/bean/ContrailDataBean.kt → OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/bean/ContrailDataBean.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.data.db.bean
package com.mogo.och.offline.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity

2
OCH/common/data/src/main/java/com/mogo/och/data/db/bean/LineDataBean.kt → OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/bean/LineDataBean.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.data.db.bean
package com.mogo.och.offline.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity

2
OCH/common/data/src/main/java/com/mogo/och/data/db/bean/SiteDataBean.kt → OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/bean/SiteDataBean.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.data.db.bean
package com.mogo.och.offline.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity

2
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/bean/TaskSiteDataBean.kt
View File

@@ -3,7 +3,7 @@ package com.mogo.och.offline.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.mogo.och.data.db.bean.SiteDataBean
import com.mogo.och.offline.repository.db.bean.SiteDataBean
@Entity(tableName = TaskSiteDataBean.tableName)
data class TaskSiteDataBean(

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

@@ -4,7 +4,7 @@ import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import com.mogo.och.data.db.bean.ContrailDataBean
import com.mogo.och.offline.repository.db.bean.ContrailDataBean
@Dao
interface ContrailDataDao {

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

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import io.reactivex.Observable
@Dao

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

@@ -5,7 +5,7 @@ import androidx.room.Delete
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import com.mogo.och.data.db.bean.SiteDataBean
import com.mogo.och.offline.repository.db.bean.SiteDataBean
@Dao
interface SiteDataDao {

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

@@ -2,7 +2,7 @@ package com.mogo.och.offline.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.data.db.bean.ContrailDataBean
import com.mogo.och.offline.repository.db.bean.ContrailDataBean
import com.mogo.och.offline.repository.db.IDbRepository
import com.mogo.och.offline.repository.db.MyDataBase
import com.mogo.och.offline.repository.db.dao.ContrailDataDao

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

@@ -3,7 +3,7 @@ package com.mogo.och.offline.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.offline.repository.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.IDbRepository
import com.mogo.och.offline.repository.db.MyDataBase
import com.mogo.och.offline.repository.db.dao.LineDataDao

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

@@ -6,7 +6,7 @@ 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.offline.repository.db.bean.SiteDataBean
import com.mogo.och.offline.repository.db.IDbRepository
import com.mogo.och.offline.repository.db.MyDataBase
import com.mogo.och.offline.repository.db.dao.SiteDataDao

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

@@ -4,7 +4,7 @@ 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.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.data.db.exception.DbException
import com.mogo.och.offline.repository.db.IDbRepository
import com.mogo.och.offline.repository.db.MyDataBase

6
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/net/bean/BindLineListResponse.kt
View File

@@ -3,9 +3,9 @@ package com.mogo.och.offline.repository.net.bean
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.data.db.bean.ContrailDataBean
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.data.db.bean.SiteDataBean
import com.mogo.och.offline.repository.db.bean.ContrailDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.SiteDataBean
import com.mogo.och.offline.repository.db.repository.ContraiDb
import com.mogo.och.offline.repository.db.repository.LineDb
import com.mogo.och.offline.repository.db.repository.SiteDb

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

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.DiffUtil.Callback
import androidx.recyclerview.widget.RecyclerView
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.repository.db.bean.LineDataBean
import com.mogo.och.offline.R
import me.jessyan.autosize.AutoSizeCompat

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

@@ -19,7 +19,7 @@ import com.mogo.och.common.module.utils.ResourcesUtils
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.data.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.offline.R
import com.mogo.och.offline.ui.bizswitch.SwtichBizModel
import kotlinx.android.synthetic.main.offline_switch_line.view.aciv_refresh_task

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

@@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.offline.callback.IBusLinesCallback
import com.mogo.och.offline.model.LineModel
import com.mogo.och.offline.model.LineModel.EXECUTABLECHANGETIME

6
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt
View File

@@ -5,9 +5,9 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.och.data.bean.SiteIntroduce
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.ContrailDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
View File

@@ -31,7 +31,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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

6
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt
View File

@@ -13,10 +13,10 @@ 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.data.db.bean.ContrailDataBean
import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean
import com.mogo.och.weaknet.repository.db.bean.EventDataBean
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.data.db.bean.SiteDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

66
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt Normal file
View File

@@ -0,0 +1,66 @@
package com.mogo.och.weaknet.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
/**
* 启动自驾使用的轨迹信息
*/
@Entity(tableName = ContrailDataBean.tableName)
data class ContrailDataBean(
@PrimaryKey(autoGenerate = true) var id: Int = 0,
/**
* 线路id
*/
@ColumnInfo(name = "line_id", typeAffinity = ColumnInfo.INTEGER, index = true)
var lineId: Long? = null,
/**
* csv格式的轨迹文件
*/
@ColumnInfo(name = "csv_file_url", typeAffinity = ColumnInfo.TEXT)
var csvFileUrl: String? = null,
/**
* csv_file_url 文件的md5值
*/
@ColumnInfo(name = "csv_file_md5", typeAffinity = ColumnInfo.TEXT)
var csvFileMd5: String? = null,
/**
* txt格式的轨迹文件
*/
@ColumnInfo(name = "txt_file_url", typeAffinity = ColumnInfo.TEXT)
var txtFileUrl: String? = null,
/**
* txt文件的md5
*/
@ColumnInfo(name = "txt_file_md5", typeAffinity = ColumnInfo.TEXT)
var txtFileMd5: String? = null,
/**
* 文件的保存时间
*/
@ColumnInfo(name = "contrail_save_time", typeAffinity = ColumnInfo.INTEGER)
var contrailSaveTime: Long? = null,
/**
* 前几个字符拼接后做md5的值
*/
@ColumnInfo(name = "md5", typeAffinity = ColumnInfo.TEXT, index = true)
var md5: String? = null,
) {
companion object {
const val tableName: String = "contrail_data_table"
}
override fun toString(): String {
return "ContrailDataBean(lineId=$lineId, csvFileUrl=$csvFileUrl, csvFileMd5=$csvFileMd5, txtFileUrl=$txtFileUrl, txtFileMd5=$txtFileMd5, contrailSaveTime=$contrailSaveTime)"
}
}

72
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt Normal file
View File

@@ -0,0 +1,72 @@
package com.mogo.och.weaknet.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.google.gson.annotations.SerializedName
@Entity(tableName = LineDataBean.tableName)
data class LineDataBean(
@PrimaryKey(autoGenerate = true)
var id: Long = 0,
/**
* 线路id
*/
@ColumnInfo(name = "line_id", typeAffinity = ColumnInfo.INTEGER, index = true)
var lineId: Long? = null,
/**
* 线路名称
*/
@ColumnInfo(name = "line_name", typeAffinity = ColumnInfo.TEXT)
@SerializedName("name", alternate = ["lineName"])
var lineName: String? = null,
/**
* 终点站名称
*/
@ColumnInfo(name = "end_station_name", typeAffinity = ColumnInfo.TEXT)
@SerializedName("endSiteName")
var endStationName: String? = null,
/**
* 存储此条数据时时间戳
*/
@ColumnInfo(name = "line_get_time", typeAffinity = ColumnInfo.INTEGER)
val linegetTime: Long = System.currentTimeMillis(),
) {
companion object {
const val tableName: String = "line_data_table"
}
fun getLineIdAndName(function: (lineId:Long,lineName:String) -> Unit) {
lineId?.let {id->
lineName?.let {name->
function(id,name)
}
}
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as LineDataBean
if (lineId != other.lineId) return false
if (lineName != other.lineName) return false
return true
}
override fun hashCode(): Int {
var result = lineId?.hashCode() ?: 0
result = 31 * result + (lineName?.hashCode() ?: 0)
return result
}
}

121
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/SiteDataBean.kt Normal file
View File

@@ -0,0 +1,121 @@
package com.mogo.och.weaknet.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.Ignore
import androidx.room.PrimaryKey
import com.mogo.och.data.bean.SiteIntroduce
@Entity(tableName = SiteDataBean.tableName)
data class SiteDataBean(
@PrimaryKey(autoGenerate = true) var id: Int = 0,
/**
* 站点id
*/
@ColumnInfo(name = "site_id", typeAffinity = ColumnInfo.INTEGER, index = true)
var siteId: Long? = null,
/**
* 站点所属线路Id
*/
@ColumnInfo(name = "line_id", typeAffinity = ColumnInfo.INTEGER, index = true)
var lineId: Long? = null,
/**
* 站点名称
*/
@ColumnInfo(name = "name", typeAffinity = ColumnInfo.TEXT)
var name: String? = null,
/**
* 站点韩文名称
*/
@ColumnInfo(name = "name_kr", typeAffinity = ColumnInfo.TEXT)
var nameKr: String? = null,
/**
* 站点排序
*/
@ColumnInfo(name = "seq", typeAffinity = ColumnInfo.INTEGER)
var seq: Int? = null,
/**
* 高德坐标
*/
@ColumnInfo(name = "gcj_lon", typeAffinity = ColumnInfo.REAL)
var gcjLon: Double? = null,
/**
* 高德坐标
*/
@ColumnInfo(name = "gcj_lat", typeAffinity = ColumnInfo.REAL)
var gcjLat: Double? = null,
/**
* 高精坐标
*/
@ColumnInfo(name = "lon", typeAffinity = ColumnInfo.REAL)
var lon: Double? = null,
/**
* 高精坐标
*/
@ColumnInfo(name = "lat", typeAffinity = ColumnInfo.REAL)
var lat: Double? = null,
/**
* 站点介绍
*/
@ColumnInfo(name = "introduction", typeAffinity = ColumnInfo.TEXT)
var introduction: String? = null,
/**
* 是否播放站点介绍
*/
@ColumnInfo(name = "is_play_tts", typeAffinity = ColumnInfo.INTEGER)
var isPlayTts: Boolean? = false,
/**
* 除id 外其他值做的md5
*/
@ColumnInfo(name = "md5", typeAffinity = ColumnInfo.TEXT)
var md5: String? = null,
/**
* 站点视频
*/
@ColumnInfo(name = "videoList", typeAffinity = ColumnInfo.TEXT)
var videoListDB: String? = null,
@Ignore
var videoList:MutableList<SiteIntroduce>?=null
) {
companion object {
const val tableName = "site_data_table"
const val mediaTypeVideo = 1
}
override fun toString(): String {
return "SiteDataBean(siteId=$siteId, lineId=$lineId, name=$name, nameKr=$nameKr, seq=$seq, gcjLon=$gcjLon, gcjLat=$gcjLat, lon=$lon, lat=$lat, introduction=$introduction, isPlayTts=$isPlayTts, videoList=$videoListDB)"
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as SiteDataBean
if (siteId != other.siteId) return false
if (lineId != other.lineId) return false
return true
}
override fun hashCode(): Int {
var result = siteId?.hashCode() ?: 0
result = 31 * result + (lineId?.hashCode() ?: 0)
return result
}
}

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt
View File

@@ -3,7 +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
import com.mogo.och.weaknet.repository.db.bean.SiteDataBean
@Entity(tableName = TaskSiteDataBean.tableName)
data class TaskSiteDataBean(

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/ContrailDataDao.kt
View File

@@ -4,7 +4,7 @@ import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import com.mogo.och.data.db.bean.ContrailDataBean
import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean
@Dao
interface ContrailDataDao {

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/LineDataDao.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import io.reactivex.Observable
@Dao

4
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt
View File

@@ -5,7 +5,7 @@ import androidx.room.Delete
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import com.mogo.och.data.db.bean.SiteDataBean
import com.mogo.och.weaknet.repository.db.bean.SiteDataBean
@Dao
interface SiteDataDao {
@@ -13,7 +13,7 @@ interface SiteDataDao {
@Insert(onConflict = OnConflictStrategy.REPLACE)
fun insert(vararg lineDataBean: SiteDataBean)
@Delete()
@Delete
fun deleteById(vararg siteDataBean: SiteDataBean)
@Query("UPDATE ${SiteDataBean.tableName} SET site_id = :site_id ,line_id = :lineId,name = :name,name_kr = :nameKr,seq = :seq," +

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiDb.kt
View File

@@ -2,9 +2,9 @@ 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.data.db.bean.ContrailDataBean
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
object ContraiDb : IDbRepository {

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineDb.kt
View File

@@ -3,9 +3,9 @@ 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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt
View File

@@ -6,9 +6,9 @@ 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.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
object SiteDb: IDbRepository {

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt
View File

@@ -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.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.data.db.exception.DbException
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
object TaskSiteDb : IDbRepository {

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/ILineRepository.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
import io.reactivex.Observable

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/NetInterface.java
View File

@@ -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.data.db.bean.LineDataBean;
import com.mogo.och.weaknet.repository.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;

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bean/response/BusQueryLinesResponse.java
View File

@@ -1,7 +1,7 @@
package com.mogo.och.weaknet.repository.net.bean.response;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.och.data.db.bean.LineDataBean;
import com.mogo.och.weaknet.repository.db.bean.LineDataBean;
import java.util.List;

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/dali/bus/DaliBusServiceManager.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/bus/MogoBusServiceManager.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/project/mogo/shuttle/MogoShuttleServiceManager.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt
View File

@@ -13,7 +13,7 @@ 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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizModel.kt
View File

@@ -7,7 +7,7 @@ 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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
/**
* @author XuXinChao

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt
View File

@@ -11,7 +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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import me.jessyan.autosize.AutoSizeCompat
/**

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt
View File

@@ -20,7 +20,7 @@ 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.repository.RepositoryManager
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.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

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt
View File

@@ -10,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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt
View File

@@ -15,7 +15,7 @@ import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.common.module.wigets.TaskBottomDecoration
import com.mogo.och.common.module.wigets.WindowRelativeLayout
import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
import com.mogo.och.weaknet.ui.bizswitch.SwtichBizModel
import kotlinx.android.synthetic.main.shuttle_weak_error_view.view.tv_error_msg

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers

4
OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt
View File

@@ -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.data.db.bean.LineDataBean
import com.mogo.och.data.db.bean.SiteDataBean
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
import com.mogo.och.weaknet.repository.db.bean.SiteDataBean
import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean
import org.junit.Test