From 0089308e56859860672cad0728b89f6fa82ff837 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Fri, 11 Sep 2020 14:39:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?opt:=20adas=E7=AA=97=E5=8F=A3=E4=B8=8D?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/guide/MogoGuideProvider.kt  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
index 6258977faa..85262296c0 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.location.IMogoLocationListener
 import com.mogo.map.marker.IMogoMarkerClickListener
@@ -56,11 +57,12 @@ class MogoGuideProvider : IMogoModuleProvider {
     }
 
     override fun init(context: Context?) {
-        if (isDeviceOfD()) {
-            GuideBizManager.init()
-        } else {
-            Logger.d("MogoGuideProvider", "device type is not D")
-        }
+        Logger.d("MogoGuideProvider", "init====")
+//        if (DebugConfig.isLoadGuideModule()) {
+        GuideBizManager.init()
+//        } else {
+//            Logger.d("MogoGuideProvider", "device type is not D")
+//        }
 
     }
 

From a069837e75b833d18bd35c87bc18442a0a049d29 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 11 Sep 2020 14:43:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=A9=E6=B0=94?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84npe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/extensions/entrance/EntrancePresenter.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
index c4ca90cd05..5dc24ee1a3 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -71,9 +71,12 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
         if ( weatherInfo == null ) {
             return;
         }
-        String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() );
         Phenomena phenomena = Phenomena.getById( weatherInfo.getPhenomena() );
-        String desc = phenomena == null ? "" : phenomena.nameCn;
+        if ( phenomena == null ) {
+            return;
+        }
+        String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() );
+        String desc = phenomena.nameCn;
         int resId = phenomena.resId;
         mView.renderWeatherInfo( temp, desc, resId );
     }

From 392c03585cad3ca4ce60658e13eb4da023bc5a0b Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 11 Sep 2020 14:44:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?D=E7=83=AD=E5=BF=83=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/mogo-module-v2x/src/main/res/values/dimens.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 b049144d59..9f5a8fb1f3 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -55,8 +55,8 @@
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
-    <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">20px</dimen>
+    <dimen name="module_v2x_des_index_width">20px</dimen>
+    <dimen name="module_v2x_des_index_height">16px</dimen>
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>