From dcc8cc9892d6b7097138aa829e76accba38cb64f Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sun, 27 Sep 2020 14:09:29 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml | 2 +-
 modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index 94c233e74a..ad3974ab91 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
+    android:layout_height="wrap_content"
     android:background="@drawable/v2x_alert_window_bg"
     android:padding="@dimen/dp_25">
 
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 c87bb64112..e0a9f57de8 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
@@ -79,5 +79,5 @@
 
     <dimen name="share_item_text_size">16px</dimen>
     <dimen name="share_item_padding">20px</dimen>
-    <dimen name="module_v2x_widow_top_gaps">8px</dimen>
+    <dimen name="module_v2x_widow_top_gaps">6px</dimen>
 </resources>

From ab53eb0cd47d62db4231ffd0c4079e8d6ab2708b Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sun, 27 Sep 2020 15:03:41 +0800
Subject: [PATCH 2/6] ui-m4

---
 modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c87bb64112..a3d322e698 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
@@ -79,5 +79,5 @@
 
     <dimen name="share_item_text_size">16px</dimen>
     <dimen name="share_item_padding">20px</dimen>
-    <dimen name="module_v2x_widow_top_gaps">8px</dimen>
+    <dimen name="module_v2x_widow_top_gaps">3px</dimen>
 </resources>

From bff1bb9c78f2e5efce34dae5dc816e8b34a0d57f Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sun, 27 Sep 2020 15:11:23 +0800
Subject: [PATCH 3/6] ui-F

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

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 477387d351..16f90b3823 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
@@ -77,7 +77,6 @@
     <dimen name="module_v2x_panel_tab_height">158px</dimen>
     <dimen name="share_item_text_size">26px</dimen>
     <dimen name="share_item_padding">25px</dimen>
-
-    <dimen name="module_v2x_widow_top_gaps">0px</dimen>
+    <dimen name="module_v2x_widow_top_gaps">2px</dimen>
 
 </resources>

From 842a2406e07164243412c44cf4c1010d6662b4b1 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Sun, 27 Sep 2020 17:15:46 +0800
Subject: [PATCH 4/6] opt

---
 .../extensions/entrance/EntranceFragment.java      | 14 ++++++++------
 .../mogo/module/share/constant/ShareConstants.java |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 49392a87a6..d2cdb92a15 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -431,8 +431,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             } else {
                 Logger.d(TAG, " playShareOuterGuideVoice else interval = " + (time - intervalTime));
                 if ((time - intervalTime) > SEVEN_DAY_TIME) {
-                    SharedPrefsMgr.getInstance(getContext()).putLong(KEY_SHARE_OUTER_GUIDE_TIME, time);
-                    SharedPrefsMgr.getInstance(getContext()).putInt(KEY_SHARE_OUTER_GUIDE, ++shareItemSum);
                     if (shareItemSum == 1) {
                         AIAssist.getInstance(getContext()).speakTTSVoice(mOuterGuideVoiceStrings[1]);
                     } else if (shareItemSum == 2) {
@@ -444,6 +442,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                     } else if (shareItemSum == 5) {
                         AIAssist.getInstance(getContext()).speakTTSVoice(mOuterGuideVoiceStrings[2]);
                     }
+                    SharedPrefsMgr.getInstance(getContext()).putLong(KEY_SHARE_OUTER_GUIDE_TIME, time);
+                    SharedPrefsMgr.getInstance(getContext()).putInt(KEY_SHARE_OUTER_GUIDE, ++shareItemSum);
                 } else {
                     Logger.e(TAG, " playShareOuterGuideVoice else  < ONE_DAY_TIME ");
                 }
@@ -465,13 +465,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             } else {
                 Logger.d(TAG, " playShareGuideVoice else interval = " + (time - intervalTime));
                 if ((time - intervalTime) > ONE_DAY_TIME) {
-                    SharedPrefsMgr.getInstance(getContext()).putLong(KEY_CLICK_SHARE_TIME, time);
-                    SharedPrefsMgr.getInstance(getContext()).putInt(KEY_CLICK_SHARE_BUTTON, ++shareItemSum);
                     if (shareItemSum == 1) {
                         AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[1]);
                     } else {
                         AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[0]);
                     }
+
+                    SharedPrefsMgr.getInstance(getContext()).putLong(KEY_CLICK_SHARE_TIME, time);
+                    SharedPrefsMgr.getInstance(getContext()).putInt(KEY_CLICK_SHARE_BUTTON, ++shareItemSum);
                 } else {
                     Logger.e(TAG, " playShareGuideVoice else  < ONE_DAY_TIME ");
                 }
@@ -504,13 +505,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             } else {
                 Logger.d(TAG, " showSlideMapVoiceGuide else interval = " + (time - intervalTime));
                 if ((time - intervalTime) > ONE_DAY_TIME) {
-                    SharedPrefsMgr.getInstance(getContext()).putLong(KEY_SHARE_INNER_GUIDE_TIME, time);
-                    SharedPrefsMgr.getInstance(getContext()).putInt(KEY_SHARE_INNER_GUIDE, ++shareItemSum);
                     if (shareItemSum == 1) {
                         AIAssist.getInstance(getContext()).speakTTSVoice(mInnerGuideVoiceStrings[1]);
                     } else {
                         AIAssist.getInstance(getContext()).speakTTSVoice(mInnerGuideVoiceStrings[2]);
                     }
+                    SharedPrefsMgr.getInstance(getContext()).putLong(KEY_SHARE_INNER_GUIDE_TIME, time);
+                    SharedPrefsMgr.getInstance(getContext()).putInt(KEY_SHARE_INNER_GUIDE, ++shareItemSum);
+
                 } else {
                     Logger.e(TAG, " showSlideMapVoiceGuide else  < ONE_DAY_TIME ");
                 }
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
index 28ed0f468e..bfbb2fe379 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
@@ -115,8 +115,8 @@ public class ShareConstants {
     public static final int VOICE_ALERT_COUNT = 3;
 
     //1天的毫秒 TODO
-    public static final long ONE_DAY_TIME = 86400000;
-//    public static final long ONE_DAY_TIME = 60000;
+//    public static final long ONE_DAY_TIME = 86400000;
+    public static final long ONE_DAY_TIME = 60000;
 
     //7天的毫秒
     public static final long SEVEN_DAY_TIME = 604800000;

From 6eeef719842f9f1f31e631d38ccd21036b325d8c Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Sun, 27 Sep 2020 17:18:16 +0800
Subject: [PATCH 5/6] opt

---
 .../java/com/mogo/module/share/constant/ShareConstants.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
index bfbb2fe379..28ed0f468e 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
@@ -115,8 +115,8 @@ public class ShareConstants {
     public static final int VOICE_ALERT_COUNT = 3;
 
     //1天的毫秒 TODO
-//    public static final long ONE_DAY_TIME = 86400000;
-    public static final long ONE_DAY_TIME = 60000;
+    public static final long ONE_DAY_TIME = 86400000;
+//    public static final long ONE_DAY_TIME = 60000;
 
     //7天的毫秒
     public static final long SEVEN_DAY_TIME = 604800000;

From a531ec529ad8dbab3ed52a98680d9454c5c0d49d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Sun, 27 Sep 2020 17:48:46 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index fd51aa6146..c0deed1c08 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -53,9 +53,16 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     private val mV2XShareEventsFragment = V2XShareEventsFragment()
 
     companion object {
-        private val fragment = V2XEventPanelFragment()
+        private var fragment: V2XEventPanelFragment? = null
         fun getInstance(): V2XEventPanelFragment {
-            return fragment
+            if (fragment == null) {
+                synchronized(this) {
+                    if (fragment == null) {
+                        fragment = V2XEventPanelFragment()
+                    }
+                }
+            }
+            return fragment as V2XEventPanelFragment
         }
     }