diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt index 225d4d9c16..424ac42b2f 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt @@ -29,7 +29,7 @@ object RecordManager { takeOverRecordInfo.let { 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) + it.level3Id,it.level3Name,it.lineName,it.reportNote,it.reportStatus,it.bagId) if (Thread.currentThread() == Looper.getMainLooper().thread){ scope.launch{ withContext(Dispatchers.IO){ @@ -62,7 +62,7 @@ object RecordManager { takeOverRecordInfo.let{ 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) + it.lineName,it.reportNote,it.reportStatus,it.bagId) if (Thread.currentThread() == Looper.getMainLooper().thread){ scope.launch{ withContext(Dispatchers.IO){ @@ -95,7 +95,7 @@ object RecordManager { takeOverRecordInfo.let{ 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) + it.lineName,it.reportNote,it.reportStatus,it.bagId) if (Thread.currentThread() == Looper.getMainLooper().thread){ scope.launch { withContext(Dispatchers.IO) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt index 868902f2d4..1cd4c73d39 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt @@ -44,7 +44,7 @@ class TakeOverRecordProvider: ITakeOverProvider { recordInfoList.add( TakeOverRecordInfo(it.faultStartTime,it.address,it.level1Id, it.level2Id,it.level3Id,it.level1Name,it.level2Name,it.level3Name, - it.lineName,it.reportNote,it.reportStatus,false) + it.lineName,it.reportNote,it.reportStatus,false,it.bagId) ) } return recordInfoList diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt index 202143510b..3c2f52cc5c 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt @@ -41,5 +41,8 @@ data class RecordInfo( var reportNote: String, //上传状态 false:未上传,可编辑 true:已上传,不可编辑 @ColumnInfo - var reportStatus: Boolean + var reportStatus: Boolean, + //Bag包唯一标识 key + @ColumnInfo + var bagId: Long ) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index e477b8db88..4506bca906 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -445,9 +445,8 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis address,level1Id,level2Id,level3Id, level1Name, level2Name, level3Name, BadCaseConfig.lineName,reportNote, - reportStatus = false, - selectStatus = false - ) + reportStatus = false, selectStatus = false, + recordPanel.key) CallerTakeOverManager.insertRecord(activity,takeOverRecordInfo) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt index 0e2e19c7dc..ca5050d615 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt @@ -386,8 +386,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, val padProblemInfo = PadProblemInfo( address, faultCodeList, millis2String(workOrderOccurrenceTime), level1Id, level2Id, level3Id, BadCaseConfig.lineName, note, reportType, - SharedPrefsMgr.getInstance().getString("och_account", "") - ) + SharedPrefsMgr.getInstance().getString("och_account", ""), + 0L) padProblemList.add(padProblemInfo) val padAddProblemReq = PadAddProblemReq(padProblemList, AppConfigInfo.plateNumber) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt index 2bf54e5212..bcfc28c627 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt @@ -143,7 +143,7 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { val padProblemList= ArrayList() val padProblemInfo = PadProblemInfo(address,faultCodeList,millis2String(System.currentTimeMillis()),level1Id, level2Id,level3Id,BadCaseConfig.lineName,"${level1Name}-${level2Name}-${level3Name}",reportType, - SharedPrefsMgr.getInstance().getString("och_account","")) + SharedPrefsMgr.getInstance().getString("och_account",""),0L) padProblemList.add(padProblemInfo) val padAddProblemReq = PadAddProblemReq(padProblemList, AppConfigInfo.plateNumber) CallerDevaToolsManager.problemPadAdd(padAddProblemReq) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt index 1e5c5d34ca..721daa1d70 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt @@ -140,7 +140,8 @@ class TakeOverRecordView @JvmOverloads constructor( val padProblemInfo = PadProblemInfo(it.address, emptyList(), millis2String(it.faultStartTime),it.level1Id,it.level2Id,it.level3Id, it.lineName,reason,1, - SharedPrefsMgr.getInstance().getString("och_account","")) + SharedPrefsMgr.getInstance().getString("och_account",""), + it.bagId) padProblemList.add(padProblemInfo) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt index 48d414a11d..4b668a16ea 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt @@ -337,7 +337,7 @@ class FaultReasonView @JvmOverloads constructor( val padProblemInfo = PadProblemInfo( address, faultCodeList, millis2String(workOrderOccurrenceTime), level1Id, level2Id, level3Id, BadCaseConfig.lineName, note, reportType, - SharedPrefsMgr.getInstance().getString("och_account", "") + SharedPrefsMgr.getInstance().getString("och_account", ""),0L ) padProblemList.add(padProblemInfo) val padAddProblemReq = diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt index 82065a2c01..444078206c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt @@ -102,7 +102,7 @@ class ReportTypeView @JvmOverloads constructor( val padProblemList= ArrayList() val padProblemInfo = PadProblemInfo(address,faultCodeList,millis2String(System.currentTimeMillis()),level1Id, level2Id,level3Id,BadCaseConfig.lineName,"${level1Name}-${level2Name}-${level3Name}",reportType, - SharedPrefsMgr.getInstance().getString("och_account","")) + SharedPrefsMgr.getInstance().getString("och_account",""),0L) padProblemList.add(padProblemInfo) val padAddProblemReq = PadAddProblemReq(padProblemList, AppConfigInfo.plateNumber) CallerDevaToolsManager.problemPadAdd(padAddProblemReq) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt index 08585d8c09..0cf82c6290 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt @@ -12,7 +12,8 @@ package com.mogo.eagle.core.data.deva.report * @param reportNote 上报描述 * @param reportType 上报方式:0:小程序 1:司机屏 2:云端上报 * @param reporterMark 上报人标识(手机号) + * @param bagId Bag包唯一标识 */ data class PadProblemInfo(var address: String,var faultCodeList: List,var faultStartTime: String, var level1Id: Int,var level2Id: Int,var level3Id: Int,var lineName: String,var reportNote: String, - var reportType: Int,var reporterMark: String) \ No newline at end of file + var reportType: Int,var reporterMark: String,var bagId: Long) \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/TakeOverRecordInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/TakeOverRecordInfo.kt index 8a0c163c5c..7a13e2afd1 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/TakeOverRecordInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/TakeOverRecordInfo.kt @@ -14,9 +14,11 @@ package com.mogo.eagle.core.data.deva.report * @param reportNote 上报描述 * @param reportStatus 上传状态 false:未上传,可编辑 true:已上传,不可编辑 * @param selectStatus 选择状态 + * @param bagId Bag唯一识别标识 */ data class TakeOverRecordInfo(var faultStartTime: Long, var address:String, var level1Id: Int, var level2Id: Int, var level3Id: Int, var level1Name: String,var level2Name: String,var level3Name: String, var lineName: String, var reportNote: String, - var reportStatus: Boolean,var selectStatus: Boolean) \ No newline at end of file + var reportStatus: Boolean,var selectStatus: Boolean, + var bagId: Long) \ No newline at end of file