Merge branch 'dev_robotaxi-d_240807_6.6.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240807_6.6.0

This commit is contained in:
xinfengkun
2024-08-23 15:21:28 +08:00
25 changed files with 299 additions and 87 deletions

View File

@@ -27,7 +27,7 @@ object RecordManager {
*/
fun insertRecord(context: Context,takeOverRecordInfo: TakeOverRecordInfo){
takeOverRecordInfo.let {
val recordInfo = RecordInfo(null,it.address,it.faultStartTime,it.level1Id,
val recordInfo = RecordInfo(it.faultStartTime,it.address,it.level1Id,
it.level2Id,it.level3Id,it.lineName,it.reportNote,it.reportStatus)
if (Thread.currentThread() == Looper.getMainLooper().thread){
scope.launch{
@@ -59,7 +59,7 @@ object RecordManager {
*/
fun updateRecord(context: Context,takeOverRecordInfo: TakeOverRecordInfo){
takeOverRecordInfo.let{
val recordInfo = RecordInfo(null,it.address,it.faultStartTime,it.level1Id,
val recordInfo = RecordInfo(it.faultStartTime,it.address,it.level1Id,
it.level2Id,it.level3Id,it.lineName,it.reportNote,it.reportStatus)
if (Thread.currentThread() == Looper.getMainLooper().thread){
scope.launch{
@@ -91,7 +91,7 @@ object RecordManager {
*/
fun deleteRecord(context: Context, takeOverRecordInfo: TakeOverRecordInfo) {
takeOverRecordInfo.let{
val recordInfo = RecordInfo(null,it.address,it.faultStartTime,it.level1Id,
val recordInfo = RecordInfo(it.faultStartTime,it.address,it.level1Id,
it.level2Id,it.level3Id,it.lineName,it.reportNote,it.reportStatus)
if (Thread.currentThread() == Looper.getMainLooper().thread){
scope.launch {

View File

@@ -9,15 +9,12 @@ import androidx.room.PrimaryKey
*/
@Entity(tableName = "take_over_record")
data class RecordInfo(
//自增主键
@PrimaryKey(autoGenerate = true)
var id: Int ?= null,
//故障开始时间 主键
@PrimaryKey(autoGenerate = false)
val faultStartTime: Long,
//故障地点
@ColumnInfo
val address: String,
//故障开始时间 yyyy-MM-dd HH:mm:ss
@ColumnInfo
val faultStartTime: String,
//一级分类ID
@ColumnInfo
var level1Id: Int,