From d2ee15f0d716efbe6053a76a1346a384b2aff080 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, 26 May 2021 16:57:46 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations.xml                   |  1 +
 .../res/raw/test_data_v2x_zuiyouluxian.json   | 72 ++++++++++---------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d8b..e497da9998 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json b/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
index 881ae6787a..d3c95b323c 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
@@ -1,44 +1,52 @@
 {
-  "current_lane_id": "1903",
+  "current_lane_id": "010",
   "current_lane_num": -2,
-  "most_lane_num": -3,
-  "most_speed": 8.0,
-  "road_id": "400139",
-  "sn": "F803EB2046PZD00149",
-  "locus_list": [
-    {
-      "lat": 39.974323417486,
-      "lon": 116.411520335961
-    },
-    {
-      "lat": 39.974407914698,
-      "lon": 116.411515520661
-    },
-    {
-      "lat": 39.974658553869,
-      "lon": 116.411505432781
-    },
-    {
-      "lat": 39.974881303401,
-      "lon": 116.411499467848
-    }
-  ],
   "gd_locus_list": [
     {
-      "lat": 39.975728,
-      "lon": 116.41777
+      "lat": 39.976285,
+      "lon": 116.417649
     },
     {
-      "lat": 39.975813,
-      "lon": 116.417765
+      "lat": 39.976341,
+      "lon": 116.417642
     },
     {
-      "lat": 39.976064,
-      "lon": 116.417755
+      "lat": 39.97637,
+      "lon": 116.417639
     },
     {
-      "lat": 39.976286,
-      "lon": 116.417749
+      "lat": 39.976397,
+      "lon": 116.417638
+    },
+    {
+      "lat": 39.976428,
+      "lon": 116.417637
     }
-  ]
+  ],
+  "locus_list": [
+    {
+      "lat": 39.974879535063,
+      "lon": 116.411399349271
+    },
+    {
+      "lat": 39.974936309753,
+      "lon": 116.411392282881
+    },
+    {
+      "lat": 39.974965397592,
+      "lon": 116.411389554398
+    },
+    {
+      "lat": 39.974992457492,
+      "lon": 116.411388118996
+    },
+    {
+      "lat": 39.975023263289,
+      "lon": 116.41138715302
+    }
+  ],
+  "most_lane_num": -1,
+  "most_speed": 9.0,
+  "road_id": "400140",
+  "sn": "F803EB2046PZD00207"
 }
\ No newline at end of file

From cd4bb5533946feaf5167b659ba191f75350f0870 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 26 May 2021 17:20:40 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E8=81=94=E6=83=B3=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E5=8C=85=E6=9B=BF=E6=8D=A2=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/mogo/launcher/MogoApplication.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index c8fddfdc81..bcfd7314b8 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -126,8 +126,7 @@ public class MogoApplication extends AbsMogoApplication {
         try {
             if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
                 Intent intent = new Intent();
-                intent.setComponent(new ComponentName("com.zhidao.speech.voice.pad",
-                        "com.zhidao.speech.MainActivity"));
+                intent.setComponent(new ComponentName("com.zhidao.speech", "com.zhidao.speech.MainActivity"));
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 startActivity(intent);
             }

From cbcd3ef771c4346e70295f1e8b94f89c0c2b1cc8 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, 26 May 2021 17:30:04 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=BC=80=E5=90=AFbugly=E5=9C=A8release?=
 =?UTF-8?q?=E7=9A=84=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/functions/crashreport.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/functions/crashreport.gradle b/app/functions/crashreport.gradle
index 9390b9e7ee..2462fb32a3 100644
--- a/app/functions/crashreport.gradle
+++ b/app/functions/crashreport.gradle
@@ -5,11 +5,11 @@ project.dependencies {
         implementation rootProject.ext.dependencies.crashreport
         implementation rootProject.ext.dependencies.crashreportupgrade
         debugImplementation rootProject.ext.dependencies.crashreportbugly
-        releaseImplementation rootProject.ext.dependencies.crashreportnoop
+        releaseImplementation rootProject.ext.dependencies.crashreportbugly
     } else {
         implementation project(':test:crashreport')
         implementation project(':test:crashreport-upgrade')
-        debugImplementation project(':test:crashreport-bugly')
-        releaseImplementation project(':test:crashreport-noop')
+        implementation project(':test:crashreport-bugly')
+        releaseImplementation project(':test:crashreport-bugly')
     }
 }
\ No newline at end of file

From c2930daf4accdcca625e8c1703acd4c885c0ab0b Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 26 May 2021 17:48:21 +0800
Subject: [PATCH 4/8] add map angle of view ui

---
 .../src/main/AndroidManifest.xml              |   4 +
 .../main/launcher/MainLauncherActivity.java   | 108 ++++++++++++++++++
 .../extensions/entrance/EntranceFragment.java |  10 +-
 .../res/drawable/module_switch_map_bg.xml     |   2 +-
 .../res/layout/module_ext_layout_entrance.xml |  41 +++++--
 .../res/values-xhdpi-1920x1000/dimens.xml     |   1 -
 .../res/values-xhdpi-2560x1440/dimens.xml     |   6 +-
 .../src/main/res/values/colors.xml            |   2 +-
 .../src/main/res/values/dimens.xml            |   7 +-
 .../src/main/res/values/strings.xml           |   3 +
 10 files changed, 164 insertions(+), 20 deletions(-)

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 bbca1838ed..f2a345d006 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
+++ b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.zhidao.mogo.module.main.launcher">
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
     <application>
         <activity
             android:name=".MainLauncherActivity"
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index c185d432fc..147c5f95c5 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -1,15 +1,24 @@
 package com.zhidao.mogo.module.main.launcher;
 
+import android.Manifest;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Process;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.debug.DebugConfig;
@@ -29,6 +38,7 @@ import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_T
 import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_LEFT;
 import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_RIGHT;
 import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP;
+import static com.mogo.utils.ProcessUtils.getPackageName;
 
 /**
  * 针对作为Launcher的情况，做个性化操作
@@ -50,6 +60,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         DebugConfig.setNeedRequestUserInfo(true);
         Log.d(TAG, "onCreate");
         mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this);
+        checkPermission();
     }
 
     @Override
@@ -248,4 +259,101 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
             mApps.setVisibility(View.VISIBLE);
         }
     }
+
+
+    private boolean isFirst = false;
+    private static final int MY_PERMISSION_REQUEST_CODE = 10000;
+
+    /**
+     * 检查是否有相应的权限
+     */
+    private void checkPermission() {
+        boolean isAllGranted = checkPermissionAllGranted(
+                new String[]{
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.ACCESS_FINE_LOCATION
+                }
+        );
+
+        if (isAllGranted) {
+            return;
+        }
+
+        /**
+         * 请求权限
+         */
+        ActivityCompat.requestPermissions(
+                this,
+                new String[]{
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.ACCESS_FINE_LOCATION
+                }, MY_PERMISSION_REQUEST_CODE);
+    }
+
+    /**
+     * 检查是否拥有指定的所有权限
+     */
+    private boolean checkPermissionAllGranted(String[] permissions) {
+        for (String permission : permissions) {
+            if (ContextCompat.checkSelfPermission(getContext(), permission) != PackageManager.PERMISSION_GRANTED) {
+                // 只要有一个权限没有被授予, 则直接返回 false
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 申请权限结果返回处理
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == MY_PERMISSION_REQUEST_CODE) {
+            boolean isAllGranted = true;
+            // 判断是否所有的权限都已经授予了
+            for (int grant : grantResults) {
+                if (grant != PackageManager.PERMISSION_GRANTED) {
+                    isAllGranted = false;
+                    break;
+                }
+            }
+            Log.d("liyz", "onRequestPermissionsResult isAllGranted = " + isAllGranted);
+            if (isAllGranted) {
+                isFirst = false;
+            } else {
+                // 弹出对话框告诉用户需要权限的原因, 并引导用户去应用权限管理中手动打开权限按钮
+                if (!isFirst) {
+                    openAppDetails();
+                    isFirst = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * 打开APP的详情设置
+     */
+    private void openAppDetails() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setMessage("请在 “应用信息 -> 权限” 中授予权限");
+        builder.setPositiveButton("手动授权", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Intent intent = new Intent();
+                intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                intent.addCategory(Intent.CATEGORY_DEFAULT);
+                intent.setData(Uri.parse("package:" + getPackageName()));
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+                intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+                startActivity(intent);
+            }
+        });
+        builder.setNegativeButton("取消", null);
+        builder.show();
+    }
+
 }
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 4e44318695..54f57fd348 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
@@ -18,6 +18,7 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
@@ -184,6 +185,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     //远景和中景的切换
     private ImageView mSwitchMapModeImage;
     private FrameLayout mSwitchMapModeLayout;
+    private TextView mSwitchText;
 
     /**
      * 搜索莫模块
@@ -376,9 +378,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         mSwitchMapModeLayout = (FrameLayout) findViewById(R.id.module_switch_model_layout);
         mSwitchMapModeImage = (ImageView) findViewById(R.id.module_switch_model_icon);
-        mSwitchMapModeImage.setOnClickListener(clickListener);
+        mSwitchMapModeLayout.setOnClickListener(clickListener);
+        mSwitchText = (TextView) findViewById(R.id.module_switch_model_text);
 
-        //TODO
         if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
             enterVrMode();
         }
@@ -1367,15 +1369,17 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                     // show panel
                     debugPanelGroup.setVisibility(View.VISIBLE);
                 }
-            } else if (v.getId() == R.id.module_switch_model_icon) { //切换地图的远近视图
+            } else if (v.getId() == R.id.module_switch_model_layout) { //切换地图的远近视图
                 if (MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getCurrentMapVisualAngle().isLongSight()) {
                     MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).visibleAllMarkers();
                     MogoApisHandler.getInstance().getApis().getMapServiceApi()
                             .getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT);
+                    mSwitchText.setText(R.string.module_map_model_normal);
                 } else if (MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getCurrentMapVisualAngle().isMediumSight()) {
                     MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).inVisibleAllMarkers();
                     MogoApisHandler.getInstance().getApis().getMapServiceApi()
                             .getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT);
+                    mSwitchText.setText(R.string.module_map_model_faster);
                 }
 
             }
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml
index 0b1b92b69c..11b87abc64 100644
--- a/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="26px" />
+    <corners android:radius="60px" />
 
     <solid android:color="@color/module_switch_map_bg" />
 
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 5ae16335a2..6e2af4a54a 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -45,26 +45,45 @@
 
     </FrameLayout>
 
-    <!--切换地图远近事件-->
+    <!--切换地图远近事件 @dimen/module_switch_map -->
     <FrameLayout
         android:id="@+id/module_switch_model_layout"
         android:layout_width="@dimen/module_switch_map"
-        android:layout_height="@dimen/module_switch_map"
+        android:layout_height="@dimen/module_switch_map_height"
         android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginBottom="26px"
+        android:background="@drawable/module_switch_map_bg"
         android:elevation="@dimen/dp_10"
         android:padding="@dimen/dp_20"
         android:visibility="gone"
-        android:background="@drawable/module_switch_map_bg"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent">
 
-    <ImageView
-        android:id="@+id/module_switch_model_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:src="@drawable/module_switch_map_angle" />
+        <LinearLayout
+            android:id="@+id/module_switch_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/module_switch_model_icon"
+                android:layout_width="@dimen/module_switch_image"
+                android:layout_height="@dimen/module_switch_image"
+                android:paddingLeft="@dimen/module_switch_margin_left"
+                android:layout_gravity="left|center_vertical"
+                android:src="@drawable/module_switch_map_angle" />
+
+            <TextView
+                android:id="@+id/module_switch_model_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/module_switch_margin_left"
+                android:textSize="@dimen/module_switch_text_size"
+                android:gravity="right|center"
+                android:text="@string/module_map_model_normal"
+                android:textColor="@color/module_ext_color_voice_text" />
+        </LinearLayout>
     </FrameLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 4bdcc21227..3bbf5549bb 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -163,6 +163,5 @@
     <dimen name="module_event_live_error_text_size">36px</dimen>
     <dimen name="module_video_window_height_content">393px</dimen>
     <dimen name="module_video_window_width_content">700px</dimen>
-    <dimen name="module_switch_map">108px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
index c317778eb9..a66eeed6a0 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -8,5 +8,9 @@
     <dimen name="module_ext_arcView_stroke_with">15px</dimen>
     <dimen name="module_ext_arcView_center_text_size">110px</dimen>
     <dimen name="module_ext_arcView_des_text_size">40px</dimen>
-    <dimen name="module_switch_map">145px</dimen>
+    <dimen name="module_switch_map">279px</dimen>
+    <dimen name="module_switch_map_height">119px</dimen>
+    <dimen name="module_switch_margin_left">22px</dimen>
+    <dimen name="module_switch_text_size">36px</dimen>
+    <dimen name="module_switch_image">50px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml
index 74cf309afe..66347a003a 100644
--- a/modules/mogo-module-extensions/src/main/res/values/colors.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml
@@ -14,5 +14,5 @@
 
     <color name="arc_speeding">#DB3137</color>
     <color name="arc_speed">#3E77F6</color>
-    <color name="module_switch_map_bg">#3B4577</color>
+    <color name="module_switch_map_bg">#323C6F</color>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index 54c5195205..b0d6433655 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -243,6 +243,9 @@
     <dimen name="module_ext_navi_in_vr_traffic_light_no_time_margin_top">11px</dimen>
     <dimen name="module_video_window_width_content">400px</dimen>
     <dimen name="module_video_window_height_content">300px</dimen>
-
-    <dimen name="module_switch_map">108px</dimen>
+    <dimen name="module_switch_map">279px</dimen>
+    <dimen name="module_switch_map_height">119px</dimen>
+    <dimen name="module_switch_margin_left">23px</dimen>
+    <dimen name="module_switch_text_size">35px</dimen>
+    <dimen name="module_switch_image">50px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml
index 65e4b58ae8..9b05b089d1 100644
--- a/modules/mogo-module-extensions/src/main/res/values/strings.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml
@@ -69,4 +69,7 @@
         <item>提前看看出行路况，试试唤醒小智说，“中关村路况怎么样”</item>
     </string-array>
 
+    <string name="module_map_model_normal">默认视角</string>
+    <string name="module_map_model_faster">远距视角</string>
+
 </resources>

From 10c79861b31241e724e9f921860853d0c26dccc9 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, 26 May 2021 21:37:06 +0800
Subject: [PATCH 5/8] =?UTF-8?q?1.0.0-vr-8.5.31=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=91=E6=99=AF=E5=88=87=E6=8D=A2=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=BC=80=E5=90=AF=E5=AE=9A=E4=BD=8D=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=20=E4=BF=AE=E6=94=B9=E6=A1=A5=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在Application 中 MapParams.init().setAutoLocation(false)关闭自动定位
mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.57392375608,26.830652231402)）切换近视角
---
 libraries/map-custom/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index d91b1cb832..bea3924d3d 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.29'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.31'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 

From 2b8664b50334f0601cfcc660faada4fef8383860 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 27 May 2021 10:45:33 +0800
Subject: [PATCH 6/8] opt

---
 .../src/main/AndroidManifest.xml                         | 1 +
 .../mogo/module/main/launcher/MainLauncherActivity.java  | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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 f2a345d006..0524f236a8 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
+++ b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application>
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index 147c5f95c5..1fcbab8c6f 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -59,8 +59,9 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         super.onCreate(savedInstanceState);
         DebugConfig.setNeedRequestUserInfo(true);
         Log.d(TAG, "onCreate");
+        Log.d("liyz", "MainLauncherActivity onCreate ------->");
         mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this);
-        checkPermission();
+//        checkPermission();
     }
 
     @Override
@@ -272,10 +273,11 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 new String[]{
                         Manifest.permission.READ_EXTERNAL_STORAGE,
                         Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS,
                         Manifest.permission.ACCESS_FINE_LOCATION
                 }
         );
-
+        Log.d("liyz", "MainLauncherActivity checkPermission -------> isAllGranted = " + isAllGranted);
         if (isAllGranted) {
             return;
         }
@@ -288,6 +290,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 new String[]{
                         Manifest.permission.READ_EXTERNAL_STORAGE,
                         Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS,
                         Manifest.permission.ACCESS_FINE_LOCATION
                 }, MY_PERMISSION_REQUEST_CODE);
     }
@@ -315,11 +318,13 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
             boolean isAllGranted = true;
             // 判断是否所有的权限都已经授予了
             for (int grant : grantResults) {
+                Log.d("liyz", "grant =" + grant);
                 if (grant != PackageManager.PERMISSION_GRANTED) {
                     isAllGranted = false;
                     break;
                 }
             }
+
             Log.d("liyz", "onRequestPermissionsResult isAllGranted = " + isAllGranted);
             if (isAllGranted) {
                 isFirst = false;

From f6f0ea5b79e2f0be23e806151511356c5564e3f3 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 27 May 2021 17:39:19 +0800
Subject: [PATCH 7/8] modify androidsdk version

---
 config.gradle                                 |   4 +-
 .../main/launcher/MainLauncherActivity.java   | 102 ------------------
 2 files changed, 2 insertions(+), 104 deletions(-)

diff --git a/config.gradle b/config.gradle
index ee642a7c90..45564447f1 100644
--- a/config.gradle
+++ b/config.gradle
@@ -12,8 +12,8 @@ ext {
             commonIndependentAmapApiValue  : "1c3fbc5f5e183619ffb1e7bc01e6751f",
             compileSdkVersion              : 28,
             buildToolsVersion              : "29.0.2",
-            minSdkVersion                  : 19,
-            targetSdkVersion               : 22,
+            minSdkVersion                  : 22,
+            targetSdkVersion               : 23,
     ]
     dependencies = [
             // androidx
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index 1fcbab8c6f..d16e2c13e5 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -59,9 +59,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         super.onCreate(savedInstanceState);
         DebugConfig.setNeedRequestUserInfo(true);
         Log.d(TAG, "onCreate");
-        Log.d("liyz", "MainLauncherActivity onCreate ------->");
         mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this);
-//        checkPermission();
     }
 
     @Override
@@ -261,104 +259,4 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         }
     }
 
-
-    private boolean isFirst = false;
-    private static final int MY_PERMISSION_REQUEST_CODE = 10000;
-
-    /**
-     * 检查是否有相应的权限
-     */
-    private void checkPermission() {
-        boolean isAllGranted = checkPermissionAllGranted(
-                new String[]{
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS,
-                        Manifest.permission.ACCESS_FINE_LOCATION
-                }
-        );
-        Log.d("liyz", "MainLauncherActivity checkPermission -------> isAllGranted = " + isAllGranted);
-        if (isAllGranted) {
-            return;
-        }
-
-        /**
-         * 请求权限
-         */
-        ActivityCompat.requestPermissions(
-                this,
-                new String[]{
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS,
-                        Manifest.permission.ACCESS_FINE_LOCATION
-                }, MY_PERMISSION_REQUEST_CODE);
-    }
-
-    /**
-     * 检查是否拥有指定的所有权限
-     */
-    private boolean checkPermissionAllGranted(String[] permissions) {
-        for (String permission : permissions) {
-            if (ContextCompat.checkSelfPermission(getContext(), permission) != PackageManager.PERMISSION_GRANTED) {
-                // 只要有一个权限没有被授予, 则直接返回 false
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * 申请权限结果返回处理
-     */
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == MY_PERMISSION_REQUEST_CODE) {
-            boolean isAllGranted = true;
-            // 判断是否所有的权限都已经授予了
-            for (int grant : grantResults) {
-                Log.d("liyz", "grant =" + grant);
-                if (grant != PackageManager.PERMISSION_GRANTED) {
-                    isAllGranted = false;
-                    break;
-                }
-            }
-
-            Log.d("liyz", "onRequestPermissionsResult isAllGranted = " + isAllGranted);
-            if (isAllGranted) {
-                isFirst = false;
-            } else {
-                // 弹出对话框告诉用户需要权限的原因, 并引导用户去应用权限管理中手动打开权限按钮
-                if (!isFirst) {
-                    openAppDetails();
-                    isFirst = true;
-                }
-            }
-        }
-    }
-
-    /**
-     * 打开APP的详情设置
-     */
-    private void openAppDetails() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage("请在 “应用信息 -> 权限” 中授予权限");
-        builder.setPositiveButton("手动授权", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                Intent intent = new Intent();
-                intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                intent.addCategory(Intent.CATEGORY_DEFAULT);
-                intent.setData(Uri.parse("package:" + getPackageName()));
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
-                intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-                startActivity(intent);
-            }
-        });
-        builder.setNegativeButton("取消", null);
-        builder.show();
-    }
-
 }

From fe3426cde461f9d671660a48ba5282fea26f7ccc Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 27 May 2021 20:04:42 +0800
Subject: [PATCH 8/8] opt code

---
 .../java/com/zhidao/roadcondition/service/MainService.kt  | 8 ++++++--
 .../mogo/module/extensions/entrance/EntranceFragment.java | 2 +-
 .../com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
index 46bc7c564d..3c339eba5f 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -91,8 +91,12 @@ class MainService : Service() {
         CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext)
                 .init(BuildConfig.APPLICATION_ID, 0)
         serviceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(this) as IMogoServiceApis
-        speed = serviceApis.mapServiceApi.getSingletonLocationClient(this).lastKnowLocation.speed
-        Log.d(TAG, "onStartCommand speed = $speed")
+        if (serviceApis.mapServiceApi.getSingletonLocationClient(this) != null &&
+                serviceApis.mapServiceApi.getSingletonLocationClient(this).lastKnowLocation != null) {
+            speed = serviceApis.mapServiceApi.getSingletonLocationClient(this).lastKnowLocation.speed
+            Log.d(TAG, "onStartCommand speed = $speed")
+        }
+
         if (intent != null) {
             params = intent.getParcelableExtra("params")
             params?.let {
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 54f57fd348..eae621aebe 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
@@ -726,7 +726,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         // 进入vr模式，不可缩放地图
         if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
-            UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_000L );
+            UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_500L );
         }
 
         mClickShareVoiceStrings =
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 6928b349a0..783a7772f3 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
@@ -245,8 +245,11 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
                     R.dimen.module_v2x_event_panel_btn_x
                 })
                 val y = resources.getDimensionPixelSize(R.dimen.module_v2x_event_panel_btn_y)
-                V2XServiceManager.getMogoEntranceButtonController()
-                        .addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
+
+                if (V2XServiceManager.getMogoEntranceButtonController() != null) {
+                    V2XServiceManager.getMogoEntranceButtonController()
+                            .addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
+                }
                 mV2XEventPanelHistoryCountView?.visibility = if (MogoApisHandler.getInstance().apis.statusManagerApi.isVrMode) {
                     View.GONE
                 }else{