From af878a7bfe4d626be4f15ef60ba0edd18700cc32 Mon Sep 17 00:00:00 2001
From: zhangyuanzhen <zhangyuanzhen@zhidaoauto.com>
Date: Wed, 26 Feb 2020 15:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values-xhdpi/dimens.xml      |  2 +-
 .../navi/ui/search/CategorySearchFragment.kt  |  1 -
 .../navi/ui/search/ChoosePathFragment.kt      |  1 +
 .../mogo/module/navi/uitls/BitmapUtils.java   | 28 ++++++++++++++++---
 .../res/layout/fragment_search_category.xml   |  2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index 6280c4cf51..6d93ddb575 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -79,7 +79,7 @@
     <dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">24px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">10px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">20px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">60px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">16px</dimen>
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
index 53cb481346..8b40ddd71b 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
@@ -149,7 +149,6 @@ class CategorySearchFragment : BaseFragment(), CategoryView {
     lifecycle.removeObserver(mSearchPresenter)
     SearchServiceHolder.getMarkerManger()
         .removeMarkers(TAG)
-    moveMapToCenter()
   }
 
   override fun onDestroy() {
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 19b02db302..005b3a1955 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
@@ -221,6 +221,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
         .recoverLockMode()
     isStartedNavi = true
     SearchServiceHolder.fragmentManager.clearAll()
+    moveMapToRight()
   }
 
   private fun selectPath(item: MogoCalculatePath?) {
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java
index 2ea9a43e0e..64600da9da 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java
@@ -42,12 +42,28 @@ public class BitmapUtils {
         Canvas canvas = new Canvas(ret);
 
         int i = Integer.parseInt(text);
-        if (i == 1) {
-            canvas.drawText(text, (width - bounds.width()*2) / 2.0F, (float) (bounds.height() * 1.8),
-                paint);
+
+        if (isLow(context)) {
+            if (i == 1) {
+                canvas.drawText(text, (width - bounds.width() * 2) / 2.0F,
+                    (float) (bounds.height() * 2.4),
+                    paint);
+            } else {
+                canvas.drawText(text, (width - bounds.width()) / 2.0F,
+                    (float) (bounds.height() * 1.9),
+                    paint);
+            }
         } else {
-            canvas.drawText(text, (width - bounds.width()) / 2.0F, (float) (bounds.height() * 1.8),
+            if (i == 1) {
+                canvas.drawText(text, (width - bounds.width()*1.5F) / 2.0F,
+                    (float) (bounds.height() * 1.9),
+                    paint);
+            }else {
+
+                canvas.drawText(text, (width - bounds.width()*1.2F) / 2.0F,
+                (float) (bounds.height() * 1.9),
                 paint);
+            }
         }
 
         // 保存
@@ -61,4 +77,8 @@ public class BitmapUtils {
         final float scale = context.getResources().getDisplayMetrics().density;
         return (int) (dp * scale + 0.5f);
     }
+
+    public static boolean isLow(Context context) {
+        return context.getResources().getDisplayMetrics().density < 1;
+    }
 }
diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
index 7a451e6a5c..1b2b1d6786 100644
--- a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
+++ b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
@@ -20,7 +20,7 @@
       app:layout_constraintLeft_toLeftOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/ll_navi_search"
       app:cardBackgroundColor="#3F4057"
-      app:cardCornerRadius="@dimen/dp_8"
+      app:cardCornerRadius="@dimen/dp_16"
       >
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_search_result"