From b9ab72b8a7959c30f752728c7f719e1e53e61176 Mon Sep 17 00:00:00 2001
From: zhangyuanzhen <zhangyuanzhen@zhidaoauto.com>
Date: Wed, 8 Jan 2020 10:57:25 +0800
Subject: [PATCH] rename nav to search

---
 app/build.gradle                              |   2 +-
 .../.gitignore                                |   0
 .../build.gradle                              |   0
 .../consumer-rules.pro                        |   0
 .../gradle.properties                         |   0
 .../proguard-rules.pro                        |   0
 .../src/main/AndroidManifest.xml              |   0
 .../module/navi/bean/EntityConvertUtils.java  |   0
 .../com/mogo/module/navi/bean/SearchPoi.java  |   0
 .../module/navi/constants/AMapConstants.java  |   0
 .../module/navi/constants/CustomMapStyle.java |   0
 .../module/navi/constants/DataConstants.java  |   0
 .../mogo/module/navi/dao/SearchPoiDao.java    |   0
 .../module/navi/database/AppDataBase.java     |   0
 .../com/mogo/module/navi/ui/NaviActivity.kt   |   0
 .../navi/ui/adapter/HistoryPoiAdapter.java    |   0
 .../navi/ui/adapter/SearchPoiAdapter.java     |   0
 .../ui/adapter/base/RecycleBaseAdapter.java   |   0
 .../ui/adapter/base/RecycleViewHolder.java    |   0
 .../module/navi/ui/base/AMapBaseFragment.java |   0
 .../module/navi/ui/base/BaseActivity.java     |   0
 .../module/navi/ui/base/BaseFragment.java     |   0
 .../module/navi/ui/base/UiController.java     |   0
 .../navi/ui/search/SearchConstants.java       |   0
 .../module/navi/ui/search/SearchFragment.java |   0
 .../ui/search/SearchFragmentProvider.java     |   0
 .../navi/ui/search/SearchPresenter.java       |   0
 .../module/navi/ui/search/SearchUtils.java    |   0
 .../module/navi/ui/search/SearchView.java     |   0
 .../navi/ui/setting/NaviSettingFragment.kt    |  14 +++
 .../main/res/color/selector_white_gray.xml    |   9 ++
 .../res/drawable/amap_white_shadow_bkg.9.png  | Bin
 .../main/res/drawable/shape_round_gray.xml    |   0
 .../src/main/res/layout/activity_navi.xml     |   0
 .../main/res/layout/fragment_navi_setting.xml |  83 ++++++++++++++++++
 .../src/main/res/layout/fragment_search.xml   |   0
 .../src/main/res/layout/item_search_poi.xml   |   0
 .../src/main/res/mipmap-xhdpi/icon_back.png   | Bin
 .../res/mipmap-xhdpi/icon_navi_company.png    | Bin
 .../main/res/mipmap-xhdpi/icon_navi_gas.png   | Bin
 .../main/res/mipmap-xhdpi/icon_navi_home.png  | Bin
 .../res/mipmap-xhdpi/icon_navi_location.png   | Bin
 .../main/res/mipmap-xhdpi/icon_navi_park.png  | Bin
 .../res/mipmap-xhdpi/icon_navi_position.png   | Bin
 .../res/mipmap-xhdpi/icon_navi_restrant.png   | Bin
 .../res/mipmap-xhdpi/icon_navi_setting.png    | Bin
 .../main/res/mipmap-xhdpi/icon_navi_tolit.png | Bin
 .../main/res/mipmap-xhdpi/icon_navi_wash.png  | Bin
 .../src/main/res/values/colors.xml            |   1 +
 .../src/main/res/values/dimens.xml            |   2 +
 .../src/main/res/values/ids.xml               |   0
 .../src/main/res/values/strings.xml           |   5 +-
 .../src/main/res/values/styles.xml            |  10 +++
 settings.gradle                               |   2 +-
 54 files changed, 125 insertions(+), 3 deletions(-)
 rename modules/{mogo-module-navi => mogo-module-search}/.gitignore (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/build.gradle (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/consumer-rules.pro (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/gradle.properties (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/proguard-rules.pro (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/AndroidManifest.xml (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/bean/SearchPoi.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/constants/AMapConstants.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/constants/CustomMapStyle.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/constants/DataConstants.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/dao/SearchPoiDao.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/database/AppDataBase.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/NaviActivity.kt (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/adapter/HistoryPoiAdapter.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/adapter/SearchPoiAdapter.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleViewHolder.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/base/AMapBaseFragment.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/base/UiController.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/search/SearchConstants.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/search/SearchFragmentProvider.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/search/SearchUtils.java (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/java/com/mogo/module/navi/ui/search/SearchView.java (100%)
 create mode 100644 modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
 create mode 100644 modules/mogo-module-search/src/main/res/color/selector_white_gray.xml
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/drawable/amap_white_shadow_bkg.9.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/drawable/shape_round_gray.xml (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/layout/activity_navi.xml (100%)
 create mode 100644 modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/layout/fragment_search.xml (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/layout/item_search_poi.xml (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_back.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_company.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_gas.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_home.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_location.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_park.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_position.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_restrant.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_setting.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_tolit.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/mipmap-xhdpi/icon_navi_wash.png (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/values/colors.xml (93%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/values/dimens.xml (51%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/values/ids.xml (100%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/values/strings.xml (76%)
 rename modules/{mogo-module-navi => mogo-module-search}/src/main/res/values/styles.xml (75%)

diff --git a/app/build.gradle b/app/build.gradle
index 19f74dadbe..a0bb93f8fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,6 +72,6 @@ dependencies {
         implementation project(':foudations:mogo-commons')
         implementation project(':modules:mogo-module-common')
         implementation project(':modules:mogo-module-tanlu')
-        implementation project(':modules:mogo-module-navi')
+        implementation project(':modules:mogo-module-search')
     }
 }
diff --git a/modules/mogo-module-navi/.gitignore b/modules/mogo-module-search/.gitignore
similarity index 100%
rename from modules/mogo-module-navi/.gitignore
rename to modules/mogo-module-search/.gitignore
diff --git a/modules/mogo-module-navi/build.gradle b/modules/mogo-module-search/build.gradle
similarity index 100%
rename from modules/mogo-module-navi/build.gradle
rename to modules/mogo-module-search/build.gradle
diff --git a/modules/mogo-module-navi/consumer-rules.pro b/modules/mogo-module-search/consumer-rules.pro
similarity index 100%
rename from modules/mogo-module-navi/consumer-rules.pro
rename to modules/mogo-module-search/consumer-rules.pro
diff --git a/modules/mogo-module-navi/gradle.properties b/modules/mogo-module-search/gradle.properties
similarity index 100%
rename from modules/mogo-module-navi/gradle.properties
rename to modules/mogo-module-search/gradle.properties
diff --git a/modules/mogo-module-navi/proguard-rules.pro b/modules/mogo-module-search/proguard-rules.pro
similarity index 100%
rename from modules/mogo-module-navi/proguard-rules.pro
rename to modules/mogo-module-search/proguard-rules.pro
diff --git a/modules/mogo-module-navi/src/main/AndroidManifest.xml b/modules/mogo-module-search/src/main/AndroidManifest.xml
similarity index 100%
rename from modules/mogo-module-navi/src/main/AndroidManifest.xml
rename to modules/mogo-module-search/src/main/AndroidManifest.xml
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/bean/SearchPoi.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/SearchPoi.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/bean/SearchPoi.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/SearchPoi.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/constants/AMapConstants.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/AMapConstants.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/constants/AMapConstants.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/AMapConstants.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/constants/CustomMapStyle.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/CustomMapStyle.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/constants/CustomMapStyle.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/CustomMapStyle.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/constants/DataConstants.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/DataConstants.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/constants/DataConstants.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/DataConstants.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/dao/SearchPoiDao.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/dao/SearchPoiDao.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/dao/SearchPoiDao.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/dao/SearchPoiDao.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/database/AppDataBase.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/database/AppDataBase.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/database/AppDataBase.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/database/AppDataBase.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/NaviActivity.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/NaviActivity.kt
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/NaviActivity.kt
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/NaviActivity.kt
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/HistoryPoiAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/HistoryPoiAdapter.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/HistoryPoiAdapter.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/HistoryPoiAdapter.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/SearchPoiAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchPoiAdapter.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/SearchPoiAdapter.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchPoiAdapter.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleViewHolder.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleViewHolder.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleViewHolder.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleViewHolder.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/AMapBaseFragment.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/AMapBaseFragment.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/AMapBaseFragment.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/AMapBaseFragment.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/UiController.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/UiController.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/base/UiController.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/UiController.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchConstants.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchConstants.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchConstants.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchConstants.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchFragmentProvider.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragmentProvider.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchFragmentProvider.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragmentProvider.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchUtils.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchUtils.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchUtils.java
diff --git a/modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchView.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchView.java
similarity index 100%
rename from modules/mogo-module-navi/src/main/java/com/mogo/module/navi/ui/search/SearchView.java
rename to modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchView.java
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
new file mode 100644
index 0000000000..78b40c88c0
--- /dev/null
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
@@ -0,0 +1,14 @@
+package com.mogo.module.navi.ui.setting
+
+import com.mogo.module.navi.R
+import com.mogo.module.navi.ui.base.BaseFragment
+
+/**
+ * @author zyz
+ * 2020-01-07.
+ */
+class NaviSettingFragment : BaseFragment() {
+  override fun getLayoutId(): Int {
+    return R.layout.fragment_navi_setting
+  }
+}
diff --git a/modules/mogo-module-search/src/main/res/color/selector_white_gray.xml b/modules/mogo-module-search/src/main/res/color/selector_white_gray.xml
new file mode 100644
index 0000000000..d11193535f
--- /dev/null
+++ b/modules/mogo-module-search/src/main/res/color/selector_white_gray.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/white"  android:state_activated="true" />
+  <item android:color="@color/white"  android:state_selected="true" />
+  <item android:color="@color/white" android:state_pressed="true" />
+  <item android:color="@color/white" android:state_checked="true" />
+  <item android:color="@color/white_80" />
+
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-navi/src/main/res/drawable/amap_white_shadow_bkg.9.png b/modules/mogo-module-search/src/main/res/drawable/amap_white_shadow_bkg.9.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/drawable/amap_white_shadow_bkg.9.png
rename to modules/mogo-module-search/src/main/res/drawable/amap_white_shadow_bkg.9.png
diff --git a/modules/mogo-module-navi/src/main/res/drawable/shape_round_gray.xml b/modules/mogo-module-search/src/main/res/drawable/shape_round_gray.xml
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/drawable/shape_round_gray.xml
rename to modules/mogo-module-search/src/main/res/drawable/shape_round_gray.xml
diff --git a/modules/mogo-module-navi/src/main/res/layout/activity_navi.xml b/modules/mogo-module-search/src/main/res/layout/activity_navi.xml
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/layout/activity_navi.xml
rename to modules/mogo-module-search/src/main/res/layout/activity_navi.xml
diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
new file mode 100644
index 0000000000..734b29da06
--- /dev/null
+++ b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
@@ -0,0 +1,83 @@
+<?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"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/fragment_left_margin"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+
+  <RelativeLayout
+      android:layout_width="match_parent"
+      android:id="@+id/rl_navi_setting_title"
+      android:layout_marginTop="@dimen/dp_30"
+      android:layout_height="@dimen/dp_80"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      android:layout_gravity="center_horizontal">
+
+
+    <ImageView
+        android:id="@+id/iv_back"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
+        android:layout_centerVertical="true"
+        android:src="@mipmap/icon_back" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_toRightOf="@id/iv_back"
+        android:text="@string/navi_setting"
+        android:textColor="@color/white"
+        android:textSize="@dimen/txt_title" />
+
+
+  </RelativeLayout>
+
+
+  <TextView
+      app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title"
+      android:layout_width="400px"
+      android:layout_marginTop="@dimen/dp_40"
+      app:layout_constraintLeft_toLeftOf="parent"
+      android:layout_height="45px"
+      android:id="@+id/tv_navi_prefer"
+      android:text="@string/preference_navi"
+      android:textColor="@color/white"
+      android:textSize="@dimen/txt_normal"
+      />
+
+
+
+  <RadioGroup android:layout_width="match_parent"
+      android:layout_marginTop="@dimen/dp_12"
+      android:orientation="horizontal"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/tv_navi_prefer"
+      android:layout_marginBottom="26dp"
+      android:id="@+id/rg_time_mode"
+      android:layout_height="wrap_content">
+
+    <RadioButton
+        android:id="@+id/rb_time_24"
+        android:text="@string/navi_prefer_jam"
+        android:checked="true"
+        android:layout_marginRight="20dp"
+        style="@style/rb_setting"/>
+
+
+    <RadioButton
+        android:id="@+id/rb_time_12"
+        android:text="@string/time_mode_12"
+        android:layout_marginRight="20dp"
+        style="@style/rb_energy"/>
+
+  </RadioGroup>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search.xml
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/layout/fragment_search.xml
rename to modules/mogo-module-search/src/main/res/layout/fragment_search.xml
diff --git a/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml b/modules/mogo-module-search/src/main/res/layout/item_search_poi.xml
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml
rename to modules/mogo-module-search/src/main/res/layout/item_search_poi.xml
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_back.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_back.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_back.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_back.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_company.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_company.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_gas.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_gas.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_home.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_home.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_location.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_location.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_park.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_park.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_position.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_position.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_position.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_position.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_restrant.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_restrant.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_setting.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_setting.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_tolit.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_tolit.png
diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_wash.png
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png
rename to modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_wash.png
diff --git a/modules/mogo-module-navi/src/main/res/values/colors.xml b/modules/mogo-module-search/src/main/res/values/colors.xml
similarity index 93%
rename from modules/mogo-module-navi/src/main/res/values/colors.xml
rename to modules/mogo-module-search/src/main/res/values/colors.xml
index 9034eeceb2..0944d5ad10 100644
--- a/modules/mogo-module-navi/src/main/res/values/colors.xml
+++ b/modules/mogo-module-search/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
     <color name="white">#FFFFFF</color>
     <color name="white_10">#1AFFFFFF</color>
     <color name="white_60">#99FFFFFF</color>
+    <color name="white_80">#CCFFFFFF</color>
     <color name="white_7f">#7FFFFFFF</color>
     <color name="arrow_color">#00BFFF</color>
     <color name="white_30">#4DFFFFFF</color>
diff --git a/modules/mogo-module-navi/src/main/res/values/dimens.xml b/modules/mogo-module-search/src/main/res/values/dimens.xml
similarity index 51%
rename from modules/mogo-module-navi/src/main/res/values/dimens.xml
rename to modules/mogo-module-search/src/main/res/values/dimens.xml
index 80589d6506..a5f6465305 100644
--- a/modules/mogo-module-navi/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-search/src/main/res/values/dimens.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <dimen name="txt_normal">@dimen/sp_32</dimen>
+  <dimen name="fragment_left_margin">@dimen/dp_60</dimen>
+  <dimen name="txt_title">@dimen/sp_40</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-navi/src/main/res/values/ids.xml b/modules/mogo-module-search/src/main/res/values/ids.xml
similarity index 100%
rename from modules/mogo-module-navi/src/main/res/values/ids.xml
rename to modules/mogo-module-search/src/main/res/values/ids.xml
diff --git a/modules/mogo-module-navi/src/main/res/values/strings.xml b/modules/mogo-module-search/src/main/res/values/strings.xml
similarity index 76%
rename from modules/mogo-module-navi/src/main/res/values/strings.xml
rename to modules/mogo-module-search/src/main/res/values/strings.xml
index 52a805debd..77001b3dc0 100644
--- a/modules/mogo-module-navi/src/main/res/values/strings.xml
+++ b/modules/mogo-module-search/src/main/res/values/strings.xml
@@ -9,8 +9,11 @@
   <string name="navi_toilet">卫生间</string>
   <string name="navi_park">停车场</string>
   <string name="navi_wash">洗车</string>
-  <string name="navi_setting">更多设置</string>
+  <string name="navi_setting">导航设置</string>
+  <string name="more_setting">更多设置</string>
   <string name="history_clear">清空历史</string>
   <string name="history_empty">暂无历史结果</string>
   <string name="search_empty">暂无搜索结果</string>
+  <string name="preference_navi">路线偏好</string>
+  <string name="navi_prefer_jam">躲避拥堵</string>
 </resources>
diff --git a/modules/mogo-module-navi/src/main/res/values/styles.xml b/modules/mogo-module-search/src/main/res/values/styles.xml
similarity index 75%
rename from modules/mogo-module-navi/src/main/res/values/styles.xml
rename to modules/mogo-module-search/src/main/res/values/styles.xml
index deafcf3d63..3f9614df4d 100644
--- a/modules/mogo-module-navi/src/main/res/values/styles.xml
+++ b/modules/mogo-module-search/src/main/res/values/styles.xml
@@ -26,4 +26,14 @@
     <item name="android:paddingTop">@dimen/dp_44</item>
   </style>
 
+  <style name="rb_setting">
+
+    <item name="android:layout_width">180dp</item>
+    <item name="android:button">@null</item>
+    <item name="android:gravity">center</item>
+    <item name="android:textSize">@dimen/sp_40</item>
+    <item name="android:textColor">@color/selector_white_gray</item>
+    <item name="android:layout_height">@dimen/dp_120</item>
+  </style>
+
 </resources>
diff --git a/settings.gradle b/settings.gradle
index d98d79d1a8..e070d5df36 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ include ':foudations:mogo-commons'
 include ':modules:mogo-module-map'
 include ':modules:mogo-module-common'
 include ':modules:mogo-module-main'
-include ':modules:mogo-module-navi'
+include ':modules:mogo-module-search'
 include ':modules:mogo-module-tanlu'
 include ':modules:mogo-module-service'
 include ':libraries:map-amap'