diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 6d75caaf9b..be9d8f248c 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -43,6 +43,7 @@ import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.statusmanager.IMogoStatusManager; +import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; import org.json.JSONException; @@ -266,6 +267,12 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme if ( size == 0 ) { showLayout(); } else if ( size == 1 ) { + UiThreadHandler.postDelayed(new Runnable() { + @Override public void run() { + mMogoMapUIController.setPointToCenter(0.5,0.5); + + } + },1000); hideLayout(); } } ); diff --git a/modules/mogo-module-search/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 index d8f6584ede..02bc1b9482 100644 --- a/modules/mogo-module-search/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 @@ -84,7 +84,7 @@ public abstract class BaseFragment extends Fragment { * 移动地图中心点到屏幕中心 */ protected void moveMapToCenter(){ - SearchServiceHolder.INSTANCE.getMapUIController().setPointToCenter(0.5,0.5); + //SearchServiceHolder.INSTANCE.getMapUIController().setPointToCenter(0.5,0.5); } //mMogoMapUIController.setPointToCenter( 0.66145, 0.590688 ); 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 9459b25520..95f9f99352 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 @@ -56,7 +56,9 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB "startNavi" -> { startNavi() } - + "retry" -> { + retry() + } "cancel" -> { SearchServiceHolder.fragmentManager .clearAll() @@ -107,17 +109,22 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB mAdapter.setDatas(calculatedStrategies) mAdapter.selectTag = calculatedStrategies[0].tagId } - AIAssist.getInstance(context).speakTTSVoice(String.format("已为你规划处%d条路线,请选择",calculatedStrategies.size)) + AIAssist.getInstance(context) + .speakTTSVoice(String.format("已为你规划处%d条路线,请选择", calculatedStrategies.size)) pb_path.visibility = View.GONE group_path.visibility = View.GONE tv_navi_navi.text = getString(R.string.start_navi) + unregisterRetryVoice() + } override fun onoCalculateFailed() { group_path.visibility = View.VISIBLE tv_navi_navi.text = "重试" - pb_path.visibility=View.GONE + pb_path.visibility = View.GONE + + registerRetryVoice() } @@ -176,10 +183,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB tv_navi_navi.setOnClickListener { if (group_path.visibility == View.VISIBLE) { - SearchServiceHolder.getNavi() - .naviTo(mogoTip) - pb_path.visibility=View.VISIBLE - group_path.visibility=View.GONE + retry() } else { startNavi() } @@ -212,14 +216,33 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } + private fun registerRetryVoice(){ + AIAssist.getInstance(context) + .registerUnWakeupCommand("retry", arrayOf("重试"), this) + } + + private fun unregisterRetryVoice(){ + AIAssist.getInstance(context) + .unregisterUnWakeupCommand("retry") + + } + + private fun retry() { + SearchServiceHolder.getNavi() + .naviTo(mogoTip) + pb_path.visibility = View.VISIBLE + group_path.visibility = View.GONE + } + private fun startNavi() { + moveMapToRight() + SearchServiceHolder.getNavi() .startNavi(!SettingManager.isMonitor()) SearchServiceHolder.getMapUIController() .recoverLockMode() isStartedNavi = true SearchServiceHolder.fragmentManager.clearAll() - moveMapToRight() } private fun selectPath(item: MogoCalculatePath?) { @@ -253,7 +276,6 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB AIAssist.getInstance(context) .unregisterUnWakeupCommand("startNavi") - } companion object {