diff --git a/app/build.gradle b/app/build.gradle index e90b27d6bf..f7fac3e35b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,10 +21,10 @@ android { multiDexEnabled true externalNativeBuild { -// ndk { -// // 设置支持的SO库架构 -// abiFilters 'armeabi-v7a' -// } + ndk { + // 设置支持的SO库架构 + abiFilters 'armeabi-v7a' + } } } signingConfigs { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index 0f7ae2a71b..10bc476db0 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -38,6 +38,8 @@ public class ExtensionsModuleConst { public static final String UPLOAD_ROAD_CONDITION_AWAKEN = "com.zhidao.pathfinder.report.roadCondition"; //关闭分享框 唤醒 public static final String SHARE_DIALOG_CLOSE = "com.zhidao.share.close"; + // 两次未回复关闭分享对话框 + public static final String NO_REPLY_SHARE_DIALOG_CLOSE = "com.zhidao.share.dialog.close"; //我要分享 public static final String GO_TO_SHARE = "com.zhidao.share"; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 0ef8d0a9b9..400d6b39c3 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -103,6 +103,7 @@ public class EntrancePresenter extends Presenter { mogoIntentManager.registerIntentListener(ExtensionsModuleConst.GO_TO_SHARE, mogoIntentListener); mogoIntentManager.registerIntentListener(ExtensionsModuleConst.SHARE_DIALOG_CLOSE, mogoIntentListener); mogoIntentManager.registerIntentListener(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION_AWAKEN, mogoIntentListener); + mogoIntentManager.registerIntentListener(ExtensionsModuleConst.NO_REPLY_SHARE_DIALOG_CLOSE,mogoIntentListener); } @@ -147,6 +148,10 @@ public class EntrancePresenter extends Presenter { } else if (intentStr.equals(ExtensionsModuleConst.SHARE_DIALOG_CLOSE)) { //关闭分享框 唤醒 ShareControl.getInstance(mContext).dismissDialog(); Log.d(TAG, "mogoIntentListener 关闭分享框 唤醒 ----> "); + } else if (intentStr.equals(ExtensionsModuleConst.NO_REPLY_SHARE_DIALOG_CLOSE)) { + // 两次未回复关闭对话框 + ShareControl.getInstance(mContext).dismissDialog(); + Logger.d(TAG, "mogoIntentListener 两次未回复关闭对话框"); } } }; diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt index 4be59aa3a1..91b293b75e 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt @@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.commons.voice.AIAssist import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.map.marker.IMogoMarker +import com.mogo.map.marker.IMogoMarkerClickListener import com.mogo.map.marker.MogoMarkerOptions import com.mogo.map.search.geo.MogoPoiItem import com.mogo.map.search.inputtips.MogoTip @@ -32,7 +33,13 @@ import kotlinx.android.synthetic.main.fragment_search_category.tv_navi_navi * @author zyz * 2020-01-09. */ -class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBack { +class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBack + { +// override fun onMarkerClicked(marker: IMogoMarker?): Boolean { +// +// return true +// } + override fun onCmdSelected(cmd: String?) { if (cmd?.startsWith("position") == true) { var index = cmd.substring(8) @@ -83,6 +90,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa .icon(createWaterMask) .latitude(datums[index].point?.lat ?: 0.0) .owner("CategorySearchFragment") + .`object`(index) // .anchor(0.5f, 1f) .longitude(datums[index].point?.lng ?: 0.0) arrayList.add(options) @@ -98,6 +106,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa addMarkers = SearchServiceHolder.getMarkerManger() .addMarkers(TAG, arrayList, true) moveMapToRight() + addClick() } private fun registerVoice() { @@ -118,11 +127,30 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa addMarkers = SearchServiceHolder.getMarkerManger() .addMarkers(TAG, arrayList, true) registerVoice() + addClick() + } else { unRegisterVoice() } } + private fun addClick(){ + if (addMarkers != null) { + for (item in addMarkers!!){ + item.setOnMarkerClickListener { + + var index = it.mogoMarkerOptions.`object` as Int + mAdapter.current=index + rv_search_result.smoothScrollToPosition(index) + updateMarker() + true + } + + } + } + + } + private lateinit var mAdapter: SearchCategoryAdapter private lateinit var mSearchPresenter: CategoryPresenter @@ -185,8 +213,9 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa addMarkers?.get(mAdapter.lastPosition) ?.setIcon(getMarkerIcon(mAdapter.lastPosition)) - addMarkers?.get(mAdapter.current) - ?.setIcon(getMarkerIcon(mAdapter.current)) + var current = addMarkers?.get(mAdapter.current) + current?.setIcon(getMarkerIcon(mAdapter.current)) + current?.setToTop() arrayList.get(mAdapter.lastPosition) .icon(getMarkerIcon(mAdapter.lastPosition)) arrayList.get(mAdapter.current) diff --git a/modules/mogo-module-search/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 index a2b25b8e8b..0b335233d8 100644 --- a/modules/mogo-module-search/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 @@ -595,7 +595,7 @@ public class SearchFragment extends BaseSearchFragment mSearchPresenter.deleteAllCachedPoi(); AIAssist.getInstance(getContext()) .speakQAndACmd(getString(R.string.notice_clean_history), - new String[] { "确定" }, new String[] { "取消" }, this); + new String[] { "确定","立即清空" }, new String[] { "取消" }, this); break; case BACK_CMD: @@ -642,8 +642,8 @@ public class SearchFragment extends BaseSearchFragment @Override public void onCmdAction(String speakText) { - mSearchPresenter.deleteAllCachedPoi(); mSearchPresenter.hideDialog(); + mSearchPresenter.deleteAllCachedPoiImpl(); } @Override public void onCmdCancel(String speakText) { diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_blue.png deleted file mode 100644 index 0bd9d83a57..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_blue.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png deleted file mode 100644 index 551334ee17..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png and /dev/null differ