From 457d28d56bb43fff51642229e4e20032effff9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 19 Mar 2020 10:35:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/icon_map_marker_car_blue.png | Bin 3394 -> 0 bytes .../icon_map_marker_music_play.png | Bin 1855 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_blue.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png 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 0bd9d83a57873901ea07731cee560cf3d8b40e23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3394 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 Y1Ej2ob;<(T!2kdN07*qoM6N<$f)1l?f&c&j 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 551334ee17cb293a90a38aa4cb1b716edae66bb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1855 zcmV-F2f+A=P)Px*`AI}URCodHoL@*}WfZ{IolLi~tqtkVW)FeYix1Xgs3`cL4?>vWn}py~;H%I} zutYwX`w|irB^4MZk+eZCf*{I5fd&fh8m)hKT?TDj+teLLJHMOva%bkw+&^=_J9nHp zaMnBbe)s$HoAaITeCOWTvJ3f(r zH2_@}trF!p*S1fk4xsIe?wuXWAGMNer|o)IAqB38J}1htN;#6scSLtZIaVU7fIT6- zeNproCB3$oZ$6eL)sq{87%SeZqWG*r6nxrWqOMm{FBW!58hTBXptDc~E5q7Y6qu@x#Vs&`&RWs1`zt2^ z7&|c{!S5p{H&Dh6FdbGQ_$#O5XDmSbN7NBCr@)woSk`%hCBxAKKTd$n_R4m8Ist}* z$7h{~X(+?66bu1q>=3fXYIeY=2+JyD2QS@sB(Qi&l)Y%iki!lbaTer@MOZzVNlZ^m z$p(yNm!P!Rgw&IscS{?4CMOO^wmZctjNQ_hG67>FeV(1XogpxG7^I06Ft$5k%{rtF zK;a1(q;37IfLW4N*s(BIoyH;+7(~O8{0jp}SR`3lDlpQ@B}pcb#Ka7Yh`yL&u4F8k zKfwexnwWvH2`z~=0fUVh7>~kAVoktcqXQ$lHO$WX9{27p$I8k|V@I*Kw>LjHICxETU3J?Y>c1!V+|_gXugeE^ z>VeAX>FMvO4a&Kr#l^)hnwy)y-Pzg6nrcbCSMg_(jJKGQsAg`88+25CSy@>{U0vP# zYin!Y3=Ivv;pnDd3c=_i7Dnos1YzJ}Wnn3uNUW@^eAm&@@%i%dvg;>2DRuer@ix{K z=Hy_cwzjrset!P@(b3Vj{1|bLbyS8Om^MCH7;1WYdOllUU;m(?p&@WzYl2)Dz|J~c zR#Q{+&eYV@50jIVO{PHvd8h#kZSZ47LSnUQ@oArIZ*LEFb#)mLxK&vN=gM*Vb)t_e zsNA+n2Tnh09f?F@Z+3R}dQ(%=jjRRzyZ8tnW|@lhuMKrIMIw>Qjg5^T?(Xh>+Sk|j zg1VNBnj=`)o1%IEYg`H9AXf`B_c0!i->0;*grEIKkWa!YY@Cjbl6e$CT(#fRM#>w0ftVL|0|q;ClxClxHPFMd= z*4EZvJ&|^QQvwT%yT32*cbsl)Z2Z*L*47yyECwCN!Z724c~T@fv^!&CV;}YQ_AW4j zfaOpJ7I3@nnJaM4WnTW@hGkOH0cynaTus9!3xKI1Ff^lC7<+pJkKX84_5q zfzb&*4B& z_mnvJFmBa&p0EWFv!lntcs^N@bOLwf6wf7-{0DCjm&BTY!N%-xF}s*``Jz4x6WC~C z2F3}^?Eb%0`uB`L5|dP5{4DN436((r7D+#UP6b9uZ8b1%Dei+b7FNI@8ZB;4+UQ}B zWL=!K0>*jB<|`vW`}r2eo@QNiDibiWuXMQo%W< z;{8nZX0kB7{H7eF&13!IIsD658FNO-W?|e!4v1YkzihKBD@6)g*iZi{n$>qZfxuiQ z9=RfFXOU8*AcZmB7PZYjI{^j(sFOegnt8)69}8ZXMOc=jB&t(jP~lhiyco+bBhHJZ zVOhY^l7sTsR@?xiGN6%21De}=<(5zhK8tDS$g=dFdl@v-lN~%MZNiR16jnnl%hqS5 z4$ccO>cEuA5s{%Sv^b48>y9X2yle3ajD~QQOi#WgUR@8nUjxvpC_yQG_auI;c!0ku zTJ5P9>TklT*c&o4auUCQ>7C%$tAGp3yBfrgfbwm(;x{nqnVyOsQ|6 z^g*Zsrq^E~2L!u3!sA$_kayn^Wic{x@P0R_8ko7itfr;^_|{Cs#W5=?0QsGhuEcaK t9;m+J@=zB?jS^_GBI`=P8Tdor{{Sh%rF*y|Gi3k(002ovPDHLkV1iDpdRqVh From 8f6cba6992c762e127f76206be026534c41bbd98 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 19 Mar 2020 11:04:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=20fix=20=E3=80=90=E6=96=B0=E9=B2=9C?= =?UTF-8?q?=E4=BA=8B2.0.2=E3=80=91=E4=BA=8C=E6=AC=A1=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=90=8E=EF=BC=8C=E5=88=86=E4=BA=AB=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=9C=AA=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/extensions/ExtensionsModuleConst.java | 2 ++ .../mogo/module/extensions/entrance/EntrancePresenter.java | 5 +++++ 2 files changed, 7 insertions(+) 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 两次未回复关闭对话框"); } } }; From db2c668a685984a8ad272991426faeb2ca9cdc3d Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 19 Mar 2020 14:42:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=82=B9=E5=87=BBmarker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 ++--- .../navi/ui/search/CategorySearchFragment.kt | 35 +++++++++++++++++-- .../module/navi/ui/search/SearchFragment.java | 4 +-- 3 files changed, 38 insertions(+), 9 deletions(-) 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-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) {