From dc2a65ce4a3fd6aca96d99b4e660bff15ac23702 Mon Sep 17 00:00:00 2001
From: zhangyuanzhen <zhangyuanzhen@zhidaoauto.com>
Date: Mon, 6 Jan 2020 15:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/fragment_search.xml   | 174 ++++++++++++++++--
 .../src/main/res/layout/item_search_poi.xml   |  97 +++++-----
 .../res/mipmap-xhdpi/icon_navi_company.png    | Bin 0 -> 703 bytes
 .../main/res/mipmap-xhdpi/icon_navi_gas.png   | Bin 0 -> 1007 bytes
 .../main/res/mipmap-xhdpi/icon_navi_home.png  | Bin 0 -> 712 bytes
 .../res/mipmap-xhdpi/icon_navi_location.png   | Bin 0 -> 1847 bytes
 .../main/res/mipmap-xhdpi/icon_navi_park.png  | Bin 0 -> 1978 bytes
 .../res/mipmap-xhdpi/icon_navi_restrant.png   | Bin 0 -> 2367 bytes
 .../res/mipmap-xhdpi/icon_navi_setting.png    | Bin 0 -> 1935 bytes
 .../main/res/mipmap-xhdpi/icon_navi_tolit.png | Bin 0 -> 2143 bytes
 .../main/res/mipmap-xhdpi/icon_navi_wash.png  | Bin 0 -> 1645 bytes
 .../src/main/res/values/colors.xml            |   2 +
 .../src/main/res/values/dimens.xml            |   4 +
 .../src/main/res/values/strings.xml           |   4 +
 .../src/main/res/values/styles.xml            |   9 +
 .../com/mogo/module/navi/ExampleUnitTest.java |  17 ++
 16 files changed, 247 insertions(+), 60 deletions(-)
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png
 create mode 100755 modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png
 create mode 100644 modules/mogo-module-navi/src/main/res/values/dimens.xml
 create mode 100644 modules/mogo-module-navi/src/test/java/com/mogo/module/navi/ExampleUnitTest.java

diff --git a/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml b/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml
index 282105a721..295f98317b 100644
--- a/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml
+++ b/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml
@@ -13,31 +13,183 @@
     >
 
   <LinearLayout
+      android:id="@+id/ll_navi_search"
       android:layout_width="@dimen/dp_600"
       android:layout_height="@dimen/dp_60"
-      android:orientation="horizontal"
-      android:gravity="center_vertical"
       android:background="@drawable/shape_round_gray"
+      android:gravity="center_vertical"
+      android:orientation="horizontal"
       app:layout_constraintLeft_toLeftOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       >
 
+    <EditText
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:hint="@string/hint_map_search"
+        android:textColor="@color/white"
+        android:textColorHint="@color/white_60"
+        />
+
     <ImageView
         android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
         android:layout_marginLeft="@dimen/dp_12"
         android:layout_marginRight="@dimen/dp_10"
         android:src="@mipmap/icon_back"
-        android:layout_height="@dimen/dp_40"/>
-
-    <EditText
-        android:layout_width="0dp"
-        android:textColor="@color/white"
-        android:textColorHint="@color/white_60"
-        android:hint="@string/hint_map_search"
-        android:layout_height="wrap_content"
-      android:layout_weight="1"/>
+        />
 
   </LinearLayout>
 
 
+  <LinearLayout
+      android:id="@+id/ll_navi_home"
+      android:layout_width="@dimen/dp_284"
+      android:layout_height="@dimen/dp_60"
+      android:background="@drawable/shape_round_gray"
+      android:gravity="center_vertical"
+      android:layout_marginLeft="@dimen/dp_16"
+      android:orientation="horizontal"
+      app:layout_constraintLeft_toRightOf="@id/ll_navi_search"
+      app:layout_constraintTop_toTopOf="parent"
+      >
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:textSize="@dimen/txt_normal"
+        android:gravity="center_vertical"
+        android:drawableLeft="@mipmap/icon_navi_home"
+        android:text="@string/navi_home"
+        android:textColor="@color/white"
+        />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="@dimen/dp_36"
+        android:background="#17D8D8D8"
+        />
+
+    <TextView
+        android:layout_width="0dp"
+        android:textSize="@dimen/txt_normal"
+        android:text="@string/navi_company"
+        android:gravity="center_vertical"
+        android:drawableLeft="@mipmap/icon_navi_company"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:textColor="@color/white"
+        />
+
+  </LinearLayout>
+  <RelativeLayout
+      android:id="@+id/rl_navi_history"
+      android:layout_width="@dimen/dp_600"
+      android:layout_height="@dimen/dp_389"
+      android:layout_marginTop="@dimen/dp_16"
+      android:background="@drawable/shape_round_gray"
+      android:padding="@dimen/dp_20"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/ll_navi_search"
+      >
+
+    <TextView
+        android:id="@+id/tv_navi_history"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/history_search"
+        android:textColor="@color/white_60"
+        android:textSize="@dimen/sp_16"
+        />
+
+
+    <TextView
+        android:id="@+id/tv_navi_history_clear"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        android:layout_alignParentRight="true"
+        android:text="@string/history_search"
+        android:textColor="@color/txt_blue"
+        android:textSize="@dimen/sp_16"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/dp_30"
+        />
+
+    
+
+  </RelativeLayout>
+  <TextView
+      android:drawableTop="@mipmap/icon_navi_restrant"
+      app:layout_constraintTop_toTopOf="@id/rl_navi_history"
+      app:layout_constraintLeft_toRightOf="@id/rl_navi_history"
+      android:text="@string/navi_restrant"
+      android:id="@+id/tv_navi_restaurant"
+      android:layout_marginLeft="@dimen/dp_16"
+      style="@style/txt_navi_style"
+      />
+
+  <TextView
+      android:drawableTop="@mipmap/icon_navi_gas"
+      android:id="@+id/tv_navi_gas"
+      app:layout_constraintTop_toTopOf="@id/tv_navi_restaurant"
+      app:layout_constraintLeft_toRightOf="@id/tv_navi_restaurant"
+      android:text="@string/navi_restrant"
+      android:layout_marginLeft="@dimen/dp_16"
+      style="@style/txt_navi_style"
+      />
+
+
+  <TextView
+      android:drawableTop="@mipmap/icon_navi_tolit"
+      android:id="@+id/tv_navi_toilet"
+      app:layout_constraintTop_toBottomOf="@id/tv_navi_restaurant"
+      app:layout_constraintLeft_toLeftOf="@id/tv_navi_restaurant"
+      android:text="@string/navi_restrant"
+      android:layout_marginTop="@dimen/dp_16"
+      style="@style/txt_navi_style"
+      />
+
+
+  <TextView
+      android:drawableTop="@mipmap/icon_navi_wash"
+      android:id="@+id/tv_navi_wash"
+      app:layout_constraintTop_toBottomOf="@id/tv_navi_toilet"
+      app:layout_constraintLeft_toLeftOf="@id/tv_navi_restaurant"
+      android:text="@string/navi_restrant"
+      android:layout_marginTop="@dimen/dp_16"
+
+      style="@style/txt_navi_style"
+      />
+
+  <TextView
+      android:drawableTop="@mipmap/icon_navi_park"
+      android:id="@+id/tv_navi_park"
+      app:layout_constraintTop_toBottomOf="@id/tv_navi_gas"
+      app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas"
+      android:text="@string/navi_restrant"
+      android:layout_marginTop="@dimen/dp_16"
+
+      style="@style/txt_navi_style"
+      />
+
+  <TextView
+      android:drawableTop="@mipmap/icon_navi_setting"
+      android:id="@+id/tv_navi_setting"
+      app:layout_constraintTop_toBottomOf="@id/tv_navi_park"
+      app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas"
+      android:text="@string/navi_restrant"
+      android:layout_marginTop="@dimen/dp_16"
+
+      style="@style/txt_navi_style"
+      />
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml b/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml
index fe43a9d083..ddff59b03a 100644
--- a/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml
+++ b/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml
@@ -1,58 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="130dp">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_90"
+    >
 
-    <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginLeft="130dp"
-            android:layout_marginRight="60dp"
+  <ImageView
+      android:id="@+id/iv_position"
+      android:layout_width="@dimen/dp_40"
+      android:layout_height="@dimen/dp_40"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      />
 
-            android:background="#802D3256"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
-
-    <ImageView
-            android:id="@+id/iv_position"
-            android:layout_width="30dp"
-            android:layout_height="42dp"
-            android:layout_marginLeft="130dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+  <TextView
+      android:id="@+id/tv_position"
+      android:layout_width="0dp"
+      android:layout_height="@dimen/dp_35"
+      android:layout_marginLeft="@dimen/dp_15"
+      android:layout_marginTop="@dimen/dp_15"
+      android:gravity="center_vertical"
+      android:textColor="@color/white"
+      android:textSize="@dimen/sp_25"
+      app:layout_constraintLeft_toRightOf="@id/iv_position"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      />
 
 
-    <TextView
-            android:id="@+id/tv_position"
-            android:layout_width="0dp"
-            android:layout_height="42dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="28dp"
-            android:layout_marginRight="60dp"
-            android:textColor="@color/white"
+  <TextView
+      android:id="@+id/tv_position_des"
+      android:layout_width="0dp"
+      android:layout_height="@dimen/dp_21"
+      android:layout_marginTop="@dimen/dp_4"
+      android:ellipsize="marquee"
+      android:singleLine="true"
+      android:textColor="@color/white_60"
+      android:textSize="@dimen/sp_15"
+      app:layout_constraintLeft_toLeftOf="@id/tv_position"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/tv_position"
+      />
 
-            android:textSize="30sp"
-            app:layout_constraintLeft_toRightOf="@id/iv_position"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-            android:id="@+id/tv_position_des"
-            android:layout_width="0dp"
-            android:layout_height="30dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="60dp"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:textColor="@color/white_7f"
-            android:textSize="22sp"
-            app:layout_constraintLeft_toRightOf="@id/iv_position"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_position" />
+  <View
+      android:layout_width="0dp"
+      android:layout_height="@dimen/dp_1"
+      android:layout_marginLeft="@dimen/dp_55"
+      android:background="@color/white_10"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png
new file mode 100755
index 0000000000000000000000000000000000000000..47782f77f5793d94aed3215012ea80f94d5deb1e
GIT binary patch
literal 703
zcmV;w0zmzVP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px%c}YY;RA>e5nLSHfK@^5}vl>Ax1d#+34BA--0$Nz45QMCt24ZI~ScrvS(nV|p
z3;%<a5;52%5X2vlDqv*@7!VdxL=gPCJ_j5bZtlX)%)Q*%a1Ol8$DK2Co-_Azw^C8l
z3}^;41DXNNfM!555SoD`Nv6?jR1KXgI)9)hk+D-M@6kYXf%*mn%sfil4IQ6R9d-E5
z9fcnNS%7pu+HY#>XgG?1U4tNS8}K{rFX#@XP5R{6JJjX6PHE!_)&|^>K<FDrvTL$?
zS=OL)3yqc*c&iH&<UfGMmt!>~*P&dGa$RQGyczFWK5=!(dwjK8y+sG;4Ra5n59lYd
z?Umhdsh19D2MgpG`beMLY!>ZfzV)a84Fr%0^&h4kQbq|F0+jYuz;s61tzGCV68HO;
zBxDvXSc$1w^}?&U0s<so3UW)ILjv{!rL8mFQDi$95Gc8h$B{tIpg|Okc>w|?r`ZIO
zT@tA0D9irPd4S%c?yLbt_c;Rsw@gs0sJ}^Y4f^-d9{S2N?HZpt_4WWH&<*qy*>+Cj
z6WT@JfV#C0mRWb+L4vj6wrLC0F;I79f;3w@=s^$E5;_Wj<MfqJroU1)3o@iX2ry(}
z%Xfu(50Wx>iviG_@}|rcG6uk0fzp#HU^*iOw67lKG-a+!#IS>#5M3ZCb2p#oV6H*%
zh*@JoQ6Uz?4i*AtCRIR_iFPgj`yC9r$?*Po*y7I0tC+E|7XA8+Lr56}$ih<|i$C-9
z^H{1<@i|3LyjBWx`sM5H{C6^^m;7kdi(Gw2@R45uZjg&zGFU#zqWOq+30}u)1~dbj
l0nLDBKr^5j&<r%qz&&ROTpUnn_Za{H002ovPDHLkV1i*IE<FGM

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png
new file mode 100755
index 0000000000000000000000000000000000000000..0ae97b36d1ec8cb88f3682768f72abfc4e7b16a2
GIT binary patch
literal 1007
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3jKx9jP7LeL$-HD>U|#9z;uuoF
z_;!wUhlry<TlrOoqwXqp4o4hZ4tj_fn;TgfJ6`Z$F*Gq0;SuTaJ#yy3yC7a4o|fGn
zES8QTE`mo7uq$co6Ds{1oxU^e_l>=8=gxZdcwbvmRn@N5yY|&rm!*BXm=&nNz{ugi
zz$DPXz(NGGQPpq3Tg(4>+jqx(<UjT8w3(U7bo;K)PTv;X&9l$dNc)+na?J3i`^@y6
zD<8~0y*$;%+0o+hN~icY;kWp;w{~3mq3M0{eZaH+)Yn=}=eO=v{T=i+IzLR~fZWZ(
zo2RsHl+N9EF6`^mtrHcVr|d0?pL$h}MWlR@IcM(vlT87q*K2${$#KNfpJ~?d$r*ap
zw$Cqhzx}xC#wG4`Z-1|N7g#IKdROY|-Bof;J5+azFs;|hon+P8!rd#pDc1Cy?wxX<
z*S))=7yAo`ALU%6(=0Jr?dG<qV7I#L;^;*RrR#bmt{CiZ-(q$B2=l66?77dk?5fi*
zSo3X}5Nqe;Iakm5+%ZVnyZB$bxaG4;4R!gd*IHaEEf)CewtI=ExC!VzOVjE|e3Qf~
zDUvpu@7~1yb7!6Z?kIcQHf)!|<7eilepJ8uliA4l@L>85m3u1Iy1TWEwK<IXzct1E
zEq`AA|N0iKL&{ULLw`5^dtCaySl(#Pi_I%ee_N3k<T~MDM7?Wl6~FT0WmT&=g7nXC
z+&lH3+@+Q4rW6UkeZu!eDtwp1!%18FPKW95Q$DWyaf;|X>qrsp{aep%JtArpn`-eU
z@VJJ;Kie3Y)Q0f;k6145bqF_Dwx^*2r1t6ABc^suJ0AHrD|?(evX#{_=Hv2%f-0$x
zZZ#>a`*HaJ$0Vb|Tt|WMKbZwAo-=oBQ|QqCXJXN`#3v?N;D~6wl#FAL+B#j1M_u;3
zeF~bB|4o}8c(@<x>ciLF^G_VoFI#`Y$GcEIU}oCvhcWUqTIUDOKP55Cv_*7M>)AYk
zrW+g2e(F((yzz!ju|xK@&Up?z!V_NZXMDMwWxDBC<xLiTKhC{t(^~q$-yweWuH$JJ
zVh-&Wo_l@nub9cg-HunK!js-iKJ32LD)-*aT+X5`CpS!6zUI2u6W_@vC63H8{a|@v
z=}j)qz^z`_vNlJjY1VM02HItp?%7h%<4;0nfMlGEz60@BukUZ+672X4%)tzvu6{1-
HoD!M<b(*`G

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png
new file mode 100755
index 0000000000000000000000000000000000000000..e1a918fa24d44d835bcb2e030e2b80a5f2bd62f9
GIT binary patch
literal 712
zcmV;(0yq7MP)<h;3K|Lk000e1NJLTq0024w0021%1^@s6XD>L000001b5ch_0Itp)
z=>Px%f=NU{RA>e5m(NR7Q545V4LA9-b*PB_3n?fze?zsf+ywm#;!YGn2npN<Zp4K<
zAu1}`IP(ugP)X4rP^s&FxN!O$cvlXuUNi5$ckdgRbKuK8=goQNd(QV>?~JvYnJHij
zm;$DNDPRhi0;Yf|5LSU!t91u#fU&Sl6;)@j0k8v{9pg+@)J_;$1{wjc+=OcVjz1fQ
zHF8x3nFb%#aN=I5_y_*o$ZeHN#{i4qObsROCYT4O5+o*rua?UmsTz$x1n0>hvit-~
zjvilj`V-K$OK`>IboEN3{ot|g9{(%2nQokC<KPHrdqXgq&h4t028Y25-8KGOa6PM0
zJ{tskK-&j`$*gxOeNJOj;Jxk^{}5d5q%rc=fWD-@5&v}xI;j;bhlUow3DCAh(3gjl
z{CnV+Dk3-X?L0Mt<<iIl@LM$}jV}8V@~()cZ)(})72kS=--BE(oo%2^j@w+(;?$S{
zpLJpUCm`;P4B-%X2DH5+m?%1=d!Jg@KvNUozXl^NC-@54^Hc**iHFK2rl#D;`zfxM
zW%Fd#OA$XJ?$1mv;REWgYfhh%xo$;AAf(Rk!<-*-Ey@{mCqfRMx3&$MSFvu-@0lG9
z{sqh>BA3;Da3f>azwrEkJMHp<%gBrWSZ+XP?byj%cDesq+x}$K@3!Oo*XJ>gZq`of
zemcp~`MLezM>o|`lem#QtFzup{NPLMK^y!nZpc&|MOmW_8sq57T$P&*TKN`~+<@(9
z$%0m1u4i^M_SZ{2`C5@3uE*SFuYa25=UB`p(_B9P?E4<wi!^z}*o)hD&|L=eA}lC~
ua0<7XDPRhi0;Yf|U<#N5rhqBXPJurYx5><%qdK7g0000<MNUMnLSTYqQ&9W>

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png
new file mode 100755
index 0000000000000000000000000000000000000000..be529a46a397d88b8fab3b413c75b686d6b7afee
GIT binary patch
literal 1847
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

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png
new file mode 100755
index 0000000000000000000000000000000000000000..161e1137bf7ec6c10eacf64888e5ef8ef3952ef2
GIT binary patch
literal 1978
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

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png
new file mode 100755
index 0000000000000000000000000000000000000000..44f01d1337e05242a139a068a0c22e37db5f5fef
GIT binary patch
literal 2367
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

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png
new file mode 100755
index 0000000000000000000000000000000000000000..9db11f18bb8275b1b3d532467629e53d9cd05f91
GIT binary patch
literal 1935
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

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png
new file mode 100755
index 0000000000000000000000000000000000000000..d8e3d9e3bd95aa37a54f1b8a41f6deb689e93aa9
GIT binary patch
literal 2143
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
M*2?iB-NHZle{vNAjsO4v

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png
new file mode 100755
index 0000000000000000000000000000000000000000..8064743c9be19d87dde3bfea079d3e9e63750d7c
GIT binary patch
literal 1645
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
aJrOzXPqQL9;k_0A1Az4Q_j>3NmHlsvuo{{G

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-navi/src/main/res/values/colors.xml b/modules/mogo-module-navi/src/main/res/values/colors.xml
index 95d44677b1..9034eeceb2 100644
--- a/modules/mogo-module-navi/src/main/res/values/colors.xml
+++ b/modules/mogo-module-navi/src/main/res/values/colors.xml
@@ -5,6 +5,7 @@
     <color name="colorAccent">#D81B60</color>
     <color name="bg_gray_common_page">#ff080625</color>
     <color name="white">#FFFFFF</color>
+    <color name="white_10">#1AFFFFFF</color>
     <color name="white_60">#99FFFFFF</color>
     <color name="white_7f">#7FFFFFFF</color>
     <color name="arrow_color">#00BFFF</color>
@@ -12,5 +13,6 @@
     <color name="txt_gray_day">#4D080625</color>
 
     <color name="bg_common">#080625</color>
+    <color name="txt_blue">#3E7FFC</color>
 
 </resources>
diff --git a/modules/mogo-module-navi/src/main/res/values/dimens.xml b/modules/mogo-module-navi/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..a3ee6f7620
--- /dev/null
+++ b/modules/mogo-module-navi/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <dimen name="txt_normal">@dimen/sp_16</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-navi/src/main/res/values/strings.xml b/modules/mogo-module-navi/src/main/res/values/strings.xml
index ac37e0a964..30e397bbaa 100644
--- a/modules/mogo-module-navi/src/main/res/values/strings.xml
+++ b/modules/mogo-module-navi/src/main/res/values/strings.xml
@@ -1,4 +1,8 @@
 <resources>
   <string name="app_name">mogo-module-navi</string>
   <string name="hint_map_search">查看地点、公交、地铁</string>
+  <string name="history_search">搜索历史</string>
+  <string name="navi_home">回家</string>
+  <string name="navi_company">去公司</string>
+  <string name="navi_restrant">餐馆</string>
 </resources>
diff --git a/modules/mogo-module-navi/src/main/res/values/styles.xml b/modules/mogo-module-navi/src/main/res/values/styles.xml
index 624c3162ae..d30e008efe 100644
--- a/modules/mogo-module-navi/src/main/res/values/styles.xml
+++ b/modules/mogo-module-navi/src/main/res/values/styles.xml
@@ -16,4 +16,13 @@
         <item name="android:paddingLeft">48dp</item>
     </style>
 
+  <style name="txt_navi_style">
+    <item name="android:layout_width">@dimen/dp_134</item>
+    <item name="android:gravity">center_horizontal</item>
+    <item name="android:textSize">@dimen/txt_normal</item>
+    <item name="android:textColor">@color/white</item>
+    <item name="android:background">@drawable/shape_round_gray</item>
+    <item name="android:layout_height">@dimen/dp_118</item>
+  </style>
+
 </resources>
diff --git a/modules/mogo-module-navi/src/test/java/com/mogo/module/navi/ExampleUnitTest.java b/modules/mogo-module-navi/src/test/java/com/mogo/module/navi/ExampleUnitTest.java
new file mode 100644
index 0000000000..3a4d4d42eb
--- /dev/null
+++ b/modules/mogo-module-navi/src/test/java/com/mogo/module/navi/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.mogo.module.navi;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file