From ddb60eed714c22a7a890f0978a6700572e66e05e Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sun, 29 Nov 2020 11:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=89=93=E5=BC=80=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E9=9D=A2=E6=9D=BF,=E9=9A=90=E8=97=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/module/main/SchemeIntent.java       | 1 +
 .../com/mogo/module/service/unwake/GlobalUnwakeManager.java    | 1 +
 .../src/main/res/layout/module_v2x_event_share_empty.xml       | 2 +-
 modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml    | 3 ++-
 modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml    | 2 +-
 modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml   | 3 ++-
 modules/mogo-module-v2x/src/main/res/values/dimens.xml         | 3 ++-
 7 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
index 09839d91eb..7c959c2012 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.mogo.map.MogoLatLng;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
index 691fbe525f..36f6a706b2 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
@@ -96,6 +96,7 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog
      * @param type 面板位置索引
      */
     private void showPanelByStatus(String target, int type){
+        MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
         if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) {
             MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type);
         } else {
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index d3bb0f90c1..edaa337156 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -9,7 +9,7 @@
         android:id="@+id/no_share_image"
         android:layout_width="@dimen/share_empty_icon_width"
         android:layout_height="@dimen/share_empty_icon_width"
-        android:layout_marginTop="30px"
+        android:layout_marginTop="@dimen/share_empty_margin_top"
         android:src="@drawable/icon_share_empty" />
 
     <TextView
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 3bd416c637..d6b4a75755 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -64,7 +64,8 @@
     <dimen name="des_text_margin_bottom">22px</dimen>
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>
-    <dimen name="shaer_refresh_padding">34px</dimen>
+    <dimen name="share_empty_margin_top">15px</dimen>
+    <dimen name="share_refresh_padding">34px</dimen>
     <dimen name="share_index_bottom_padding">15px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 3fabb9b780..a211bb52c0 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -65,7 +65,7 @@
     <dimen name="des_text_margin_bottom">22px</dimen>
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>
-    <dimen name="shaer_refresh_padding">34px</dimen>
+    <dimen name="share_refresh_padding">34px</dimen>
     <dimen name="share_index_bottom_padding">16px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index c9d80ab227..190ceeba56 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -62,7 +62,8 @@
     <dimen name="des_text_margin_bottom">48px</dimen>
     <dimen name="share_index_des_size">28px</dimen>
     <dimen name="share_empty_btn_padding">40px</dimen>
-    <dimen name="shaer_refresh_padding">60px</dimen>
+    <dimen name="share_empty_margin_top">30px</dimen>
+    <dimen name="share_refresh_padding">60px</dimen>
     <dimen name="share_index_bottom_padding">22px</dimen>
     <dimen name="share_btn_middle_padding">54px</dimen>
     <dimen name="v2x_panel_btn_translationY">-10px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index 79bc217c51..c371aabb58 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -60,7 +60,8 @@
     <dimen name="des_text_margin_bottom">22px</dimen>
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>
-    <dimen name="shaer_refresh_padding">34px</dimen>
+    <dimen name="share_empty_margin_top">20px</dimen>
+    <dimen name="share_refresh_padding">34px</dimen>
     <dimen name="share_index_bottom_padding">15px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>