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 @@
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
#FFFFFF
#1AFFFFFF
#99FFFFFF
+ #CCFFFFFF
#7FFFFFFF
#00BFFF
#4DFFFFFF
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 @@
@dimen/sp_32
+ @dimen/dp_60
+ @dimen/sp_40
\ 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 @@
卫生间
停车场
洗车
- 更多设置
+ 导航设置
+ 更多设置
清空历史
暂无历史结果
暂无搜索结果
+ 路线偏好
+ 躲避拥堵
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 @@
- @dimen/dp_44
+
+
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'