From 9ece7af5acd965c86d0d3a424cdafa0784bfe6f8 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 25 Nov 2020 16:50:52 +0800
Subject: [PATCH] =?UTF-8?q?[UI]=20=E8=BD=A6=E5=8F=8B=E5=88=97=E8=A1=A8-F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values-xhdpi/dimens.xml       |  8 ++++----
 .../onlinecar/panel/OnlineCarPanelAdapter.java |  2 +-
 .../module_services_panel_item_bkg.xml         |  4 ++--
 ...dule_services_fragment_online_car_panel.xml |  2 +-
 .../module_services_online_car_panel_item.xml  |  7 ++++---
 .../src/main/res/values-ldpi/dimens.xml        |  3 ++-
 .../src/main/res/values-mdpi/dimens.xml        |  3 ++-
 .../main/res/values-xhdpi-1920x1000/dimens.xml |  4 ++--
 .../src/main/res/values-xhdpi/dimens.xml       | 18 +++++++++---------
 .../src/main/res/values/dimens.xml             |  4 +++-
 .../src/main/res/values/strings.xml            |  2 +-
 .../module_services_panel_item_bkg_light.xml   |  2 +-
 12 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
index 1e3dc1ca7d..0f5abc133c 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
@@ -28,8 +28,8 @@
     <dimen name="module_event_fragment_container_padding">20px</dimen>
     <dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
 
-    <dimen name="module_main_event_panel_fragment_paddingTop">18px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingBottom">18px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingLeft">18px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingRight">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingTop">15px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingBottom">15px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingLeft">15px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingRight">15px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
index de632983fd..86beee061c 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
@@ -129,7 +129,7 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter<OnlineCarPanelAdapter.V
             }
             float distance = Utils.calculateLineDistance(location.getLon(), location.getLat(), lon, lat);
             if (distance >= 1000) {
-                return String.format("%.1f千米", distance / 1000);
+                return String.format("%.1f公里", distance / 1000);
             } else {
                 return String.format("%.1f米", distance);
             }
diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml b/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml
index 08e5f85a0a..e694f85e35 100644
--- a/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="#1F2131"/>
-            <corners android:radius="@dimen/module_services_panel_item_corner"/>
+            <solid android:color="#1F2131" />
+            <corners android:radius="@dimen/module_services_panel_item_corner" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
index 2b4ceea7d2..1a5729e252 100644
--- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
@@ -16,7 +16,7 @@
         android:id="@+id/module_services_id_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top"
+        android:layout_marginTop="@dimen/module_services_online_car_panel_title_margin_top"
         android:textStyle="bold"
         android:text="@string/module_services_online_car_panel_title"
         android:textColor="@color/module_services_online_car_panel_title_textColor"
diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml
index 577b0ba7d3..e11c589602 100644
--- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml
@@ -6,13 +6,14 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/module_services_panel_item_marginBottom"
     android:background="@drawable/module_services_panel_item_bkg"
-    android:padding="@dimen/module_services_panel_item_padding">
+    android:paddingTop="@dimen/module_services_panel_item_padding"
+    android:paddingStart="@dimen/module_services_panel_item_start"
+    android:paddingBottom="@dimen/module_services_panel_item_padding">
 
     <com.mogo.module.common.widget.CustomCircleImageView
         android:id="@+id/module_services_id_panel_item_avatar"
         android:layout_width="@dimen/module_services_panel_item_avatar_size"
         android:layout_height="@dimen/module_services_panel_item_avatar_size"
-        android:layout_marginStart="@dimen/dp_24"
         android:src="@drawable/module_common_default_user_head"
         app:civ_border_color="@color/module_services_id_panel_item_avatar_border_color"
         app:civ_border_width="@dimen/module_services_id_panel_item_avatar_border_width"
@@ -81,7 +82,7 @@
         android:textStyle="bold"
         android:textColor="@color/module_services_panel_item_detail_textColor"
         android:textSize="@dimen/module_services_panel_item_detail_textSize"
-        android:layout_marginRight="@dimen/dp_30"
+        android:layout_marginRight="@dimen/module_services_panel_item_start"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
index 8fb8c16e93..4103d9c547 100644
--- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
@@ -48,7 +48,7 @@
     <dimen name="module_services_id_panel_item_avatar_border_width">5px</dimen>
     <dimen name="module_services_panel_item_padding">20px</dimen>
     <dimen name="module_services_panel_item_nickname_marginLeft">13px</dimen>
-    <dimen name="module_services_id_panel_item_distance_marginLeft">42px</dimen>
+    <dimen name="module_services_id_panel_item_distance_marginLeft">10px</dimen>
     <dimen name="module_services_panel_item_detail_bkg_corner">8.89px</dimen>
     <dimen name="module_services_panel_item_detail_padding">13px</dimen>
     <dimen name="module_services_panel_item_marginBottom">16px</dimen>
@@ -62,4 +62,5 @@
     <dimen name="module_services_panel_item_corner">12.5px</dimen>
     <dimen name="module_services_panel_item_nickname_marginTop">3px</dimen>
     <dimen name="module_services_panel_item_distance_tag_marginBottom">3px</dimen>
+    <dimen name="module_services_panel_item_start">20px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
index aa8cf42951..6feb909906 100644
--- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -47,7 +47,7 @@
     <dimen name="module_services_id_panel_item_avatar_border_width">5px</dimen>
     <dimen name="module_services_panel_item_padding">28px</dimen>
     <dimen name="module_services_panel_item_nickname_marginLeft">13px</dimen>
-    <dimen name="module_services_id_panel_item_distance_marginLeft">42px</dimen>
+    <dimen name="module_services_id_panel_item_distance_marginLeft">10px</dimen>
     <dimen name="module_services_panel_item_detail_bkg_corner">8.89px</dimen>
     <dimen name="module_services_panel_item_detail_padding">13px</dimen>
     <dimen name="module_services_panel_item_marginBottom">16px</dimen>
@@ -61,4 +61,5 @@
     <dimen name="module_services_panel_item_corner">12.5px</dimen>
     <dimen name="module_services_panel_item_nickname_marginTop">3px</dimen>
     <dimen name="module_services_panel_item_distance_tag_marginBottom">3px</dimen>
+    <dimen name="module_services_panel_item_start">20px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 9f26351058..fb1ea406df 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -34,7 +34,7 @@
     <dimen name="module_services_online_car_panel_paddingLeft">50px</dimen>
     <dimen name="module_services_online_car_panel_paddingBottom">28px</dimen>
 
-    <dimen name="module_services_online_car_panel_close_margin_top">36px</dimen>
+    <dimen name="module_services_online_car_panel_close_margin_top">55px</dimen>
     <dimen name="module_services_online_car_panel_title_margin_top">50px</dimen>
     <dimen name="module_services_online_car_panel_title_text_size">36px</dimen>
     <dimen name="module_services_online_car_panel_recycler_view_margin_top">151px</dimen>
@@ -46,7 +46,7 @@
     <dimen name="module_services_id_panel_item_avatar_border_width">9px</dimen>
     <dimen name="module_services_panel_item_padding">40px</dimen>
     <dimen name="module_services_panel_item_nickname_marginLeft">20px</dimen>
-    <dimen name="module_services_id_panel_item_distance_marginLeft">70px</dimen>
+    <dimen name="module_services_id_panel_item_distance_marginLeft">20px</dimen>
     <dimen name="module_services_panel_item_detail_bkg_corner">16px</dimen>
     <dimen name="module_services_panel_item_detail_padding">21px</dimen>
     <dimen name="module_services_panel_item_marginBottom">28px</dimen>
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
index 1881b587f6..316b89ce91 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
@@ -23,19 +23,18 @@
     <dimen name="module_service_content_minWidth">120px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
 
-    <dimen name="module_services_online_car_panel_marginTop">20px</dimen>
-    <dimen name="module_services_online_car_panel_marginBottom">20px</dimen>
-    <dimen name="module_services_online_car_panel_marginRight">20px</dimen>
-    <dimen name="module_services_online_car_panel_paddingLeft">50px</dimen>
+    <dimen name="module_services_online_car_panel_marginTop">13px</dimen>
+    <dimen name="module_services_online_car_panel_marginBottom">13px</dimen>
+    <dimen name="module_services_online_car_panel_marginRight">13px</dimen>
+    <dimen name="module_services_online_car_panel_paddingLeft">43px</dimen>
     <dimen name="module_services_online_car_panel_paddingBottom">28px</dimen>
 
-
     <dimen name="modle_car_panel_call">98px</dimen>
     <dimen name="modle_car_panel_call_margin">46px</dimen>
     <dimen name="modle_car_panel_call_margin_left">40px</dimen>
 
-    <dimen name="module_services_online_car_panel_close_margin_top">36px</dimen>
-    <dimen name="module_services_online_car_panel_title_margin_top">50px</dimen>
+    <dimen name="module_services_online_car_panel_close_margin_top">40px</dimen>
+    <dimen name="module_services_online_car_panel_title_margin_top">55px</dimen>
     <dimen name="module_services_online_car_panel_title_text_size">36px</dimen>
     <dimen name="module_services_online_car_panel_recycler_view_margin_top">151px</dimen>
     <dimen name="module_services_load_strategy_textSize">33px</dimen>
@@ -46,7 +45,7 @@
     <dimen name="module_services_id_panel_item_avatar_border_width">9px</dimen>
     <dimen name="module_services_panel_item_padding">40px</dimen>
     <dimen name="module_services_panel_item_nickname_marginLeft">20px</dimen>
-    <dimen name="module_services_id_panel_item_distance_marginLeft">70px</dimen>
+    <dimen name="module_services_id_panel_item_distance_marginLeft">20px</dimen>
     <dimen name="module_services_panel_item_detail_bkg_corner">16px</dimen>
     <dimen name="module_services_panel_item_detail_padding">21px</dimen>
     <dimen name="module_services_panel_item_marginBottom">28px</dimen>
@@ -60,4 +59,5 @@
     <dimen name="module_services_panel_item_corner">22.5px</dimen>
     <dimen name="module_services_panel_item_nickname_marginTop">6px</dimen>
     <dimen name="module_services_panel_item_distance_tag_marginBottom">6px</dimen>
-</resources>
\ No newline at end of file
+    <dimen name="module_services_panel_item_start">40px</dimen>
+</resources>
diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml
index df03037594..d5bbe4d08b 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -46,7 +46,7 @@
     <dimen name="module_services_id_panel_item_avatar_border_width">5px</dimen>
     <dimen name="module_services_panel_item_padding">20px</dimen>
     <dimen name="module_services_panel_item_nickname_marginLeft">13px</dimen>
-    <dimen name="module_services_id_panel_item_distance_marginLeft">42px</dimen>
+    <dimen name="module_services_id_panel_item_distance_marginLeft">10px</dimen>
     <dimen name="module_services_panel_item_detail_bkg_corner">8.89px</dimen>
     <dimen name="module_services_panel_item_detail_padding">13px</dimen>
     <dimen name="module_services_panel_item_marginBottom">16px</dimen>
@@ -60,4 +60,6 @@
     <dimen name="module_services_panel_item_corner">12.5px</dimen>
     <dimen name="module_services_panel_item_nickname_marginTop">3px</dimen>
     <dimen name="module_services_panel_item_distance_tag_marginBottom">3px</dimen>
+    <dimen name="module_services_panel_item_start">24px</dimen>
+¬
 </resources>
\ No newline at end of file
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 46bb81ce90..8d73bcbd45 100644
--- a/modules/mogo-module-service/src/main/res/values/strings.xml
+++ b/modules/mogo-module-service/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="module_service_open_app_tip">亲，建议您使用蘑菇出行</string>
     <string name="module_services_str_20Km_radius">扩大到20公里半径</string>
     <string name="module_services_str_40Km_radius">扩大到40公里半径</string>
-    <string name="module_services_panel_item_distance_tag_text">距离导航目的地</string>
+    <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">很抱歉，目的地%d公里内未找到车友</string>
diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml
index d126dfc22a..c9cb66b911 100644
--- a/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="#DDDDDD"/>
+            <solid android:color="#E5E5E5"/>
             <corners android:radius="@dimen/module_services_panel_item_corner"/>
         </shape>
     </item>