diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index ddc42b1988..5233b3699e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -30,6 +30,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; +import com.mogo.eagle.core.function.hmi.ui.setting.SOPSettingView; import com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; diff --git a/OCH/mogo-och-noop/build.gradle b/OCH/mogo-och-noop/build.gradle index 7067f05711..d9254953fe 100644 --- a/OCH/mogo-och-noop/build.gradle +++ b/OCH/mogo-och-noop/build.gradle @@ -37,18 +37,25 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.androidxconstraintlayout + implementation rootProject.ext.dependencies.rxjava + implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_call + implementation rootProject.ext.dependencies.mogo_core_function_hmi }else { implementation project(":core:mogo-core-utils") implementation project(":foudations:mogo-commons") implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') + implementation project(':core:function-impl:mogo-core-function-hmi') } } diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java deleted file mode 100644 index b55de4fa57..0000000000 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.mogo.och.bus; - - -import android.content.Context; - -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.module.status.IMogoStatusChangedListener; -import com.mogo.commons.module.status.StatusDescriptor; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - - -/** - * @author congtaowang - * @since 2021/1/15 - *

- * 描述 - */ -@Route(path = OCHConstants.PATH) -public class MogoOCHNoop implements IMogoOCH , IMogoStatusChangedListener { - - @Override - public void createCoverage(FragmentActivity activity, int containerId) { - - } - - @Nullable - @Override - public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) { - return null; - } - - @NotNull - @Override - public String getFunctionName() { - return null; - } - - @Override - public void onDestroy() { - - } - - @Override - public void init(Context context) { - - } - - @Override - public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { - - } -} diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/IMogoOCH.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java similarity index 77% rename from OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/IMogoOCH.java rename to OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java index 073f7fcc29..2dc04ff268 100644 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/IMogoOCH.java +++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus; +package com.mogo.och.noop; import androidx.annotation.IdRes; import androidx.fragment.app.FragmentActivity; @@ -20,5 +20,7 @@ interface IMogoOCH extends IMoGoFunctionProvider { * @param activity * @param containerId 容器ID */ - void createCoverage(FragmentActivity activity, @IdRes int containerId); + default void createCoverage(FragmentActivity activity, @IdRes int containerId){ + + }; } diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt new file mode 100644 index 0000000000..9d04c6c036 --- /dev/null +++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt @@ -0,0 +1,33 @@ +package com.mogo.och.noop + +import android.content.Context +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import com.alibaba.android.arouter.facade.annotation.Route + +/** + * @author congtaowang + * @since 2021/1/15 + * + * + * 描述 + */ +@Route(path = OCHConstants.PATH) +class MoGoOCHNoopProvider : IMogoOCH { + + override val functionName: String + get() = "MogoOCHNoopProvider" + + override fun init(context: Context) { + + } + + override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? { + + return null + } + + override fun onDestroy() { + + } +} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/OCHConstants.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java similarity index 66% rename from OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/OCHConstants.java rename to OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java index e403d542bc..b0893ba9f8 100644 --- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/OCHConstants.java +++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus; +package com.mogo.och.noop; public /** @@ -12,5 +12,5 @@ class OCHConstants { /** * arouter 路由地址 */ - public static final String PATH = "/driver/api"; + public static final String PATH = "/och/noop/api"; } diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt new file mode 100644 index 0000000000..855b980820 --- /dev/null +++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt @@ -0,0 +1,15 @@ +package com.mogo.och.noop + +import com.mogo.commons.mvp.IView + + +/** + *@author xiaoyuzhou + *@date 2021/8/4 3:38 下午 + */ +interface OchNoopContract { + + interface View : IView { + + } +} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt new file mode 100644 index 0000000000..f071115360 --- /dev/null +++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt @@ -0,0 +1,115 @@ +package com.mogo.och.noop + +import android.view.View +import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.hmi.ui.setting.CameraLiveView.Companion.cameraLiveView +import com.mogo.eagle.core.function.hmi.ui.setting.ToolsView.Companion.toolsView +import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.och.bus.R +import kotlinx.android.synthetic.main.fragment_hmi.* + +class OchNoopFragment : MvpFragment(), + OchNoopContract.View { + + companion object { + private const val TAG = "OchNoopFragment" + } + + override fun getLayoutId(): Int { + return R.layout.och_noop_fragment_hmi + } + + override fun getTagName(): String { + return TAG + } + + override fun createPresenter(): OchNoopPresenter { + return OchNoopPresenter(this) + } + + + override fun initViews() { + ivCameraIcon?.setOnClickListener { + cameraLiveView.showCameraList(context, CallerFuncBizManager.bizProvider.getCameraList){ liveStatus -> + if(liveStatus){ + ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_selected) + }else{ + ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor) + } + } + } + + ivToolsIcon?.setOnClickListener { + toolsView.showToolsFloat(context) + } + + //美化模式隐藏开关 + viewDemoModeSwitch.setOnClickListener { + //只在司机端设置美化模式开关功能 + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + //单次查询,是否有行程信息（订单进行中时点击不生效）,autopilotControlParameters为null代表不处于自动驾驶状态下 + if (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().autopilotControlParameters == null) { + FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode + context?.let { + CallerHmiManager.updateStatusBarLeftView( + FunctionBuildConfig.isDemoMode, + "demoMode", + DemoModeView(it) + ) + } + CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode) + if (!FunctionBuildConfig.isDemoMode) { + //关闭美化模式时，通知工控机 + CallerAutoPilotManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode) + } + } + } + } + + cbMsgBoxDriver.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + viewDriverMsgBoxList.visibility = View.VISIBLE + viewDriverMsgBoxList.notifyData() + viewDriverMsgBoxBubble.visibility = View.GONE + viewDriverMsgBoxBubble.isShowData(false) + CallerHmiManager.updateDriverMsgBoxTipView(false) + } else { + viewDriverMsgBoxList.visibility = View.GONE + viewDriverMsgBoxBubble.visibility = View.VISIBLE + viewDriverMsgBoxBubble.isShowData(true) + } + } + + cbMsgBoxPassenger.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + viewPassengerMsgBoxList.visibility = View.VISIBLE + viewPassengerMsgBoxBubble.visibility = View.GONE + viewPassengerMsgBoxBubble.isShowData(false) + CallerHmiManager.updatePassengerMsgBoxTipView(false) + } else { + viewPassengerMsgBoxList.visibility = View.GONE + viewPassengerMsgBoxBubble.visibility = View.VISIBLE + viewPassengerMsgBoxBubble.isShowData(true) + } + } + + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + cbMsgBoxDriver.visibility = View.VISIBLE + viewDriverMsgBoxBubble.visibility = View.VISIBLE + } + if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) + ) { + cbMsgBoxPassenger.visibility = View.VISIBLE + viewPassengerMsgBoxBubble.visibility = View.VISIBLE + } + } + + +} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt new file mode 100644 index 0000000000..0d690328cf --- /dev/null +++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt @@ -0,0 +1,8 @@ +package com.mogo.och.noop + +import com.mogo.commons.mvp.Presenter + +class OchNoopPresenter(view: OchNoopContract.View?) : + Presenter(view) { + +} \ No newline at end of file diff --git a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml new file mode 100644 index 0000000000..ffdf7313df --- /dev/null +++ b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt index c5b48cecc6..7429cdc0cb 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt @@ -296,8 +296,8 @@ class HttpDnsStartUp : AndroidStartup() { object : IMoGoMapLocationListener { override fun onLocationChanged( location: MogoLocation?, from: Int, isGps: Boolean) { - location?.let { - MogoLocationInfoServices.getInstance().provideLocation(it) + location?.let { loc -> + MogoLocationInfoServices.getInstance().provideLocation(loc) } } }, diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/core/function-impl/mogo-core-function-devatools/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar index cf19b0896e..c8ae23b144 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar and b/core/function-impl/mogo-core-function-devatools/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index b94d506ace..3518b967b0 100644 --- a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugShaders/merger.xml b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugShaders/merger.xml index e00f878c26..9aa6a9ec29 100644 --- a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugAssets/merger.xml b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugAssets/merger.xml index e523a0dda3..d4d9e95df3 100644 --- a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugAssets/merger.xml +++ b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index bbbf8ad5e4..488ed8575a 100644 --- a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1,63 +1,63 @@ -#Tue Dec 27 10:26:55 CST 2022 -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_record_edit_bg.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/badcase_record_edit_bg.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_record_template.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/item_record_template.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_expand.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_expand.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_search_bg.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/bad_case_search_bg.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio_bg.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_audio_bg.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/view_initiative_bad_case.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_inaccurate.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_audio.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_search.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_search.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/save_button_bg.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/save_button_bg.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_cancel_bg.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_cancel_bg.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_can_disable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/layout_badcase_config.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/rv_scroll_bar_track.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/rv_scroll_bar_track.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_radio_button_style.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/badcase_radio_button_style.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/view_ai_data_collect.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_route_enable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_good.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_title_bg.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/ai_collect_title_bg.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_check.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ap_badcase_check.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/flex_divider.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/flex_divider.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_gps_disable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_selector.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/bad_case_selector.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/layout_status_bar_item.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/case_list_select.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/case_list_select.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_topic_list.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/item_topic_list.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_delect.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_delect.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_true.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/shape_size_check_true.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_ipc_disable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_list.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/dialog_case_list.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/layout_status_bar.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_dialog_bg.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/bad_case_dialog_bg.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_slam_good.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/report_button_bg.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/report_button_bg.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_error.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_trace_unkown.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_ipc_enable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_select.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ai_select.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_normal.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ai_normal.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_unknow.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_un_fold.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_un_fold.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_false.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/shape_size_check_false.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_track_enable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_normal.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_normal.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/template_list_bg.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/template_list_bg.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_can_enable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_normal.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_audio_normal.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_disable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_net_disable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_not_credible.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_topic_list.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/dialog_case_topic_list.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_select.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_select.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_case_list.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/item_case_list.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_selector.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/ai_collect_selector.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_default.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ap_badcase_default.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_gps_enable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_enable.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_net_enable.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_select.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_audio_select.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_num_bg.png=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_num_bg.png -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/rv_scroll_bar_thumb.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/rv_scroll_bar_thumb.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/case_list_normal.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/case_list_normal.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/case_list_selector.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/case_list_selector.xml -/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml=/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/view_passive_bad_case.xml +#Mon Jan 23 17:36:48 CST 2023 +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_normal.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_normal.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/template_list_bg.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/template_list_bg.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/layout_status_bar.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_search_bg.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/bad_case_search_bg.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_can_disable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_good.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio_bg.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_audio_bg.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_select.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_select.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_trace_unkown.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_track_enable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_topic_list.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/dialog_case_topic_list.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_error.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_expand.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_expand.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_num_bg.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_num_bg.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_route_enable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_slam_good.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_title_bg.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/ai_collect_title_bg.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_default.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ap_badcase_default.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_ipc_enable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/rv_scroll_bar_track.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/rv_scroll_bar_track.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_radio_button_style.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/badcase_radio_button_style.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_inaccurate.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_select.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_audio_select.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/badcase_record_edit_bg.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/badcase_record_edit_bg.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_case_list.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/item_case_list.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/case_list_select.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/case_list_select.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_delect.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_delect.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_gps_disable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/case_list_selector.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/case_list_selector.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_gps_enable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/layout_badcase_config.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_can_enable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_select.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ai_select.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_search.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_search.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/case_list_normal.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/case_list_normal.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ap_badcase_check.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ap_badcase_check.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_ipc_disable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_un_fold.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_un_fold.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_audio.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_audio.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_topic_list.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/item_topic_list.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_not_credible.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_enable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_net_enable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_net_disable.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_net_disable.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_list.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/dialog_case_list.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/flex_divider.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/flex_divider.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_selector.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/bad_case_selector.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/view_ai_data_collect.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/ai_collect_selector.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/ai_collect_selector.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_false.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/shape_size_check_false.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/view_passive_bad_case.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_record_template.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/item_record_template.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_dialog_bg.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/bad_case_dialog_bg.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/layout_status_bar_item.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/shape_size_check_true.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/shape_size_check_true.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_dev_status_rtk_unknow.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_cancel_bg.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_cancel_bg.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/rv_scroll_bar_thumb.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/rv_scroll_bar_thumb.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_ai_normal.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_ai_normal.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/save_button_bg.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/save_button_bg.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/report_button_bg.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable/report_button_bg.xml +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bad_case_audio_normal.png=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/icon_bad_case_audio_normal.png +/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml=/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/build/intermediates/packaged_res/debug/layout/view_initiative_bad_case.xml diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/merger.xml b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/merger.xml index 3d55c4fc29..cac57b4622 100644 --- a/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/merger.xml +++ b/core/function-impl/mogo-core-function-devatools/build/intermediates/incremental/packageDebugResources/merger.xml @@ -1,5 +1,5 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/core/function-impl/mogo-core-function-devatools/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 7eb86a3560..0d6c5f0f32 100644 --- a/core/function-impl/mogo-core-function-devatools/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/core/function-impl/mogo-core-function-devatools/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -6,27 +6,27 @@ 6 7 /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml +8-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml 9 android:targetSdkVersion="27" /> -9-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml +9-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml 10 11 -11-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:5-79 -11-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:22-76 +11-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:5-79 +11-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:22-76 12 -12-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:5-79 -12-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:22-76 +12-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:5-79 +12-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:22-76 13 -13-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:5-76 -13-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:22-73 +13-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:5-76 +13-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:22-73 14 -14-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:5-68 -14-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:22-65 +14-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:5-68 +14-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:22-65 15 -15-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:5-74 -15-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:22-71 +15-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:5-74 +15-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:22-71 16 -16-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:5-76 -16-->/Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:22-73 +16-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:5-76 +16-->/Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:22-73 17 18 diff --git a/core/function-impl/mogo-core-function-devatools/build/outputs/logs/manifest-merger-debug-report.txt b/core/function-impl/mogo-core-function-devatools/build/outputs/logs/manifest-merger-debug-report.txt index 6807946bf0..e84c3106aa 100644 --- a/core/function-impl/mogo-core-function-devatools/build/outputs/logs/manifest-merger-debug-report.txt +++ b/core/function-impl/mogo-core-function-devatools/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,61 +1,61 @@ -- Merging decision tree log --- manifest -ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 +ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 package - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:3:5-52 - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:3:5-52 + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml android:versionName - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml android:versionCode - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:1-11:12 + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml xmlns:android - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:11-69 + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:2:11-69 uses-permission#android.permission.ACCESS_FINE_LOCATION -ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:5-79 +ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:5-79 android:name - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:22-76 + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:5:22-76 uses-permission#android.permission.ACCESS_NETWORK_STATE -ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:5-79 +ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:5-79 android:name - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:22-76 + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:6:22-76 uses-permission#android.permission.ACCESS_WIFI_STATE -ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:5-76 +ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:5-76 android:name - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:22-73 + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:7:22-73 uses-permission#android.permission.BLUETOOTH -ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:5-68 +ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:5-68 android:name - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:22-65 + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:8:22-65 uses-permission#android.permission.BLUETOOTH_ADMIN -ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:5-74 +ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:5-74 android:name - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:22-71 + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:9:22-71 uses-permission#android.permission.CHANGE_WIFI_STATE -ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:5-76 +ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:5-76 android:name - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:22-73 + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml:10:22-73 uses-sdk -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml reason: use-sdk injection requested -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml -INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml reason: use-sdk injection requested +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml +INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml android:targetSdkVersion - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml - ADDED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml - INJECTED from /Users/mogoauto/Documents/zhihuijiashi/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + ADDED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml + INJECTED from /Users/emarrow/Documents/androidProject/MoGoEagleEye/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin index a2ee5a863a..217fe6e449 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/apt-cache.bin b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/apt-cache.bin index 0ecd2a1f89..5af0517713 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/apt-cache.bin and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/apt-cache.bin differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-entries.bin b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-entries.bin index b3fdc12210..b9d889924f 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-entries.bin and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-entries.bin differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin index 4c93d6e3c5..c26b65a800 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/java-cache.bin b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/java-cache.bin index ebad4bef30..654de415ee 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/java-cache.bin and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/java-cache.bin differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kapt_metadata index 53de57ccc4..db41fd3143 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kapt_metadata index ba3d8f937f..a7721f6676 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManagerKt.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManagerKt.kapt_metadata index 82107ef707..278862cfc5 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManagerKt.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManagerKt.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kapt_metadata index 933438edef..fba916a2d3 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kapt_metadata index 920f01f0f1..9eaac8c544 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kapt_metadata index adcdc7d987..7a50331451 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kapt_metadata index 1aa4ce15da..69f4c459d9 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kapt_metadata index 3cbc534ee6..063796d509 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kapt_metadata index 05dbf77831..de0cc31341 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kapt_metadata index 51a9f4da03..618b76f53b 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/CaseListAdapter.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/RecordTemplateAdapter.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/RecordTemplateAdapter.kapt_metadata index cb65e89333..141d9d3276 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/RecordTemplateAdapter.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/RecordTemplateAdapter.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kapt_metadata index 3b7931a1da..4286ee370b 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kapt_metadata index d381dfd26d..9b9c709469 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kapt_metadata deleted file mode 100644 index 2418af9caf..0000000000 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kapt_metadata and /dev/null differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kapt_metadata index 671653ac1f..e5117b3b6c 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDb.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDb.kapt_metadata index bb5917d2b7..7433430194 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDb.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDb.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDbModel.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDbModel.kapt_metadata index 0be79db2a7..c3b0bc6754 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDbModel.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/BadCaseDbModel.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/dao/IBadCaseRecordDao.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/dao/IBadCaseRecordDao.kapt_metadata index 68a6fed91d..bb376da3f3 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/dao/IBadCaseRecordDao.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/dao/IBadCaseRecordDao.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/entity/AutoPilotRecord.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/entity/AutoPilotRecord.kapt_metadata index d9ef5a0acd..ee31e982c1 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/entity/AutoPilotRecord.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/db/entity/AutoPilotRecord.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kapt_metadata index 05ab8cafe3..8c444f44a8 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kapt_metadata index af91d0bdac..3d87bca3e4 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kapt_metadata index d4d3b4ef5a..405ad6bd9d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kapt_metadata index 20b4234735..f2df2d025e 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/store/BadCaseStore.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/store/BadCaseStore.kapt_metadata index 7d10370f80..bb87a0815d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/store/BadCaseStore.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/badcase/repository/store/BadCaseStore.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kapt_metadata index 3a3004a3d2..eceea5108d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kapt_metadata index 4de16f3e05..92a7ad0fc4 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kapt_metadata index fade625ff4..9143b1800b 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/ext/ExtentionsKt.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/ext/ExtentionsKt.kapt_metadata index bde9cb95d4..72bfeeedbb 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/ext/ExtentionsKt.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/ext/ExtentionsKt.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kapt_metadata index 6a386ae5a0..ceb3374461 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kapt_metadata index 01f1fe94d1..8f24068db3 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kapt_metadata index cf70d3244e..5e5de99eb3 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigApiService.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigApiService.kapt_metadata index c11af882b2..9dea657ffc 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigApiService.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigApiService.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kapt_metadata index fa303c538a..8d5c03e6b8 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kapt_metadata index ca8d064497..a09521ce38 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kapt_metadata index bd3b58e10e..e0f7a03008 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kapt_metadata index 71eda1af00..147bdaa40e 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/CpuMonitor.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/CpuMonitor.kapt_metadata index db512e29db..4a6938d572 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/CpuMonitor.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/CpuMonitor.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MemMonitor.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MemMonitor.kapt_metadata index 4cdeff1c11..1fc1e92572 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MemMonitor.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MemMonitor.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kapt_metadata index 1bbf97eda9..99e6468344 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/CpuInfo.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/CpuInfo.kapt_metadata index eb49c7957b..e338783cea 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/CpuInfo.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/CpuInfo.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MemInfo.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MemInfo.kapt_metadata index 0f9700f96e..b4735b393e 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MemInfo.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MemInfo.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDao.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDao.kapt_metadata index 57e33d36cf..30019bd62f 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDao.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDao.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDb.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDb.kapt_metadata index 25d737ef0e..7244587088 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDb.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/db/MonitorDb.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/remote/UserServiceManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/remote/UserServiceManager.kapt_metadata index 2dec60a134..ca922668f3 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/remote/UserServiceManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/remote/UserServiceManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/DoubleUtils.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/DoubleUtils.kapt_metadata index 6f8679c5f9..a23c5b9c92 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/DoubleUtils.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/DoubleUtils.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/FileUtil.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/FileUtil.kapt_metadata index 29cb2add32..eeee3c0b4e 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/FileUtil.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/monitor/utils/FileUtil.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kapt_metadata index ef042e1007..8d5fc018a7 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kapt_metadata index 9cefbfbeb1..1023d6e897 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/StatusManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/StatusManager.kapt_metadata index a8432cf1de..e3f0f48674 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/StatusManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/StatusManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/CanStatus.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/CanStatus.kapt_metadata index 85c81c2e0f..2019bfba9a 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/CanStatus.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/CanStatus.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/GpsStatus.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/GpsStatus.kapt_metadata index 9cd9f0c021..1bb05805d1 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/GpsStatus.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/GpsStatus.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/IpcStatus.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/IpcStatus.kapt_metadata index a365ec1d87..5542c4b43d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/IpcStatus.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/IpcStatus.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/RTKStatus.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/RTKStatus.kapt_metadata index 267cdb11b1..87097edb3d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/RTKStatus.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/RTKStatus.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/Status.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/Status.kapt_metadata index 73803bf145..8be5406520 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/Status.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/Status.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/StatusKt.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/StatusKt.kapt_metadata index e068208e23..022257e1e3 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/StatusKt.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/StatusKt.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/TracingStatus.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/TracingStatus.kapt_metadata index a0c3a1c77c..cc71b515fc 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/TracingStatus.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/entity/TracingStatus.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kapt_metadata index 3784e188e5..aab41951d4 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kapt_metadata index b1a3efbb62..1319d2e3b3 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kapt_metadata index 6299522c7a..dc3ecb54dc 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/ipc/IpcImpl.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/ipc/IpcImpl.kapt_metadata index d173479bef..ec7faa9e8d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/ipc/IpcImpl.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/ipc/IpcImpl.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kapt_metadata index 2d1015f99b..41ab2e0f91 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kapt_metadata index bd8001b414..c8ae1fa700 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kapt_metadata index 9c4b9194a8..b86fb63e7c 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kapt_metadata index 6f0ccf9395..39d48ec04d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kapt_metadata index 63780a43ac..d261ce1a1f 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/diff/StatusDiffCallback.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/diff/StatusDiffCallback.kapt_metadata index a94ce1c166..55ebaf1e90 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/diff/StatusDiffCallback.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/status/ui/diff/StatusDiffCallback.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kapt_metadata index de6c91a4b0..eea0af7374 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kapt_metadata index d3a28b5185..d4448cd337 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/StartUpTraceNetWorkModel.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/StartUpTraceNetWorkModel.kapt_metadata index 2a353e8e4b..4a79d76450 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/StartUpTraceNetWorkModel.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/StartUpTraceNetWorkModel.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/TraceStartUpApiService.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/TraceStartUpApiService.kapt_metadata index fdae08383c..26cf5f5077 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/TraceStartUpApiService.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/trace/network/TraceStartUpApiService.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kapt_metadata index c092122855..2d116272ce 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeApiService.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeApiService.kapt_metadata index 492824343a..1ca5f5857e 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeApiService.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeApiService.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kapt_metadata index 9045ee9780..d131543c5d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeNetWorkModel.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeNetWorkModel.kapt_metadata index 0c03617b0b..2d36669bee 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeNetWorkModel.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeNetWorkModel.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeHostConst.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeHostConst.kapt_metadata index 83bffda100..630c727f5e 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeHostConst.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeHostConst.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kapt_metadata b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kapt_metadata index 0f9ef14967..445286a19f 100644 Binary files a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kapt_metadata and b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/stubs/debug/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kapt_metadata differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index c13f7ee41b..9f42fde6d5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -1,6 +1,5 @@ package com.mogo.eagle.core.function.hmi.ui -import android.animation.Animator import android.content.* import android.graphics.* import android.graphics.drawable.* @@ -13,7 +12,6 @@ import android.util.* import android.view.Gravity import android.view.View import android.view.ViewGroup -import android.view.WindowManager import android.view.WindowManager.LayoutParams import android.view.animation.* import android.widget.* @@ -27,7 +25,6 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.* import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo -import com.mogo.eagle.core.data.camera.CameraEntity import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.constants.MoGoFragmentPaths @@ -35,7 +32,6 @@ import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean import com.mogo.eagle.core.data.enums.EventTypeEnum -import com.mogo.eagle.core.data.enums.SidePattern import com.mogo.eagle.core.data.enums.SidePattern.* import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.map.Infrastructure @@ -46,10 +42,8 @@ import com.mogo.eagle.core.data.notice.NoticeNormalData import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy.IViewNotificationProvider -import com.mogo.eagle.core.function.api.hmi.view.IOchBusView import com.mogo.eagle.core.function.api.hmi.view.IViewLimitingVelocity import com.mogo.eagle.core.function.api.hmi.view.IViewNotification import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight @@ -66,22 +60,17 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Turn import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.notification.WarningFloat -import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator import com.mogo.eagle.core.function.hmi.ui.bindingcar.ModifyBindingCarDialog import com.mogo.eagle.core.function.hmi.ui.bindingcar.ToBindingCarDialog import com.mogo.eagle.core.function.hmi.ui.bindingcar.UpgradeAppDialog -import com.mogo.eagle.core.function.hmi.ui.camera.CameraListView import com.mogo.eagle.core.function.hmi.ui.camera.RoadVideoDialog import com.mogo.eagle.core.function.hmi.ui.dispatch.DispatchDialogManager import com.mogo.eagle.core.function.hmi.ui.notice.NoticeCheckDialog import com.mogo.eagle.core.function.hmi.ui.notice.traffic.NoticeTrafficDialog -import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView +import com.mogo.eagle.core.function.hmi.ui.setting.CameraLiveView.Companion.cameraLiveView import com.mogo.eagle.core.function.hmi.ui.setting.IPCReportWindow -import com.mogo.eagle.core.function.hmi.ui.setting.ReportListFloatWindow -import com.mogo.eagle.core.function.hmi.ui.setting.SOPSettingView +import com.mogo.eagle.core.function.hmi.ui.setting.ToolsView.Companion.toolsView import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog -import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView -import com.mogo.eagle.core.function.hmi.ui.tools.MaskView import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView @@ -107,8 +96,6 @@ import kotlinx.android.synthetic.main.fragment_hmi.* import kotlinx.android.synthetic.main.view_auto_pilot_check.view.* import kotlinx.android.synthetic.main.view_och_bus_operation.view.* import kotlinx.coroutines.* -import me.jessyan.autosize.utils.AutoSizeUtils -import mogo_msg.MogoReportMsg import record_cache.RecordPanelOuterClass import java.util.* @@ -124,34 +111,15 @@ class MoGoHmiFragment : MvpFragment(), IMoGoHmiViewProxy, MoGoHmiContract.View, IMoGoAutopilotRecordListener, - IMoGoAutopilotStatusListener, IViewNotificationProvider { - private val TAG = "MoGoHmiFragment" + IViewNotificationProvider { - // DebugSettingView - private var mDebugSettingViewFloat: WarningFloat.Builder? = null - private var mDebugSettingView: DebugSettingView? = null - - //SOPSettingView - private var mSOPSettingViewFloat: WarningFloat.Builder? = null - private var mSOPSettingView: SOPSettingView? = null + companion object{ + private const val TAG = "MoGoHmiFragment" + } //StatusView private var statusBarView: StatusBarView? = null - // 超视距、路侧、前车直播 - private var cameraListView: CameraListView? = null - private var cameraViewFloat: WarningFloat.Builder? = null - - private var toolsView: AutoPilotAndCheckView? = null - - // 检测、自动驾驶速度设置 - private var toolsViewFloat: WarningFloat.Builder? = null - - private var maskViewFloat: WarningFloat.Builder? = null - private var maskView: MaskView? = null - - private var upgradeTipsView: (() -> View)? = null - // HMI 视图控件代理 // 红绿灯 View代理 private var mViewTrafficLight: IViewTrafficLight? = null @@ -162,29 +130,18 @@ class MoGoHmiFragment : MvpFragment(), // V2X预警弹窗 View 代理 private var mViewNotificationProvider: IViewNotificationProvider? = null - //工控机节点上报列表 - private var reportList = arrayListOf() - - //工控机上报列表悬浮窗 - private var reportListFloatWindow: ReportListFloatWindow? = null - private var ipcReportWindow: IPCReportWindow? = null - - private var adUpgradeDialog: AdUpgradeDialog? = null - private var lastSpeakJob: Job? = null private var lastShowV2XJob: Job? = null private var showingV2XTip: IReminder? = null - private var roadVideoDialog: RoadVideoDialog? = null - - private var busOperationStatus: IOchBusView? = null override fun initViews() { initViewShowWithConfig() // 同步AppInfo Config信息 - CallerDevaToolsManager.syncConfig() + CallerDevaToolsManager.syncConfig() //todo arrow 页面初始化 放到合适位置 + //todo 抽象fragment能力 放入baseHmi val decorView = requireActivity().window.decorView as FrameLayout statusBarView = decorView.findViewWithTag("status_bar") as StatusBarView? //设置StatusBar初始状态 @@ -195,24 +152,24 @@ class MoGoHmiFragment : MvpFragment(), } ivCameraIcon?.setOnClickListener { - if (cameraViewFloat == null) { - showCameraList(CallerFuncBizManager.bizProvider.getCameraList) + cameraLiveView.showCameraList( + context, + CallerFuncBizManager.bizProvider.getCameraList + ) { liveStatus -> + if (liveStatus) { + ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_selected) + } else { + ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor) + } } } - /**ivCameraIcon?.setOnLongClickListener { - activity?.let { it1 -> CarcorderPreviewView.show(it1) } - true - }*/ - ivToolsIcon?.setOnClickListener { - if (toolsViewFloat == null) { - showToolsFloat() - } + toolsView.showToolsFloat(context) } viewShowDebugView.setOnLongClickListener { - toggleDebugView() + toolsView.showToolsFloat(context) true } @@ -278,16 +235,9 @@ class MoGoHmiFragment : MvpFragment(), } } - @OptIn(ExperimentalCoroutinesApi::class) override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) CallerAutopilotRecordListenerManager.addListener(TAG, this) - CallerAutoPilotStatusListenerManager.addListener(TAG, this) - - /*// TODO 这里后面需要改成独立进程通讯后台获取YUV - view.postDelayed({ - activity?.let { CarcorderPreviewView.show(it) } - }, 1000)*/ // 首次初始化使用默认视图 setProxyTrafficLightView(viewTrafficLightVr) @@ -298,7 +248,7 @@ class MoGoHmiFragment : MvpFragment(), override fun getNotificationView(): IViewNotification? = context?.let { V2XNotificationView(it) } - override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) { + override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) { //todo 数据中心 CallerLogger.d("$M_HMI$TAG", "recordKey=${recordPanel.key},stat=${recordPanel.stat}") if (BadCaseConfig.recordKeyList.contains(recordPanel.key)) { if (recordPanel.stat == 100 || recordPanel.stat == 101) { @@ -364,20 +314,11 @@ class MoGoHmiFragment : MvpFragment(), override fun onDestroyView() { super.onDestroyView() CallerAutopilotRecordListenerManager.removeListener(TAG) - CallerAutoPilotStatusListenerManager.removeListener(TAG) - } - - - /** - *注册工控机升级提示圆点View的回调 - * @param 提示圆点View - */ - override fun registerUpgradeTipsCallback(tipsView: () -> View) { - upgradeTipsView = tipsView } /** - * 工控机重启返回结果 + * ok + * 工控机重启返回结果 todo 确认数据源 * @param code * @param msg */ @@ -396,6 +337,7 @@ class MoGoHmiFragment : MvpFragment(), } /** + * ok * 展示工控机监控上报数据 * @param errorReportList 错误级别上报数据列表 * @param warningReportList 提醒级别上报数据列表 @@ -408,33 +350,16 @@ class MoGoHmiFragment : MvpFragment(), ) { ThreadUtils.runOnUiThread { if (reportLevel == 1) { - if (ipcReportWindow == null) { - ipcReportWindow = activity?.let { IPCReportWindow(it) } - ipcReportWindow?.setClickListener(object : IPCReportWindow.ClickListener { - override fun closeWindow() { - ipcReportWindow?.hideFloatWindow() - ipcReportWindow = null - } - }) - ipcReportWindow?.let { - SoundUtils.playRing(requireContext()) - } - } - ipcReportWindow?.showFloatWindow() + IPCReportWindow.show(requireContext(),errorReportList,warningReportList,reportLevel) } - ipcReportWindow?.refreshData(errorReportList, warningReportList, reportLevel) } } + /** todo----------------------------------------------- **/ override fun setViewNotificationProvider(provider: IViewNotificationProvider) { mViewNotificationProvider = provider } - override fun setBusOperationView(view: IOchBusView) { - busOperationStatus = view - busOperationStatus?.showBusOperation() - } - override fun setStatusBarDarkOrLight(light: Boolean) { statusBarView?.setStatusBarDarkOrLight(light) } @@ -455,21 +380,6 @@ class MoGoHmiFragment : MvpFragment(), statusBarView?.updateMfStatus(tag, status) } - override fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean) { - context?.let { - if (DispatchDialogManager.getInstance(it).isShowing) { - return - } - DispatchDialogManager.getInstance(it).showDialog(msgData) - } - } - - override fun dismissDispatchDialog() { - context?.let { - DispatchDialogManager.getInstance(it).releaseDialog() - } - } - override fun updateDriverMsgBoxTipView(show: Boolean) { if (show) { MsgBoxTipView.visibility = View.VISIBLE @@ -500,73 +410,6 @@ class MoGoHmiFragment : MvpFragment(), mViewLimitingVelocity = view } - private fun showToolsFloat() { - context?.let { - if (toolsViewFloat == null) { - if (toolsView == null) { - toolsView = AutoPilotAndCheckView(it) - toolsView!!.setClickListener(object : AutoPilotAndCheckView.ClickListener { - override fun onClose(v: View) { - dismissToolsFloatView() - } - - override fun showDebugPanelView() { - toggleDebugView() - } - - override fun showFeedbackView() { - dismissToolsFloatView() - CallerDevaToolsManager.showFeedbackView(it) - } - - override fun showSOPSettingView() { - toggleSOPView() - } - }) - } - toolsViewFloat = WarningFloat.with(it) - .setTag("ToolsViewFloat") - .setLayout(toolsView!!) - .setSidePattern(SidePattern.LEFT) - .setGravity(Gravity.LEFT) - .setImmersionStatusBar(true) - .setWindowHeight(LayoutParams.MATCH_PARENT) -// .setWindowWidth(AutoSizeUtils.dp2px(context, 960f)) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern) - ?.apply { - interpolator = OvershootInterpolator() - } - - override fun exitAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .addWarningStatusListener(object : IMoGoWarningStatusListener { - override fun onDismiss() { - toolsViewFloat = null - toolsView = null - // TODO:("") - } - }) - .show() - } else { - toolsViewFloat?.show() - } - } - } - /** * 根据配置文件初始化视图显示 */ @@ -603,8 +446,8 @@ class MoGoHmiFragment : MvpFragment(), if (HmiBuildConfig.isShowBadCaseView) { ivBadCaseTools.visibility = View.VISIBLE ivAiCollectTools.visibility = View.VISIBLE - CallerDevaToolsManager.initBadCase(ivBadCaseTools) - CallerDevaToolsManager.initAiCollect(ivAiCollectTools) + CallerDevaToolsManager.initBadCase(ivBadCaseTools) //todo 新超 封装在hmi view + CallerDevaToolsManager.initAiCollect(ivAiCollectTools) //todo 新超 封装在hmi view } else { ivBadCaseTools.visibility = View.GONE ivAiCollectTools.visibility = View.GONE @@ -624,6 +467,7 @@ class MoGoHmiFragment : MvpFragment(), setCameraViewVisibility(View.GONE) } } + /** todo----------------------------------------------- **/ override fun getLayoutId(): Int { return R.layout.fragment_hmi @@ -641,6 +485,7 @@ class MoGoHmiFragment : MvpFragment(), DisplayEffectsHelper.getInstance().display() } + /** todo----------------------------------------------- **/ override fun setSpeedChartViewVisibility(visibility: Int) { viewSpeedChart?.visibility = visibility } @@ -665,265 +510,7 @@ class MoGoHmiFragment : MvpFragment(), ivCameraIcon?.visibility = visibility } - /** - * 开关DebugView - */ - override fun toggleDebugView() { - CallerLogger.d("$M_HMI$TAG", "长按显示状态工具栏") - activity?.let { - if (mDebugSettingViewFloat != null) { - WarningFloat.dismiss(mDebugSettingViewFloat!!.config.floatTag, false) - mDebugSettingViewFloat = null - mDebugSettingView = null - //关闭工控机上报列表 - reportListFloatWindow?.hideFloatWindow() - reportListFloatWindow = null - } else { - if (mDebugSettingView == null) { - mDebugSettingView = DebugSettingView(it) - mDebugSettingView?.reportInit(reportList) - mDebugSettingView?.setClickListener(object : DebugSettingView.ClickListener { - override fun showReportListWindow(show: Boolean) { - if (show) { - //打开工控机上报列表 - reportListFloatWindow = ReportListFloatWindow(it) - reportListFloatWindow?.showFloatWindow() - reportListFloatWindow?.refreshData(reportList) - } else { - //关闭工控机上报列表 - reportListFloatWindow?.hideFloatWindow() - } - } - }) - if (mDebugSettingView != null) { - CallerLogger.d("$M_HMI$TAG", "new DebugSettingView success") - } - } - var side = SidePattern.RIGHT - var gravity = Gravity.RIGHT - //调试窗默认靠右显示，Bus的乘客端右端有视图覆盖，调试窗靠左显示 - if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && - AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) - ) { - side = SidePattern.LEFT - gravity = Gravity.LEFT - } - mDebugSettingViewFloat = WarningFloat.with(it) - .setTag("DebugSettingView") - .setLayout(mDebugSettingView!!) - .setSidePattern(side) - .setGravity(gravity, offsetY = 70) - .setImmersionStatusBar(true) - .setWindowHeight(AutoSizeUtils.dp2px(context, 1100f)) - .setWindowWidth(AutoSizeUtils.dp2px(context, 800f)) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern) - ?.apply { - interpolator = OvershootInterpolator() - } - - override fun exitAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .show() - } - } - } - - override fun toggleSOPView() { - activity?.let { - if (mSOPSettingViewFloat != null) { - WarningFloat.dismiss(mSOPSettingViewFloat!!.config.floatTag, false) - mSOPSettingViewFloat = null - mSOPSettingView = null - } else { - if (mSOPSettingView == null) { - mSOPSettingView = SOPSettingView(it) - } - var side = RIGHT - var gravity = Gravity.RIGHT - //调试窗默认靠右显示，Bus的乘客端右端有视图覆盖，调试窗靠左显示 - if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && - AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) - ) { - side = LEFT - gravity = Gravity.LEFT - } - mSOPSettingViewFloat = WarningFloat.with(it) - .setTag("mSOPSettingView") - .setLayout(mSOPSettingView!!) - .setSidePattern(side) - .setGravity(gravity, offsetY = 70) - .setImmersionStatusBar(true) - .setWindowWidth(AutoSizeUtils.dp2px(context, 800f)) - .setWindowHeight(AutoSizeUtils.dp2px(context, 1100f)) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern) - ?.apply { - interpolator = OvershootInterpolator() - } - - override fun exitAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .show() - } - } - } - - /** - * 展示VR下V2X预警 - * - * @param poiType V2X类型 - * @param alertContent 提醒文本 - * @param ttsContent tts语音播报消息 - * @param tag tag绑定弹窗的标志 - */ - @Synchronized - override fun showWarningV2X( - v2xType: String, - alertContent: CharSequence?, - ttsContent: String?, - tag: String?, - listener: IMoGoWarningStatusListener?, - playTts: Boolean, - expireTime: Long - ) { - val playTTS = - playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) - activity?.let { - val warningContent = alertContent - ?: EventTypeEnum.getWarningContent(v2xType) - - //占道施工预警 - if (v2xType.equals("10006") || v2xType.equals("100061")) { - val currentTime = System.currentTimeMillis() / 1000 - val oldTime = - context?.let { it -> SharedPrefsMgr.getInstance(it).getLong("roadwork", 0) } - if (currentTime - oldTime!! > 60) { //超过一分钟，才会继续播报重复提醒 - context?.let { it -> - SharedPrefsMgr.getInstance(it) - .putLong("roadwork", System.currentTimeMillis() / 1000) - } - CallerAutoPilotManager.sendTripInfo(5, "", "", "", false); - } - } - - if (warningContent.isEmpty()) { - CallerLogger.e("$M_HMI$TAG", "Show warningContent is null or empty!") - return - } - val content = mViewNotificationProvider?.getNotificationView() ?: return - content.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType)) - content.setWarningContent(warningContent) - CallerLogger.d( - "$M_HMI$TAG", - "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime" - ) - Reminder.enqueue( - this@MoGoHmiFragment, - object : PopupWindowReminder( - PopupWindow( - content, - LayoutParams.WRAP_CONTENT, - LayoutParams.WRAP_CONTENT - ).also { itx -> - itx.isTouchable = false - itx.isFocusable = false - itx.isClippingEnabled = false - itx.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - val transition = Slide( - when (content.sidePattern) { - LEFT, RESULT_LEFT -> Gravity.LEFT - RIGHT, RESULT_RIGHT -> Gravity.RIGHT - TOP, RESULT_TOP -> Gravity.TOP - BOTTOM, RESULT_BOTTOM -> Gravity.BOTTOM - else -> Gravity.TOP - } - ).also { t -> - t.interpolator = AccelerateDecelerateInterpolator() - t.duration = 200 - } - if (VERSION.SDK_INT >= VERSION_CODES.M) { - itx.enterTransition = transition - itx.exitTransition = transition - } - }) { - override fun show() { - val parent = it.window.decorView - parent.doOnAttach { - CallerLogger.d( - "$M_HMI$TAG", - "--- show v2x dialog 2 ---: info -> v2x-type: $v2xType : expireTime: $expireTime" - ) - popupWindow.showAtLocation(parent, content.layoutGravity, 0, 0) - } - } - - override fun isOverride(): Boolean { - return true - } - - override fun key(): String { - return v2xType - } - }, - object : IStateChangeListener { - - override fun onShow(reminder: IReminder) { - listener?.onShow() - lastShowV2XJob?.safeCancel() - lastSpeakJob?.safeCancel() - showingV2XTip = reminder - lifecycleScope.launch { - delay(expireTime) - }.also { itx -> - lastShowV2XJob = itx - }.invokeOnCompletion { _ -> - reminder.hide() - } - if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) { - lifecycleScope.launch { - speak(it, ttsContent) - }.also { itx -> - lastSpeakJob = itx - } - } - } - - override fun onHide(reminder: IReminder) { - listener?.onDismiss() - showingV2XTip = null - showWarning(WarningDirectionEnum.ALERT_WARNING_NON) - } - }) - } - } - + /** todo----------------------------------------------- **/ /** * 不展示顶部弹窗，其它保留 */ @@ -944,7 +531,7 @@ class MoGoHmiFragment : MvpFragment(), ?: EventTypeEnum.getWarningContent(v2xType) //占道施工预警 - if (v2xType.equals("10006") || v2xType.equals("100061")) { + if (v2xType == "10006" || v2xType == "100061") { val currentTime = System.currentTimeMillis() / 1000 val oldTime = context?.let { it -> SharedPrefsMgr.getInstance(it).getLong("roadwork", 0) } @@ -1145,10 +732,28 @@ class MoGoHmiFragment : MvpFragment(), flV2XWarningView?.dismissWarning(direction) clearAnimation(flV2XWarningView) } - - private var noticeTrafficDialog: NoticeTrafficDialog? = null + /** todo----------------------------------------------- **/ /** + * ok + */ + override fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean) { + context?.let { + DispatchDialogManager.getInstance(it).showDialog(msgData) + } + } + + /** + * ok + */ + override fun dismissDispatchDialog() { + context?.let { + DispatchDialogManager.getInstance(it).releaseDialog() + } + } + + /** + * ok * 展示云公告交警详情 * @param trafficStylePushData */ @@ -1158,19 +763,13 @@ class MoGoHmiFragment : MvpFragment(), } ThreadUtils.runOnUiThread { context?.let { - noticeTrafficDialog = - NoticeTrafficDialog( - it, - trafficStylePushData - ) - noticeTrafficDialog?.show() + NoticeTrafficDialog.show(it,trafficStylePushData) } } } - private var pushCheckDialog: NoticeCheckDialog? = null - /** + * ok * 展示云公告详情 */ override fun showNoticeNormalData(normalData: NoticeNormalData?) { @@ -1179,195 +778,52 @@ class MoGoHmiFragment : MvpFragment(), } ThreadUtils.runOnUiThread { context?.let { - pushCheckDialog = NoticeCheckDialog(it) - pushCheckDialog?.showCheckDialog(normalData) + NoticeCheckDialog.show(it,normalData) } } } - override fun startRoadCameraLive(flvUrl: String) { - cameraListView?.startRoadCameraLive(flvUrl) - } - - override fun showNoSignView() { - cameraListView?.showNoSignal() - } - /** - * 展示蒙层 + * ok */ - override fun showMaskView() { - if (maskViewFloat == null) { - context?.let { - if (maskViewFloat == null) { - if (maskView == null) { - maskView = MaskView(it) - } - - maskViewFloat = WarningFloat.with(it) - .setTag("MaskViewFloat") - .setLayout(maskView!!) - .setSidePattern(SidePattern.LEFT) - .setGravity(Gravity.CENTER) - .setImmersionStatusBar(true) - .setWindowHeight(LayoutParams.MATCH_PARENT) - .setWindowWidth(LayoutParams.MATCH_PARENT) -// .setCountDownTime(6000) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern) - ?.apply { - interpolator = OvershootInterpolator() - } - - override fun exitAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .addWarningStatusListener(object : IMoGoWarningStatusListener { - override fun onDismiss() { - maskViewFloat = null - maskView = null - // TODO:("") - } - }) - .show() - } else { - maskViewFloat?.show() - } - } - } + override fun startRoadCameraLive(flvUrl: String) { + cameraLiveView.startRoadCameraLive(flvUrl) } - override fun hideMaskView() { - dismissMaskView() + /** + * ok + */ + override fun showNoSignView() { + cameraLiveView.showNoSignView() } + /** + * ok + */ override fun showToolsView() { - if (toolsViewFloat == null) { - showToolsFloat() - } else { - ToastUtils.showShort("弹窗状态有误!") - } + toolsView.showToolsFloat(context) } + /** + * ok + */ override fun hideToolsView() { - dismissToolsFloatView() + toolsView.dismiss() } + /** + * ok + */ @BizConfig(V2I, "", BIZ_RTS) override fun showVideoDialog(infList: List) { - context?.let { - if (roadVideoDialog == null) { - roadVideoDialog = RoadVideoDialog(it) - } - roadVideoDialog?.show(infList) - } - } - - @BizConfig(V2I, "", BIZ_RTS) - private fun showCameraList(cameraList: List?) { - context?.let { - if (cameraViewFloat == null) { - if (cameraListView == null) { - cameraListView = CameraListView(it) - cameraListView!!.updateCameraData(cameraList) - } - cameraListView!!.setClickListener(object : CameraListView.ClickListener { - override fun onClose(v: View) { - // Builder和cameraListView都置空 - dismissFloatView() - // 丢弃开启摄像头推流请求，同时monitor回调hmi的startRoadCameraLive() - // 也做了cameraListView的非空判断 - CallerFuncBizManager.bizProvider.closeCameraLive() - } - - override fun onShowLive(isShow: Boolean) { - when { - isShow -> ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_selected) - else -> ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor) - } - } - - override fun refreshCameraList() { - cameraListView?.refreshCameraList(CallerFuncBizManager.bizProvider.getCameraList) - } - }) - cameraViewFloat = WarningFloat.with(it) - .setTag("CameraListFloat") - .setLayout(cameraListView!!) - .setSidePattern(SidePattern.RIGHT) - .setGravity(Gravity.RIGHT, -40, 255) - .setImmersionStatusBar(true) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern) - ?.apply { - interpolator = OvershootInterpolator() - } - - override fun exitAnim( - view: View, - params: LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .addWarningStatusListener(object : IMoGoWarningStatusListener { - override fun onDismiss() { - cameraViewFloat = null - cameraListView = null - ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor) - } - }) - .show() - } else { - cameraViewFloat?.show() + ThreadUtils.runOnUiThread { + context?.let { + RoadVideoDialog.show(it, infList) } } } - private fun dismissFloatView() { - cameraViewFloat?.let { - WarningFloat.dismiss(it.config.floatTag, false) - cameraViewFloat = null - cameraListView = null - } - } - - private fun dismissToolsFloatView() { - toolsViewFloat?.let { - WarningFloat.dismiss(it.config.floatTag, false) - toolsViewFloat = null - toolsView = null - } - } - - private fun dismissMaskView() { - maskViewFloat?.let { - WarningFloat.dismiss(it.config.floatTag, false) - maskViewFloat = null - maskView = null - } - } - + /** todo----------------------------------------------- **/ private var isLeftLight: Boolean = false private var isRightLight: Boolean = false private var isDisappare: Boolean = false @@ -1430,105 +886,95 @@ class MoGoHmiFragment : MvpFragment(), CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) } } - -// turnLightView?.let { -// turnLightView.setTurnLight(light) -// } } } } + private var isBrake: Boolean = false + /** * 显示刹车效果 */ override fun showBrakeLight(light: Int) { + if (HmiBuildConfig.isShowBrakeLightView) { + ThreadUtils.runOnUiThread { + if (light == 1) { //刹车灯亮 + if (!isBrake) { + isBrake = true + CallerLogger.d( + "${SceneConstant.M_DEVA}${"BrakeLight"}", + " showBrakeLight light = 1 " + ) + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500) + } + } else { + if (isBrake) {//默认 不亮灯 + isBrake = false + CallerLogger.d( + "${SceneConstant.M_DEVA}${"BrakeLight"}", + " showBrakeLight light != 1 " + ) + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) + } + } + } + } } + /** todo----------------------------------------------- **/ - private var modifyBindingCarDialog: ModifyBindingCarDialog? = null - private var toBindingCarDialog: ToBindingCarDialog? = null - private var upgradeAppDialog: UpgradeAppDialog? = null + /** + * ok + */ override fun showToBindingcarDialog() { - if (toBindingCarDialog == null) { - toBindingCarDialog = ToBindingCarDialog(requireContext()) + if (ContextHolderUtil.getContext() != null) { + ToBindingCarDialog.show(ContextHolderUtil.getContext()) } - toBindingCarDialog!!.showToBindingCarDialog() - } - - override fun showModifyBindingcarDialog() { - if (modifyBindingCarDialog == null) { - modifyBindingCarDialog = ModifyBindingCarDialog(requireContext()) - } - modifyBindingCarDialog!!.showModifyBindingCarDialog() } /** + * ok + */ + override fun showModifyBindingcarDialog() { + if (ContextHolderUtil.getContext() != null) { + ModifyBindingCarDialog.show(ContextHolderUtil.getContext()) + } + } + + /** + * ok * 升级app弹框 */ - override fun showUpgradeDialog( - name: String, - url: String, - title: String, - content: String, - installType: String - ) { + override fun showUpgradeDialog(name: String, url: String, title: String, content: String, installType: String) { if (ContextHolderUtil.getContext() != null) { - if (upgradeAppDialog == null) { - upgradeAppDialog = UpgradeAppDialog(ContextHolderUtil.getContext()) - } - upgradeAppDialog!!.setCanceledOnTouchOutside(false) - upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content, installType) + UpgradeAppDialog.show(ContextHolderUtil.getContext(),name, url, title, content, installType) } } /** + * ok * 工控机镜像升级确认窗 * @param images 镜像列表 * @param padSn SN * @param releaseId 任务ID */ - override fun showAdUpgradeDialog( - images: List, - padSn: String, - releaseId: String - ) { + override fun showAdUpgradeDialog(images: List, padSn: String, releaseId: String) { ThreadUtils.runOnUiThread { - if (adUpgradeDialog == null) { - adUpgradeDialog = AdUpgradeDialog(requireContext(), images, padSn, releaseId) - adUpgradeDialog?.setClickListener(object : AdUpgradeDialog.ClickListener { - override fun confirm() { - //确认升级 - CallerDevaToolsManager.upgradeConfirm(images, padSn, releaseId) - AdUpgradeStateHelper.setConfirmUpgrade(true) - ToastUtils.showLong("最新版本下载中...") - adUpgradeDialog?.dismiss() - adUpgradeDialog = null - } - - override fun cancel() { - adUpgradeDialog?.dismiss() - adUpgradeDialog = null - } - - }) + if (ContextHolderUtil.getContext() != null) { + AdUpgradeDialog.show(ContextHolderUtil.getContext(),images, padSn, releaseId) } - adUpgradeDialog?.showUpgradeDialog() } } + /** + * ok + */ override fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo) { ThreadUtils.runOnUiThread { - toolsView?.showAdUpgradeStatus(ipcUpgradeStateInfo) - ipcUpgradeStateInfo.status.let { - if (AdUpgradeStateHelper.isUpgradeSuccess(it)) { - ToastUtils.showLong("升级成功") - AdUpgradeStateHelper.setConfirmUpgrade(false) - } - } + toolsView.showAdUpgradeStatus(ipcUpgradeStateInfo) } } - override fun setTurnLightFunction(isOpen: Boolean) { HmiBuildConfig.isShowTurnLightView = isOpen } @@ -1549,62 +995,6 @@ class MoGoHmiFragment : MvpFragment(), HmiBuildConfig.isShowCloudWeaknessTrafficView = isOpen } - private var takeOver = false - - /** - * 工控机监控节点上报 - */ - override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { - ThreadUtils.runOnUiThread { - guardianInfo?.let { - if (reportList.size > 49) { - reportList.removeLast() - } - reportList.add( - 0, - ReportEntity( - TimeUtils.millis2String(System.currentTimeMillis()), - it.src, it.level, it.msg, it.code, it.resultList, it.actionsList - ) - ) - reportListFloatWindow?.refreshData(reportList) - - if (FunctionBuildConfig.isDemoMode) { - return@let - } - if (takeOver) { - return@let - } - when (it.code) { - EXIT_AUTOPILOT_FOR_PLANNING, - EXIT_AUTOPILOT_FOR_LOCATION, - EXIT_AUTOPILOT_FOR_CHASSIS, - EXIT_AUTOPILOT_FOR_DISTANCE -> { - warningV2X( - EventTypeEnum.TAKE_OVER_EVENT.poiType, - EventTypeEnum.TAKE_OVER_EVENT.content, - EventTypeEnum.TAKE_OVER_EVENT.tts, - EventTypeEnum.TAKE_OVER_EVENT.poiType, - object : IMoGoWarningStatusListener { - override fun onShow() { - takeOver = true - clTakeOverView.visibility = View.VISIBLE - } - - override fun onDismiss() { - takeOver = false - clTakeOverView.visibility = View.GONE - } - }, - true, - 6000L - ) - } - } - } - } - } - override fun showSmallFragment() { // 加载全览模式图层 val fragmentOverview = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_OVERVIEW) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt index bd2df29800..162b620264 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt @@ -8,8 +8,8 @@ import com.mogo.commons.module.status.MogoStatusManager import com.mogo.commons.module.status.StatusDescriptor import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.hmi.R -import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast /** @@ -18,8 +18,24 @@ import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog */ class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { - companion object{ - private const val TAG = "BindingCarDialog" + companion object { + private const val TAG = "ModifyBindingCarDialog" + + private var modifyBindingCarDialog: ModifyBindingCarDialog? = null + + fun show(context: Context?) { + context?.let { + if (modifyBindingCarDialog == null) { + modifyBindingCarDialog = ModifyBindingCarDialog(it) + } + modifyBindingCarDialog?.let { dialog -> + if (dialog.isShowing) { + return + } + dialog.show() + } + } + } } private var confirmTv: TextView? = null @@ -58,7 +74,7 @@ class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifec * 修改绑定车机 */ private fun modifyBindingCar() { - CallerDevaToolsManager.modifyCarInfo{ + CallerDevaToolsManager.modifyCarInfo { if (it.code == 200) { TipToast.shortTip("修改绑定成功") } else { @@ -70,6 +86,7 @@ class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifec override fun dismiss() { super.dismiss() + modifyBindingCarDialog = null MogoStatusManager.getInstance().unregisterStatusChangedListener( TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, @@ -77,12 +94,4 @@ class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifec ) } - fun showModifyBindingCarDialog() { - if (isShowing) { - return - } - show() - } - - } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt index 44868a424f..31633e2f5b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt @@ -8,28 +8,45 @@ import com.mogo.commons.module.status.MogoStatusManager import com.mogo.commons.module.status.StatusDescriptor import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.hmi.R -import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast /** * @brief 绑定车辆对话框 * @author lixiaopeng */ -class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver{ +class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { - companion object{ + companion object { private const val TAG = "ToBindingCarDialog" + + private var toBindingCarDialog: ToBindingCarDialog? = null + + fun show(context: Context?) { + context?.let { + if (toBindingCarDialog == null) { + toBindingCarDialog = ToBindingCarDialog(it) + } + toBindingCarDialog?.let { dialog -> + if (dialog.isShowing) { + return + } + dialog.show() + } + } + } } private var confirmTv: TextView? = null private var cancelTv: TextView? = null - private val statusChangedListenerForCheckNotice = IMogoStatusChangedListener { descriptor, isTrue -> - if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND && isTrue) { - dismiss() + private val statusChangedListenerForCheckNotice = + IMogoStatusChangedListener { descriptor, isTrue -> + if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND && isTrue) { + dismiss() + } } - } init { setContentView(R.layout.dialog_to_bindingcar) @@ -57,7 +74,7 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle * 修改绑定车机 */ private fun toBindingCar() { - CallerDevaToolsManager.modifyCarInfo{ + CallerDevaToolsManager.modifyCarInfo { if (it.code == 200) { TipToast.shortTip("绑定成功") } else { @@ -69,6 +86,7 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle override fun dismiss() { super.dismiss() + toBindingCarDialog = null MogoStatusManager.getInstance().unregisterStatusChangedListener( TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, @@ -76,12 +94,4 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle ) } - fun showToBindingCarDialog() { - if (isShowing) { - return - } - show() - } - - } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt index 644bdc0343..92fe6ed30b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt @@ -15,15 +15,40 @@ import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog */ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { - private val TAG = "UpgradeAppDialog" + companion object{ + private const val TAG = "UpgradeAppDialog" + + private var upgradeAppDialog: UpgradeAppDialog? = null + + fun show(context: Context?, + name: String, + url: String, + title: String, + content: String, + installType: String) { + context?.let { + if (upgradeAppDialog == null) { + upgradeAppDialog = UpgradeAppDialog(it) + } + upgradeAppDialog?.let { dialog -> + if (dialog.isShowing) { + return + } + dialog.showUpgradeAppDialog(name, url, title, content, installType) + } + } + } + } + + private var confirmTv: TextView? = null - private var cancleTv: TextView? = null + private var cancelTv: TextView? = null private var upgradeTitleTv: TextView? = null private var upgradeContentTv: TextView? = null private var verticalLineView: View? = null private var confirmForceTv: TextView? = null private var tag: String? = null - private var downloarUrl: String? = null + private var downloadUrl: String? = null init { setContentView(R.layout.dialog_upgrade_app) @@ -32,7 +57,7 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb upgradeTitleTv = findViewById(R.id.tv_upgrade_title) upgradeContentTv = findViewById(R.id.tv_upgrade_content) confirmTv = findViewById(R.id.tv_upgrade_confirm) - cancleTv = findViewById(R.id.tv_upgrade_cancel) + cancelTv = findViewById(R.id.tv_upgrade_cancel) verticalLineView = findViewById(R.id.view_vertical_line) confirmForceTv = findViewById(R.id.tv_upgrade_confirm_force) @@ -40,7 +65,7 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb downloadApp() } - cancleTv?.setOnClickListener { + cancelTv?.setOnClickListener { dismiss() } @@ -55,13 +80,14 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb */ fun downloadApp() { ToastUtils.showLong("开始下载APK,稍后可前往downloads文件夹查看,通知栏查看下载进度") - tag?.let { downloarUrl?.let { it1 -> CallerDevaToolsManager.downLoadPackage(it, it1) } } + tag?.let { downloadUrl?.let { it1 -> CallerDevaToolsManager.downLoadPackage(it, it1) } } dismiss() } override fun dismiss() { super.dismiss() + upgradeAppDialog = null } // 升级类型 1:提示升级 2:静默升级 3:强制升级 @@ -72,29 +98,29 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb content: String, installType: String ) { - if (isShowing) { - return - } tag = name - downloarUrl = url + downloadUrl = url upgradeTitleTv?.text = title upgradeContentTv?.text = content - if (installType.equals("1")) { - confirmForceTv?.visibility = View.GONE - confirmTv?.visibility = View.VISIBLE - cancleTv?.visibility = View.VISIBLE - verticalLineView?.visibility = View.VISIBLE - } else if (installType.equals("3")) { - confirmTv?.visibility = View.GONE - cancleTv?.visibility = View.GONE - verticalLineView?.visibility = View.GONE + when (installType) { + "1" -> { + confirmForceTv?.visibility = View.GONE + confirmTv?.visibility = View.VISIBLE + cancelTv?.visibility = View.VISIBLE + verticalLineView?.visibility = View.VISIBLE + } + "3" -> { + confirmTv?.visibility = View.GONE + cancelTv?.visibility = View.GONE + verticalLineView?.visibility = View.GONE - confirmForceTv?.visibility = View.VISIBLE - } else if (installType.equals("2")) { - //静默安装 + confirmForceTv?.visibility = View.VISIBLE + } + "2" -> { + //静默安装 + } } - show() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt index 4325a792ea..1d8f7c8d53 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt @@ -9,11 +9,11 @@ import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.data.map.Infrastructure import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer -import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.model.VideoOptionModel @@ -30,7 +30,25 @@ import tv.danmaku.ijk.media.player.IjkMediaPlayer */ class RoadVideoDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { - private val TAG = "RoadVideoDialog" + companion object { + private const val TAG = "RoadVideoDialog" + + private var roadVideoDialog: RoadVideoDialog? = null + + fun show(context: Context?, infList: List) { + context?.let { + if (roadVideoDialog == null) { + roadVideoDialog = RoadVideoDialog(it) + } + roadVideoDialog?.let { dialog -> + if(dialog.isShowing){ + return + } + dialog.show(infList) + } + } + } + } private val gsyVideoOptionBuilder by lazy { GSYVideoOptionBuilder() @@ -150,6 +168,7 @@ class RoadVideoDialog(context: Context) : BaseFloatDialog(context), LifecycleObs private fun stopLive() { try { GSYVideoManager.releaseAllVideos() + roadVideoDialog = null } catch (e: Exception) { e.printStackTrace() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/dispatch/DispatchDialogManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/dispatch/DispatchDialogManager.java index 19872c3114..88cfdb089b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/dispatch/DispatchDialogManager.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/dispatch/DispatchDialogManager.java @@ -37,6 +37,9 @@ public class DispatchDialogManager { } public void showDialog(DispatchAdasAutoPilotLocReceiverBean msgData) { + if(isShowing()){ + return; + } if (msgData == null) { return; } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt index 92597ad08a..ff1cec7f89 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt @@ -10,15 +10,15 @@ import androidx.lifecycle.LifecycleObserver import com.mogo.commons.module.status.IMogoStatusChangedListener import com.mogo.commons.module.status.MogoStatusManager import com.mogo.commons.module.status.StatusDescriptor -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.data.notice.NoticeNormalData -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.utilcode.util.BitmapHelper import com.mogo.eagle.core.widget.media.video.NoticeSimpleVideoPlayer -import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack @@ -28,9 +28,28 @@ import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack * @brief 点击查看对话框 * @author lixiaopeng */ -class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver{ +class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { + + companion object { + private const val TAG = "NoticeCheckDialog" + + private var pushCheckDialog: NoticeCheckDialog? = null + + fun show(context: Context?, normalData: NoticeNormalData) { + context?.let { + if (pushCheckDialog == null) { + pushCheckDialog = NoticeCheckDialog(it) + } + pushCheckDialog?.let { dialog -> + if (dialog.isShowing) { + return + } + dialog.showCheckDialog(normalData) + } + } + } + } - private val TAG = "NoticeCheckDialog" private var pushCheckClose: ImageView? = null private var pushCheckTitle: TextView? = null private var pushCheckContent: TextView? = null @@ -42,11 +61,12 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO private var mVideoUrl: String = "" private var playErrorImageView: ImageView? = null private var connectTextView: TextView? = null - private val statusChangedListenerForCheckNotice = IMogoStatusChangedListener { descriptor, isTrue -> - if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND && isTrue) { - dismiss() + private val statusChangedListenerForCheckNotice = + IMogoStatusChangedListener { descriptor, isTrue -> + if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND && isTrue) { + dismiss() + } } - } init { setContentView(R.layout.notice_dialog_check_with_accessory) @@ -92,13 +112,21 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO playVideo(mVideoUrl) } - MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForCheckNotice) + MogoStatusManager.getInstance().registerStatusChangedListener( + TAG, + StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, + statusChangedListenerForCheckNotice + ) } - override fun dismiss() { super.dismiss() - MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForCheckNotice) + pushCheckDialog = null + MogoStatusManager.getInstance().unregisterStatusChangedListener( + TAG, + StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, + statusChangedListenerForCheckNotice + ) stopLive() } @@ -106,10 +134,6 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO * 展示详情页面 */ fun showCheckDialog(noticeNormal: NoticeNormalData) { - if (isShowing || noticeNormal == null) { - return - } - if (noticeNormal.title.isBlank() || noticeNormal.content.isBlank()) { return } @@ -148,7 +172,7 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO private fun playVideo(videoUrl: String) { try { gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(false).setPlayTag(TAG) - .build(pushVideo) + .build(pushVideo) pushVideo!!.startButton.performClick() playImageView!!.visibility = View.GONE thumbnailImageView!!.visibility = View.GONE @@ -187,11 +211,11 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO /** * 播放结束后 */ - private fun complete(firstbitmap: Bitmap, path: String) { + private fun complete(firstBitmap: Bitmap, path: String) { playImageView!!.visibility = View.VISIBLE playImageView!!.setImageResource(R.drawable.notice_video_play) thumbnailImageView!!.visibility = View.VISIBLE - GlideApp.with(context).load(firstbitmap).optionalTransform( + GlideApp.with(context).load(firstBitmap).optionalTransform( GlideRoundedCornersTransform( 20f, GlideRoundedCornersTransform.CornerType.ALL @@ -201,7 +225,7 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO } private fun startVideoCallBack(path: String) { - Thread(Runnable { + Thread { val firstBitmap = BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*/ pushVideo!!.setVideoAllCallBack(object : VideoAllCallBack { override fun onAutoComplete(url: String, vararg objects: Any) { @@ -214,15 +238,15 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO } override fun onClickStop(url: String, vararg objects: Any) { - CallerLogger.d(M_HMI + TAG, "onClickStop") + CallerLogger.d(M_HMI + TAG, "onClickStop") } override fun onStartPrepared(url: String, vararg objects: Any) { - CallerLogger.d(M_HMI + TAG, "onStartPrepared") + CallerLogger.d(M_HMI + TAG, "onStartPrepared") } override fun onPlayError(url: String, vararg objects: Any) { - CallerLogger.d(M_HMI + TAG, "onPlayError") + CallerLogger.d(M_HMI + TAG, "onPlayError") pushImageView?.visibility = View.GONE pushVideo?.visibility = View.GONE playImageView!!.visibility = View.GONE @@ -249,10 +273,10 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO override fun onClickStartThumb(url: String, vararg objects: Any) {} override fun onClickBlank(url: String, vararg objects: Any) {} override fun onClickBlankFullscreen(url: String, vararg objects: Any) { - CallerLogger.d(M_HMI + TAG, "onClickBlankFullscreen") + CallerLogger.d(M_HMI + TAG, "onClickBlankFullscreen") } }) - }).start() + }.start() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.java deleted file mode 100644 index 567fb4b2b8..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.java +++ /dev/null @@ -1,451 +0,0 @@ -package com.mogo.eagle.core.function.hmi.ui.notice.traffic; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI; - -import android.content.Context; -import android.graphics.Bitmap; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.lifecycle.LifecycleObserver; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; - -import com.mogo.cloud.commons.utils.CoordinateUtils; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.module.status.IMogoStatusChangedListener; -import com.mogo.commons.module.status.MogoStatusManager; -import com.mogo.commons.module.status.StatusDescriptor; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; -import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; -import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; -import com.mogo.eagle.core.data.notice.NoticeValue; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; -import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager; -import com.mogo.eagle.core.function.hmi.R; -import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp; -import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform; -import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.util.BitmapHelper; -import com.mogo.eagle.core.utilcode.util.DateTimeUtils; -import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer; -import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog; -import com.shuyu.gsyvideoplayer.GSYVideoManager; -import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; -import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack; -import com.shuyu.gsyvideoplayer.utils.NetworkUtils; -import com.shuyu.gsyvideoplayer.video.base.GSYVideoView; - -import java.util.ArrayList; - -/** - * @author liujing - * @description 交警事故详情弹框 - * http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=66917475 根据infoId获取事故详情 - * @since: 10/26/21 - */ -public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObserver { - private String TAG = "AINotice"; - private Context mContext; - private RecyclerView mRecyclerView; - private NoticeSimpleSmallVideoPlayer mVideoPlayer; - private NoticeTrafficStylePushData mPushData; - private ImageView close; - private ImageView playImageView; - private MogoImageView thumbnailImage; - private final GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder(); - private TextView accept;//接受 - private TextView refuse;//拒绝 - private TextView connect;//连接 - private NoticeTrafficAdapter adapter; - private final ArrayList dataArrayList = new ArrayList<>(); - private NoticeTrafficStyleInfo.NoticeTrafficAccountInfo mTrafficStyleInfo; - - public NoticeTrafficDialog(@NonNull Context context, NoticeTrafficStylePushData pushData) { - super(context); - mContext = context; - mPushData = pushData; - initView(); - } - - public NoticeTrafficDialog(@NonNull Context context, int themeResId) { - super(context, themeResId); - } - - public void initView() { - setContentView(R.layout.notice_dialog_traffic_police); - setCanceledOnTouchOutside(true); - playerShow();//视频播放器及接操作按钮 - recyclerVie();//详情信息列表 - MogoStatusManager.getInstance().registerStatusChangedListener(M_HMI + TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForNotice); - } - - /** - * 根据推送消息渲染顶部图片/视频 - * type 0图片 1视频 - */ - private void playerShow() { - mVideoPlayer = findViewById(R.id.video_player); - thumbnailImage = findViewById(R.id.thumbnail_image); - playImageView = this.findViewById(R.id.start_for_traffic); - playImageView.setOnClickListener(v -> startLive()); - close = findViewById(R.id.notice_traffic_dialog_close); - close.setOnClickListener(v -> { - releasePlayer(); - dismiss(); - }); - accept = findViewById(R.id.accept_traffic); - refuse = findViewById(R.id.refuse_traffic); - connect = findViewById(R.id.notice_connect); - accept.setOnClickListener(v -> feedBackTraffic(1)); - refuse.setOnClickListener(v -> feedBackTraffic(0)); - //重新连接 - connect.setOnClickListener(v -> { - netWorkStatus(); - startLive(); - requestTrafficInfo(); - }); - requestTrafficInfo(); - netWorkStatus(); - if (mPushData.getType() == 1) { - startLive(); - } else { - GlideApp.with(mContext).load(mPushData.getPoiImgUrl()).optionalTransform(new GlideRoundedCornersTransform - (20f, GlideRoundedCornersTransform.CornerType.ALL)).into(thumbnailImage); - mVideoPlayer.setVisibility(View.INVISIBLE); - playImageView.setVisibility(View.INVISIBLE); - thumbnailImage.setVisibility(View.VISIBLE); - } - mVideoPlayer.setOnClickListener(v -> { - if (mVideoPlayer.getCurrentState() == GSYVideoView.CURRENT_STATE_PAUSE) {/*播放中*/ - resume(); - } else { - pause(); - } - }); - - } - - private void recyclerVie() { - //网格绘制 - try { - mRecyclerView = findViewById(R.id.traffic_info_recyclerView); - //网格布局 - StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL); - mRecyclerView.setLayoutManager(staggeredGridLayoutManager); - NoticeTrafficInfoGridItemDivider gridLayoutDivider = new NoticeTrafficInfoGridItemDivider(1, - (mContext.getResources().getColor(R.color.notice_check_dialog_bg_color))); - mRecyclerView.addItemDecoration(gridLayoutDivider); - } catch (Exception e) { - e.printStackTrace(); - } - adapter = new NoticeTrafficAdapter(mContext, dataArrayList); - mRecyclerView.setAdapter(adapter); - - } - - /** - * @param i 是否接受交通事故任务 - * 0不接收 1接受 发起自动驾驶任务,显示引导线 - */ - private void feedBackTraffic(int i) { - CallerFuncBizManager.getBizProvider().feedBackNoticeTraffic(mPushData.getInfoId(), MoGoAiCloudClientConfig.getInstance().getSn(), i); - if (i == 1) { - startAutoPilot(); - } - dismiss(); - } - - - /** - * 开启自动驾驶 - */ - private void startAutoPilot() { - if (mTrafficStyleInfo != null) { - AutopilotControlParameters parameters = new AutopilotControlParameters(); - parameters.isSpeakVoice = false; - parameters.vehicleType = 10; - //云平台使用的是火星坐标,自动驾驶需要wgs84 - double[] gcj02 = CoordinateUtils.transformGcj02toWgs84(mTrafficStyleInfo.getLat(), mTrafficStyleInfo.getLon()); - parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat - (CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), - CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon()); - parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat - (gcj02[0], gcj02[1]); - CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters); - } - } - - /** - * 暂停 - */ - private void pause() { - playImageView.setVisibility(View.VISIBLE); - thumbnailImage.setVisibility(View.GONE); - playImageView.setOnClickListener(v -> mVideoPlayer.onVideoResume()); - thumbnailImage.setOnClickListener(v -> mVideoPlayer.onVideoResume()); - } - - /** - * 继续 - */ - private void resume() { - playImageView.setImageResource(R.drawable.notice_video_pause); - playImageView.setVisibility(View.GONE); - thumbnailImage.setVisibility(View.GONE); - } - - /** - * 播放结束后 - */ - private void complete(Bitmap firstbitmap) { - thumbnailImage.setVisibility(View.VISIBLE); -// thumbnailImage.setImageBitmap(firstbitmap); - GlideApp.with(mContext).load(firstbitmap).optionalTransform(new GlideRoundedCornersTransform - (20f, GlideRoundedCornersTransform.CornerType.ALL)).into(thumbnailImage); - playImageView.setImageResource(R.drawable.notice_video_play); - playImageView.setVisibility(View.VISIBLE); - playImageView.setOnClickListener(v -> startLive()); - thumbnailImage.setOnClickListener(v -> startLive()); - } - - /** - * 视频播放 - */ - private void startLive() { - if (mPushData != null) { - try { - CallerLogger.INSTANCE.d(M_HMI + TAG, "交警事故开始播放视频startLive"); - String videoUrl = mPushData.getPoiImgUrl(); - gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(false).setPlayTag("NoticeTrafficDialog") - .build(mVideoPlayer); - mVideoPlayer.getStartButton().performClick(); - liveCallBack(); - } catch (Exception e) { - e.printStackTrace(); - } - } - if (dataArrayList.size() == 0) { - requestTrafficInfo(); - } - } - - private void liveCallBack() { - new Thread(() -> { - Bitmap firstBitmap = BitmapHelper.getVideoThumbnail(mPushData.getPoiImgUrl());/*获取第一帧图*/ - mVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() { - @Override - public void onAutoComplete(String url, Object... objects) { - complete(firstBitmap); - } - - @Override - public void onClickResume(String url, Object... objects) { - thumbnailImage.setVisibility(View.GONE); - playImageView.setVisibility(View.GONE); - } - - @Override - public void onClickStop(String url, Object... objects) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStop"); - } - - @Override - public void onStartPrepared(String url, Object... objects) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onStartPrepared"); - } - - @Override - public void onPrepared(String url, Object... objects) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onPrepared"); - thumbnailImage.setVisibility(View.GONE); - playImageView.setVisibility(View.GONE); - connect.setVisibility(View.GONE); - } - - @Override - public void onClickStartIcon(String url, Object... objects) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStartIcon"); - } - - @Override - public void onClickStartError(String url, Object... objects) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "onClickStartError"); - } - - @Override - public void onClickStopFullscreen(String url, Object... objects) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStopFullscreen"); - } - - @Override - public void onClickResumeFullscreen(String url, Object... objects) { - } - - @Override - public void onClickSeekbar(String url, Object... objects) { - } - - @Override - public void onClickSeekbarFullscreen(String url, Object... objects) { - } - - @Override - public void onEnterFullscreen(String url, Object... objects) { - } - - @Override - public void onQuitFullscreen(String url, Object... objects) { - } - - @Override - public void onQuitSmallWidget(String url, Object... objects) { - } - - @Override - public void onEnterSmallWidget(String url, Object... objects) { - } - - @Override - public void onTouchScreenSeekVolume(String url, Object... objects) { - } - - @Override - public void onTouchScreenSeekPosition(String url, Object... objects) { - } - - @Override - public void onTouchScreenSeekLight(String url, Object... objects) { - } - - @Override - public void onPlayError(String url, Object... objects) { - thumbnailImage.setVisibility(View.VISIBLE); - connect.setVisibility(View.VISIBLE); - CallerLogger.INSTANCE.d(M_HMI + TAG, "onPlayError"); - } - - @Override - public void onClickStartThumb(String url, Object... objects) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStartThumb"); - } - - @Override - public void onClickBlank(String url, Object... objects) { - } - - @Override - public void onClickBlankFullscreen(String url, Object... objects) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickBlankFullscreen"); - - } - }); - }).start(); - } - - /** - * 获取交通事故详情 - */ - private void requestTrafficInfo() { - CallerLogger.INSTANCE.d(M_HMI + TAG, "requestTrafficInfo"); - CallerFuncBizManager.getBizProvider().requestAccidentInfo(mPushData.getInfoId(), MoGoAiCloudClientConfig.getInstance().getSn(), trafficInfo -> { - CallerLogger.INSTANCE.d(M_HMI + TAG, "交通事故详情::" + trafficInfo); - mTrafficStyleInfo = trafficInfo.getResult().getAccidentInfo(); - infoRefresh(mTrafficStyleInfo); - }); - } - - private void infoRefresh(NoticeTrafficStyleInfo.NoticeTrafficAccountInfo info) { - if (dataArrayList.size() > 0) { - dataArrayList.clear(); - } - NoticeValue laiYuan = new NoticeValue(); - laiYuan.setKey("事故来源："); - laiYuan.setValue(info.getUploadType()); - dataArrayList.add(laiYuan); - - NoticeValue cTime = new NoticeValue(); - cTime.setKey("事故时间："); - cTime.setValue(DateTimeUtils.getTimeText(info.getDataCreateTime(), DateTimeUtils.MM_Yue_dd_Ri_HH_mm)); - dataArrayList.add(cTime); - - NoticeValue hTime = new NoticeValue(); - hTime.setKey("处理时间："); - hTime.setValue(DateTimeUtils.getTimeText(info.getDataHandleTime(), DateTimeUtils.MM_Yue_dd_Ri_HH_mm)); - dataArrayList.add(hTime); - - NoticeValue reason = new NoticeValue(); - reason.setKey("事故原因："); - reason.setValue(info.getReason()); - dataArrayList.add(reason); - - NoticeValue status = new NoticeValue(); - status.setKey("处理状态："); - if (info.getOperaStatus().equals("1")) { - status.setValue("待处理"); - } else { - status.setValue("已处理"); - } - dataArrayList.add(status); - - NoticeValue location = new NoticeValue(); - location.setKey("事故地点："); - location.setValue(info.getUploadAddress()); - dataArrayList.add(location); - - NoticeValue style = new NoticeValue(); - style.setKey("事故等级："); - style.setValue(info.getTroubleTypeName()); - dataArrayList.add(style); - - adapter.setData(dataArrayList); - adapter.notifyDataSetChanged(); - } - - /** - * 判断网络状态 - */ - private void netWorkStatus() { - if (NetworkUtils.isAvailable(getContext())) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "网络可用"); - thumbnailImage.setVisibility(View.GONE); - connect.setVisibility(View.GONE); - thumbnailImage.setBackgroundResource(R.drawable.notice_traffic_placeholder); - } else { - thumbnailImage.setVisibility(View.VISIBLE); - thumbnailImage.setBackgroundResource(R.drawable.notice_unsuccess_traffic); - connect.setVisibility(View.VISIBLE); - } - } - - public void cancel() { - - } - - private void releasePlayer() { - try { - GSYVideoManager.releaseAllVideos(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - public void dismiss() { - super.dismiss(); - CallerLogger.INSTANCE.d(M_HMI + TAG, "trafficDialog dismiss"); - MogoStatusManager.getInstance().unregisterStatusChangedListener(M_HMI + TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForNotice); - releasePlayer(); - } - - private final IMogoStatusChangedListener statusChangedListenerForNotice = (descriptor, isTrue) -> { - if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND && isTrue) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "onStatusChanged==MAIN_PAGE_IS_BACKGROUND"); - dismiss(); - } - }; -} diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt new file mode 100644 index 0000000000..a4359b6dd3 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt @@ -0,0 +1,445 @@ +package com.mogo.eagle.core.function.hmi.ui.notice.traffic + +import android.content.Context +import android.graphics.Bitmap +import android.view.View +import android.widget.ImageView +import android.widget.TextView +import androidx.lifecycle.LifecycleObserver +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.StaggeredGridLayoutManager +import com.mogo.cloud.commons.utils.CoordinateUtils +import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.module.status.IMogoStatusChangedListener +import com.mogo.commons.module.status.MogoStatusManager +import com.mogo.commons.module.status.StatusDescriptor +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLonLat +import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo +import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo.NoticeTrafficAccountInfo +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData +import com.mogo.eagle.core.data.notice.NoticeValue +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager.startAutoPilot +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84Lat +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84Lon +import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager.bizProvider +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp +import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform +import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.BitmapHelper +import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer +import com.shuyu.gsyvideoplayer.GSYVideoManager +import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder +import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack +import com.shuyu.gsyvideoplayer.utils.NetworkUtils +import com.shuyu.gsyvideoplayer.video.base.GSYVideoView + +/** + * @author liujing + * @description 交警事故详情弹框 + * http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=66917475 根据infoId获取事故详情 + * @since: 10/26/21 + */ +class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver { + + companion object { + private const val TAG = "AINotice" + + private var noticeTrafficDialog: NoticeTrafficDialog? = null + + fun show(context: Context?, trafficStylePushData: NoticeTrafficStylePushData) { + context?.let { + if (noticeTrafficDialog == null) { + noticeTrafficDialog = NoticeTrafficDialog(it, trafficStylePushData) + } + noticeTrafficDialog?.let { dialog -> + if (dialog.isShowing) { + return + } + dialog.show() + } + } + } + + } + + private var mContext: Context? = null + private var mRecyclerView: RecyclerView? = null + private var mVideoPlayer: NoticeSimpleSmallVideoPlayer? = null + private var mPushData: NoticeTrafficStylePushData? = null + private var close: ImageView? = null + private var playImageView: ImageView? = null + private var thumbnailImage: MogoImageView? = null + private val gsyVideoOptionBuilder = GSYVideoOptionBuilder() + private var accept: TextView? = null//接受 + private var refuse: TextView? = null//拒绝 + private var connect: TextView? = null//连接 + private var adapter: NoticeTrafficAdapter? = null + private val dataArrayList = ArrayList() + private var mTrafficStyleInfo: NoticeTrafficAccountInfo? = null + + constructor(context: Context, pushData: NoticeTrafficStylePushData?) : super(context) { + mContext = context + mPushData = pushData + initView() + } + + fun initView() { + setContentView(R.layout.notice_dialog_traffic_police) + setCanceledOnTouchOutside(true) + playerShow() //视频播放器及接操作按钮 + recyclerVie() //详情信息列表 + MogoStatusManager.getInstance().registerStatusChangedListener( + SceneConstant.M_HMI + TAG, + StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, + statusChangedListenerForNotice + ) + } + + /** + * 根据推送消息渲染顶部图片/视频 + * type 0图片 1视频 + */ + private fun playerShow() { + mVideoPlayer = findViewById(R.id.video_player) + thumbnailImage = findViewById(R.id.thumbnail_image) + playImageView = findViewById(R.id.start_for_traffic) + close = findViewById(R.id.notice_traffic_dialog_close) + accept = findViewById(R.id.accept_traffic) + refuse = findViewById(R.id.refuse_traffic) + connect = findViewById(R.id.notice_connect) + + playImageView?.setOnClickListener { startLive() } + close?.setOnClickListener { + releasePlayer() + dismiss() + } + accept?.setOnClickListener { feedBackTraffic(1) } + refuse?.setOnClickListener { feedBackTraffic(0) } + //重新连接 + connect?.setOnClickListener { + netWorkStatus() + startLive() + requestTrafficInfo() + } + requestTrafficInfo() + netWorkStatus() + if (mPushData!!.type == 1) { + startLive() + } else { + GlideApp.with(mContext!!).load(mPushData!!.poiImgUrl).optionalTransform( + GlideRoundedCornersTransform( + 20f, + GlideRoundedCornersTransform.CornerType.ALL + ) + ).into(thumbnailImage!!) + mVideoPlayer?.visibility = View.INVISIBLE + playImageView?.visibility = View.INVISIBLE + thumbnailImage?.visibility = View.VISIBLE + } + mVideoPlayer?.setOnClickListener { + if (mVideoPlayer!!.currentState == GSYVideoView.CURRENT_STATE_PAUSE) { /*播放中*/ + resume() + } else { + pause() + } + } + } + + private fun recyclerVie() { + //网格绘制 + try { + mRecyclerView = findViewById(R.id.traffic_info_recyclerView) + //网格布局 + val staggeredGridLayoutManager = + StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL) + mRecyclerView?.layoutManager = staggeredGridLayoutManager + val gridLayoutDivider = NoticeTrafficInfoGridItemDivider( + 1, + mContext!!.resources.getColor(R.color.notice_check_dialog_bg_color) + ) + mRecyclerView?.addItemDecoration(gridLayoutDivider) + } catch (e: Exception) { + e.printStackTrace() + } + adapter = NoticeTrafficAdapter(mContext!!, dataArrayList) + mRecyclerView!!.adapter = adapter + } + + /** + * @param i 是否接受交通事故任务 + * 0不接收 1接受 发起自动驾驶任务,显示引导线 + */ + private fun feedBackTraffic(i: Int) { + bizProvider.feedBackNoticeTraffic( + mPushData!!.infoId, + MoGoAiCloudClientConfig.getInstance().sn, + i + ) + if (i == 1) { + startAutoPilot() + } + dismiss() + } + + /** + * 开启自动驾驶 + */ + private fun startAutoPilot() { + if (mTrafficStyleInfo != null) { + val parameters = AutopilotControlParameters() + parameters.isSpeakVoice = false + parameters.vehicleType = 10 + //云平台使用的是火星坐标,自动驾驶需要wgs84 + val gcj02 = CoordinateUtils.transformGcj02toWgs84( + mTrafficStyleInfo!!.lat, mTrafficStyleInfo!!.lon + ) + parameters.startLatLon = AutoPilotLonLat( + getCurWgs84Lat(), + getCurWgs84Lon() + ) + parameters.endLatLon = AutoPilotLonLat(gcj02[0], gcj02[1]) + startAutoPilot(parameters) + } + } + + /** + * 暂停 + */ + private fun pause() { + playImageView!!.visibility = View.VISIBLE + thumbnailImage!!.visibility = View.GONE + playImageView!!.setOnClickListener { v: View? -> mVideoPlayer!!.onVideoResume() } + thumbnailImage!!.setOnClickListener { v: View? -> mVideoPlayer!!.onVideoResume() } + } + + /** + * 继续 + */ + private fun resume() { + playImageView!!.setImageResource(R.drawable.notice_video_pause) + playImageView!!.visibility = View.GONE + thumbnailImage!!.visibility = View.GONE + } + + /** + * 播放结束后 + */ + private fun complete(firstBitmap: Bitmap) { + thumbnailImage!!.visibility = View.VISIBLE + GlideApp.with(mContext!!).load(firstBitmap).optionalTransform( + GlideRoundedCornersTransform( + 20f, + GlideRoundedCornersTransform.CornerType.ALL + ) + ).into( + thumbnailImage!! + ) + playImageView!!.setImageResource(R.drawable.notice_video_play) + playImageView!!.visibility = View.VISIBLE + playImageView!!.setOnClickListener { v: View? -> startLive() } + thumbnailImage!!.setOnClickListener { v: View? -> startLive() } + } + + /** + * 视频播放 + */ + private fun startLive() { + if (mPushData != null) { + try { + d(SceneConstant.M_HMI + TAG, "交警事故开始播放视频startLive") + val videoUrl = mPushData!!.poiImgUrl + gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(false) + .setPlayTag("NoticeTrafficDialog") + .build(mVideoPlayer) + mVideoPlayer!!.startButton.performClick() + liveCallBack() + } catch (e: Exception) { + e.printStackTrace() + } + } + if (dataArrayList.size == 0) { + requestTrafficInfo() + } + } + + private fun liveCallBack() { + Thread { + val firstBitmap = BitmapHelper.getVideoThumbnail(mPushData!!.poiImgUrl) /*获取第一帧图*/ + mVideoPlayer!!.setVideoAllCallBack(object : VideoAllCallBack { + override fun onAutoComplete(url: String, vararg objects: Any) { + complete(firstBitmap) + } + + override fun onClickResume(url: String, vararg objects: Any) { + thumbnailImage!!.visibility = View.GONE + playImageView!!.visibility = View.GONE + } + + override fun onClickStop(url: String, vararg objects: Any) { + d(SceneConstant.M_HMI + TAG, "onClickStop") + } + + override fun onStartPrepared(url: String, vararg objects: Any) { + d(SceneConstant.M_HMI + TAG, "onStartPrepared") + } + + override fun onPrepared(url: String, vararg objects: Any) { + d(SceneConstant.M_HMI + TAG, "onPrepared") + thumbnailImage!!.visibility = View.GONE + playImageView!!.visibility = View.GONE + connect!!.visibility = View.GONE + } + + override fun onClickStartIcon(url: String, vararg objects: Any) { + d(SceneConstant.M_HMI + TAG, "onClickStartIcon") + } + + override fun onClickStartError(url: String, vararg objects: Any) { + e(SceneConstant.M_HMI + TAG, "onClickStartError") + } + + override fun onClickStopFullscreen(url: String, vararg objects: Any) { + d(SceneConstant.M_HMI + TAG, "onClickStopFullscreen") + } + + override fun onClickResumeFullscreen(url: String, vararg objects: Any) {} + override fun onClickSeekbar(url: String, vararg objects: Any) {} + override fun onClickSeekbarFullscreen(url: String, vararg objects: Any) {} + override fun onEnterFullscreen(url: String, vararg objects: Any) {} + override fun onQuitFullscreen(url: String, vararg objects: Any) {} + override fun onQuitSmallWidget(url: String, vararg objects: Any) {} + override fun onEnterSmallWidget(url: String, vararg objects: Any) {} + override fun onTouchScreenSeekVolume(url: String, vararg objects: Any) {} + override fun onTouchScreenSeekPosition(url: String, vararg objects: Any) {} + override fun onTouchScreenSeekLight(url: String, vararg objects: Any) {} + override fun onPlayError(url: String, vararg objects: Any) { + thumbnailImage!!.visibility = View.VISIBLE + connect!!.visibility = View.VISIBLE + d(SceneConstant.M_HMI + TAG, "onPlayError") + } + + override fun onClickStartThumb(url: String, vararg objects: Any) { + d(SceneConstant.M_HMI + TAG, "onClickStartThumb") + } + + override fun onClickBlank(url: String, vararg objects: Any) {} + override fun onClickBlankFullscreen(url: String, vararg objects: Any) { + d(SceneConstant.M_HMI + TAG, "onClickBlankFullscreen") + } + }) + }.start() + } + + /** + * 获取交通事故详情 + */ + private fun requestTrafficInfo() { + d(SceneConstant.M_HMI + TAG, "requestTrafficInfo") + bizProvider.requestAccidentInfo( + mPushData!!.infoId, + MoGoAiCloudClientConfig.getInstance().sn + ) { trafficInfo: NoticeTrafficStyleInfo -> + d(SceneConstant.M_HMI + TAG, "交通事故详情::$trafficInfo") + mTrafficStyleInfo = trafficInfo.getResult().accidentInfo + infoRefresh(mTrafficStyleInfo) + } + } + + private fun infoRefresh(info: NoticeTrafficAccountInfo?) { + if (dataArrayList.size > 0) { + dataArrayList.clear() + } + val laiYuan = NoticeValue() + laiYuan.key = "事故来源：" + laiYuan.value = info!!.uploadType + dataArrayList.add(laiYuan) + val cTime = NoticeValue() + cTime.key = "事故时间：" + cTime.value = DateTimeUtils.getTimeText( + info.dataCreateTime, + DateTimeUtils.MM_Yue_dd_Ri_HH_mm + ) + dataArrayList.add(cTime) + val hTime = NoticeValue() + hTime.key = "处理时间：" + hTime.value = DateTimeUtils.getTimeText( + info.dataHandleTime, + DateTimeUtils.MM_Yue_dd_Ri_HH_mm + ) + dataArrayList.add(hTime) + val reason = NoticeValue() + reason.key = "事故原因：" + reason.value = info.reason + dataArrayList.add(reason) + val status = NoticeValue() + status.key = "处理状态：" + if (info.operaStatus == "1") { + status.value = "待处理" + } else { + status.value = "已处理" + } + dataArrayList.add(status) + val location = NoticeValue() + location.key = "事故地点：" + location.value = info.uploadAddress + dataArrayList.add(location) + val style = NoticeValue() + style.key = "事故等级：" + style.value = info.troubleTypeName + dataArrayList.add(style) + adapter!!.setData(dataArrayList) + adapter!!.notifyDataSetChanged() + } + + /** + * 判断网络状态 + */ + private fun netWorkStatus() { + if (NetworkUtils.isAvailable(context)) { + d(SceneConstant.M_HMI + TAG, "网络可用") + thumbnailImage!!.visibility = View.GONE + connect!!.visibility = View.GONE + thumbnailImage!!.setBackgroundResource(R.drawable.notice_traffic_placeholder) + } else { + thumbnailImage!!.visibility = View.VISIBLE + thumbnailImage!!.setBackgroundResource(R.drawable.notice_unsuccess_traffic) + connect!!.visibility = View.VISIBLE + } + } + + override fun cancel() {} + private fun releasePlayer() { + try { + GSYVideoManager.releaseAllVideos() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun dismiss() { + super.dismiss() + d(SceneConstant.M_HMI + TAG, "trafficDialog dismiss") + noticeTrafficDialog = null + MogoStatusManager.getInstance().unregisterStatusChangedListener( + SceneConstant.M_HMI + TAG, + StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, + statusChangedListenerForNotice + ) + releasePlayer() + } + + private val statusChangedListenerForNotice = + IMogoStatusChangedListener { descriptor: StatusDescriptor, isTrue: Boolean -> + if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND && isTrue) { + d(SceneConstant.M_HMI + TAG, "onStatusChanged==MAIN_PAGE_IS_BACKGROUND") + dismiss() + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/CameraLiveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/CameraLiveView.kt new file mode 100644 index 0000000000..11c1b2d970 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/CameraLiveView.kt @@ -0,0 +1,117 @@ +package com.mogo.eagle.core.function.hmi.ui.setting + +import android.animation.Animator +import android.content.Context +import android.view.Gravity +import android.view.View +import android.view.WindowManager +import android.view.animation.OvershootInterpolator +import com.mogo.eagle.core.data.camera.CameraEntity +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig +import com.mogo.eagle.core.data.enums.SidePattern +import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener +import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager +import com.mogo.eagle.core.function.hmi.notification.WarningFloat +import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator +import com.mogo.eagle.core.function.hmi.ui.camera.CameraListView +import com.zhjt.service_biz.BizConfig + +class CameraLiveView private constructor() { + + companion object { + val cameraLiveView by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + CameraLiveView() + } + } + + // 超视距、路侧、前车直播 + private var cameraListView: CameraListView? = null + private var cameraViewFloat: WarningFloat.Builder? = null + + + @BizConfig(FuncBizConfig.V2I, "", FuncBizConfig.BIZ_RTS) + fun showCameraList( + context: Context?, + cameraList: List?, + liveStatus: ((Boolean) -> Unit) + ) { + context?.let { + if (cameraViewFloat == null) { + if (cameraListView == null) { + cameraListView = CameraListView(it) + cameraListView!!.updateCameraData(cameraList) + } + cameraListView!!.setClickListener(object : CameraListView.ClickListener { + override fun onClose(v: View) { + // Builder和cameraListView都置空 + dismissFloatView() + // 丢弃开启摄像头推流请求，同时monitor回调hmi的startRoadCameraLive() + // 也做了cameraListView的非空判断 + CallerFuncBizManager.bizProvider.closeCameraLive() + } + + override fun onShowLive(isShow: Boolean) { + liveStatus.invoke(isShow) + } + + override fun refreshCameraList() { + cameraListView?.refreshCameraList(CallerFuncBizManager.bizProvider.getCameraList) + } + }) + cameraViewFloat = WarningFloat.with(it) + .setTag("CameraListFloat") + .setLayout(cameraListView!!) + .setSidePattern(SidePattern.RIGHT) + .setGravity(Gravity.RIGHT, -40, 255) + .setImmersionStatusBar(true) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { + interpolator = OvershootInterpolator() + } + + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .addWarningStatusListener(object : IMoGoWarningStatusListener { + override fun onDismiss() { + cameraViewFloat = null + cameraListView = null + liveStatus.invoke(false) + } + }) + .show() + } else { + cameraViewFloat?.show() + } + } + } + + fun startRoadCameraLive(flvUrl: String) { + cameraListView?.startRoadCameraLive(flvUrl) + } + + fun showNoSignView() { + cameraListView?.showNoSignal() + } + + private fun dismissFloatView() { + cameraViewFloat?.let { + WarningFloat.dismiss(it.config.floatTag, false) + cameraViewFloat = null + cameraListView = null + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 1d56f0b229..e4d12c8020 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -91,7 +91,7 @@ import kotlin.math.abs * 调试使用的设置页面，这里只作为调试使用 * 展示 本机、网络、工控机、OBU等状态信息，支持设置IP，等参数进行调试 */ -class DebugSettingView @JvmOverloads constructor( +internal class DebugSettingView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt index bbf39d6ba5..e5a1a90541 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/IPCReportWindow.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting import android.app.Activity +import android.content.Context import android.graphics.PixelFormat import android.util.DisplayMetrics import android.view.* @@ -12,14 +13,36 @@ import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper.getDrawable import com.mogo.eagle.core.utilcode.util.BarUtils -import java.lang.reflect.Field +import com.mogo.eagle.core.utilcode.util.SoundUtils /** * @author XuXinChao * @description 工控机异常节点上报 * @since: 2022/5/12 */ -class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener{ +class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener { + + companion object { + private const val TAG = "IPCReportWindow" + + private var ipcReportWindow: IPCReportWindow? = null + + fun show( + context: Context?, + errorReportList: ArrayList, + warningReportList: ArrayList, + reportLevel: Int + ) { + context?.let { + if (ipcReportWindow == null) { + ipcReportWindow = IPCReportWindow(it as Activity) + SoundUtils.playRing(it) + } + ipcReportWindow?.showFloatWindow() + ipcReportWindow?.refreshData(errorReportList, warningReportList, reportLevel) + } + } + } private var mActivity: Activity = activity private var mWindowParams: WindowManager.LayoutParams? = null @@ -28,7 +51,7 @@ class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener{ private lateinit var ivIpcClose: ImageView private lateinit var tvIpcErrorTab: TextView private lateinit var tvIpcWarningTab: TextView - private var ipcReportAdapter: IPCReportAdapter?=null + private var ipcReportAdapter: IPCReportAdapter? = null private lateinit var mFloatLayout: View private var mInViewX = 0f @@ -38,8 +61,6 @@ class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener{ private var mInScreenX = 0f private var mInScreenY = 0f - private var clickListener: ClickListener? = null - private var ipcErrorReportList: List? = null //错误上报列表 private var ipcWarningReportList: List? = null//警告上报列表 @@ -47,10 +68,11 @@ class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener{ initFloatWindow(); } - private fun initFloatWindow(){ - mFloatLayout = LayoutInflater.from(mActivity).inflate(R.layout.view_ipc_report, null) as View + private fun initFloatWindow() { + mFloatLayout = + LayoutInflater.from(mActivity).inflate(R.layout.view_ipc_report, null) as View mFloatLayout.setOnTouchListener(this) - rvIPCReport= mFloatLayout.findViewById(R.id.rv_ipc_report) + rvIPCReport = mFloatLayout.findViewById(R.id.rv_ipc_report) ivIpcClose = mFloatLayout.findViewById(R.id.iv_ipc_close) tvIpcErrorTab = mFloatLayout.findViewById(R.id.tv_ipc_error_tab) tvIpcWarningTab = mFloatLayout.findViewById(R.id.tv_ipc_warning_tab) @@ -65,35 +87,43 @@ class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener{ it.alpha = 1.0f } ipcReportAdapter = IPCReportAdapter() - rvIPCReport.layoutManager = WrapContentLinearLayoutManager(mActivity, - LinearLayoutManager.VERTICAL,false) + rvIPCReport.layoutManager = WrapContentLinearLayoutManager( + mActivity, + LinearLayoutManager.VERTICAL, false + ) rvIPCReport.adapter = ipcReportAdapter //关闭按钮 ivIpcClose.setOnClickListener { - clickListener?.closeWindow() + hideFloatWindow() } //错误列表 tvIpcErrorTab.setOnClickListener { - tvIpcErrorTab.background = getDrawable(mActivity,R.drawable.ipc_error_tab_normal_bg) - tvIpcWarningTab.background = getDrawable(mActivity,R.drawable.ipc_warning_tab_normal_bg) + tvIpcErrorTab.background = getDrawable(mActivity, R.drawable.ipc_error_tab_normal_bg) + tvIpcWarningTab.background = + getDrawable(mActivity, R.drawable.ipc_warning_tab_normal_bg) ipcReportAdapter?.setData(ipcErrorReportList) ipcReportAdapter?.notifyDataSetChanged() } //预警列表 tvIpcWarningTab.setOnClickListener { - tvIpcErrorTab.background = getDrawable(mActivity,R.drawable.ipc_error_tab_select_bg) - tvIpcWarningTab.background = getDrawable(mActivity,R.drawable.ipc_warning_tab_select_bg) + tvIpcErrorTab.background = getDrawable(mActivity, R.drawable.ipc_error_tab_select_bg) + tvIpcWarningTab.background = + getDrawable(mActivity, R.drawable.ipc_warning_tab_select_bg) ipcReportAdapter?.setData(ipcWarningReportList) ipcReportAdapter?.notifyDataSetChanged() } } - fun refreshData(errorReportList:List,warningReportList:List,reportLevel: Int){ - if(reportLevel == 1){ + fun refreshData( + errorReportList: List, + warningReportList: List, + reportLevel: Int + ) { + if (reportLevel == 1) { ipcReportAdapter?.setData(errorReportList) ipcErrorReportList = errorReportList - }else{ + } else { ipcReportAdapter?.setData(warningReportList) ipcWarningReportList = warningReportList } @@ -135,22 +165,16 @@ class IPCReportWindow constructor(activity: Activity) : View.OnTouchListener{ mWindowManager!!.defaultDisplay.getMetrics(metrics) mWindowParams!!.x = metrics.widthPixels // mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight() - mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-100 + mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight() - 100 mWindowManager!!.addView(mFloatLayout, mWindowParams) } } - fun hideFloatWindow() { - if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout) + private fun hideFloatWindow() { + if (mFloatLayout.parent != null) { + mWindowManager!!.removeView(mFloatLayout) + } + ipcReportWindow = null } - fun setClickListener(clickListener: ClickListener) { - this.clickListener = clickListener - } - - interface ClickListener { - fun closeWindow() - } - - } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index ca74993d5a..0227d92b75 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -29,7 +29,7 @@ import java.util.* /** * SOP设置窗口 */ -class SOPSettingView @JvmOverloads constructor( +internal class SOPSettingView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SopView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SopView.kt new file mode 100644 index 0000000000..ceb84b519c --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SopView.kt @@ -0,0 +1,80 @@ +package com.mogo.eagle.core.function.hmi.ui.setting + +import android.animation.Animator +import android.content.Context +import android.view.Gravity +import android.view.View +import android.view.WindowManager +import android.view.animation.OvershootInterpolator +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.enums.SidePattern +import com.mogo.eagle.core.function.hmi.notification.WarningFloat +import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import me.jessyan.autosize.utils.AutoSizeUtils + +class SopView private constructor(){ + + companion object{ + val sopView by lazy(LazyThreadSafetyMode.SYNCHRONIZED){ + SopView() + } + } + + //SOPSettingView + private var mSOPSettingViewFloat: WarningFloat.Builder? = null + private var mSOPSettingView: SOPSettingView? = null + + fun toggle(context: Context?, gravity: Int = Gravity.RIGHT, sidePattern: SidePattern = SidePattern.RIGHT) { + context?.let { + if (mSOPSettingViewFloat != null) { + WarningFloat.dismiss(mSOPSettingViewFloat!!.config.floatTag, false) + mSOPSettingViewFloat = null + mSOPSettingView = null + } else { + if (mSOPSettingView == null) { + mSOPSettingView = SOPSettingView(it) + } +// var side = SidePattern.RIGHT +// var gravity = Gravity.RIGHT +// //调试窗默认靠右显示，Bus的乘客端右端有视图覆盖，调试窗靠左显示 +// if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && +// AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) +// ) { +// side = SidePattern.LEFT +// gravity = Gravity.LEFT +// } + mSOPSettingViewFloat = WarningFloat.with(it) + .setTag("mSOPSettingView") + .setLayout(mSOPSettingView!!) + .setSidePattern(sidePattern) + .setGravity(gravity, offsetY = 70) + .setImmersionStatusBar(true) + .setWindowWidth(AutoSizeUtils.dp2px(context, 800f)) + .setWindowHeight(AutoSizeUtils.dp2px(context, 1100f)) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { + interpolator = OvershootInterpolator() + } + + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .show() + } + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt new file mode 100644 index 0000000000..69b4b17e89 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt @@ -0,0 +1,124 @@ +package com.mogo.eagle.core.function.hmi.ui.setting + +import android.animation.Animator +import android.app.Activity +import android.content.Context +import android.view.Gravity +import android.view.View +import android.view.WindowManager +import android.view.animation.OvershootInterpolator +import com.mogo.eagle.core.data.enums.SidePattern +import com.mogo.eagle.core.data.report.ReportEntity +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.hmi.notification.WarningFloat +import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator +import com.mogo.eagle.core.utilcode.util.TimeUtils +import me.jessyan.autosize.utils.AutoSizeUtils +import mogo_msg.MogoReportMsg + +class ToggleDebugView private constructor() : IMoGoAutopilotStatusListener { + + companion object { + val toggleDebugView by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + ToggleDebugView() + } + } + + // DebugSettingView + private var mDebugSettingViewFloat: WarningFloat.Builder? = null + private var mDebugSettingView: DebugSettingView? = null + + //工控机节点上报列表 + private val reportList = arrayListOf() + + //工控机上报列表悬浮窗 + private var reportListFloatWindow: ReportListFloatWindow? = null + + override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { + super.onAutopilotGuardian(guardianInfo) + guardianInfo?.let { + if (reportList.size > 49) { + reportList.removeLast() + } + reportList.add( + 0, + ReportEntity( + TimeUtils.millis2String(System.currentTimeMillis()), + it.src, it.level, it.msg, it.code, it.resultList, it.actionsList + ) + ) + reportListFloatWindow?.refreshData(reportList) + } + } + + /** + * 开关DebugView + */ + fun toggle(context: Context, gravity: Int = Gravity.RIGHT, sidePattern: SidePattern = SidePattern.RIGHT) { + if (mDebugSettingViewFloat != null) { + dismiss() + } else { + if (mDebugSettingView == null) { + mDebugSettingView = DebugSettingView(context) + mDebugSettingView?.reportInit(reportList) + mDebugSettingView?.setClickListener(object : DebugSettingView.ClickListener { + override fun showReportListWindow(show: Boolean) { + if (show) { + //打开工控机上报列表 + reportListFloatWindow = + ReportListFloatWindow(context.applicationContext as Activity) + reportListFloatWindow?.showFloatWindow() + reportListFloatWindow?.refreshData(reportList) + } else { + //关闭工控机上报列表 + reportListFloatWindow?.hideFloatWindow() + } + } + }) + } + mDebugSettingViewFloat = WarningFloat.with(context) + .setTag("DebugSettingView") + .setLayout(mDebugSettingView!!) + .setSidePattern(sidePattern) + .setGravity(gravity, offsetY = 70) + .setImmersionStatusBar(true) + .setWindowHeight(AutoSizeUtils.dp2px(context, 1100f)) + .setWindowWidth(AutoSizeUtils.dp2px(context, 800f)) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { + interpolator = OvershootInterpolator() + } + + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .show() + } + } + + private fun dismiss() { + mDebugSettingViewFloat?.let { + WarningFloat.dismiss(it.config.floatTag, false) + mDebugSettingViewFloat = null + mDebugSettingView = null + //关闭工控机上报列表 + reportListFloatWindow?.hideFloatWindow() + reportListFloatWindow = null + } + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt new file mode 100644 index 0000000000..62341fb157 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt @@ -0,0 +1,121 @@ +package com.mogo.eagle.core.function.hmi.ui.setting + +import android.animation.Animator +import android.content.Context +import android.view.Gravity +import android.view.View +import android.view.WindowManager +import android.view.animation.OvershootInterpolator +import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper +import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo +import com.mogo.eagle.core.data.enums.SidePattern +import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener +import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.eagle.core.function.hmi.notification.WarningFloat +import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator +import com.mogo.eagle.core.function.hmi.ui.setting.SopView.Companion.sopView +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView.Companion.toggleDebugView +import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView +import com.mogo.eagle.core.utilcode.util.ToastUtils + +class ToolsView private constructor() { + + companion object { + val toolsView by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + ToolsView() + } + } + + private var toolsView: AutoPilotAndCheckView? = null + + // 检测、自动驾驶速度设置 + private var toolsViewFloat: WarningFloat.Builder? = null + + fun showToolsFloat(context: Context?) { + context?.let { + if (toolsViewFloat == null) { + if (toolsView == null) { + toolsView = AutoPilotAndCheckView(it) + toolsView!!.setClickListener(object : AutoPilotAndCheckView.ClickListener { + override fun onClose(v: View) { + dismissToolsFloatView() + } + + override fun showDebugPanelView() { + toggleDebugView.toggle(it) + } + + override fun showFeedbackView() { + dismissToolsFloatView() + CallerDevaToolsManager.showFeedbackView(it) + } + + override fun showSOPSettingView() { + sopView.toggle(it) + } + }) + } + toolsViewFloat = WarningFloat.with(it) + .setTag("ToolsViewFloat") + .setLayout(toolsView!!) + .setSidePattern(SidePattern.LEFT) + .setGravity(Gravity.LEFT) + .setImmersionStatusBar(true) + .setWindowHeight(WindowManager.LayoutParams.MATCH_PARENT) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { + interpolator = OvershootInterpolator() + } + + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .addWarningStatusListener(object : IMoGoWarningStatusListener { + override fun onDismiss() { + toolsViewFloat = null + toolsView = null + } + }) + .show() + } else { + toolsViewFloat?.show() + } + } + } + + fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo){ + toolsView?.showAdUpgradeStatus(ipcUpgradeStateInfo) + ipcUpgradeStateInfo.status.let { + if (AdUpgradeStateHelper.isUpgradeSuccess(it)) { + ToastUtils.showLong("升级成功") + AdUpgradeStateHelper.setConfirmUpgrade(false) + } + } + } + + private fun dismissToolsFloatView() { + toolsViewFloat?.let { + WarningFloat.dismiss(it.config.floatTag, false) + toolsViewFloat = null + toolsView = null + } + } + + fun dismiss() { + dismissToolsFloatView() + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/takeover/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/takeover/TakeOverView.kt index 7c33227f88..23dde7c51a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/takeover/TakeOverView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/takeover/TakeOverView.kt @@ -3,16 +3,85 @@ package com.mogo.eagle.core.function.hmi.ui.takeover import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.enums.EventTypeEnum +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.zhidao.support.adas.high.common.MogoReport +import mogo_msg.MogoReportMsg class TakeOverView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr) { +) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener { + + companion object { + const val TAG = "TakeOverView" + } init { LayoutInflater.from(context).inflate(R.layout.view_take_over, this, true) } + + private var takeOver = false + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerAutoPilotStatusListenerManager.addListener(TAG, this) + } + + /** + * 工控机监控节点上报 + */ + override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { + super.onAutopilotGuardian(guardianInfo) + ThreadUtils.runOnUiThread { + guardianInfo?.let { + if (FunctionBuildConfig.isDemoMode) { + return@let + } + if (takeOver) { + return@let + } + when (it.code) { + MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_PLANNING, + MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_LOCATION, + MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_CHASSIS, + MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_DISTANCE -> { + CallerHmiManager.warningV2X( + EventTypeEnum.TAKE_OVER_EVENT.poiType, + EventTypeEnum.TAKE_OVER_EVENT.content, + EventTypeEnum.TAKE_OVER_EVENT.tts, + EventTypeEnum.TAKE_OVER_EVENT.poiType, + object : IMoGoWarningStatusListener { + override fun onShow() { + takeOver = true + visibility = View.VISIBLE + } + + override fun onDismiss() { + takeOver = false + visibility = View.GONE + } + }, + true, + 6000L + ) + } + } + } + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerAutoPilotStatusListenerManager.removeListener(TAG) + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt index de7c4e75b8..8a645c3cf2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt @@ -3,55 +3,79 @@ package com.mogo.eagle.core.function.hmi.ui.tools import android.content.Context import android.widget.TextView import androidx.lifecycle.LifecycleObserver +import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper +import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.util.ToastUtils /** * @author XuXinChao * @description 工控机确认升级对话框 * @since: 2022/1/13 */ -class AdUpgradeDialog(context: Context,images: List,padSn: String,releaseId: String) - : BaseFloatDialog(context), LifecycleObserver { +class AdUpgradeDialog(context: Context, images: List, padSn: String, releaseId: String) : + BaseFloatDialog(context), LifecycleObserver { - private var upgradeConfirm : TextView? = null - private var upgradeCancel : TextView? = null + companion object { + private var adUpgradeDialog: AdUpgradeDialog? = null + + fun show(context: Context?, images: List, padSn: String, releaseId: String) { + context?.let { + if (adUpgradeDialog == null) { + adUpgradeDialog = AdUpgradeDialog(it, images, padSn, releaseId) + } + adUpgradeDialog?.let { dialog -> + if (dialog.isShowing) { + return + } + dialog.show() + } + } + } + } + + private var upgradeConfirm: TextView? = null + private var upgradeCancel: TextView? = null private var clickListener: ClickListener? = null - private var images: List?=null - private var padSn: String?=null - private var releaseId: String?=null + private var images: List? = null + private var padSn: String? = null + private var releaseId: String? = null init { setContentView(R.layout.dialog_ad_upgrade) setCanceledOnTouchOutside(false) - upgradeConfirm=findViewById(R.id.tv_upgrade_confirm) - upgradeCancel=findViewById(R.id.tv_upgrade_cancel) + upgradeConfirm = findViewById(R.id.tv_upgrade_confirm) + upgradeCancel = findViewById(R.id.tv_upgrade_cancel) - upgradeConfirm?.setOnClickListener{ - clickListener?.confirm() - } - upgradeCancel?.setOnClickListener { - clickListener?.cancel() - } this.images = images this.padSn = padSn this.releaseId = releaseId + + upgradeConfirm?.setOnClickListener { + //确认升级 + CallerDevaToolsManager.upgradeConfirm(images, padSn, releaseId) + AdUpgradeStateHelper.setConfirmUpgrade(true) + ToastUtils.showLong("最新版本下载中...") + dismiss() + } + upgradeCancel?.setOnClickListener { + dismiss() + } + } + + override fun dismiss() { + super.dismiss() + adUpgradeDialog = null } fun setClickListener(clickListener: ClickListener) { this.clickListener = clickListener } - fun showUpgradeDialog(){ - if(isShowing){ - return - } - show() - } - - interface ClickListener{ + interface ClickListener { fun confirm() fun cancel() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 50332a5599..3de065ef78 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -165,7 +165,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor( MsgBoxConfig.setUserRecord(0) } actvLoginout.visibility = View.VISIBLE - CallerHmiManager.setBusOperationView(toolBusOperationView) + toolBusOperationView.showBusOperation() // TODO 这里判断方式可以替换为使用 AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)等进行替换 when (DebugConfig.getProductFlavor()) { @@ -199,7 +199,6 @@ class AutoPilotAndCheckView @JvmOverloads constructor( systemVersionView?.showAdUpgradeStatus(ipcUpgradeStateInfo) } - override fun onAttachedToWindow() { super.onAttachedToWindow() CallerAutoPilotStatusListenerManager.addListener(TAG, this) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt index aa67e83c67..526ffa33cd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt @@ -4,9 +4,9 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.View +import android.widget.LinearLayout import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.temp.EventLogout -import com.mogo.eagle.core.function.api.hmi.view.IOchBusView import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils @@ -23,7 +23,7 @@ class BusOperationView @JvmOverloads constructor( context: Context?, attrs: AttributeSet? = null, defStyleAttr: Int = 0) - : IOchBusView(context, attrs, defStyleAttr) { + : LinearLayout(context, attrs, defStyleAttr) { init { LayoutInflater.from(context).inflate(R.layout.view_och_bus_operation,this,true) @@ -47,15 +47,11 @@ class BusOperationView @JvmOverloads constructor( } } - override fun showBusOperation() { + fun showBusOperation() { ochBusOperationStatus.visibility = View.VISIBLE initPersonalIcon() } - override fun changerOperationStatus(isOut: Boolean) { - - } - override fun onAttachedToWindow() { super.onAttachedToWindow() context?.let { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/MaskView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/MaskView.kt deleted file mode 100644 index 8592692e41..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/MaskView.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.mogo.eagle.core.function.hmi.ui.tools - -import android.annotation.SuppressLint -import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.util.AttributeSet -import android.view.LayoutInflater -import android.widget.FrameLayout -import com.mogo.eagle.core.function.hmi.R - -/** - * @author lixiaopeng - * 蒙层view - */ -class MaskView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : FrameLayout( - context, - attrs, - defStyleAttr -) { - - private val TAG = "MaskView" - - init { - LayoutInflater.from(context).inflate(R.layout.view_mask, this, true) - initView() - } - - companion object { - private var speedLimit: Double = 0.0 - } - - @SuppressLint("ClickableViewAccessibility") - private fun initView() { -// background = ColorDrawable(Color.parseColor("#F0151D41")) - } - -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index 0575c586c8..8f10f9e037 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -38,7 +38,6 @@ class SpeedPanelView @JvmOverloads constructor( } init { - initEvent() setBackgroundResource(R.drawable.yi_biao_pan_bg_nor) mContext = context mSpeedChartView = SpeedChartView(context) @@ -52,13 +51,6 @@ class SpeedPanelView @JvmOverloads constructor( addView(mSpeedChartView) } - private fun initEvent() { - setOnLongClickListener { - CallerHmiManager.toggleDebugView() - false - } - } - private var timerTask: TimerTask? = null override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt index 2de467d3b4..abb454520e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt @@ -25,7 +25,6 @@ class V2XNotificationView @JvmOverloads constructor( defStyleAttr: Int = 0 ) : IViewNotification(context, attrs, defStyleAttr) { - init { LayoutInflater.from(context).inflate(R.layout.notification_v2x_msg_vr, this, true) // 设置View的出场位置 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/toggle_setting_btn_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/toggle_setting_btn_bg.png new file mode 100644 index 0000000000..ba41bf3a53 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/toggle_setting_btn_bg.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_operation_status_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_operation_status_bg.xml new file mode 100644 index 0000000000..4d612cb98f --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_operation_status_bg.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_togger_debug_view.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_togger_debug_view.xml new file mode 100644 index 0000000000..68e34ad4dc --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_togger_debug_view.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 37d0977691..e36325e31c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -40,13 +40,13 @@ app:layout_constraintTop_toTopOf="parent" /> - - - - - - - + + + + + + + - - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintRight_toLeftOf="@id/viewLimitingVelocity" + app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon" /> + + tools:ignore="MissingConstraints" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" /> + tools:ignore="MissingConstraints" /> + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@id/cbMsgBoxDriver" /> + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@id/cbMsgBoxDriver" /> + app:layout_constraintBottom_toTopOf="@id/cbMsgBoxPassenger" + app:layout_constraintLeft_toLeftOf="@id/cbMsgBoxPassenger" + app:layout_constraintRight_toRightOf="@id/cbMsgBoxPassenger" /> + app:layout_constraintBottom_toTopOf="@id/cbMsgBoxPassenger" + app:layout_constraintLeft_toLeftOf="@id/cbMsgBoxPassenger" + app:layout_constraintRight_toRightOf="@id/cbMsgBoxPassenger" /> - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_mask.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_mask.xml deleted file mode 100644 index f5eef7fc84..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_mask.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 62454489fa..cb5e3610d1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -50,8 +50,8 @@ - - + +