From f71008c3507d7998755456887989c64f3c19e96e Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 17 Jun 2020 11:39:05 +0800
Subject: [PATCH] UI opt & bugfix

---
 .idea/misc.xml                                |   2 +-
 .../com/mogo/commons/AbsMogoApplication.java  |   4 ++--
 .../src/main/res/values-xhdpi/dimens.xml      |   4 ++--
 .../src/main/res/values/dimens.xml            |   4 ++--
 .../extensions/utils/TopViewAnimHelper.java   |   4 ++--
 .../res/layout/module_main_activity_main.xml  |  13 +++++------
 .../service/marker/MapMarkerManager.java      |   2 +-
 .../module/service/marker/MapMarkerView.java  |   3 ---
 .../drawable-xhdpi/module_service_ic_call.png | Bin 8990 -> 7971 bytes
 .../res/drawable/module_service_ic_call.png   | Bin 3738 -> 3115 bytes
 .../layout/view_map_data_user_info_window.xml |  21 +++++++++---------
 .../src/main/res/layout/view_map_marker.xml   |  14 ++++--------
 .../main/res/layout/view_map_marker_info.xml  |   6 ++---
 .../src/main/res/values-xhdpi/dimens.xml      |  10 ++++++++-
 .../src/main/res/values/dimens.xml            |  12 ++++++++--
 15 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 707ee6e613..2dc54c489f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index b1e7afd023..53d2b568cc 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -133,9 +133,9 @@ public class AbsMogoApplication extends Application {
         } );
     }
 
-    private static void getTicket(TicketInfoCallback callback){
+    private static void getTicket( TicketInfoCallback callback ) {
         if ( DebugConfig.isLauncher() ) {
-            AccountClientManager.getTicket(callback);
+            AccountClientManager.getTicket( callback );
         } else {
             AccountClientManager.getAppTicket( callback );
         }
diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
index e4753b0f9d..a9ba5a2fef 100644
--- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">140px</dimen>
     <dimen name="module_apps_navigator_icon_height">140px</dimen>
     <dimen name="module_apps_navigator_icon_divider">30px</dimen>
-    <dimen name="module_apps_voice_icon_width">110px</dimen>
-    <dimen name="module_apps_voice_icon_height">110px</dimen>
+    <dimen name="module_apps_voice_icon_width">100px</dimen>
+    <dimen name="module_apps_voice_icon_height">100px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml
index c9efac23e8..679816b821 100644
--- a/modules/mogo-module-apps/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">78px</dimen>
     <dimen name="module_apps_navigator_icon_height">78px</dimen>
     <dimen name="module_apps_navigator_icon_divider">17px</dimen>
-    <dimen name="module_apps_voice_icon_width">70px</dimen>
-    <dimen name="module_apps_voice_icon_height">70px</dimen>
+    <dimen name="module_apps_voice_icon_width">60px</dimen>
+    <dimen name="module_apps_voice_icon_height">60px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
index 0b6ebc03de..f52b467232 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -473,9 +473,9 @@ public class TopViewAnimHelper {
         arriveTimeGroup.setVisibility(View.GONE);
         int scene = 0;
         if (isTopViewOut) {
-            scene = Scene.AIMLESS_WITH_ROAD_EVENT;
-        } else {
             scene = Scene.AIMLESS;
+        } else {
+            scene = Scene.AIMLESS_WITH_ROAD_EVENT;
         }
         Logger.d(TAG, "hide navi setMapCenterPointByScene: " + scene);
         MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene);
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 96f61eca7b..25994bb014 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -9,13 +9,7 @@
     <FrameLayout
         android:id="@+id/module_main_id_map_fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <FrameLayout
-            android:id="@+id/module_main_id_search_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
+        android:layout_height="match_parent"/>
 
     <FrameLayout
         android:id="@+id/module_main_id_map_left_shadow_frame"
@@ -54,6 +48,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <FrameLayout
+        android:id="@+id/module_main_id_search_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <FrameLayout
         android:id="@+id/module_main_id_cover_up"
         android:layout_width="match_parent"
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index b37af341fb..559d7c301f 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -864,7 +864,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                 float distance = Utils.calculateLineDistance( lastLon, lastLat, lng, lat );
                 lastLon = lng;
                 lastLat = lat;
-                if ( distance < 0.5f ) {// 距离过短，认为静止不动
+                if ( distance < 0.2f ) {// 距离过短，认为静止不动
                     continue;
                 }
 
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
index 9b7153b574..6d2d7affe2 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
@@ -24,8 +24,6 @@ import com.mogo.module.service.ServiceConst;
 public class MapMarkerView extends MapMarkerBaseView {
     private String TAG = "MapMarkerView";
 
-    private ImageView ivBg;
-
     public MapMarkerView( Context context ) {
         super( context );
     }
@@ -48,7 +46,6 @@ public class MapMarkerView extends MapMarkerBaseView {
         LayoutInflater.from( context ).inflate( R.layout.view_map_marker, this );
         ivIcon = findViewById( R.id.ivIcon );
         ivCar = findViewById( R.id.ivCar );
-        ivBg = findViewById( R.id.ivBg );
     }
 
     public void updateView( MarkerShowEntity markerShowEntity ) {
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png
index 89680bd182c081623188865b92b3ceda8fa98a4e..9a9321b3a61b8ddf4e42aa52f1ad0f94b51dbbc2 100644
GIT binary patch
literal 7971
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
Z{=fgI?2sW@Eh+#2002ovPDHLkV1m$VmPP;o

literal 8990
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
ReD4LgdG*$nvdhjf{|Dx=532wG

diff --git a/modules/mogo-module-service/src/main/res/drawable/module_service_ic_call.png b/modules/mogo-module-service/src/main/res/drawable/module_service_ic_call.png
index 3f90fd4af55cd683fbc5da1d339ecdee40fccdd8..a66ed29d09f3e05c3ebdd24fe5a2c0a4b3c9a08b 100644
GIT binary patch
literal 3115
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
FV1lQS3<dxI

literal 3738
zcmV;L4rTF)P)<h;3K|Lk000e1NJLTq004LZ004Lh1^@s6Ib=4{000hQNkl<Zc-rlq
zYfM|`8OIZ8YSoXe`YCF2hXfW9E>)_kYBNpSw65ybN=tT=nndbUO-ZIsnz}U~rc5eb
zwMJ-J)iq1ImTV1c8JLTWxrCUTvANrrd$<!IKte7hgd|YE`#<MmA73!0<s6@5-becB
zwF%gSzu)(N&U<;D4I6my;K73j4<0;t@ZiCN2M-=Rc<|uCgU4D$a#z=5X`Z$N>7A})
zsh-v>U;+(kp4R@<_Lf;N4;EA1&BXjZck^tjyQP1htFd99tI32mE7jF}ETygKKysJk
zG5!~gaisOOZA$NQABCvdX&r6-zzZ>%kM>puLH)RiW<Rbbwogf0qZ04F)`tF+HfJ{4
zqr2MdoA_T`gGlXmC8T$?pG@m?xzamaUWm#BJZ&sc+!g`9xXr5(mqApvS3ydP)4R9D
z;o95UcrvM>CV?xlhVg{M@kmCe>o7#MWBBy~mJU(V)eyHeNZb}@Ak7Yz(hRYi9d<lF
zOurjf=xatsU*F^Ct*6pE-7|uyGD>kfg2a^sUVc~(5;&r`4I$!+0!uX2qphFW(^!8h
zv8Cm4u2__j;_*BRVKdXZ+;aiKt|aa^^W2bOIZ#}uUszdO1$!Fpb09OtQ}-xWaJi_e
z`W8ezk<sOz#l;f~C$3hWyR5iPLE<*r1@_1^*k_ZSwI}HR!Ua{tQ+=KLGdkU#3=(!3
zabxGX(TZEApw^Sz?AX8Vh27cT|8Pc6`{|5s_mW>+H`A@>`oyh|ATDs$5=(e|dZ*R;
z@VXQ?{c=YVM0Jy}QT1FMd2WEXVFdm*1Qu`zt$UBNCTV?LA@_O?;zDX}C2{rdxyuOa
z6SziZF4<9cF#eTgY$IJEXLPrFqwcwe@LX|NUPfGjWJirRxxP9Re}#?lIal1-`4EK7
z0W475`0(6_;?`IDNUE>SN$$*jD6YhP1~WeC-5#qfY+QS;qc*It0`@A2YHQrgf(cWN
zUG27L#Em1*4Hej~6j;D!c#&yXUUkon7tf6#Zc?31#9n1J?r@C@D(<<#LvxV8V0WD@
z$B-9Z!qqbO++~FosJ$exyS6gZVB)$DMRO~(o;-IsaYcbId3V*=4jE>KDw;`*b?Lcb
z#1#atsU+qSYIHv1MRUvPJsvmr+^Xn%Z;el2wyV0*t?RjKVc~##?rM9kpX!U$p4RV@
zU%;vm_uL4c8(v(ntNP+nV(lfJEj40+JEODR!#(#K^julsDnVqAt~L!wJ27JBxj*e{
zXPKiz?C;~F?5&~8?0Nj05j;0oTv6Z(f!)>RCv>xiD$+I^H9hw?{XMLG?n}1h^#(A%
zw8YL_8TAXSXV3Ky%|3AjY!$Pc>nyR~<3$r1T6^yI@p_dvuCoVUeH9VY%v7MjI`mxM
zupA(6xj>?=BDNDC;?~v`c0aDMxTi)2+4Tnx*a8H+r$BtZB(Na0#CsUJb?>=h#Fdy!
ztg3oEmc93smY#cVa-7}8@H@W>ZsEi5BfO8^JvW@diNvMyQ!!fxT-B!ZZ|J#4`nuTM
z;v&1Vw8-Y7<c@^-+O+;XH(1<DWg@n+nJ02{wO>}mZP8&Z?{mxHxwj$k*MWNROZb54
z-E%|4m8mK}to^N#cveW0``rC)O>E}=eRgy4!RmP6=RAgY19)zzxRs?W@nWf6Q*l#W
zIOP}aAec(`xd*#FY!)I#$9)Oq<NIv%?p>BD56`;x+#qp9yxS|x30huUoz!w}`55kZ
zuR)}!xgVZibhz~IxuN2+1feZEspatO(sFM3je%Y^4S|R$shz%mZ`Hin-)judRR}9^
z(F#gj+K7vj^=UYKt>xVE3H0Er5Ga6q(J^^%L4Y3rQ7N#VJvT&L0q>I)6`M2|p4~^a
zUe7(!+sP&%(m0raP!mGC;QQLR;(1sWL=NG@Xb{g07FX`YN7e7a9#^*3>$xvNm@5#<
z$AZY1g!uTb#6lSEvTEFB?Qt5%b3??fC;`@N^#!JcCmOHkrlTFcJI_WT)CiDUC8J@!
zE<DH8b0-!gUcmbr%X5RpEnzz=EdA>4bEZ^9A=zxSS<kJ$Im?D1mdJe6)ZLh6FSIoo
z(Q|{u74SY$R`!^R!*kn#SnZ)YJ2A!vAlM)n2xeZ<3fy6Rcjnl8SeQs}up8HNmEx9L
zL@KNY)Vsj)v>uPu9;#z~-Rv@ii<UPqcWtEm+;HOVR3Ztyqs)9<y%{WIkc-tGs%O#T
zd(bO;A)XI<uAoPOD6r8zH>md#rIsx91ny`x#c~f-0T%GPAzl~gjsX4p`H3sW_gtm0
zM46fGC^wtb?7<DO+_(IDOjOVnu}nt<++W^i&*OCr@3{(bMT#3#yvPy~d&X?v^0W9*
zxFDPd0?M?@;OoJ>JJfG@&lSa$dap>oial7!+8Wb+%jd?&1d*em>DCSQ9A3xJo~snM
zROrRC>IqCKd1Jh9`Da)WYW?ySYrP#EXGVq$?YWAc3xSK-_R`{cH3eSO!&xEI^i|e;
z`(}7<1wy^}Cz$9kuIKv26(}<=swc3ROgrXhg<iu3fJTU?q(R_@^!$d%O_98-6D$S2
z*r1;47gt18f#>ybRwxA&PERo>M0DPaj001g#GAcchV<M3ajivcyH&*@T1bPhle0oc
zI@_5Y!YQejAK&m(FHtjljeQUAX*ADOiYp1M;zgFLrC%@SbN7G?*hp6k@dCLX%B)Dv
z<P{9nRmSpMg}8#irA6x9CP@V>baOuU$GFI=hH%SsErdT^?lGF@DtfO#gNg!EbrOA@
z&wX!rfY~6N!1a}wVVA(q@xd^P=PHC{+e-@37Mj%T!C87cpZheH1B-FNRSDt3a&3lP
z48n}ttnc7GjNrLDl;RSWLKPPqP*+HgIWdl4@}mO6`I%<r5)}&Mua(bCvmDHbJq173
zz2_>$1=~srkEwSS7)7J>niC@nLv<;{D+8r6Gr>#+@X_cnORKeocy1Cngb(bWu?Bqx
z^V#pfw_l}QAxeR@^V|S|w_1zUTkxlfU{cX2-Q~pCkMI8iSJfpDPGH*KTIex`Wx^t~
zQ$kCS$WP<7WN}}?@1H$3!YoshtYiw`i`F9X84i`d1WVA=a|6Maom_RRvQb4az2?Mt
z8MaXj(agb2g+4EaU@~7|?f688o4teONZ;45%I!n|MUxZkHC&`==D9xaEg=6@cheok
z-nPbUJ?Ei1-sNFM5T-DQqM+6XM2pCzp8{Vy&R)lIsTQ8=7q@_IvlOVmZ8in9{PdiM
zDjED`;4&+Kcm?Q%CV`3YOiK73k4FYQo!We~#4qvxR@-xBfgvv2T2iR~#&;^zxL2s<
zr{6qO`|7IL`@@66B7+YIvl9Q4fp{x|tMJd^$=}6$sph%<o=bS2EGp8bNTyJzQRjK6
z_T%U10xB1R1u!u#cy8`8(7$~#PK-sx2ZQ}=H+rx-p6e5r(B|-&ATX+M8X*tWvl#CG
zH8#vXhiKvWF9DGvf?m2DITF8Wa;oCFK7q|9w#8DY-SJT>u?kVWM#%km0PpiLdNNIH
zTmW(_Jcc+IqGp6$!0nT-1)oX$wXa7N&y~fc;d#3`PusG#RASW#xgUw=>TB3pY~A?}
zgbL4y$XFo%UJiU<lw{+z6V~2yMRAGZd~H)Wh(7E*Y?$1Sn80`juX6@|c^(20*-{(&
z9D+f#^Ag#?KuqFOsTCg&vc$FaTv=SO)nd{<2@9oBqWZZ;$^A&A;d|f4wBx4`@zYU}
zPeK@ykRFdL#~}M;SmYh-7Flc0RS=srN)%Ka*)X{urG<lJv?n|+_Ax|?%%H$W5+4uy
z`AA^E$19Gywe?*8(9E`)^J9|;je;s)OU025k^51(<o7a0o%gYja1P>~8xCebVvzk4
zt-w%te%Ic%_MYn(cy5!~9NX&RRQcLKxgP_T`!cF4*&i^qc@_f7d^i-yS$qg&J{%0>
zb*wNYs^GbD?**~1#zJMysq(dPazBQy=l&43@iu()1Bmz!2uG6_^!S58C6|4?+uO~4
zfEg^6JXai=i}PnUTP*r08Bb-+4U_wExja;ujd~Hk>sy^3_CDsa!|^w)Hoe;1z>;Xz
zN+r*g*<75jkA&btApJagvBxmEA6Hn<O}AlP*lB0KZfj<5z+->wZpCbsgQeqVRk_a%
z5_oHIp1xB03%$6xc0ZLhH*g**4c2p47I#Z={?aycfzFC@$QN9wS#Rh(R4T9MZeOwI
zqBZC1v#bsU6?LMT_3@MwLzTJZFrK?rMBjz6gkJ1)CQ;4$xXFp3iRWTyF3O+VVlnBv
zw4Kk79d!q#n)TdsqYxK(H(N{xHy9}(Y$o^IsKjMk3iFLsURH{YN%hq^+;by%Zc!du
zlQ9cK3%wZS%P~A#x#x!Oxe(X7A=juS-WAJ=5ZJ~&H%Q!~d|S+x0o4#W$zEmUo-31Q
zjT>=&!!?GY-F3Dc?z!+>qYulGF1&WvR%TMo`gQ2J-Yw$t-^LB`9=mF6hp1-#dhuME
z#MoS%cWA?UiUem(64k6<2cGLT%nX$pbJtX}p30iXo9BwFLiwk4Kew#O-Y(Rvr?Tep
z<GFbr-7fjXa?=2nHHV<HM)h3UX0wfUV(4wLUQe;PuI^E)d@U45Hjd}c(FQr)?4dHm
zu#L*sR2-S==jzsTu_>MQEysLotFdRnav!1kxm02m!g_V!x!!HXCOaJ`iM!dTSO=9@
zr7E0MsF7;<Y3R9LI-g5NI5j`zw_bw^HBv1<D)&Ye!Ki4|nt3j=*+ATW%87x;M>RWH
z&m+Q6j*4JZG>Ym9LEtQ^PC^ANsKx=M!KX~=lxvxwl)RL+bq5lAZbR-zh-`w8S-7=1
zPI;(QPgTT&2M-=Rc<|uCg9i^DJb3Wn!Gi}69_uUq4<~h&9M~1@7ytkO07*qoM6N<$
Ef{)K}$N&HU

diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml b/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml
index 5028bcbe89..0967298a46 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml
@@ -7,14 +7,12 @@
     android:background="@android:color/transparent"
     android:gravity="center"
     android:orientation="vertical"
-    android:paddingStart="@dimen/dp_5"
-    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/module_service_id_marker_content"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_90"
+        android:layout_height="@dimen/module_services_info_window_height"
         android:background="@drawable/module_services_driver_blue_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,8 +20,9 @@
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/module_service_id_user_header"
-            android:layout_width="@dimen/dp_76"
-            android:layout_height="@dimen/dp_76"
+            android:layout_width="@dimen/module_service_user_header_width"
+            android:layout_height="@dimen/module_service_user_header_height"
+            android:layout_marginLeft="2.5px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -38,10 +37,10 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_10"
             android:ellipsize="end"
+            android:minWidth="@dimen/module_service_content_minWidth"
             android:singleLine="true"
-            android:minWidth="@dimen/dp_100"
             android:textColor="#ffffff"
-            android:textSize="@dimen/sp_32"
+            android:textSize="@dimen/module_service_content_textSize"
             app:layout_constraintStart_toEndOf="@+id/module_service_id_user_header"
             app:layout_constraintTop_toTopOf="@+id/module_service_id_user_header"
             app:layout_goneMarginRight="@dimen/dp_30"
@@ -51,19 +50,21 @@
             android:id="@+id/module_service_id_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5px"
             android:background="@drawable/module_services_driver_type_blue_info"
             android:textColor="#ffffff"
-            android:textSize="@dimen/sp_20"
+            android:textSize="@dimen/module_service_tag_textSize"
             app:layout_constraintStart_toStartOf="@+id/module_service_id_content"
             app:layout_constraintTop_toBottomOf="@+id/module_service_id_content"
             tools:text="老司机" />
 
         <ImageView
             android:id="@+id/module_service_id_call"
-            android:layout_width="@dimen/dp_85"
-            android:layout_height="@dimen/dp_85"
+            android:layout_width="@dimen/module_service_user_header_width"
+            android:layout_height="@dimen/module_service_user_header_height"
             android:layout_gravity="center"
             android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="2.5px"
             android:scaleType="fitXY"
             android:src="@drawable/module_service_ic_call"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
index cb9fef8112..3ba8e4a5cf 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
@@ -12,22 +12,16 @@
     <FrameLayout
         android:id="@+id/clMarkerTopView"
         android:layout_width="@dimen/module_service_marker_bubble_width"
+        android:background="@drawable/bg_map_marker_dark"
         android:layout_height="@dimen/module_service_marker_bubble_height">
 
         <ImageView
-            android:id="@+id/ivBg"
+            android:id="@+id/ivIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/bg_map_marker_dark" />
-
-        <ImageView
-            android:id="@+id/ivIcon"
-            android:layout_width="@dimen/module_service_marker_bubble_icon_width"
-            android:layout_height="@dimen/module_service_marker_bubble_icon_height"
-            android:layout_marginTop="@dimen/module_service_marker_bubble_icon_marginTop"
-            android:layout_gravity="center_horizontal"
-            tools:src="@drawable/icon_map_marker_road_block_up"/>
+            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
+            tools:src="@drawable/icon_map_marker_road_block_up" />
 
     </FrameLayout>
 
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
index 1917bf59ae..028892962e 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
@@ -7,8 +7,6 @@
     android:gravity="center"
     android:orientation="vertical"
     android:padding="1px"
-    android:paddingStart="@dimen/dp_5"
-    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -34,8 +32,8 @@
 
         <ImageView
             android:id="@+id/ivIcon"
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginLeft="@dimen/dp_15"
             android:visibility="invisible"
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 8c98cbda76..28ce0219a0 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
@@ -6,11 +6,19 @@
     <dimen name="module_service_marker_bubble_height">117px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">50px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">50px</dimen>
-    <dimen name="module_service_marker_bubble_icon_marginTop">24px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
 
     <!-- 导航查看全程显示范围-->
     <dimen name="module_service_marker_bounds_leftMargin">1000px</dimen>
     <dimen name="module_service_marker_bounds_topMargin">390px</dimen>
     <dimen name="module_service_marker_bounds_bottomMargin">200px</dimen>
     <dimen name="module_service_marker_bounds_rightMargin">200px</dimen>
+    <dimen name="module_services_info_window_paddingStart">10px</dimen>
+    <dimen name="module_services_info_window_paddingEnd">10px</dimen>
+    <dimen name="module_services_info_window_height">100px</dimen>
+    <dimen name="module_service_user_header_width">80px</dimen>
+    <dimen name="module_service_user_header_height">80px</dimen>
+    <dimen name="module_service_content_textSize">24px</dimen>
+    <dimen name="module_service_tag_textSize">20px</dimen>
+    <dimen name="module_service_content_minWidth">120px</dimen>
 </resources>
\ No newline at end of file
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 451d9a661b..03b1e6650a 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_service_marker_anchor_size">16dp</dimen>
-    <dimen name="module_service_marker_dot_marginTop">8dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
     <dimen name="module_service_marker_bubble_width">56px</dimen>
     <dimen name="module_service_marker_bubble_height">65px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">27px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">27px</dimen>
-    <dimen name="module_service_marker_bubble_icon_marginTop">14px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
 
     <dimen name="module_service_marker_bounds_leftMargin">550px</dimen>
     <dimen name="module_service_marker_bounds_topMargin">208px</dimen>
     <dimen name="module_service_marker_bounds_bottomMargin">100px</dimen>
     <dimen name="module_service_marker_bounds_rightMargin">100px</dimen>
+    <dimen name="module_services_info_window_paddingStart">100px</dimen>
+    <dimen name="module_services_info_window_paddingEnd">10px</dimen>
+    <dimen name="module_services_info_window_height">54px</dimen>
+    <dimen name="module_service_user_header_width">44px</dimen>
+    <dimen name="module_service_user_header_height">44px</dimen>
+    <dimen name="module_service_content_textSize">14px</dimen>
+    <dimen name="module_service_tag_textSize">12px</dimen>
+    <dimen name="module_service_content_minWidth">64px</dimen>
 </resources>
\ No newline at end of file