[6.6.0]数据闭环修改

This commit is contained in:
xuxinchao
2024-08-29 14:50:54 +08:00
parent ef5fc4aca2
commit 26446de932
15 changed files with 367 additions and 76 deletions

View File

@@ -27,8 +27,9 @@ object RecordManager {
*/
fun insertRecord(context: Context,takeOverRecordInfo: TakeOverRecordInfo){
takeOverRecordInfo.let {
val recordInfo = RecordInfo(it.faultStartTime,it.address,it.level1Id,
it.level2Id,it.level3Id,it.lineName,it.reportNote,it.reportStatus)
val recordInfo = RecordInfo(it.faultStartTime,it.address,
it.level1Id,it.level1Name, it.level2Id,it.level2Name,
it.level3Id,it.level3Name,it.lineName,it.reportNote,it.reportStatus)
if (Thread.currentThread() == Looper.getMainLooper().thread){
scope.launch{
withContext(Dispatchers.IO){
@@ -60,7 +61,8 @@ object RecordManager {
fun updateRecord(context: Context,takeOverRecordInfo: TakeOverRecordInfo){
takeOverRecordInfo.let{
val recordInfo = RecordInfo(it.faultStartTime,it.address,it.level1Id,
it.level2Id,it.level3Id,it.lineName,it.reportNote,it.reportStatus)
it.level1Name, it.level2Id,it.level2Name,it.level3Id,it.level3Name,
it.lineName,it.reportNote,it.reportStatus)
if (Thread.currentThread() == Looper.getMainLooper().thread){
scope.launch{
withContext(Dispatchers.IO){
@@ -92,7 +94,8 @@ object RecordManager {
fun deleteRecord(context: Context, takeOverRecordInfo: TakeOverRecordInfo) {
takeOverRecordInfo.let{
val recordInfo = RecordInfo(it.faultStartTime,it.address,it.level1Id,
it.level2Id,it.level3Id,it.lineName,it.reportNote,it.reportStatus)
it.level1Name, it.level2Id,it.level2Name,it.level3Id,it.level3Name,
it.lineName,it.reportNote,it.reportStatus)
if (Thread.currentThread() == Looper.getMainLooper().thread){
scope.launch {
withContext(Dispatchers.IO) {

View File

@@ -43,7 +43,8 @@ class TakeOverRecordProvider: ITakeOverProvider {
list.forEach {
recordInfoList.add(
TakeOverRecordInfo(it.faultStartTime,it.address,it.level1Id,
it.level2Id,it.level3Id,it.lineName,it.reportNote,it.reportStatus,false)
it.level2Id,it.level3Id,it.level1Name,it.level2Name,it.level3Name,
it.lineName,it.reportNote,it.reportStatus,false)
)
}
return recordInfoList

View File

@@ -18,12 +18,21 @@ data class RecordInfo(
//一级分类ID
@ColumnInfo
var level1Id: Int,
//一级分类名称
@ColumnInfo
var level1Name: String,
//二级分类ID
@ColumnInfo
var level2Id: Int,
//二级分类名称
@ColumnInfo
var level2Name: String,
//三级分类ID
@ColumnInfo
var level3Id: Int,
//三级分类名称
@ColumnInfo
var level3Name: String,
//行驶路线
@ColumnInfo
val lineName: String,