diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 8c577e312e..1900721c51 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -1566,4 +1566,32 @@ class MoGoAutopilotControlProvider : return AdasManager.getInstance().sendCaptureImgReqOnTakeOver(uuid)>-1 } + /** + * 数据落盘 硬盘挂载状态查询 + */ + override fun sendCopyBagDiskStatus(): Boolean { + return AdasManager.getInstance().sendCopyBagDiskStatus() > -1 + } + + /** + * 数据落盘 拷贝日期 + */ + override fun sendCopyBagCopyDate(date: Int): Boolean { + return AdasManager.getInstance().sendCopyBagCopyDate(date) > -1 + } + + /** + * 数据落盘 硬盘安全弹出请求 + */ + override fun sendCopyBagSafeUnmount(): Boolean { + return AdasManager.getInstance().sendCopyBagSafeUnmount() > -1 + } + + /** + * 数据落盘 终止拷贝 + */ + override fun sendCopyBagAbortCopy(): Boolean { + return AdasManager.getInstance().sendCopyBagAbortCopy() > -1 + } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 1fd779a6e0..5d2b760bc0 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -84,6 +84,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerTakeoverListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2nNioEventListenerManager import com.mogo.eagle.core.function.call.devatools.CallerCaptureImgManager +import com.mogo.eagle.core.function.call.devatools.CallerDiskCopyManager import com.mogo.eagle.core.function.call.devatools.CallerOTAManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.call.obu.CallerObuMapMathListenerManager @@ -1460,8 +1461,11 @@ class MoGoAdasListenerImpl : OnAdasListener { CallerCaptureImgManager.invokeCaptureImgOnTakeOver(isFront, data) } + /** + * 数据落盘辅助工具拷贝信息响应 + */ override fun onCopyBag(header: MessagePad.Header, diskCopy: CopyBag.DiskCopy) { - + CallerDiskCopyManager.invokeCopyBag(diskCopy) } /** diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 99e2eec422..ad36c8db3d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -61,6 +61,7 @@ import com.zhjt.mogo_core_function_devatools.coldstart.ColdStartManager import com.zhjt.mogo_core_function_devatools.driver.video.DriveSeatVideoProviderImpl import com.mogo.eagle.core.function.api.driver.video.IDriveSeatVideoProvider import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.zhjt.mogo_core_function_devatools.diskcopy.DiskCopyManager import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager import com.zhjt.mogo_core_function_devatools.exam.ExamControlManager import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter @@ -206,6 +207,7 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener { BadCaseManager.init(mContext!!) ColdStartManager.init(mContext!!) OTAUpgradeManager.init(mContext!!) + DiskCopyManager.init(mContext!!) if (DebugConfig.isDebug()) { SdtManager.init(mContext!!, true, DetectResultImpl()) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/diskcopy/DiskCopyManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/diskcopy/DiskCopyManager.kt new file mode 100644 index 0000000000..ef520e7fda --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/diskcopy/DiskCopyManager.kt @@ -0,0 +1,31 @@ +package com.zhjt.mogo_core_function_devatools.diskcopy + +import android.content.Context +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.function.api.devatools.IDiskCopyListener +import com.mogo.eagle.core.function.call.devatools.CallerDiskCopyManager +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import packet_mytest_upload.CopyBag + +/** + * 数据落盘辅助工具管理 + */ +object DiskCopyManager: IDiskCopyListener{ + + const val TAG = "DiskCopyManager" + + fun init(context: Context){ + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + CallerDiskCopyManager.addListener(TAG, this) + } + } + + /** + * 数据落盘拷贝信息回调 + */ + override fun onCopyBag(diskCopy: CopyBag.DiskCopy) { + super.onCopyBag(diskCopy) + + } + +} \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt index b5d061d79d..a3a0df7821 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt @@ -737,4 +737,25 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider { * 域控响应接口{@link OnAdasListener#onCaptureImgOnTakeOver(MessagePad.Header, boolean, MessagePad.CaptureImgOnTakeOver)} */ fun sendCaptureImgReqOnTakeOver(uuid: Long): Boolean + + /** + * 数据落盘 硬盘挂载状态查询 + */ + fun sendCopyBagDiskStatus(): Boolean + + /** + * 数据落盘 拷贝日期 + */ + fun sendCopyBagCopyDate(date: Int): Boolean + + /** + * 数据落盘 硬盘安全弹出请求 + */ + fun sendCopyBagSafeUnmount(): Boolean + + /** + * 数据落盘 终止拷贝 + */ + fun sendCopyBagAbortCopy(): Boolean + } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDiskCopyListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDiskCopyListener.kt new file mode 100644 index 0000000000..02366c6320 --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDiskCopyListener.kt @@ -0,0 +1,13 @@ +package com.mogo.eagle.core.function.api.devatools + +import packet_mytest_upload.CopyBag + +/** + * 数据落盘辅助工具接口 + */ +interface IDiskCopyListener { + /** + * 数据落盘拷贝信息回调 + */ + fun onCopyBag(diskCopy: CopyBag.DiskCopy){} +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt index d8c5b4383f..502e90e67e 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt @@ -1105,4 +1105,32 @@ object CallerAutoPilotControlManager { return providerApi?.sendCaptureImgReqOnTakeOver(uuid)?:false } + /** + * 数据落盘 硬盘挂载状态查询 + */ + fun sendCopyBagDiskStatus(): Boolean{ + return providerApi?.sendCopyBagDiskStatus()?:false + } + + /** + * 数据落盘 拷贝日期 + */ + fun sendCopyBagCopyDate(date: Int): Boolean{ + return providerApi?.sendCopyBagCopyDate(date)?:false + } + + /** + * 数据落盘 硬盘安全弹出请求 + */ + fun sendCopyBagSafeUnmount(): Boolean{ + return providerApi?.sendCopyBagSafeUnmount()?:false + } + + /** + * 数据落盘 终止拷贝 + */ + fun sendCopyBagAbortCopy(): Boolean{ + return providerApi?.sendCopyBagAbortCopy()?:false + } + } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDiskCopyManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDiskCopyManager.kt new file mode 100644 index 0000000000..34ef4ecd12 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDiskCopyManager.kt @@ -0,0 +1,22 @@ +package com.mogo.eagle.core.function.call.devatools + +import com.mogo.eagle.core.function.api.devatools.IDiskCopyListener +import com.mogo.eagle.core.function.call.base.CallerBase +import packet_mytest_upload.CopyBag + +/** + * 数据落盘辅助工具回调管理 + */ +object CallerDiskCopyManager: CallerBase() { + + /** + * 数据落盘拷贝信息回调 + */ + fun invokeCopyBag(diskCopy: CopyBag.DiskCopy){ + M_LISTENERS.forEach{ + val listener = it.value + listener.onCopyBag(diskCopy) + } + } + +} \ No newline at end of file