From 3a8542425bfbcef5dccfff5845108b2035fe4858 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 17 Nov 2020 18:02:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=8C=89=E9=92=AE=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E8=B0=83=E6=95=B4=E8=BD=A6=E5=A4=B4=E6=96=B9=E5=90=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensions/entrance/EntranceFragment.java | 34 ++++++++++++++++---
 .../service/ttsConfig/TtsConfigProvider.java  |  4 ++-
 .../src/main/res/values/strings.xml           |  1 -
 3 files changed, 32 insertions(+), 7 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 a01330099d..3d9aabd36d 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
@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -112,7 +113,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     private TextView mUpload;
     private ImageView mUploading;
 
-    private View mMove2CurrentLocation;
+    private ImageButton mMove2CurrentLocation;
 
     private NaviInfoView mNaviInfo;
     private TextView mExitNavi;
@@ -247,9 +248,17 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                     mStatusManager.setDisplayOverview(TAG, false);
                     UiThreadHandler.removeCallbacks(mLockCarRunnable);
                 }
-                if ( !mApis.getRefreshStrategyControllerApi().restartAutoRefreshAtTime( 0 ) ) {
-                    mStatusManager.setUserInteractionStatus(TAG, true, false);
-                    mMApUIController.recoverLockMode();
+                if ( mIsLock ) {
+                    if ( mMApUIController.getCurrentUiMode() == EnumMapUI.CarUp_2D ) {
+                        mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
+                    } else if( mMApUIController.getCurrentUiMode() == EnumMapUI.NorthUP_2D ){
+                        mMApUIController.changeMapMode( EnumMapUI.CarUp_2D );
+                    }
+                } else {
+                    if ( !mApis.getRefreshStrategyControllerApi().restartAutoRefreshAtTime( 0 ) ) {
+                        mStatusManager.setUserInteractionStatus(TAG, true, false);
+                        mMApUIController.recoverLockMode();
+                    }
                 }
             }
         } );
@@ -734,6 +743,16 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         } else {
             mExitNavi.setText(R.string.module_ext_str_continue_navi);
         }
+
+        if ( isLock ) {
+            if ( mMApUIController.getCurrentUiMode() == EnumMapUI.CarUp_2D ) {
+                mMove2CurrentLocation.setImageResource( R.drawable.icon_north_up );
+            } else {
+                mMove2CurrentLocation.setImageResource( R.drawable.icon_car_up );
+            }
+        } else {
+            mMove2CurrentLocation.setImageResource( R.drawable.module_map_ic_move2_current_location );
+        }
     }
 
     private void traceData(String from) {
@@ -784,7 +803,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         }
     }
 
-
     @Override
     public void renderWeatherInfo(String temp, String desc, int iconId) {
         if (!DebugConfig.isMapBased()) {
@@ -929,6 +947,12 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         }
         mCameraMode.setSelected(ui == EnumMapUI.NorthUP_2D);
         mCameraMode.setText(getString(ui == EnumMapUI.NorthUP_2D ? R.string.mode_car_up : R.string.mode_north_up));
+
+        if ( ui == EnumMapUI.CarUp_2D ) {
+            mMove2CurrentLocation.setImageResource( R.drawable.icon_north_up );
+        } else if( ui == EnumMapUI.NorthUP_2D ){
+            mMove2CurrentLocation.setImageResource( R.drawable.icon_car_up );
+        }
     }
 
     private static int SEEK_HELP_NOTICE_NUM_MSG_TYPE = 401015;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
index e08e573f8e..22b44c8dd0 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
@@ -6,6 +6,8 @@ import android.util.Log;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.facade.template.IProvider;
 import com.mogo.module.service.ServiceConst;
+import com.mogo.module.service.network.RefreshCallback;
+import com.mogo.module.service.network.bean.TtsConfigEntity;
 
 /**
  * @author ：zhuangyan
@@ -24,7 +26,7 @@ public class TtsConfigProvider implements IProvider {
         if (mTtsModleData==null) {
             mTtsModleData=new TtsConfigModleData();
         }
-        mTtsModleData.playTts(new RefreshCallback<TtsConfigEntity>() {
+        mTtsModleData.playTts(new RefreshCallback< TtsConfigEntity >() {
             @Override
             public void onSuccess(TtsConfigEntity o) {
             }
diff --git a/modules/mogo-module-service/src/main/res/values/strings.xml b/modules/mogo-module-service/src/main/res/values/strings.xml
index 8bfbb2b0d2..46bb81ce90 100644
--- a/modules/mogo-module-service/src/main/res/values/strings.xml
+++ b/modules/mogo-module-service/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
     <string name="module_services_panel_item_distance_tag_text">距离导航目的地</string>
     <string name="module_services_panel_item_detail_text">查看车友信息</string>
     <string name="module_services_panel_item_call">电话</string>
-    <string name="module_services_online_car_panel_empty_tmpl">很抱歉，目的地%dKM内未找到车友</string>
     <string name="module_services_online_car_panel_empty_tmpl">很抱歉，目的地%d公里内未找到车友</string>
     <string name="module_services_online_car_panel_title">目的地车友</string>
     <string name="module_services_error_text">加载失败，请点击重试</string>