From 58e5bb6b0d5ed368dfef0b88dc9645cbcca572d4 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 19 Aug 2020 17:08:09 +0800
Subject: [PATCH 01/12] opt ui

---
 .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java  | 4 ++--
 .../res/layout/module_event_panel_fragment_surrounding.xml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index ade0f4c4bf..eb784416f2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -181,8 +181,8 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             String originStr = String.format(getContext().getResources().getString(R.string.v2x_surrounding_top_brief), exploreWayList.size());
             SpannableString spannableString = new SpannableString(originStr);
             spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#459DFF")), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            //设置字体大小，true表示前面的字体大小20单位为dip
-            spannableString.setSpan(new AbsoluteSizeSpan(38, true), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            //设置字体大小，true表示前面的字体大小 dip
+            spannableString.setSpan(new AbsoluteSizeSpan(46, true), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             spannableString.setSpan(new StyleSpan(Typeface.NORMAL), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             mTotalTv.setText(spannableString);
         } else {
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index 58553bf763..f96911d38e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/tv_brief"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
+                android:gravity="top"
                 android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
                 android:text="周围5公里，共15条交通信息"
                 android:textColor="@color/white"
@@ -48,12 +48,12 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/layout_top"
             android:layout_marginLeft="@dimen/module_v2x_surrounding_root_margin_left"
-            android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
             android:layout_marginRight="@dimen/module_v2x_surrounding_root_margin_left"
             android:layout_marginBottom="@dimen/module_v2x_surrounding_margin_left">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/surrounding_recycleview"
+                android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="visible" />

From 7ef2d72f163abf8f2c7d31483b2993580b36d59a Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 19 Aug 2020 17:14:28 +0800
Subject: [PATCH 02/12] ui

---
 .../com/mogo/module/v2x/adapter/V2XShareEventAdapter.java    | 1 -
 .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java | 5 +++++
 .../main/res/layout/module_v2x_event_share_description.xml   | 2 +-
 modules/mogo-module-v2x/src/main/res/values/style.xml        | 5 ++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index d13325056c..9412e5dc79 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -48,7 +48,6 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         if (viewType == V2XShareEventItemEnum.ITEM_TYPE_NUM_DES) {
             View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_description, parent,
                     false);
-            v.getBackground().setAlpha((int) 0.7);
             shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
             return holder;
         } else if (viewType == V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 07409ff4b3..6343fae9e7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -108,7 +108,12 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
 
             @Override
             public void onFail(String msg) {
+                if (dataArrayList.size() > 0) {
+                    dataArrayList.clear();
+                    adapter.notifyDataSetChanged();
+                }
                 loadingView.stopWithError(msg, View.VISIBLE);
+
                 loadingView.refresButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
index e9d00092d3..90a57dcea2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="20px"
     android:layout_marginRight="20px"
-    android:layout_marginBottom="16px"
+    android:layout_marginBottom="14px"
     android:background="@drawable/bg_v2x_event_description"
     android:orientation="vertical">
 
diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml
index e7ecb3aa03..f6fc71f93c 100644
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -7,9 +7,8 @@
     <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
         <item name="android:minHeight">16px</item>
         <item name="android:maxHeight">16px</item>
-        <item name="android:maxWidth">19px</item>
-        <item name="android:minWidth">19px</item>
-        <item name="android:spacing">4px</item>
+        <item name="android:maxWidth">20px</item>
+        <item name="android:minWidth">20px</item>
         <item name="android:numStars">5</item>
         <item name="android:rating">1</item>
         <item name="android:stepSize">0.5</item>

From b56a5d71e9ada6dcf907b108ba1b79e77e0940ef 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, 19 Aug 2020 19:29:00 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=89=A7=E4=B8=AD=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/item_v2x_scennario_history_other_help.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
index 742913252d..bc036adf46 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
@@ -54,6 +54,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginTop="@dimen/dp_21"
         android:layout_marginEnd="@dimen/dp_31"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
         app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
         app:layout_constraintStart_toStartOf="@+id/tagEventType"
         app:layout_constraintTop_toBottomOf="@+id/tagEventType"

From 7b3c69cb1a03349e27a8b6ba5df9ad0f1e7652f4 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 20 Aug 2020 09:51:29 +0800
Subject: [PATCH 04/12] opt

---
 .../src/main/AndroidManifest.xml              |  8 ----
 .../module/tanlu/receiver/NetWorkReceiver.kt  | 43 -------------------
 2 files changed, 51 deletions(-)
 delete mode 100644 modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/NetWorkReceiver.kt

diff --git a/modules/mogo-module-tanlu/src/main/AndroidManifest.xml b/modules/mogo-module-tanlu/src/main/AndroidManifest.xml
index 1c2b75eee1..4337c2942a 100644
--- a/modules/mogo-module-tanlu/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-tanlu/src/main/AndroidManifest.xml
@@ -42,14 +42,6 @@
                 <category android:name="android.intent.category.HOME" />
             </intent-filter>
         </receiver>
-
-        <receiver android:name=".receiver.NetWorkReceiver">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
-                <action android:name="android.net.wifi.STATE_CHANGE" />
-            </intent-filter>
-        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/NetWorkReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/NetWorkReceiver.kt
deleted file mode 100644
index d29f26bb9e..0000000000
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/NetWorkReceiver.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mogo.module.tanlu.receiver
-
-import android.Manifest
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.util.Log
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import com.mogo.module.tanlu.util.NetworkUtil
-
-/**
- * @description 网络改变监听
- *
- * @author lixiaopeng
- * @since  2019-10-17
- */
-class NetWorkReceiver : BroadcastReceiver() {
-    private var isConnect = true
-
-    override fun onReceive(context: Context, intent: Intent?) {
-        if (ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.ACCESS_NETWORK_STATE
-            ) === PackageManager.PERMISSION_GRANTED
-        ) {
-            if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
-                isConnect = NetworkUtil.isConnected(context)
-            } else {
-                isConnect = NetworkUtil.isConnectedV21(context)
-            }
-        }
-
-//        if (!isConnect) {
-//            Toast.makeText(context, "网络已断开，请检查网络", Toast.LENGTH_SHORT).show()
-//            //TODO
-//
-//        }
-
-    }
-
-}
\ No newline at end of file

From c73541dd1070af4fc9abaea8c7c44b793e1922e3 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Thu, 20 Aug 2020 15:30:50 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Monitor=E4=B8=BABaseMod?=
 =?UTF-8?q?ule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/mogo/launcher/MogoApplication.java        | 2 ++
 .../com/zhidao/mogo/module/monitor/MogoMonitorProvider.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 9fe3dd3a05..ce003d4ca1 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -75,6 +75,8 @@ public class MogoApplication extends AbsMogoApplication {
 
         MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) );
         MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME ) );
+        MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_MOGO_MONITOR,
+                "MogoMonitor"));
         MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) );
         MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) );
 
diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
index b61b845b08..593592baca 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
@@ -51,6 +51,7 @@ public class MogoMonitorProvider implements IMogoMonitorProvider,
         IMogoServiceApis apis =
                 (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
         apis.getSocketManagerApi(context).registerOnMessageListener(MogoMonitorConst.LOG_PUSH_TYPE, this);
+        startRemoteCtrl();
     }
 
     private void startRemoteCtrl(){
@@ -68,7 +69,6 @@ public class MogoMonitorProvider implements IMogoMonitorProvider,
         this.context = context;
         logDebugDialog = new LogDebugDialog(context);
         logDebugDialog.setDialogListener(this);
-        startRemoteCtrl();
     }
 
     @Override

From 19a9e52612dd6f8a36827b67fc7a053d916a882e Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Thu, 20 Aug 2020 16:58:55 +0800
Subject: [PATCH 06/12] crash fix

---
 .../src/main/java/com/mogo/module/main/MainActivity.java    | 6 +++---
 .../com/zhidao/mogo/module/monitor/MogoMonitorProvider.java | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 7975e3c195..0c97508d87 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -174,9 +174,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         } );
 
         // 初始化MonitorModule
-        IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this);
-        monitorProvider.resetActivityContext(this);
-
+//        IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this);
+//        monitorProvider.resetActivityContext(this);
+        mServiceApis.getMogoMonitorApi().resetActivityContext(this);
     }
 
     private void startBaseService() {
diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
index 593592baca..133fd25bd5 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
@@ -48,6 +48,7 @@ public class MogoMonitorProvider implements IMogoMonitorProvider,
 
     @Override
     public void init(Context context) {
+        this.context = context;
         IMogoServiceApis apis =
                 (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
         apis.getSocketManagerApi(context).registerOnMessageListener(MogoMonitorConst.LOG_PUSH_TYPE, this);

From 820e323a2e9db9afe6c49be30738dec4b78a9189 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 21 Aug 2020 15:22:12 +0800
Subject: [PATCH 07/12] =?UTF-8?q?1.=20=E7=A6=81=E6=AD=A2=E5=88=86=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                  |  3 +++
 .../src/main/AndroidManifest.xml                  |  2 +-
 .../main/independent/MainIndependentActivity.java | 15 ++++++++++++++-
 .../src/main/AndroidManifest.xml                  |  2 +-
 .../mogo-module-apps/src/main/AndroidManifest.xml |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21e549a0e5..dd500f64d8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:label="@string/app_shell_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.App"
+        android:resizeableActivity="false"
         tools:replace="android:label">
         <meta-data
             android:name="com.amap.api.v2.apikey"
@@ -28,6 +29,8 @@
 
         <activity
             android:name="com.zhidao.boot.persistent.lib.PersistentAliveActivity"
+            android:screenOrientation="landscape"
+            android:resizeableActivity="false"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
     </application>
 
diff --git a/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml b/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml
index 0d4d401316..965be80a22 100644
--- a/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml
+++ b/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
         android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
         android:enabled="true"
         android:launchMode="singleInstance"
-        android:resizeableActivity="true"
+        android:resizeableActivity="false"
         android:resumeWhilePausing="true"
         android:screenOrientation="landscape"
         android:stateNotNeeded="true"
diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
index 6eb8f5fe61..3da48ac1f3 100644
--- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
+++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
@@ -1,14 +1,16 @@
 package com.zhidao.mogo.module.main.independent;
 
+import android.annotation.TargetApi;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.map.CustomNaviInterrupter;
 import com.mogo.module.main.MainActivity;
+import com.mogo.utils.TipToast;
 
 /**
  * 针对独立应用形式，做单独定制
@@ -47,8 +49,19 @@ public class MainIndependentActivity extends MainActivity {
         if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) {
             mServiceApis.getAdasControllerApi().setUseAlgorithm( true );
         }
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+            fixInMultiWindowMode();
+        }
     }
 
+    @TargetApi( Build.VERSION_CODES.N )
+    private void fixInMultiWindowMode(){
+        if ( isInMultiWindowMode() ) {
+            TipToast.shortTip( R.string.module_main_unsupport_multi_window_mode );
+        }
+    }
+
+
     @Override
     protected void onPause() {
         super.onPause();
diff --git a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
index b59a0bf53e..bbca1838ed 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
+++ b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
             android:launchMode="singleInstance"
-            android:resizeableActivity="true"
+            android:resizeableActivity="false"
             android:resumeWhilePausing="true"
             android:screenOrientation="landscape"
             android:stateNotNeeded="true"
diff --git a/modules/mogo-module-apps/src/main/AndroidManifest.xml b/modules/mogo-module-apps/src/main/AndroidManifest.xml
index d6de6be910..711a26f5af 100644
--- a/modules/mogo-module-apps/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-apps/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
             android:name=".AppsListActivity"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:launchMode="singleTask"
-            android:resizeableActivity="true"
+            android:resizeableActivity="false"
             android:resumeWhilePausing="true"
             android:screenOrientation="landscape"
             android:stateNotNeeded="true"

From 98445dec5028b17d52fde217ab7b76e95f5465a9 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 21 Aug 2020 19:29:12 +0800
Subject: [PATCH 08/12] =?UTF-8?q?1.=20=E6=95=B4=E7=90=86=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=202.=20=E6=96=B0=E5=A2=9Elauncher1.0=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                      |  3 +--
 config.gradle                                     | 12 +++++++-----
 libraries/tanlulib/build.gradle                   | 12 +++++-------
 .../com/zhidao/roadcondition/ExampleUnitTest.kt   |  0
 modules/mogo-module-search/build.gradle           |  2 +-
 .../launchercard/LauncherCardRefresher.java       | 15 +++++++++------
 modules/mogo-module-tanlu/build.gradle            | 10 +++-------
 7 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 libraries/tanlulib/src/test/java/com/zhidao/roadcondition/ExampleUnitTest.kt

diff --git a/build.gradle b/build.gradle
index 32a0f5815c..d210cb3ce4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,6 @@ apply from: "config.gradle"
 apply from: "javadoc.gradle"
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
     repositories {
         maven {
             url 'http://maven.aliyun.com/nexus/content/groups/public/'
@@ -19,7 +18,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71'
         classpath "com.alibaba:arouter-register:1.0.2"
         classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/config.gradle b/config.gradle
index 6714fbfaaf..436b7c6281 100644
--- a/config.gradle
+++ b/config.gradle
@@ -1,6 +1,6 @@
 ext {
     time = ""
-
+    kotlin_version = "1.3.71"
     android = [
 //            applicationId       : "com.mogo.launcher",
 //            zhidadoApplicationId: "com.zhidao.launcher",
@@ -20,8 +20,8 @@ ext {
 
     dependencies = [
             // androidx
-            androidxappcompat        : "androidx.appcompat:appcompat:1.0.2",
-            androidxccorektx         : "androidx.core:core-ktx:1.2.0",
+            androidxappcompat        : "androidx.appcompat:appcompat:1.1.0",
+            androidxccorektx         : "androidx.core:core-ktx:1.3.0",
             androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:1.1.3",
             boostmultidex            : "com.bytedance.boost_multidex:boost_multidex:1.0.1",
             androidxviewpager2       : "androidx.viewpager2:viewpager2:1.0.0",
@@ -141,7 +141,7 @@ ext {
             accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.11",
             // crash
             crashSdk                 : "com.zhidaoauto.crash.log:library:1.0.5",
-            kotlinstdlibjdk7         : "org.jetbrains.kotlin:kotlin-stdlib-jdk7",
+            kotlinstdlibjdk7         : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",
 
             //探路
             videoarmv7               : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2",
@@ -196,6 +196,8 @@ ext {
             androidxroomktx          : "androidx.room:room-ktx:2.2.3",
 
             //
-            mogomodulewidgets          : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}",
+            mogomodulewidgets        : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}",
+
+            kotlingradleplugin       : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
     ]
 }
\ No newline at end of file
diff --git a/libraries/tanlulib/build.gradle b/libraries/tanlulib/build.gradle
index cf297b1c10..de83c92c42 100644
--- a/libraries/tanlulib/build.gradle
+++ b/libraries/tanlulib/build.gradle
@@ -39,13 +39,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'com.zhidaoauto.common:service:1.0.4.10'
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.aiassist
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
     implementation 'com.zhidaoauto.controller:api:1.0.8'
@@ -53,6 +50,7 @@ dependencies {
     implementation 'com.zhidao.video:video-processor:1.0.2.1'
     implementation 'com.foundation.utils:common-utils:1.0.7'
 
+    implementation rootProject.ext.dependencies.eventbus
     compileOnly rootProject.ext.dependencies.mogocommons
     implementation rootProject.ext.dependencies.eventbus
     implementation rootProject.ext.dependencies.coroutinescore
diff --git a/libraries/tanlulib/src/test/java/com/zhidao/roadcondition/ExampleUnitTest.kt b/libraries/tanlulib/src/test/java/com/zhidao/roadcondition/ExampleUnitTest.kt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle
index 53027f6e57..b5b990719a 100644
--- a/modules/mogo-module-search/build.gradle
+++ b/modules/mogo-module-search/build.gradle
@@ -49,6 +49,7 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxcardview
     kapt rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.rxandroid
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
 
 
     if (Boolean.valueOf(RELEASE)) {
@@ -66,7 +67,6 @@ dependencies {
         implementation project(':modules:mogo-module-common')
         implementation project(':modules:mogo-module-gps-simulator')
     }
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'com.zhidaoauto.voice.controller:api:1.0.2'
 
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index 58fd0037ea..afae482a97 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -223,14 +223,16 @@ class LauncherCardRefresher {
             if ( response.getResult().getExploreWay() == null || response.getResult().getExploreWay().isEmpty() ) {
                 return false;
             }
-            speakTTS( String.format( tts, response.getResult().getExploreWay().size(), mRefreshStrategy.getDesc() ) );
-            notifyLauncherCard( String.format( info, response.getResult().getExploreWay().size(), mRefreshStrategy.getDesc() ) );
+            int size = response.getResult().getExploreWay().size();
+            speakTTS( String.format( tts, size, mRefreshStrategy.getDesc() ) );
+            notifyLauncherCard( String.format( info, size, mRefreshStrategy.getDesc() ), size );
         } else {
             if ( response.getResult().getOnlineCar() == null || response.getResult().getOnlineCar().isEmpty() ) {
                 return false;
             }
-            speakTTS( String.format( tts, response.getResult().getOnlineCar().size(), mRefreshStrategy.getDesc() ) );
-            notifyLauncherCard( String.format( info, response.getResult().getOnlineCar().size(), mRefreshStrategy.getDesc() ) );
+            int size = response.getResult().getOnlineCar().size();
+            speakTTS( String.format( tts, size, mRefreshStrategy.getDesc() ) );
+            notifyLauncherCard( String.format( info, size, mRefreshStrategy.getDesc() ), size );
         }
         return true;
     }
@@ -243,11 +245,12 @@ class LauncherCardRefresher {
         AIAssist.getInstance( mContext ).speakTTSVoice( msg );
     }
 
-    private void notifyLauncherCard( String info ) {
+    private void notifyLauncherCard( String info, int amount ) {
         Intent intent = new Intent( "com.mogo.launcher.v2x" );
         intent.putExtra( "v2x_warning_type", 20000 );
-        intent.putExtra( "v2x_warining_timeout", 20 );
+        intent.putExtra( "v2x_warining_timeout", 20 * 1000L );
         intent.putExtra( "v2x_warning_tts", "" );
+        intent.putExtra( "v2x_warning_eventCount", amount );
         intent.putExtra( "v2x_warning_info", info );
         mContext.sendBroadcast( intent );
     }
diff --git a/modules/mogo-module-tanlu/build.gradle b/modules/mogo-module-tanlu/build.gradle
index f28f498553..fb48f1e204 100644
--- a/modules/mogo-module-tanlu/build.gradle
+++ b/modules/mogo-module-tanlu/build.gradle
@@ -42,13 +42,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxrecyclerview
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.arouter
     annotationProcessor rootProject.ext.dependencies.aroutercompiler

From 95d282b377c03aaa123cda5ffe6356e00d0d8958 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 21 Aug 2020 20:20:20 +0800
Subject: [PATCH 09/12] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../launchercard/LauncherCardRefresher.java     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index afae482a97..90987517d1 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -39,8 +39,8 @@ class LauncherCardRefresher {
 
     public static final int MSG_REFRESH = 2020;
     public static final int MSG_TTS_TIP = 2021;
-    public static final long ONE_MINUTE = 60 * 1000L;
-    public static final long HALF_ONE_MINUTE = 30 * 1000L;
+    public static final long ONE_MINUTE = 15 * 1000L;
+    public static final long ONE_DAY = 24 * 60 * ONE_MINUTE;
 
     private LauncherCardRefresher( Context context ) {
         mContext = context;
@@ -117,7 +117,7 @@ class LauncherCardRefresher {
         int counter = SharedPrefsMgr.getInstance( mContext ).getInt( KEY_LauncherCardTipCounter, 0 );
         if ( counter >= 5 ) {
             long lastTipTime = SharedPrefsMgr.getInstance( mContext ).getLong( KEY_LauncherCardTipLastTipTime, 0L );
-            if ( System.currentTimeMillis() - lastTipTime < /*10 * 24 * 60 **/ ONE_MINUTE ) {
+            if ( System.currentTimeMillis() - lastTipTime < 10 * ONE_DAY ) {
                 stop();
                 return;
             } else {
@@ -224,15 +224,15 @@ class LauncherCardRefresher {
                 return false;
             }
             int size = response.getResult().getExploreWay().size();
-            speakTTS( String.format( tts, size, mRefreshStrategy.getDesc() ) );
-            notifyLauncherCard( String.format( info, size, mRefreshStrategy.getDesc() ), size );
+            speakTTS( tts = String.format( tts, size, mRefreshStrategy.getDesc() ) );
+            notifyLauncherCard( String.format( info, size, mRefreshStrategy.getDesc() ), size, tts );
         } else {
             if ( response.getResult().getOnlineCar() == null || response.getResult().getOnlineCar().isEmpty() ) {
                 return false;
             }
             int size = response.getResult().getOnlineCar().size();
-            speakTTS( String.format( tts, size, mRefreshStrategy.getDesc() ) );
-            notifyLauncherCard( String.format( info, size, mRefreshStrategy.getDesc() ), size );
+            speakTTS( tts = String.format( tts, size, mRefreshStrategy.getDesc() ) );
+            notifyLauncherCard( String.format( info, size, mRefreshStrategy.getDesc() ), size , tts);
         }
         return true;
     }
@@ -245,7 +245,7 @@ class LauncherCardRefresher {
         AIAssist.getInstance( mContext ).speakTTSVoice( msg );
     }
 
-    private void notifyLauncherCard( String info, int amount ) {
+    private void notifyLauncherCard( String info, int amount, String tts ) {
         Intent intent = new Intent( "com.mogo.launcher.v2x" );
         intent.putExtra( "v2x_warning_type", 20000 );
         intent.putExtra( "v2x_warining_timeout", 20 * 1000L );
@@ -253,6 +253,7 @@ class LauncherCardRefresher {
         intent.putExtra( "v2x_warning_eventCount", amount );
         intent.putExtra( "v2x_warning_info", info );
         mContext.sendBroadcast( intent );
+        Logger.d( TAG, "发送广播到桌面卡片." );
     }
 
     private void playTTS() {

From 998eab6d8beb205c506f90973cc6782ff7567234 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 21 Aug 2020 21:21:26 +0800
Subject: [PATCH 10/12] 1. merge 2. bugfix

---
 .../independent/MainIndependentActivity.java     |  2 +-
 .../src/main/res/values/strings.xml              |  2 +-
 .../launchercard/LauncherCardRefresher.java      |  6 +++---
 .../scenario/scene/seek/V2XSeekHelpDialog.java   | 16 +++++++---------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
index 3da48ac1f3..5e8642fa01 100644
--- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
+++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
@@ -57,7 +57,7 @@ public class MainIndependentActivity extends MainActivity {
     @TargetApi( Build.VERSION_CODES.N )
     private void fixInMultiWindowMode(){
         if ( isInMultiWindowMode() ) {
-            TipToast.shortTip( R.string.module_main_unsupport_multi_window_mode );
+            TipToast.shortTip( R.string.module_main_un_support_multi_window_mode );
         }
     }
 
diff --git a/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml b/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml
index 472f7c8136..3eade77337 100644
--- a/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml
+++ b/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="module_main_unsupport_multi_window_mode">应用不支持分屏</string>
+    <string name="module_main_un_support_multi_window_mode">应用不支持分屏</string>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index 90987517d1..825c071feb 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -247,9 +247,9 @@ class LauncherCardRefresher {
 
     private void notifyLauncherCard( String info, int amount, String tts ) {
         Intent intent = new Intent( "com.mogo.launcher.v2x" );
-        intent.putExtra( "v2x_warning_type", 20000 );
-        intent.putExtra( "v2x_warining_timeout", 20 * 1000L );
-        intent.putExtra( "v2x_warning_tts", "" );
+        intent.putExtra( "v2x_warning_type", "20000" );
+        intent.putExtra( "v2x_warining_timeout", 20 * 1000 );
+        intent.putExtra( "v2x_warning_tts", tts );
         intent.putExtra( "v2x_warning_eventCount", amount );
         intent.putExtra( "v2x_warning_info", info );
         mContext.sendBroadcast( intent );
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
index f75ff027e4..e88c985170 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
@@ -79,22 +79,20 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL
         void onClickRight();
     }
 
-    private boolean isShown;
     private WindowManagerView windowManager;
 
     public void show() {
         try {
             Logger.d(TAG, "使用windowManager实现");
-            if (!isShown) {
+            if ( windowManager == null ) {
                 windowManager = new WindowManagerView.Builder(
                         V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2).getContext()
                 ).contentView(this).build();
-                windowManager.show();
-                isShown = true;
-                AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗");
-                unRegisterVoiceCmd();
-                registerVoiceCmd();
             }
+            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗");
+            unRegisterVoiceCmd();
+            registerVoiceCmd();
+            windowManager.show();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -111,10 +109,10 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL
     };
 
     public void dismiss() {
-        if (isShown && windowManager != null) {
+        if (windowManager != null) {
             windowManager.dismiss();
-            isShown = false;
         }
+        windowManager = null;
     }
 
     //放弃求助

From 92ec5a0bfc0200335f73b097c03a7984e17a1025 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Mon, 24 Aug 2020 10:57:04 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20d8xx->d80x,=20f8xx->?=
 =?UTF-8?q?f80x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle   | 28 ++++++++++++++++++++++++++++
 app/regroup.gradle |  4 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e543390155..4a9dd4dfa3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -110,6 +110,20 @@ android {
             // 是否使用高德sdk自定义导航
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
         }
+        // f系列-分体机
+        f80x {
+            applicationId rootProject.ext.android.fLauncherApplicationId
+            dimension "product"
+            // 使用思必驰语音
+            buildConfigField 'int', 'AIType', '2'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+        }
         // e系列，采用Launcher方案
         e8xx {
             applicationId rootProject.ext.android.launcherApplicationId
@@ -180,6 +194,20 @@ android {
             // 是否使用高德sdk自定义导航
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
         }
+        // d系列 2 + 32
+        d80x {
+            applicationId rootProject.ext.android.independentApplicationId
+            dimension "product"
+            // 使用同行者语音
+            buildConfigField 'int', 'AIType', '1'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+        }
         // d系列 1+16 版本
         d82x {
             applicationId rootProject.ext.android.independentApplicationId
diff --git a/app/regroup.gradle b/app/regroup.gradle
index 4b3e0ba638..a30fe32197 100644
--- a/app/regroup.gradle
+++ b/app/regroup.gradle
@@ -2,8 +2,8 @@
 
 afterEvaluate {
 
-    def independent = ["em3", "em1", "d8xx", "d82x", "bydauto"]
-    def launcher = ["f8xx", "em4"]
+    def independent = ["em3", "em1", "d80x", "d82x", "bydauto"]
+    def launcher = ["f80x", "em4"]
 
     it.getTasks().iterator().forEachRemaining {
         def task = it

From b19d4e21e4e128e80fe7fa7fad8ced47dc24af9a Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 24 Aug 2020 11:31:00 +0800
Subject: [PATCH 12/12] msg

---
 .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 6343fae9e7..961a08bc2a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -205,7 +205,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
 
             @Override
             public void onFail(String msg) {
-                loadingView.stopWithError(msg, View.INVISIBLE);
+                loadingView.stopWithError("网络异常，点击刷新重试", View.INVISIBLE);
             }
         });
     }