From 19d02aa429e44b8b94acc06c6d7df75d229bcec4 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 4 Jan 2023 21:03:30 +0800 Subject: [PATCH] [2.13.0-arhc-opt] move monitoring to biz --- config.gradle | 1 - .../biz/{push => }/FuncBizProvider.kt | 28 ++- .../dispatch/DispatchAutoPilotManager.kt | 11 +- .../dispatch/network/DispatchServiceModel.kt | 2 +- .../network/IDispatchAdasApiService.kt | 2 +- .../biz}/monitoring/CronTaskManager.kt | 27 +-- .../monitoring/net/ICameraListServices.kt} | 4 +- .../{push => }/notice/NoticeSocketManager.kt | 2 +- .../notice/network/INoticeApiService.java | 2 +- .../notice/network/NoticeNetWorkManager.java | 2 +- .../mogo-core-function-hmi/build.gradle | 2 - .../core/function/hmi/ui/MoGoHmiFragment.kt | 8 +- .../function/hmi/ui/camera/CameraListView.kt | 4 +- .../function/hmi/ui/camera/RoadVideoDialog.kt | 4 +- .../function/main/MainMoGoApplication.java | 2 - .../mogo-core-function-monitoring/.gitignore | 1 - .../build.gradle | 68 ------- .../consumer-rules.pro | 0 .../gradle.properties | 3 - .../proguard-rules.pro | 21 --- .../src/main/AndroidManifest.xml | 5 - .../function/live/CameraLiveGSYVideoView.java | 173 ------------------ .../core/function/live/CameraLiveManager.java | 91 --------- .../live/ExtensionServiceManager.java | 26 --- .../function/live/PushCameraLiveWindow.java | 117 ------------ .../core/function/live/PushDataType.java | 13 -- .../function/live/impl/AbsCameraScenario.java | 38 ---- .../function/live/impl/ICameraScenario.java | 46 ----- .../function/live/impl/ICameraWindow.java | 23 --- .../monitoring/MoGoMonitoringProvider.kt | 42 ----- .../src/main/res/drawable-ldpi/icon_space.png | Bin 163 -> 0 bytes .../src/main/res/drawable-mdpi/icon_space.png | Bin 163 -> 0 bytes .../module_camera_normal_traffic.png | Bin 5264 -> 0 bytes .../drawable-xhdpi/icon_live_load_error.png | Bin 6309 -> 0 bytes .../main/res/drawable-xhdpi/icon_space.png | Bin 163 -> 0 bytes .../module_camera_normal_traffic.png | Bin 5264 -> 0 bytes .../res/drawable/shape_react_blue_grident.xml | 14 -- .../res/drawable/shape_react_gray_grident.xml | 11 -- .../main/res/drawable/shape_round_gray.xml | 7 - .../main/res/drawable/v2x_alert_window_bg.xml | 38 ---- .../res/drawable/v2x_refresh_button_bg.xml | 9 - .../res/layout/camera_item_v2x_live_video.xml | 36 ---- .../res/layout/camera_push_live_video.xml | 22 --- .../camera_view_video_layout_normal.xml | 68 ------- .../main/res/layout/dialog_navi_notice.xml | 48 ----- .../src/main/res/values/colors.xml | 7 - .../src/main/res/values/strings.xml | 4 - .../function/api/biz/IMoGoFuncBizProvider.kt | 22 ++- .../api/monitoring/IMoGoMonitoringProvider.kt | 19 -- .../function/call/biz/CallerFuncBizManager.kt | 1 - .../call/monitor/CallerMonitorManager.kt | 29 --- .../mogo/commons/utils}/RetryWithDelay.java | 2 +- gradle.properties | 1 - modules.txt | 1 - settings.gradle | 2 - 55 files changed, 77 insertions(+), 1032 deletions(-) rename core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/{push => }/FuncBizProvider.kt (58%) rename core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/{push => }/dispatch/DispatchAutoPilotManager.kt (95%) rename core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/{push => }/dispatch/network/DispatchServiceModel.kt (98%) rename core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/{push => }/dispatch/network/IDispatchAdasApiService.kt (95%) rename core/function-impl/{mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz}/monitoring/CronTaskManager.kt (94%) rename core/function-impl/{mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/net/CameraListServices.kt => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/net/ICameraListServices.kt} (92%) rename core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/{push => }/notice/NoticeSocketManager.kt (98%) rename core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/{push => }/notice/network/INoticeApiService.java (96%) rename core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/{push => }/notice/network/NoticeNetWorkManager.java (98%) delete mode 100644 core/function-impl/mogo-core-function-monitoring/.gitignore delete mode 100644 core/function-impl/mogo-core-function-monitoring/build.gradle delete mode 100644 core/function-impl/mogo-core-function-monitoring/consumer-rules.pro delete mode 100644 core/function-impl/mogo-core-function-monitoring/gradle.properties delete mode 100644 core/function-impl/mogo-core-function-monitoring/proguard-rules.pro delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/AndroidManifest.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveGSYVideoView.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveManager.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/ExtensionServiceManager.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushCameraLiveWindow.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushDataType.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/AbsCameraScenario.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraScenario.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraWindow.java delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/MoGoMonitoringProvider.kt delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-ldpi/icon_space.png delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-mdpi/icon_space.png delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-mdpi/module_camera_normal_traffic.png delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/icon_live_load_error.png delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/icon_space.png delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/module_camera_normal_traffic.png delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_blue_grident.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_gray_grident.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_round_gray.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_alert_window_bg.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_refresh_button_bg.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_item_v2x_live_video.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml delete mode 100644 core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml delete mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/monitoring/IMoGoMonitoringProvider.kt delete mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/monitor/CallerMonitorManager.kt rename {core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring => foudations/mogo-commons/src/main/java/com/mogo/commons/utils}/RetryWithDelay.java (94%) diff --git a/config.gradle b/config.gradle index f736edc7e7..33a8350b53 100644 --- a/config.gradle +++ b/config.gradle @@ -180,7 +180,6 @@ ext { mogo_core_function_hmi : "com.mogo.eagle.core.function.impl:hmi:${MOGO_CORE_FUNCTION_HMI_VERSION}", mogo_core_function_map : "com.mogo.eagle.core.function.impl:map:${MOGO_CORE_FUNCTION_MAP_VERSION}", mogo_core_function_main : "com.mogo.eagle.core.function.impl:main:${MOGO_CORE_FUNCTION_MAIN_VERSION}", - mogo_core_function_monitoring: "com.mogo.eagle.core.function.impl:monitoring:${MOGO_CORE_FUNCTION_MONITORING_VERSION}", mogo_core_function_obu_mogo : "com.mogo.eagle.core.function.impl:obu-mogo:${MOGO_CORE_FUNCTION_OBU_MOGO_VERSION}", mogo_core_function_smp : "com.mogo.eagle.core.function.impl:smp:${MOGO_CORE_FUNCTION_SMP_VERSION}", mogo_core_function_v2x : "com.mogo.eagle.core.function.impl:v2x:${MOGO_CORE_FUNCTION_V2X_VERSION}", diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/FuncBizProvider.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt similarity index 58% rename from core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/FuncBizProvider.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt index 1ee9c58d2b..f76adb6a20 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/FuncBizProvider.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt @@ -1,22 +1,26 @@ -package com.mogo.eagle.function.biz.push +package com.mogo.eagle.function.biz import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.eagle.core.data.camera.CameraEntity import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.biz.IMoGoFuncBizProvider import com.mogo.eagle.core.function.api.biz.IMoGoNoticeNetCallBack -import com.mogo.eagle.function.biz.push.dispatch.DispatchAutoPilotManager.Companion.dispatchAutoPilotManager -import com.mogo.eagle.function.biz.push.notice.NoticeSocketManager.Companion.noticeSocketManager -import com.mogo.eagle.function.biz.push.notice.network.NoticeNetWorkManager +import com.mogo.eagle.function.biz.dispatch.DispatchAutoPilotManager.Companion.dispatchAutoPilotManager +import com.mogo.eagle.function.biz.monitoring.CronTaskManager.Companion.cronTaskManager +import com.mogo.eagle.function.biz.notice.NoticeSocketManager.Companion.noticeSocketManager +import com.mogo.eagle.function.biz.notice.network.NoticeNetWorkManager @Route(path = MogoServicePaths.PATH_FUNC_BIZ) class FuncBizProvider : IMoGoFuncBizProvider { + override val functionName: String get() = "FuncBiz" override fun init(context: Context) { noticeSocketManager.init(context) dispatchAutoPilotManager.init(context) + cronTaskManager.startCronTask() } override fun feedBackNoticeTraffic(infoId: String, sn: String, accept: Int) { @@ -39,8 +43,24 @@ class FuncBizProvider : IMoGoFuncBizProvider { dispatchAutoPilotManager.testDispatch(sceneType) } + override val getCameraList: List + get() = cronTaskManager.getCameraList() + + override fun openCameraStream(cameraIp: String) { + cronTaskManager.reqOpenCameraStream(cameraIp) + } + + override fun openCameraStream(cameraIp: String, success: (String) -> Unit, error: (Throwable) -> Unit) { + cronTaskManager.reqOpenCameraStream(cameraIp, success, error) + } + + override fun closeCameraLive() { + cronTaskManager.clear() + } + override fun onDestroy() { noticeSocketManager.release() dispatchAutoPilotManager.release() + cronTaskManager.release() } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt similarity index 95% rename from core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/DispatchAutoPilotManager.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt index 6013c78479..e85fd7e0de 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/DispatchAutoPilotManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt @@ -1,6 +1,5 @@ -package com.mogo.eagle.function.biz.push.dispatch +package com.mogo.eagle.function.biz.dispatch -import android.annotation.SuppressLint import android.content.Context import android.os.Handler import android.os.Message @@ -22,10 +21,10 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.function.biz.push.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_AFFIRM -import com.mogo.eagle.function.biz.push.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_MANUAL_CANCEL -import com.mogo.eagle.function.biz.push.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_TIMER_CANCEL -import com.mogo.eagle.function.biz.push.dispatch.network.DispatchServiceModel.Companion.dispatchServiceModel +import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_AFFIRM +import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_MANUAL_CANCEL +import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_TIMER_CANCEL +import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.dispatchServiceModel import mogo.telematics.pad.MessagePad diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/DispatchServiceModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt similarity index 98% rename from core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/DispatchServiceModel.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt index 77d56338c4..850fad5f74 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/DispatchServiceModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.function.biz.push.dispatch.network +package com.mogo.eagle.function.biz.dispatch.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.constants.HostConst diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/IDispatchAdasApiService.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt similarity index 95% rename from core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/IDispatchAdasApiService.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt index 77537ab127..af2bb38117 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/IDispatchAdasApiService.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.function.biz.push.dispatch.network +package com.mogo.eagle.function.biz.dispatch.network import com.mogo.eagle.core.data.BaseData import io.reactivex.Observable diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt similarity index 94% rename from core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt index fc562c2988..70263088ac 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt @@ -1,15 +1,15 @@ -package com.mogo.eagle.core.function.monitoring +package com.mogo.eagle.function.biz.monitoring -import android.content.Context import android.os.Handler import android.os.Looper import android.os.Message import com.mogo.commons.constants.HostConst +import com.mogo.commons.utils.RetryWithDelay import com.mogo.eagle.core.data.camera.CameraEntity import com.mogo.eagle.core.data.camera.ReqLiveCarBean import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager -import com.mogo.eagle.core.function.monitoring.net.CameraListServices +import com.mogo.eagle.function.biz.monitoring.net.ICameraListServices import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MONITOR @@ -18,11 +18,15 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers -class CronTaskManager(private var context: Context?) { +class CronTaskManager { companion object { private const val TAG = "CronTaskManager" private const val CRON_TASK_TYPE = 1011 + + val cronTaskManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED){ + CronTaskManager() + } } // 请求路侧摄像头 @@ -57,7 +61,7 @@ class CronTaskManager(private var context: Context?) { private fun requestCameraList() { // 衡阳可直播的摄像头有限，先写死roadId便于调试 disposable = MoGoRetrofitFactory.getInstance(HostConst.CAMERA_STREAM_HOST) - .create(CameraListServices::class.java) + .create(ICameraListServices::class.java) .getCameraList("10849") .subscribeOn(Schedulers.io()) .map { cameraListInfo -> @@ -88,7 +92,7 @@ class CronTaskManager(private var context: Context?) { private fun requestDeviceList() { CallerMapLocationListenerManager.getCurrentLocation()?.let { location -> disposable = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST) - .create(CameraListServices::class.java) + .create(ICameraListServices::class.java) .getDeviceList(location.longitude, location.latitude, 500) .subscribeOn(Schedulers.io()) .map { cameraListInfo -> @@ -122,7 +126,7 @@ class CronTaskManager(private var context: Context?) { private fun requestCarCameraList() { CallerMapLocationListenerManager.getCurrentLocation()?.let { location -> carDisposable = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST) - .create(CameraListServices::class.java) + .create(ICameraListServices::class.java) .getCarCameraList(ReqLiveCarBean(location.longitude, location.latitude)) .subscribeOn(Schedulers.io()) .map { liveCarCameraInfo -> @@ -161,7 +165,7 @@ class CronTaskManager(private var context: Context?) { if (!it.isDisposed) it.dispose() } streamDisposable = MoGoRetrofitFactory.getInstance(HostConst.OPEN_CAMERA_STREAM_HOST) - .create(CameraListServices::class.java) + .create(ICameraListServices::class.java) .openCameraStream(cameraIp) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -190,7 +194,7 @@ class CronTaskManager(private var context: Context?) { if (!it.isDisposed) it.dispose() } streamDisposable = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST) - .create(CameraListServices::class.java) + .create(ICameraListServices::class.java) .reqOpenCameraStream(cameraIp) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -219,7 +223,7 @@ class CronTaskManager(private var context: Context?) { if (!it.isDisposed) it.dispose() } streamDisposable2 = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST) - .create(CameraListServices::class.java) + .create(ICameraListServices::class.java) .reqOpenCameraStreamWithRetry(cameraIp) .flatMap { if (it.code != 200 && it.code != 0) { @@ -268,8 +272,7 @@ class CronTaskManager(private var context: Context?) { } } - fun onDestroy() { - context = null + fun release() { disposable?.dispose() carDisposable?.dispose() streamDisposable?.let { diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/net/CameraListServices.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/net/ICameraListServices.kt similarity index 92% rename from core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/net/CameraListServices.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/net/ICameraListServices.kt index cba6c1a43a..7328b33246 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/net/CameraListServices.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/net/ICameraListServices.kt @@ -1,11 +1,11 @@ -package com.mogo.eagle.core.function.monitoring.net +package com.mogo.eagle.function.biz.monitoring.net import com.mogo.eagle.core.data.camera.* import io.reactivex.Observable import io.reactivex.Single import retrofit2.http.* -interface CameraListServices { +interface ICameraListServices { @GET("/yycp-smartTransportationAiCloud-service/eagle/device/list") fun getCameraList(@Query("roadId") roadId: String?): Single diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/NoticeSocketManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt similarity index 98% rename from core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/NoticeSocketManager.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt index 2c883f671c..a30e0b16ae 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/NoticeSocketManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.function.biz.push.notice +package com.mogo.eagle.function.biz.notice import android.content.Context import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/network/INoticeApiService.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/INoticeApiService.java similarity index 96% rename from core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/network/INoticeApiService.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/INoticeApiService.java index 7faafa2d02..1a564de54a 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/network/INoticeApiService.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/INoticeApiService.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.function.biz.push.notice.network; +package com.mogo.eagle.function.biz.notice.network; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.notice.NoticeNormalDetail; diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/network/NoticeNetWorkManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java similarity index 98% rename from core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/network/NoticeNetWorkManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java index d7caeed384..55f30615e8 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/notice/network/NoticeNetWorkManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.function.biz.push.notice.network; +package com.mogo.eagle.function.biz.notice.network; import android.util.ArrayMap; diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 0da46f1f81..89f5b15e0d 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -92,7 +92,6 @@ dependencies { api rootProject.ext.dependencies.mogo_core_function_bindingcar api rootProject.ext.dependencies.mogo_core_function_map api rootProject.ext.dependencies.mogo_core_function_v2x - api rootProject.ext.dependencies.mogo_core_function_monitoring api rootProject.ext.dependencies.mogo_core_function_devatools api rootProject.ext.dependencies.mogo_core_function_call @@ -109,7 +108,6 @@ dependencies { api project(':core:function-impl:mogo-core-function-obu-mogo') api project(':core:function-impl:mogo-core-function-map') api project(':core:function-impl:mogo-core-function-v2x') - api project(':core:function-impl:mogo-core-function-monitoring') api project(':core:function-impl:mogo-core-function-devatools') api project(':core:function-impl:mogo-core-function-chat') api project(':core:function-impl:mogo-core-function-bindingcar') 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 66e4b32a6d..939a871dfd 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 @@ -59,11 +59,11 @@ 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.autopilot.CallerAutopilotRecordListenerManager import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager +import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager 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.* import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Turning -import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager 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 @@ -211,7 +211,7 @@ class MoGoHmiFragment : MvpFragment(), ivCameraIcon?.setOnClickListener { if (cameraViewFloat == null) { - showCameraList(CallerMonitorManager.getCameraList()) + showCameraList(CallerFuncBizManager.bizProvider.getCameraList) } } @@ -1304,7 +1304,7 @@ class MoGoHmiFragment : MvpFragment(), dismissFloatView() // 丢弃开启摄像头推流请求，同时monitor回调hmi的startRoadCameraLive() // 也做了cameraListView的非空判断 - CallerMonitorManager.disposeCameraStream() + CallerFuncBizManager.bizProvider.closeCameraLive() } override fun onShowLive(isShow: Boolean) { @@ -1315,7 +1315,7 @@ class MoGoHmiFragment : MvpFragment(), } override fun refreshCameraList() { - cameraListView?.refreshCameraList(CallerMonitorManager.getCameraList()) + cameraListView?.refreshCameraList(CallerFuncBizManager.bizProvider.getCameraList) } }) cameraViewFloat = WarningFloat.with(it) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt index 0a02ae8999..506e313c7d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt @@ -21,7 +21,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive import com.mogo.eagle.core.data.camera.CameraEntity -import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager +import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI @@ -107,7 +107,7 @@ class CameraListView : FrameLayout { gsyVideoPlay(cameraEntity.flvUrl!!) } else if (!cameraEntity.ip.isNullOrEmpty()) { CallerLogger.d("$M_HMI$TAG", "打开推流的摄像头ip为：${cameraEntity.ip}") - CallerMonitorManager.openCameraStream(cameraEntity.ip!!) + CallerFuncBizManager.bizProvider.openCameraStream(cameraEntity.ip!!) } else { CallerLogger.e("$M_HMI$TAG", "摄像头视频播放地址和ip均为空") } 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 b3956d1659..4325a792ea 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 @@ -7,7 +7,7 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.data.map.Infrastructure -import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager +import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -88,7 +88,7 @@ class RoadVideoDialog(context: Context) : BaseFloatDialog(context), LifecycleObs private fun playVideo(ip: String) { roadVideoPB.visibility = View.VISIBLE tvCameraDesc.visibility = View.GONE - CallerMonitorManager.openCameraStream(ip, { flvUrl -> + CallerFuncBizManager.bizProvider.openCameraStream(ip, { flvUrl -> gsyVideoPlay(flvUrl) }) { roadVideoPB.visibility = View.GONE diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index d2093e8196..d4bd696b6f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -231,8 +231,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // OBU 模块 MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "IMoGoObuProvider")); - // 超视距，路测、行车记录仪监控 - MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AI_MONITORING, "IMoGoMonitoringProvider")); // 云公告发布 MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_FUNC_BIZ, "IMoGoNoticeProvider")); // 车聊聊，IM diff --git a/core/function-impl/mogo-core-function-monitoring/.gitignore b/core/function-impl/mogo-core-function-monitoring/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/build.gradle b/core/function-impl/mogo-core-function-monitoring/build.gradle deleted file mode 100644 index b73c52461d..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/build.gradle +++ /dev/null @@ -1,68 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' - id 'com.alibaba.arouter' -} -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - // buildToolsVersion rootProject.ext.android.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - //ARouter apt 参数 - kapt { - useBuildCache = false - arguments { - arg("AROUTER_MODULE_NAME", project.getName()) - } - } - - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation rootProject.ext.dependencies.kotlinstdlibjdk7 - implementation rootProject.ext.dependencies.androidxccorektx - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.arouter - implementation rootProject.ext.dependencies.rxandroid - - kapt rootProject.ext.dependencies.aroutercompiler - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_res - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_function_call - } else { - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-function-call') - implementation project(":foudations:mogo-commons") - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-monitoring/consumer-rules.pro b/core/function-impl/mogo-core-function-monitoring/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/function-impl/mogo-core-function-monitoring/gradle.properties b/core/function-impl/mogo-core-function-monitoring/gradle.properties deleted file mode 100644 index 6853d19f1c..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.eagle.core.function.impl -POM_ARTIFACT_ID=monitoring -VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-monitoring/proguard-rules.pro b/core/function-impl/mogo-core-function-monitoring/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-monitoring/src/main/AndroidManifest.xml deleted file mode 100644 index 0352a7c214..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveGSYVideoView.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveGSYVideoView.java deleted file mode 100644 index ffcb761f8a..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveGSYVideoView.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.mogo.eagle.core.function.live; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MONITOR; - -import android.content.Context; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ProgressBar; -import android.widget.TextView; - -import androidx.constraintlayout.widget.ConstraintLayout; - -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.function.monitoring.R; -import com.mogo.eagle.core.widget.LiveRoundLayout; -import com.tencent.rtmp.ITXLivePlayListener; -import com.tencent.rtmp.TXLiveConstants; -import com.tencent.rtmp.TXLivePlayConfig; -import com.tencent.rtmp.TXLivePlayer; -import com.tencent.rtmp.ui.TXCloudVideoView; - -/** - * V2XLiveGSYVideoView - */ -public class CameraLiveGSYVideoView extends LiveRoundLayout { - private static final String TAG = "CameraLiveGSYVideoView"; - private TXCloudVideoView mTxcVideoView; - private ProgressBar mLoading; - private TXLivePlayer mLivePlayer; - private ConstraintLayout mClLoadError; - private TextView mTvRefreshButton; - - private String mLiveUrl; - - - public CameraLiveGSYVideoView(Context context) { - this(context, null); - } - - public CameraLiveGSYVideoView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public CameraLiveGSYVideoView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initView(context); - - } - - private void initView(Context context) { - LayoutInflater.from(context) - .inflate(R.layout.camera_view_video_layout_normal, this); - //mPlayerView 即 step1 中添加的界面 view - mTxcVideoView = findViewById(R.id.txcVideoView); - //创建 player 对象 - mLivePlayer = new TXLivePlayer(context); - //关键 player 对象与界面 view - mLivePlayer.setPlayerView(mTxcVideoView); - mLivePlayer.setMute(true); - - TXLivePlayConfig txLivePlayConfig = new TXLivePlayConfig(); - // 增加重试次数 - txLivePlayConfig.setConnectRetryCount(30); - mLivePlayer.setConfig(txLivePlayConfig); - - mLivePlayer.enableHardwareDecode(true); - - mLoading = findViewById(R.id.loading); - // mLoading.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(context, R.color.module_live_video_progress_bar_loading_color), PorterDuff.Mode.MULTIPLY); - - mClLoadError = findViewById(R.id.clLoadError); - mTvRefreshButton = findViewById(R.id.tvRefreshButton); - mTvRefreshButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mLoading.setVisibility(VISIBLE); - mClLoadError.setVisibility(GONE); - if (mLiveUrl != null) { - startLive(mLiveUrl); - } - } - }); - } - - /** - * 开始直播 - * - * @param liveUrl 要直播的车机，如果没有直播的地址需要重新获取最新的直播地址 - */ - public void startLive(String liveUrl) { - // 进行直播播放 - if (mLivePlayer != null) { - if (!TextUtils.isEmpty(liveUrl)) { - mLiveUrl = liveUrl; - playLiveVideo(liveUrl); - } - } - } - - /** - * 播放直播流，且开始心跳 - */ - private void playLiveVideo(String liveUrl) { - try { - if (mLivePlayer != null) { - mLivePlayer.startPlay(liveUrl, TXLivePlayer.PLAY_TYPE_LIVE_RTMP); - mLivePlayer.setPlayListener(new ITXLivePlayListener() { - @Override - public void onPlayEvent(int event, Bundle bundle) { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, - "直播信息= " + - "\n播放器：onPlayEvent==" + event + - "\nbundle===" + bundle + - "liveUrl = " + liveUrl); - if (event == TXLiveConstants.PLAY_EVT_PLAY_LOADING) { - mLoading.setVisibility(VISIBLE); - mClLoadError.setVisibility(GONE); - } else if (event == TXLiveConstants.PLAY_EVT_PLAY_BEGIN) { - mLoading.setVisibility(GONE); - mClLoadError.setVisibility(GONE); - } else if (event < 0) { - stopLive(mLiveUrl); - mLoading.setVisibility(GONE); - mClLoadError.setVisibility(VISIBLE); - } - } - - @Override - public void onNetStatus(Bundle bundle) { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "播放器：onNetStatus===bundle===" + bundle); - } - }); - } - } catch (Exception e) { - e.printStackTrace(); - CallerLogger.INSTANCE.e(M_MONITOR + TAG, "播放器：onNetStatus e = " + e); - mLoading.setVisibility(GONE); - mClLoadError.setVisibility(VISIBLE); - } - } - - public void stopLive(String liveUrl) { - try { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "心跳：关闭直播..."); - // 暂停 - mLivePlayer.pause(); - // true 代表清除最后一帧画面 - mLivePlayer.stopPlay(true); - mTxcVideoView.onDestroy(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - if (mLiveUrl != null) { - startLive(mLiveUrl); - } - } - - @Override - protected void onDetachedFromWindow() { - stopLive(mLiveUrl); - mLoading.setVisibility(VISIBLE); - super.onDetachedFromWindow(); - } - -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveManager.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveManager.java deleted file mode 100644 index ddca1ae01b..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveManager.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.mogo.eagle.core.function.live; - -import android.view.View; - -import androidx.annotation.Nullable; - -import com.mogo.cloud.socket.entity.SocketDownData; -import com.mogo.eagle.core.function.live.impl.AbsCameraScenario; - -/** - * 路边摄像头直播控制 V2XPushLiveCarScenario - */ -public class CameraLiveManager extends AbsCameraScenario { - private static final String TAG = "CameraLiveManager"; - private static CameraLiveManager mCameraLiveManager; - private boolean isShowWindow; - - private CameraLiveManager() { - } - - public static CameraLiveManager getInstance() { - if (mCameraLiveManager == null) { - synchronized (CameraLiveManager.class) { - if (mCameraLiveManager == null) { - mCameraLiveManager = new CameraLiveManager(); - mCameraLiveManager.setV2XWindow(new PushCameraLiveWindow()); - } - } - } - return mCameraLiveManager; - } - - @Override - public void init(@Nullable SocketDownData.CloudRoadDataProto cloudRoadData) { - if (isShowWindow) { - close(); - } - - setmCloudRoadData(cloudRoadData); - show(); - } - - @Override - public void show() { - showWindow(); - } - - @Override - public void showWindow() { - if (getV2XWindow() != null) { -// ViewGroup.LayoutParams layoutParams = -// new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, -// (int) AbsMogoApplication.getApp().getResources() -// .getDimension(R.dimen.module_video_window_height_content)); - // TODO 这里需要替换展示方式 -// MogoApisHandler.getInstance().getApis().getTopViewManager() -// .addViewNoLinkage(getV2XWindow().getView(), layoutParams, this); -// getV2XWindow().show(getmCloudRoadData()); - isShowWindow = true; - } - } - - @Override - public void closeWindow() { - if (getV2XWindow() != null) { - getV2XWindow().close(); - } - isShowWindow = false; - } - - @Override - public void showButton() { - - } - - @Override - public void closeButton() { - - } - - @Override - public void drawPOI() { - - } - - @Override - public void clearPOI() { - - } - -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/ExtensionServiceManager.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/ExtensionServiceManager.java deleted file mode 100644 index 9c08310b76..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/ExtensionServiceManager.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mogo.eagle.core.function.live; - -import android.content.Context; - - -public class ExtensionServiceManager { - private static boolean isInit; - private static Context mContext; - - private ExtensionServiceManager() { - - } - - public static void init(final Context context) { - if (!isInit) { - isInit = true; - mContext = context; - } - } - - public static Context getContext() { - return mContext; - } - - -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushCameraLiveWindow.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushCameraLiveWindow.java deleted file mode 100644 index 1c49303741..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushCameraLiveWindow.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.mogo.eagle.core.function.live; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MONITOR; - -import android.content.Context; -import android.os.Handler; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.RelativeLayout; - -import com.mogo.cloud.socket.entity.SocketDownData; -import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.function.live.impl.ICameraWindow; -import com.mogo.eagle.core.function.monitoring.R; -import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView; - - -/** - * 点击摄像头 marker - * vr路边摄像头弹窗 V2XPushLiveCarWindow - */ -public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindow { - private static final String TAG = "PushCameraLiveWindow"; - private CameraLiveGSYVideoView mLiveGSYVideoView; - private MogoImageView mIvReportHead; - private ImageView pushVideoClose; - - // 直播30秒自动关闭 - private static final Handler handlerV2XEvent = new Handler(); - private static Runnable runnableV2XEvent; - - public PushCameraLiveWindow() { - this(ExtensionServiceManager.getContext(), null); - } - - public PushCameraLiveWindow(Context context) { - this(context, null); - } - - public PushCameraLiveWindow(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public PushCameraLiveWindow(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initView(context); - } - - public void initView(Context context) { - CallerLogger.INSTANCE.w(M_MONITOR + TAG, "initView 。。。。。"); - LayoutInflater.from(context).inflate(R.layout.camera_push_live_video, this); - // 详情列表 - mLiveGSYVideoView = findViewById(R.id.videoPlayer); - mIvReportHead = findViewById(R.id.ivReportHead); - pushVideoClose = findViewById(R.id.pushVideoClose); - pushVideoClose.setOnClickListener(v -> { - //TODO 移除窗体 - }); - } - - /** - * 展示直播Windows - */ - @Override - public void show(SocketDownData.CloudRoadDataProto entity) { - if (entity != null) { - CallerLogger.INSTANCE.w(M_MONITOR + TAG, "更新直播信息 show entity = " + entity); - if (!TextUtils.isEmpty(entity.getRtmpUrl())) { - CallerLogger.INSTANCE.w(M_MONITOR + TAG, "entity.getRtmpUrl() = " + entity.getRtmpUrl()); - mIvReportHead.setVisibility(INVISIBLE); - GlideImageLoader.getInstance().displayImage(entity.getRtmpUrl(), - mIvReportHead); - mLiveGSYVideoView.startLive(entity.getRtmpUrl()); - } - - countDownV2XEvent(); - } - } - - @Override - public View getView() { - return this; - } - - @Override - public void close() { - // 停止倒计时 - if (runnableV2XEvent != null) { - handlerV2XEvent.removeCallbacks(runnableV2XEvent); - runnableV2XEvent = null; - } - //TODO 移除窗体 - } - - /** - * 窗体倒计时 - */ - public void countDownV2XEvent() { - // 倒计时 - if (runnableV2XEvent == null) { - runnableV2XEvent = () -> { - // CallerLogger.INSTANCE.d(MODULE_NAME, "V2X=== Window 30秒倒计时结束。。。"); - //TODO 移除窗体 - }; - } else { - handlerV2XEvent.removeCallbacks(runnableV2XEvent); - } - - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "V2X=== Window 展示开始倒计时："); - handlerV2XEvent.postDelayed(runnableV2XEvent, 20000); - } - -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushDataType.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushDataType.java deleted file mode 100644 index db65867c18..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/PushDataType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.eagle.core.function.live; - -/** - * @author lixiaopeng - * @description - * @since 2020/12/13 - */ -public class PushDataType { - /** - * Push 摄像头事件场景 VR - */ - public static final String TYPE_PUSH_CAMERA_DATA = "TYPE_PUSH_CAMERA_DATA"; -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/AbsCameraScenario.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/AbsCameraScenario.java deleted file mode 100644 index de4478c798..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/AbsCameraScenario.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.mogo.eagle.core.function.live.impl; - -import androidx.annotation.Nullable; - -import com.mogo.cloud.socket.entity.SocketDownData; - - -public abstract class AbsCameraScenario implements ICameraScenario { - protected String TAG = "AbsCameraScenario"; - private ICameraWindow mV2XWindow; - private SocketDownData.CloudRoadDataProto mCloudRoadData; - - public abstract void init(@Nullable SocketDownData.CloudRoadDataProto cloudRoadData); - - @Override - public void close() { - closeButton(); - closeWindow(); - clearPOI(); - } - - public ICameraWindow getV2XWindow() { - return mV2XWindow; - } - - public void setV2XWindow(@Nullable ICameraWindow mV2XWindow) { - this.mV2XWindow = mV2XWindow; - } - - public SocketDownData.CloudRoadDataProto getmCloudRoadData() { - return mCloudRoadData; - } - - public void setmCloudRoadData(SocketDownData.CloudRoadDataProto mCloudRoadData) { - this.mCloudRoadData = mCloudRoadData; - } - -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraScenario.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraScenario.java deleted file mode 100644 index 0174e27aad..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraScenario.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mogo.eagle.core.function.live.impl; - - -public interface ICameraScenario { - - /** - * 展示场景 - */ - void show(); - - /** - * 关闭场景 - */ - void close(); - - /** - * 展示Window - */ - void showWindow(); - - /** - * 关闭Window - */ - void closeWindow(); - - /** - * 展示按钮 - */ - void showButton(); - - /** - * 关闭按钮 - */ - void closeButton(); - - /** - * 绘制POI - */ - void drawPOI(); - - /** - * 清除POI - */ - void clearPOI(); - -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraWindow.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraWindow.java deleted file mode 100644 index 83f22019a2..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/impl/ICameraWindow.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mogo.eagle.core.function.live.impl; - -import android.view.View; - -public interface ICameraWindow { - - /** - * 展示1/2窗口 - */ - void show(T entity); - - /** - * 关闭1/2窗口 - */ - void close(); - - /** - * 返回窗体 - * - * @return 当前窗体 - */ - View getView(); -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/MoGoMonitoringProvider.kt b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/MoGoMonitoringProvider.kt deleted file mode 100644 index 588f63a2a2..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/MoGoMonitoringProvider.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.mogo.eagle.core.function.monitoring - -import android.content.Context -import com.alibaba.android.arouter.facade.annotation.Route -import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.monitoring.IMoGoMonitoringProvider -import com.mogo.eagle.core.data.camera.CameraEntity - -/** - * @author xiaoyuzhou - * @date 2021/10/29 11:09 上午 - */ -@Route(path = MogoServicePaths.PATH_AI_MONITORING) -class MoGoMonitoringProvider : IMoGoMonitoringProvider { - override var functionName = "MoGoMonitoringProvider" - private var mCronTaskManager: CronTaskManager? = null - override fun init(context: Context) { - mCronTaskManager = CronTaskManager(context) - mCronTaskManager!!.startCronTask() - } - - override val cameraList: List - get() = mCronTaskManager!!.getCameraList() - - override fun openCameraStream(cameraIp: String) { - // 现在不用华哥接口，改用卫明的打开视频推流接口 -// mCronTaskManager.requestOpenCamera(cameraIp); - mCronTaskManager!!.reqOpenCameraStream(cameraIp) - } - - override fun openCameraStream(cameraIp: String, success: (String) -> Unit, error: (Throwable) -> Unit) { - mCronTaskManager!!.reqOpenCameraStream(cameraIp, success, error) - } - - override fun disposeCameraStream() { - mCronTaskManager!!.clear() - } - - override fun onDestroy() { - mCronTaskManager!!.onDestroy() - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-ldpi/icon_space.png b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-ldpi/icon_space.png deleted file mode 100644 index a2350b85a83e3be89d63ea1461878407f940a1ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMwQX@Rme0>?T zfNTy1#`a7G7LXDkmI7i12Id8f49q~95hS*N2`lFz;gC(9 dV0`8t7X#C5#)1#A%8Nk?JYD@<);T3K0RVV#8oU4i diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-mdpi/icon_space.png b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-mdpi/icon_space.png deleted file mode 100644 index a2350b85a83e3be89d63ea1461878407f940a1ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMwQX@Rme0>?T zfNTy1#`a7G7LXDkmI7i12Id8f49q~95hS*N2`lFz;gC(9 dV0`8t7X#C5#)1#A%8Nk?JYD@<);T3K0RVV#8oU4i diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-mdpi/module_camera_normal_traffic.png b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-mdpi/module_camera_normal_traffic.png deleted file mode 100644 index d98b71a08c3958b3e8086da675af3991159c3513..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5264 zcmb`L=Q|q?w8uk?l9C!VYW0WOqq>X`v{vm^D~>`|16Shb7RDr(e>5vo?rs1a0A zd(^5;>>&2-eRcnV`<&;T@7wd@e4gifzR~)+>U6YsXaN8K-E$2U!+(nU-@ZZhZ~o;g zjQS^J-iGQ=0oVb~4FG^y^SO$$u|L_iC3QNpDhukd*iY<@FD2=>Z4mw6vkcU)V_c1~PF%o76?mWE7O;yU?#>$jn0-m_%Ng81t8~C8~N(ZJb}veg1^a zX7_y>$zE|1bf{zc=Ea+_^Cqj7fTL22&csFZ|63^uaO!{J7g>EYjthxjSxSKA(ZQzM z9BT@NZnqy%ofjL&n~jS^tEKf`oQkFxvi!Z?BSw!C@Qb%Pbn1}bJoDkg;JxM<|NWNx7 zjTCw=ZTQnbPZ}=tV?;FG~T=cdk|cR10DN%zqxJ-*WMVsNJ~!BGkNG>LVc*e zn`3BWWwU*WxICH$OHZh7xWY}vB>Hz+UXGwW>jA{iaUM{za-nxv< zyEqb3S*f%}*9RPlq@{=!hX&#WJv~llRVCV*bq%x{%>fK;SF}fNp*>3pApR7q{|fIz zd!i9n7pG_O9?vMrkS*g-p!Qb5*L(xMBr>3iu53h$dee)PMb8Q+N7mweR*fYh2zPCYd#ESwp*=pqlkiaMj7YS8PwYdGCvOm3Nr8hu!@1 zH=qK>3$FXEh%rtgF|4L&w>q{bUOL95rIy9gI7HY;Wv4~joT$#52DpHAxW!_XD9t!v zNwDt+A^bzKf;`gL24z7WJw?mqY3HwA3lF$e^KGS^*%|Ma89_yAxD&b)sMbxLYNu_% zNtx~}+F>>8U+9}pxC!xTF&;NO4EcvS6oNAziu7#hqp8;gfy8SBU7>&5;lMKYmwO_^ z0C7~BrNDg%grkc7XKN&GC@izxXaNWG$*`IS?wLKt6pLFIFZz_EL89bv1?lV|t@o&LsVbMUphIGAN) zO*l(%kqO>=fI-`~ro;ufWIYS3MZ8d(LP%lff=*`5#1`9Gu{>HK(?1 z49w!*(ChJAkg{ZtD^0_f&6lQVtPSj2OR(~wNO|(4g)nmmduV8|q{})d?Nh;l*K)o- zrb~DH!g*}qA(c7x`GJrUR(VXx!m@@CQ>-uF;$6_T4E2|4zZuv1UZ>*E0$OPjzw#&& zzIjZ^{zbP}ABW6*YIR)M=QGb*iiRdzO`xCbe{d?7T}}7DpB5X*gEITyRbN&k-p+-v zr;OlwKR)}K!@oI9MUXXyCw0TU`TG>68K$ww*=G zTa2oq4p+lBWxY?{blp;en)JXI7QG6_TC`Zj(_O8nYn-acDte#5!ZzT+mv3ab`-7L0 z)bD6-X_4;$JsKlmCQRDOF9o3PIRuV9wqoCqCvDG~8}04ipmz782$Bc{qIxjd=Kba- z0_Mji<8k-N7&6mF0{oFHsKzSY{cS>Rbi-QzWeAG)g7B-V{aNmS!@ha55VDoq`@hxZm(qF+#Pq?`5^aXNP0L zlo#PE{)fAl$@p9EzJ>9f{NEj3B7$MstpN9UPWBLpCuIB7bq3M?5;*hYPvC^5-<0=$ z#X-%HgJC33@P)y_|WvabY4x{S*2b}mz{)4Rbh)&%PxvwAiVI^dl zP7WFms7V@jpbC>rcP!;0P4hvY=y6SK-SK&q!#02UL5i*Gxu*;K%L9`;xcO3jj z3IRPoB0z^unw!lKZ^{|v)IvXAd<9bCl5DQpXCYI1u=xFcv#3dV6&|*Ry!xmIO@aoU zO*-$cy^247?qUl~JYNnHusAzA+7g_A2PtU$R->s#Hn$WqEM<3?{lC$Me5;y zGGa=g)jN(;)rGD$u`;ZW_1Rdh+#*1xa6*A=IOSbU@a?RTedw+Ha{0YgDF`n-?jEZ%2WQ*D;Sy!2KWt6!C2~y`deLTgsC??ZWUHkxh zD^k}fdBl4b7weK{Bui&^P=?>aN^n;O?b2id+7-aujq#TBT#s7bvq?Q2i2Mi)T-K4E z<^L$4^I@D@G~KP$>y!WA&gi;~4 z*tj5k8>|jY<{&jLnSK-H3md%xRE~OWPsu+L(vt&PeZPJC_MY*kP#871uKoS(=Ro?~ z5Ck!j(@R54?n)1Xv!9TjM;cAnItzjoh>0)XuB5ciT+Rny2f>KN0X9o1-tY#!QI9RH z9ir^JOLA0%2@e>ZkaD6x&zB|bp8e+^kY7tk*T-hd3o=^qsE6E+>$&za1yS^@#<+D? ztqD$1<*@eaTq|mQk)f!EoD?a4g56JI{(%;Q}NEx()*)wQb_17K2 zdP_yBW-Y5Gw?FGi#puaw^BP{IImG4NgUcD`5-#fj5jf3Oohqcl7SMD>b=65TS)^>p@*n}HJZIChaA^TU)v+| zCf^EIhGpJCy<4?eTVQlsV59j{F`nzGCfQWKC6;w$bSvs?)Q_%NskNtm()jev2%?l( zwtEVn{=&4f`))>6dX?!uF_zQOkK1dV_gEL(-xcNkCc|}Bk`nJ9x;{!wTkt`|`0ijm z8S(4Ro{kK~@lw21HGpAZJ~hrZCukAl8vA~(-Aye|Lj>7Cx0W$KitidUk9HUuX8C+m_*ksrW^h2b-+#d&rU;QzL|56*{I(AX z=W+ALXI~VcCLX_4Ss$CZ%+$GVR~Qq^Jp=X+(3BPwm`f%*LC>fK?GPvV{{{lGt}f)S zTb+!+^CB&&tuX;m+8NZEO_pAqkvs|9A_mjEx5=J1u=I|0`tig|K1h>-#U1}W&F1uc zwRp|VULxg!)+m$1r2ba%8;{Ggqo;a*w(Ab9SBTkx6yDDrwu_$i=PbnS9mw5SI0urR z?`w{fkaat$hjh9ZwRr&NIS05Z8&z%32BXd?pZE)>s^xZ-z;X} zXHWH}dIedg*WL<#SbDkEU@|%{izljfnd5#7V}HK4a>NVsu0C$vja;?^(2LU2#_FUF-EwcPfrgIlzW}?>h zLuR6a9*L3=19~Ow6XGS?F1)B@K{7O^Vp6lol8=_MDm5+RI9g-RCc{YP5_LYe@*0>qElG1=%EvVFSHnGgUG&sV51LW~?mPb%yXwq=B)BE&@@)KO@BK~Hn zPP>rbQ3aVJi*Da~!q;qkYJF9{@WI7EG5@n+gS@}Qz6zUSP56*!y1-Lq zPt$!`WD!BsuK>P?ONKZAt$#u2aC)BIG~h?8>c|5k`gfmLC!o!^t4m~!y-D*|B&O;E z7hj18wdm#+ETT{?2I=ET?b!k))*lo0AOj=TK^r zWdJHsXzCa8rkKxJ;+pr1S6z`*@}l~?@qxDG500;$E1lZEfISu?au1t`a=$U~oVm@D zAi4@DRcrkbq~aC(GT^9-`ww z9pYvVzHe$QG5W3*09t5A#_~I;KGV^2`Dbovjye8`e1jE=E`GJgck?CO&xrql!F0VM zqokaQ1&O(}L=Y^d6-;Is$<;a4IoG*u_UNGDiE8&qxM#bhJJm!-VA)a$H38+wn@Q zqVxzzBpb<|6R{@qS!kH+@ab>tXjcU9^z1JX4~g&nB>i6w%NgL0MGdn?rbUp_jH0}) z!hiHq$#OMP9v8lHs*OCk%r1iuC|++AykPSizTdG3oX3n<4WU@=`zZ=r)u&l*ozj7g zd;(X$3T{u+=qi?;d-5O~F}#5f>!1H_--!#}pKBastqeG`v{BblLlTo5Y|Zr$M+iehT- z7q%AYdOIEtCJ~~uXPDTV7E~v}D^GeG6Mfi|&j9tWr`t>_Ug!H6-MK9u0Y<8-!adxD zi{wGg%e-|?((Mc*)Vcka`{aZeIHdVzaM$&Cl=Ht&)SzH-HQ}}f9y7_Sk?rRZ^B1O! z+K||UL%s$v*-ZgFoEL8HL*ky6#X4mTRDBot^#7K>{a=!& dq{c~79J`mgR!SvA^DklqJXh6K!9KMP{U0P%c#;4B diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/icon_live_load_error.png b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/icon_live_load_error.png deleted file mode 100644 index a1da551655536f62ce8eaa5454c3f9e30500f702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6309 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 bJJtWc1%85!Qn2Qr00000NkvXXu0mjfv0E2y diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/icon_space.png b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/icon_space.png deleted file mode 100644 index a2350b85a83e3be89d63ea1461878407f940a1ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMwQX@Rme0>?T zfNTy1#`a7G7LXDkmI7i12Id8f49q~95hS*N2`lFz;gC(9 dV0`8t7X#C5#)1#A%8Nk?JYD@<);T3K0RVV#8oU4i diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/module_camera_normal_traffic.png b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable-xhdpi/module_camera_normal_traffic.png deleted file mode 100644 index d98b71a08c3958b3e8086da675af3991159c3513..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5264 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 diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_blue_grident.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_blue_grident.xml deleted file mode 100644 index 3c91cb81a9..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_blue_grident.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_gray_grident.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_gray_grident.xml deleted file mode 100644 index 5d90ff43e3..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_react_gray_grident.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_round_gray.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_round_gray.xml deleted file mode 100644 index 37f8498d8c..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/shape_round_gray.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_alert_window_bg.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_alert_window_bg.xml deleted file mode 100644 index 5f9bc8d7d2..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_alert_window_bg.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_refresh_button_bg.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_refresh_button_bg.xml deleted file mode 100644 index cac43e0f2d..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/drawable/v2x_refresh_button_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_item_v2x_live_video.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_item_v2x_live_video.xml deleted file mode 100644 index 288fd4b9ff..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_item_v2x_live_video.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml deleted file mode 100644 index da872500d7..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml deleted file mode 100644 index 07238da557..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml deleted file mode 100644 index 5110e00657..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/dialog_navi_notice.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml deleted file mode 100644 index 35753f4dd0..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/values/colors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - #FFFFFF - - #323C6F - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml deleted file mode 100644 index 71e2be73b1..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - mogo-module-extensions - - diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt index 4bc2aee14c..3914299c8d 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt @@ -1,13 +1,11 @@ package com.mogo.eagle.core.function.api.biz +import com.mogo.eagle.core.data.camera.CameraEntity import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider -/** - * @author Jing - * @description - * @since: 10/27/21 - */ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider { + + /*----------------------------------------Notice----------------------------------------*/ /** * 是否接受交通事故任务 * @param infoId @@ -24,6 +22,7 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider { */ fun requestAccidentInfo(infoId: String, sn: String, callBack: IMoGoNoticeNetCallBack) + /*----------------------------------------Dispatch----------------------------------------*/ /** * 调度确认 */ @@ -39,4 +38,17 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider { * 调度测试 */ fun testDispatch(sceneType: Int) + + /*----------------------------------------Monitoring----------------------------------------*/ + + val getCameraList: List + + fun openCameraStream(cameraIp: String) + + fun openCameraStream(cameraIp: String, success: (String) -> Unit, error: (Throwable) -> Unit) + /** + * 防止回调摄像头列表View的相关调用 + */ + fun closeCameraLive() + } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/monitoring/IMoGoMonitoringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/monitoring/IMoGoMonitoringProvider.kt deleted file mode 100644 index de8374fadb..0000000000 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/monitoring/IMoGoMonitoringProvider.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.mogo.eagle.core.function.api.monitoring - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider -import com.mogo.eagle.core.data.camera.CameraEntity - -/** - * @author xiaoyuzhou - * @date 2021/10/29 10:35 上午 - * 超视距功能，路测摄像头，前车摄像头监控 - */ -interface IMoGoMonitoringProvider : IMoGoFunctionServerProvider { - val cameraList: List? - fun openCameraStream(cameraIp: String) - fun openCameraStream(cameraIp: String, success: (String) -> Unit, error: (Throwable) -> Unit) - /** - * 防止回调摄像头列表View的相关调用 - */ - fun disposeCameraStream() -} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/biz/CallerFuncBizManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/biz/CallerFuncBizManager.kt index ef8a298df5..ede4ca3363 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/biz/CallerFuncBizManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/biz/CallerFuncBizManager.kt @@ -13,5 +13,4 @@ object CallerFuncBizManager : CallerBase() { val bizProvider: IMoGoFuncBizProvider get() = getApiInstance(IMoGoFuncBizProvider::class.java, MogoServicePaths.PATH_FUNC_BIZ) - } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/monitor/CallerMonitorManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/monitor/CallerMonitorManager.kt deleted file mode 100644 index f714d9fdde..0000000000 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/monitor/CallerMonitorManager.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.mogo.eagle.core.function.call.monitor - -import com.mogo.eagle.core.data.camera.CameraEntity -import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.monitoring.IMoGoMonitoringProvider -import com.mogo.eagle.core.function.call.base.CallerBase - -object CallerMonitorManager { - private val providerApi: IMoGoMonitoringProvider - get() = CallerBase.getApiInstance( - IMoGoMonitoringProvider::class.java, - MogoServicePaths.PATH_AI_MONITORING) - - fun getCameraList(): List? { - return providerApi.cameraList - } - - fun openCameraStream(cameraIp: String) { - providerApi.openCameraStream(cameraIp) - } - - fun openCameraStream(cameraIp: String, success: (String) -> Unit, error: (Throwable) -> Unit) { - providerApi.openCameraStream(cameraIp, success, error) - } - - fun disposeCameraStream() { - providerApi.disposeCameraStream() - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/RetryWithDelay.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/RetryWithDelay.java similarity index 94% rename from core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/RetryWithDelay.java rename to foudations/mogo-commons/src/main/java/com/mogo/commons/utils/RetryWithDelay.java index 1819095745..cb5148193d 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/RetryWithDelay.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/RetryWithDelay.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.monitoring; +package com.mogo.commons.utils; import java.util.concurrent.TimeUnit; diff --git a/gradle.properties b/gradle.properties index 2bf090e7cf..53ae54e0c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -100,7 +100,6 @@ versionName=2.13.0 MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.10 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_SMP_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_V2X_VERSION=0.0.58.10 diff --git a/modules.txt b/modules.txt index d30afff0c0..c69c9cad56 100644 --- a/modules.txt +++ b/modules.txt @@ -21,7 +21,6 @@ :core:function-impl:mogo-core-function-obu-mogo :core:function-impl:mogo-core-function-hmi :core:function-impl:mogo-core-function-map -:core:function-impl:mogo-core-function-monitoring :core:function-impl:mogo-core-function-v2x :core:function-impl:mogo-core-function-chat :core:function-impl:mogo-core-function-devatools diff --git a/settings.gradle b/settings.gradle index c18eaa8714..cb4651e678 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,8 +30,6 @@ include ':core:function-impl:mogo-core-function-map' include ':core:function-impl:mogo-core-function-v2x' // 自研OBU业务 include ':core:function-impl:mogo-core-function-obu-mogo' -// 行车超视距服务，路测摄像头、前车摄像头 -include ':core:function-impl:mogo-core-function-monitoring' // 绑定车机 include ':core:function-impl:mogo-core-function-bindingcar' // 车聊聊业务