From 39c4b4ec887fc35ea3620aa7daf2be3cf4a2cf6e Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 27 Feb 2020 18:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=AF=BC=E8=88=AA=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/navi/manager/SettingManager.kt | 14 +++++++++++++- .../module/navi/ui/search/ChoosePathFragment.kt | 3 ++- .../module/navi/ui/setting/NaviSettingFragment.kt | 7 +++++++ .../src/main/res/layout/fragment_navi_setting.xml | 10 ++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/SettingManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/SettingManager.kt index b8913c7967..b5e757d036 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/SettingManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/SettingManager.kt @@ -37,6 +37,10 @@ object SettingManager : IMogoSettingManager { * 高速优先 */ private var highSpeed = false + /** + * 模拟导航 + */ + private var isMonitor: Boolean = false override fun getPathPrefer(): Int { return settings!!.getInt(KEY_PAHT_PREFER, 0) @@ -78,6 +82,14 @@ object SettingManager : IMogoSettingManager { .apply() } + fun setMonitor(type: Boolean) { + isMonitor = type + } + + fun isMonitor(): Boolean { + return isMonitor + } + /** * 是否躲避拥堵 */ @@ -91,7 +103,7 @@ object SettingManager : IMogoSettingManager { */ fun avoidSpeed(avoidSpeed: Boolean) { this.avoidSpeed = avoidSpeed - if (avoidSpeed){ + if (avoidSpeed) { this.highSpeed = false } save() diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt index 93b65e8d16..cb6effbd3b 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt @@ -20,6 +20,7 @@ import com.mogo.module.navi.BuildConfig import com.mogo.module.navi.R import com.mogo.module.navi.constants.AMapConstants import com.mogo.module.navi.constants.SearchServiceHolder +import com.mogo.module.navi.manager.SettingManager import com.mogo.module.navi.ui.adapter.CalculatePathAdapter import com.mogo.module.navi.ui.base.BaseFragment import kotlinx.android.synthetic.main.fragment_search_category.group_path @@ -216,7 +217,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB private fun startNavi() { SearchServiceHolder.getNavi() - .startNavi(false) + .startNavi(!SettingManager.isMonitor()) SearchServiceHolder.getMapUIController() .recoverLockMode() isStartedNavi = true 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 index b59d2d88dc..896ce04f38 100644 --- 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 @@ -236,11 +236,18 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { override fun onStopTrackingTouch(seekBar: SeekBar?) { } }) + + cb_navi.setOnCheckedChangeListener { buttonView, isChecked -> + SettingManager.setMonitor(isChecked) + } + cb_navi.isChecked=SettingManager.isMonitor() } else { tv_navi_fps.visibility = View.GONE ll_navi_fps.visibility = View.GONE + cb_navi.visibility = View.GONE } + } private fun updateHome() { 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 index 5b4579eee0..66336bf3eb 100644 --- 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 @@ -480,6 +480,16 @@ + + +