From c2d7d121f217d822f3ee71c3c7ef37410efe4065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 25 Aug 2021 18:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                | 26 +++++++++++++++++++
 README.md                                     |  2 +-
 .../mogo/module/hmi/ui/MoGoWarningFragment.kt |  4 +--
 ...iewTrafficLight.kt => TrafficLightView.kt} |  2 +-
 ...Notification.kt => V2XNotificationView.kt} |  2 +-
 .../src/main/res/layout/fragment_warning.xml  |  2 +-
 .../ObuTestTriggerRecognizedReceiver.kt       | 15 +++++++++--
 7 files changed, 45 insertions(+), 8 deletions(-)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/{ViewTrafficLight.kt => TrafficLightView.kt} (98%)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/{ViewV2XNotification.kt => V2XNotificationView.kt} (95%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 96aa909210..a9d1978936 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,7 +11,32 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="../../../../../../layout/custom_preview.xml" value="0.390625" />
         <entry key="../../../../../layout/custom_preview.xml" value="0.19947916666666668" />
+        <entry key="modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml" value="0.273046875" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/camera_item_v2x_live_video.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/camera_push_live_video.xml" value="0.27447916666666666" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/camera_view_video_layout_normal.xml" value="0.27447916666666666" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/include_debug_panel.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/merge_vertical_traffic_light_in_vr.xml" value="0.27447916666666666" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_include_seeking_help_notice.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml" value="0.2953125" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_five.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="1.0" />
+        <entry key="modules/mogo-module-hmi/src/main/res/layout/notification_v2x_msg_vr.xml" value="0.3453125" />
+        <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="1.25" />
+        <entry key="modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml" value="0.28854166666666664" />
+        <entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml" value="0.359375" />
+        <entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml" value="0.359375" />
+        <entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml" value="0.359375" />
+        <entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml" value="0.33" />
+        <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" />
+        <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml" value="0.33645833333333336" />
+        <entry key="modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml" value="0.315625" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml" value="0.184" />
@@ -22,6 +47,7 @@
         <entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml" value="0.5546876453218006" />
         <entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_remind.xml" value="0.35734252929687504" />
         <entry key="modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml" value="0.28919677734374993" />
+        <entry key="modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml" value="0.2838541666666667" />
       </map>
     </option>
   </component>
diff --git a/README.md b/README.md
index 0b4239aefc..0cdcca9513 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ adb shell am broadcast -a com.hmi.v2x.limitingvelocity --ez limitingVelocityIsSh
 // 控制OBU场景自测 obuStates 1-添加，2-删除，0-更新
 adb shell am broadcast -a com.obu.test_trigger --ei obuStates 1 --ei obuLevel 3 --ei obuType 0x2A01
 
-// 控制OBU 展示周边周边车辆 惠新西街南口附近，南向北
+// 控制OBU 模拟自车位置
 adb shell am broadcast -a com.obu.test_trigger_recognized
 
 //与Rsu相关
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
index 8d9965099c..62a6e380af 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
@@ -13,7 +13,7 @@ import com.mogo.module.hmi.R
 import com.mogo.module.hmi.notification.WarningFloat
 import com.mogo.module.hmi.notification.anim.DefaultAnimator
 import com.mogo.module.hmi.notification.enums.SidePattern
-import com.mogo.module.hmi.ui.widget.ViewV2XNotification
+import com.mogo.module.hmi.ui.widget.V2XNotificationView
 import kotlinx.android.synthetic.main.fragment_warning.*
 
 /**
@@ -53,7 +53,7 @@ class MoGoWarningFragment : MvpFragment<MoGoWarningContract.View?, WaringPresent
 
         activity?.let {
 
-            val notificationView = ViewV2XNotification(activity)
+            val notificationView = V2XNotificationView(activity)
             notificationView.setWarningIcon(WarningTypeEnum.getWarningIcon(v2xType))
 
             notificationView.setWarningContent(
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/TrafficLightView.kt
similarity index 98%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/TrafficLightView.kt
index 20eea7ba09..911b65cf74 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/TrafficLightView.kt
@@ -13,7 +13,7 @@ import kotlinx.android.synthetic.main.view_traffic_light_vr.view.*
  * @date 2021/8/4 3:16 下午
  * 红绿灯控件
  */
-class ViewTrafficLight @JvmOverloads constructor(
+class TrafficLightView @JvmOverloads constructor(
     context: Context?,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewV2XNotification.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XNotificationView.kt
similarity index 95%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewV2XNotification.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XNotificationView.kt
index 9f509c689c..a6e2809ecb 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewV2XNotification.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XNotificationView.kt
@@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.notification_v2x_msg_vr.view.*
  *@author        xiaoyuzhou
  *@date          2021/8/6 12:25 下午
  */
-class ViewV2XNotification @JvmOverloads constructor(
+class V2XNotificationView @JvmOverloads constructor(
     context: Context?,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
diff --git a/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml b/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml
index a1ea4c63b9..0c17dc7705 100644
--- a/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml
+++ b/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
 
-    <com.mogo.module.hmi.ui.widget.ViewTrafficLight
+    <com.mogo.module.hmi.ui.widget.TrafficLightView
         android:id="@+id/viewTrafficLightVr"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt
index e4aea2c397..af9cfb90a5 100644
--- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt
+++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerRecognizedReceiver.kt
@@ -9,6 +9,7 @@ import com.mogo.utils.logger.Logger
 import com.zhidao.support.obu.model.CvxHvInfoIndInfo
 import com.zhidao.support.obu.model.advance.MovingObjectInfo
 import com.zhidao.support.obu.model.advance.Position
+import kotlin.random.Random
 
 /**
  * @author xiaoyuzhou
@@ -36,8 +37,18 @@ class ObuTestTriggerRecognizedReceiver : BroadcastReceiver() {
 
         val cvxHvInfoIndInfo = CvxHvInfoIndInfo(0, 1, 2)
 
-        val position = Position(0, 399739429, 1164115207, 20)
-        val movingObjectInfo = MovingObjectInfo(0, position, 1800, 60)
+        val randomLocation = Random.nextInt(100, 2000)
+
+        val position = Position(
+            0, (399739429 + randomLocation).toLong(),
+            (1164115207 + randomLocation).toLong(), 20
+        )
+        val movingObjectInfo = MovingObjectInfo(
+            0,
+            position,
+            1800 +randomLocation,
+            6000 +randomLocation
+        )
         cvxHvInfoIndInfo.basic_info = movingObjectInfo
 
         MogoPrivateObuManager.INSTANCE