From 5420c7e4ed581cc80dfaae7f88e66650b5996f80 Mon Sep 17 00:00:00 2001
From: zhangyuanzhen <zhangyuanzhen@zhidaoauto.com>
Date: Wed, 1 Apr 2020 18:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B4=A9=E6=BA=83=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/apps/AppNavigatorFragment.java     |  2 +-
 .../DiscreteScrollLayoutManager.java                   |  6 +++++-
 .../main/java/com/mogo/module/map/MapPresenter.java    | 10 +++++++++-
 .../mogo/module/navi/ui/search/ChoosePathFragment.kt   |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
index ef7e10856d..e77c4cd5f0 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
@@ -268,7 +268,7 @@ public class AppNavigatorFragment extends MvpFragment<AppNavigatorView, AppNavig
 
         if (Math.abs(index) == 1) {
             scroller.smoothScrollBy(getResources().getDimensionPixelSize(R.dimen.dp_137) * index,
-                0);
+                0,null,10);
         } else {
             layoutManager.startSmoothPendingScroll(layoutManager.getCurrentPosition() + index);
         }
diff --git a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java
index a8578f5df8..777d950bed 100644
--- a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java
+++ b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java
@@ -392,7 +392,7 @@ public class DiscreteScrollLayoutManager extends LinearLayoutManager {
                 @Override
                 protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
                     // 返回：滑过1px时经历的时间(ms)。
-                    return 150f / displayMetrics.densityDpi;
+                    return 10f / displayMetrics.densityDpi;
                 }
 
                 @Override
@@ -810,6 +810,10 @@ public class DiscreteScrollLayoutManager extends LinearLayoutManager {
                     orientationHelper.getPendingDx(pendingScroll),
                     orientationHelper.getPendingDy(pendingScroll));
         }
+
+        @Override protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
+            return 10f / displayMetrics.densityDpi;
+        }
     }
 
     public interface ScrollStateListener {
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
index 9fe033d0b6..3b23e3325b 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
@@ -57,12 +57,13 @@ public class MapPresenter extends Presenter< MapView > implements
         super( view );
         initBroadcast();
     }
+  private   BroadcastReceiver broadcastReceiver;
 
     /**
      * opera type为0：0 实时路况开；1实时路况关 type为1：0 放大地图； 1缩小地图 type为2：0切换2d车上； 1切换2d北上；2切换3d车上支持
      */
     private void initBroadcast() {
-        BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+        broadcastReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive( Context context, Intent intent ) {
                 String action = intent.getAction();
@@ -211,6 +212,13 @@ public class MapPresenter extends Presenter< MapView > implements
         unregisterVoiceCmd();
     }
 
+    @Override public void onDestroy(@NonNull LifecycleOwner owner) {
+        super.onDestroy(owner);
+        if (broadcastReceiver != null) {
+            getContext().unregisterReceiver(broadcastReceiver);
+        }
+    }
+
     private void registerVoiceCmd() {
 
         for ( Map.Entry< String, String[] > entry : VoiceConstants.sVoiceCmds.entrySet() ) {
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
index 087058a975..e0f6d0aa41 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
@@ -212,7 +212,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
     AIAssist.getInstance(context)
         .registerUnWakeupCommand("thirdPath", arrayOf<String>(thirdPath), this)
     AIAssist.getInstance(context)
-        .registerUnWakeupCommand("startNavi", arrayOf<String>(startNavi), this)
+        .registerUnWakeupCommand("startNavi", arrayOf<String>(startNavi,"开始"), this)
 
   }