Merge branch 'km' into dev2_aiSdk

2021-05-07 16:33:20 +08:00
parent 3d004e4d99 cb0c47b222
commit 2ae5f0b80b
3 changed files with 3 additions and 4 deletions
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -57,7 +57,7 @@
        android:id="@+id/warning_right"
        android:layout_width="@dimen/dp_390"
        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/module_main_id_warning_view_marginLeft"
+        android:layout_gravity="right"
        android:background="@drawable/module_main_warning_bkg_right"
        android:visibility="gone" />

--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
@@ -34,5 +34,4 @@
    <dimen name="module_main_event_panel_fragment_paddingLeft">18px</dimen>
    <dimen name="module_main_event_panel_fragment_paddingRight">18px</dimen>

-    <dimen name="module_main_id_warning_view_marginLeft">1530px</dimen>
 </resources>
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json
@@ -1,7 +1,7 @@
 {
  "type": 1,
-  "lat": 26.879062,
-  "lon": 112.568863,
+  "lat": 26.879024,
+  "lon": 112.568783,
  "distance": 2,
  "collisionLat": 26.8791769,
  "collisionLon": 112.56896496,