From bb61cd1076a17f1198208aaeb4836408b76c9354 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 27 Feb 2020 16:09:24 +0800 Subject: [PATCH 1/4] add voice next and previous --- .../module/tanlu/constant/TanluConstants.java | 7 ++ .../tanlu/fragment/TanluCardViewFragment.java | 67 +++++++++++++------ 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java index 2506814f49..612164ab58 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java @@ -13,6 +13,8 @@ public class TanluConstants { public static final String MODEL_NAME = "CARD_TYPE_ROAD_CONDITION"; public static final String[] CMD_PLAY_ROAD_CONDITION = {"播放路况"}; + public static final String[] CMD_THE_PREVIOUS = {"上一条"}; + public static final String[] CMD_THE_NEXT = {"下一条"}; //上报路况 public static final String UPLOAD_ROAD_CONDITION = "command_upload_roadcondition"; @@ -21,6 +23,11 @@ public class TanluConstants { //播放 public static final String PLAY_VIDEO = "com.zhidao.tanlu.play"; + //上一条 + public static final String THE_PREVIOUS = "com.zhidao.tanlu.previous"; + //下一条 + public static final String THE_NEXT = "com.zhidao.tanlu.next"; + //分享封路 public static final String SHARE_ROAD_CLOSURE = "com.zhidao.share.road.closure"; //分享交通检查 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index 32bb168011..b7c9f9d97c 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -495,6 +495,10 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; .build(simpleCoverVideoPlayer); simpleCoverVideoPlayer.getStartButton().performClick(); traceVideoPlayStatusData(); + } else if (cmd.equals(TanluConstants.THE_PREVIOUS)) { //上一条 + handlePrevious(); + } else if (cmd.equals(TanluConstants.THE_NEXT)) { //下一条 + handleNext(); } } @@ -584,35 +588,48 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; public void onClick(View view) { int id = view.getId(); if (id == R.id.tv_previous_res) { //上一个 - //判断是图片还是视频，第一个时，上一个不可点击 - Log.e(TAG, " tv_previous_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); - if (currentPosition < 0) { - currentPosition = markerExploreWayList.size(); - } - currentPosition--; - Log.d(TAG, " tv_previous_res --2-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); - if (markerExploreWayList.size() > currentPosition && currentPosition >= 0) { - handleMarkerExploreWay(markerExploreWayList.get(currentPosition)); - moveToMarcker(markerExploreWayList.get(currentPosition).getLocation().getLat(), markerExploreWayList.get(currentPosition).getLocation().getLon()); - } + handlePrevious(); } else if (id == R.id.tv_next_res) { //下一个 - //判断是图片还是视频，最后一个时，下一个不可点击 - Log.e(TAG, " tv_next_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); - if (currentPosition >= markerExploreWayList.size()) { - currentPosition = 0; - } - currentPosition++; - Log.d(TAG, " tv_next_res --2-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); - if (markerExploreWayList.size() > currentPosition) { - handleMarkerExploreWay(markerExploreWayList.get(currentPosition)); - moveToMarcker(markerExploreWayList.get(currentPosition).getLocation().getLat(), markerExploreWayList.get(currentPosition).getLocation().getLon()); - } + handleNext(); } else if (id == R.id.tv_main_empty) { //上报路况 sendShareReceiver("1"); } } + /** + * 上一条逻辑 + */ + private void handlePrevious() { + //判断是图片还是视频，第一个时，上一个不可点击 + Log.e(TAG, " tv_previous_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); + if (currentPosition < 0) { + currentPosition = markerExploreWayList.size(); + } + currentPosition--; + Log.d(TAG, " tv_previous_res --2-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); + if (markerExploreWayList.size() > currentPosition && currentPosition >= 0) { + handleMarkerExploreWay(markerExploreWayList.get(currentPosition)); + moveToMarcker(markerExploreWayList.get(currentPosition).getLocation().getLat(), markerExploreWayList.get(currentPosition).getLocation().getLon()); + } + } + + /** + * 下一条逻辑 + */ + private void handleNext() { + //判断是图片还是视频，最后一个时，下一个不可点击 + Log.d(TAG, " tv_next_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); + if (currentPosition >= markerExploreWayList.size()) { + currentPosition = 0; + } + currentPosition++; + Log.d(TAG, " tv_next_res --2-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); + if (markerExploreWayList.size() > currentPosition) { + handleMarkerExploreWay(markerExploreWayList.get(currentPosition)); + moveToMarcker(markerExploreWayList.get(currentPosition).getLocation().getLat(), markerExploreWayList.get(currentPosition).getLocation().getLon()); + } + } private void moveToMarcker(double lat, double lon) { MogoLatLng latLng = new MogoLatLng(lat, lon); @@ -763,6 +780,10 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; //免唤醒 AIAssist.getInstance(getActivity()).registerUnWakeupCommand(TanluConstants.PLAY_VIDEO, TanluConstants.CMD_PLAY_ROAD_CONDITION, mogoVoiceListener); + AIAssist.getInstance(getActivity()).registerUnWakeupCommand(TanluConstants.THE_PREVIOUS, + TanluConstants.CMD_THE_PREVIOUS, mogoVoiceListener); + AIAssist.getInstance(getActivity()).registerUnWakeupCommand(TanluConstants.THE_NEXT, + TanluConstants.CMD_THE_NEXT, mogoVoiceListener); isCurrentPage = true; Logger.d(TAG, "tanlu卡片 onPerform 有效 ---->"); @@ -873,6 +894,8 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; } AIAssist.getInstance(getActivity()).unregisterUnWakeupCommand(TanluConstants.PLAY_VIDEO); + AIAssist.getInstance(getActivity()).unregisterUnWakeupCommand(TanluConstants.THE_PREVIOUS); + AIAssist.getInstance(getActivity()).unregisterUnWakeupCommand(TanluConstants.THE_NEXT); } @Override From 2031be3f91299ae4487dc57320414849a3c0d6a6 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 27 Feb 2020 17:17:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 005b3a1955..93b65e8d16 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 @@ -216,7 +216,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB private fun startNavi() { SearchServiceHolder.getNavi() - .startNavi(true) + .startNavi(false) SearchServiceHolder.getMapUIController() .recoverLockMode() isStartedNavi = true From ed7270cd801f5e5cb9a1868b8b7d7e17e7a41f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 27 Feb 2020 18:13:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86=E5=A4=B1?= =?UTF-8?q?=E6=95=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 216db92ef4..781c232df8 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -288,6 +288,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag markerShowEntity.setChecked(true); IMarkerView markerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, mogoMarker.getMogoMarkerOptions()); mogoMarker.setIcon(ViewUtils.fromView(markerView.getView())); + mogoMarker.setToTop(); } } } @@ -584,7 +585,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag @Override public void onMsgReceived(final MarkerResponse response) { Logger.e(TAG, "接收到了地图大而全数据"); - if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow() && isSynchronousOnLineData) { + if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow() && isACC_ON) { Handler handler = new Handler(Looper.getMainLooper()); handler.post(new Runnable() { @Override From 39c4b4ec887fc35ea3620aa7daf2be3cf4a2cf6e Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 27 Feb 2020 18:27:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=8E=A7=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 @@ + + +