[dev_minibus-d_230425_3.2.0] 优化红绿灯显示

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt

@@ -489,7 +489,6 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
             // 删除
             MogoObuConstants.STATUS.DELETE -> {
                 // 移除顶部弹窗，当收不到信号的时候触发一次
-                CallerTrafficLightListenerManager.disableTrafficLight()
                 CallerTrafficLightListenerManager.invokeTrafficLightDisapper()
                 isShowGreenWave = false
                 isShowRunRedLight = false

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt

@@ -996,7 +996,6 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             // 删除
             MogoObuConstants.STATUS.DELETE -> {
                 // 移除顶部弹窗
-                CallerTrafficLightListenerManager.disableTrafficLight()
                 CallerTrafficLightListenerManager.invokeTrafficLightDisapper()
                 isShowGreenWave = false
                 isShowRunRedLight = false

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt

@@ -121,6 +121,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      * @param enter true:进入路口；false:离开路口
      */
     override fun onEnterCrossRoad(enter: Boolean) {
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onEnterCrossRoad enter = $enter ")
         if (!enter) {
             Handler().postDelayed({
                 hasAiLightStatus = false
@@ -139,6 +140,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      */
     override fun onTrafficRequestError() {
         hasAiLightStatus = false
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficRequestError hasObuLightStatus = $hasObuLightStatus ------> ")
         CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
         if(!hasObuLightStatus){
             hide()
@@ -149,6 +151,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      * obu数据消失
      */
     override fun onObuTrafficLightDisapper() {
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onObuTrafficLightDisapper ------> ")
         hasObuLightStatus = false
         hide()
     }
@@ -169,7 +172,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
         lightSource: DataSourceType
     ) {
         super.onTrafficLightPlusSource(light, remain, lightSource)
-        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource light = $light ---remain = $remain ---lightSource = $lightSource")
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource ----- light = $light ---remain = $remain ---lightSource = $lightSource")
         if (lightSource == DataSourceType.OBU) {
             hasObuLightStatus = true
         }

libraries/map-usbcamera/build/generated/source/buildConfig/debug/com/mogo/usbcamera/BuildConfig.java

@@ -0,0 +1,18 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.mogo.usbcamera;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.mogo.usbcamera";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
+  public static final String APPLICATION_ID = "com.mogo.usbcamera";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "";
+}

libraries/map-usbcamera/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.usbcamera"
+    android:versionCode="1" >
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="27" />
+
+    <!-- 声明使用usb -->
+    <uses-feature
+        android:name="android.hardware.usb.host"
+        android:required="true" />
+
+    <application>
+    </application>
+
+</manifest>

libraries/map-usbcamera/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"","enabled":true,"outputFile":"map-usbcamera-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.usbcamera","split":""}}]

libraries/map-usbcamera/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -0,0 +1 @@
+{}

libraries/map-usbcamera/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs"><file name="armeabi-v7a/libuvc.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libuvc.so"/><file name="armeabi-v7a/libUVCCamera.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libUVCCamera.so"/><file name="armeabi-v7a/libjpeg-turbo1500.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libjpeg-turbo1500.so"/><file name="armeabi-v7a/libUtils.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libUtils.so"/><file name="armeabi-v7a/libTxtOverlay.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libTxtOverlay.so"/><file name="armeabi-v7a/libusb100.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libusb100.so"/><file name="x86/libuvc.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86/libuvc.so"/><file name="x86/libUVCCamera.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86/libUVCCamera.so"/><file name="x86/libjpeg-turbo1500.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86/libjpeg-turbo1500.so"/><file name="x86/libusb100.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86/libusb100.so"/><file name="arm64-v8a/libuvc.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libuvc.so"/><file name="arm64-v8a/libUVCCamera.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libUVCCamera.so"/><file name="arm64-v8a/libjpeg-turbo1500.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libjpeg-turbo1500.so"/><file name="arm64-v8a/libUtils.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libUtils.so"/><file name="arm64-v8a/libTxtOverlay.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libTxtOverlay.so"/><file name="arm64-v8a/libusb100.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libusb100.so"/><file name="x86_64/libuvc.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86_64/libuvc.so"/><file name="x86_64/libUVCCamera.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86_64/libUVCCamera.so"/><file name="x86_64/libjpeg-turbo1500.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86_64/libjpeg-turbo1500.so"/><file name="x86_64/libusb100.so" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/jniLibs/x86_64/libusb100.so"/></source><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/libs"><file name="common-4.1.1.aar" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/libs/common-4.1.1.aar"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/debug/jniLibs"/></dataSet></merger>

libraries/map-usbcamera/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/mogo-adas-data/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/mogo-adas-data/src/debug/shaders"/></dataSet></merger>

libraries/map-usbcamera/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/assets"><file name="zk/SIMYOU.ttf" path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/assets/zk/SIMYOU.ttf"/></source><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/debug/assets"/></dataSet></merger>

libraries/map-usbcamera/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -0,0 +1,5 @@
+#Fri May 05 16:13:20 CST 2023
+/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/res/xml/device_filter.xml=/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/build/intermediates/packaged_res/debug/xml/device_filter.xml
+/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/res/layout/listitem_device.xml=/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/build/intermediates/packaged_res/debug/layout/listitem_device.xml
+/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/res/raw/camera_click.ogg=/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/build/intermediates/packaged_res/debug/raw/camera_click.ogg
+/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/src/main/res/layout/dialog_camera.xml=/Users/zd/Downloads/Android/MoGoEagleEye/libraries/map-usbcamera/build/intermediates/packaged_res/debug/layout/dialog_camera.xml

libraries/map-usbcamera/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="button_size">48dp</dimen>
+    <dimen name="horizontal_margin">16dp</dimen>
+    <dimen name="list_font_size">18sp</dimen>
+    <dimen name="list_height_min">32dp</dimen>
+    <dimen name="vertical_margin">16dp</dimen>
+    <string name="app_name">libusbcamera</string>
+    <string name="camera">Camera</string>
+    <string name="no_device">未搜索到可用USB Camera设备</string>
+    <string name="permission_audio">No audio recording permission. \nAll audio function is disabled</string>
+    <string name="permission_audio_recording_reason">Audio recording permission is necessary for movie capture with audio.</string>
+    <string name="permission_audio_recording_request">Audio recording permission is necessary for movie capture with audio.</string>
+    <string name="permission_audio_streaming_reason">Audio recording permission is necessary for streaming with audio.</string>
+    <string name="permission_audio_streaming_request">Audio recording permission is necessary for streaming with audio.</string>
+    <string name="permission_camera">No camera access permission</string>
+    <string name="permission_camera_finish">No camera access permission. \nApp will finish soon</string>
+    <string name="permission_camera_reason">Camera access permission is necessary for fallback to built in camera.</string>
+    <string name="permission_camera_request">Camera access permission is necessary for fallback to built in camera.</string>
+    <string name="permission_ext_storage">No permission of writing external storage. \nMovie/still image capturing are disabled.</string>
+    <string name="permission_ext_storage_finish">No writing external storage permission. \nApp will finish soon</string>
+    <string name="permission_ext_storage_reason">Permission of writing external storage is necessary for movie/still image capturing.</string>
+    <string name="permission_ext_storage_request">Permission of writing external storage is necessary for movie/still image capturing.</string>
+    <string name="permission_hardware_id_request">Permission to access phone state/hardware id necessary for calling.</string>
+    <string name="permission_location">No location access permission</string>
+    <string name="permission_location_finish">No location access permission. \nApp will finish soon</string>
+    <string name="permission_location_reason">Location access permission is necessary for %s</string>
+    <string name="permission_location_request">Location access permission is necessary for %s</string>
+    <string name="permission_network">No network access permission.</string>
+    <string name="permission_network_finish">No network access permission. \nApp will finish soon</string>
+    <string name="permission_network_reason">Network access permission is necessary for streaming.</string>
+    <string name="permission_network_request">Network access permission is necessary for streaming.</string>
+    <string name="permission_title">Regarding permission</string>
+    <string name="refresh">刷新</string>
+    <string name="select">请选择USB摄像头</string>
+</resources>