From cfddf2984eacce60cdd401eae49553530023673e Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 1 Apr 2020 15:43:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B4=A9=E6=BA=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/amap/AMapNaviViewWrapper.java | 5 +++- .../ui/adapter/SearchCategoryAdapter.java | 24 +++++++++---------- .../navi/ui/search/CategorySearchFragment.kt | 14 +++++++---- .../navi/ui/search/ChoosePathFragment.kt | 7 ++++-- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 28bb7438e5..2c404644cf 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -14,6 +14,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.animation.Interpolator; +import com.alibaba.idst.nls.internal.utils.L; import com.amap.api.maps.AMap; import com.amap.api.maps.AMapUtils; import com.amap.api.maps.CameraUpdateFactory; @@ -462,8 +463,10 @@ public class AMapNaviViewWrapper implements IMogoMapView, break; case NorthUP_2D: mMapView.setNaviMode( AMapNaviView.NORTH_UP_MODE ); - break; + break; } + + Logger.d(TAG,"mCurrentUIMode--->"+mCurrentUIMode.name()); if ( options == null ) { return; } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java index 12d58f4d3d..93004f9f43 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java @@ -33,22 +33,19 @@ public class SearchCategoryAdapter extends RecycleBaseAdapter { @Override public void onBindViewHolder(RecycleViewHolder holder, MogoPoiItem tip) { - - int layoutPosition = holder.getLayoutPosition(); - if (layoutPosition==0) { - holder.itemView.setBackgroundResource(R.drawable.selector_first_item_category_background); - }else { + if (layoutPosition == 0) { + holder.itemView.setBackgroundResource( + R.drawable.selector_first_item_category_background); + } else { holder.itemView.setBackgroundResource(R.drawable.selector_item_category_background); - } - holder.setText(R.id.tv_position, tip.getTitle()); holder.setText(R.id.tv_position_des, tip.getSnippet()); - holder.setText(R.id.iv_position,String.valueOf(holder.getLayoutPosition()+1)); + holder.setText(R.id.iv_position, String.valueOf(holder.getLayoutPosition() + 1)); holder.itemView.setTag(R.id.tag_position, holder.getLayoutPosition()); holder.itemView.setOnClickListener(onClickListener); holder.itemView.setSelected(current == holder.getLayoutPosition()); @@ -71,10 +68,10 @@ public class SearchCategoryAdapter extends RecycleBaseAdapter { public void setCurrent(int current) { - if (current==this.current) { + if (current == this.current) { return; } - this.lastPosition=this.current; + this.lastPosition = this.current; this.current = current; notifyItemChanged(lastPosition); notifyItemChanged(current); @@ -84,11 +81,14 @@ public class SearchCategoryAdapter extends RecycleBaseAdapter { return current; } - public int getLastPosition(){ + public int getLastPosition() { return lastPosition; } - public MogoPoiItem getCurrentItem(){ + public MogoPoiItem getCurrentItem() { + if (current >= list.size()) { + return null; + } return list.get(current); } } 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 5d463bda01..4d81850232 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 @@ -113,9 +113,13 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa private fun addMarkers() { addMarkers.clear() - var marginBounder = resources.getDimensionPixelSize(R.dimen.dp_60)*2 + var marginBounder = resources.getDimensionPixelSize(R.dimen.dp_60) * 2 SearchServiceHolder.getMapUIController() - .showBounds(TAG, null, locationList, Rect(cv_search_result.width+marginBounder,marginBounder, marginBounder, marginBounder), false) + .showBounds( + TAG, null, locationList, Rect( + cv_search_result.width + marginBounder, marginBounder, marginBounder, marginBounder + ), false + ) for (options in arrayList) { var addMarker = SearchServiceHolder.getMarkerManger() @@ -218,8 +222,10 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa } private fun goPath() { - var newInstance = ChoosePathFragment.newInstance(mAdapter.currentItem.point) - SearchServiceHolder.push(newInstance, MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT) + mAdapter.currentItem?.let { + var newInstance = ChoosePathFragment.newInstance(mAdapter.currentItem.point) + SearchServiceHolder.push(newInstance, MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT) + } } private fun updateMarker() { 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 1b1559d9ed..087058a975 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,12 +216,12 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } - private fun registerRetryVoice(){ + private fun registerRetryVoice() { AIAssist.getInstance(context) .registerUnWakeupCommand("retry", arrayOf("重试"), this) } - private fun unregisterRetryVoice(){ + private fun unregisterRetryVoice() { AIAssist.getInstance(context) .unregisterUnWakeupCommand("retry") @@ -235,6 +235,9 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } private fun startNavi() { + if (TextUtils.isEmpty(mAdapter.selectTag)) { + return + } moveMapToRight() SearchServiceHolder.getNavi() From c3e062aa28d6aba7877a3d2fc813d307e1a81757 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 1 Apr 2020 16:04:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E5=AE=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/navi/ui/setting/SettingAddressFragment.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt index 696b599fb5..ba46d11b41 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt @@ -50,7 +50,7 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener { var neighborhood = regeocodeResult?.regeocodeAddress?.neighborhood if (!TextUtils.isEmpty(neighborhood)) { selectPoi?.name = neighborhood - }else{ + } else { selectPoi?.name = formatAddress } } @@ -80,7 +80,8 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener { .getFromLocationAsyn(mogoRegeocodeQuery) addMarker?.apply { SearchServiceHolder.getMapUIController() - .startJumpAnimation(this, + .startJumpAnimation( + this, 150f, { input -> if (input <= 0.5) { (0.5f - 2.0 * (0.5 - input) * (0.5 - input)).toFloat() @@ -182,13 +183,12 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener { AppDataBase.getDatabase(context) .poiDao() .insert(searchPoi) + AddressHelper.notifyAddressChanged(context, searchPoi) + }) .subscribeOn(Schedulers.io()) .subscribe() - - AddressHelper.notifyAddressChanged(context, searchPoi) - } override fun onDestroyView() { From 40339afd5b7db23a53fcda3362f6475ecf1c9410 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Apr 2020 16:54:57 +0800 Subject: [PATCH 3/5] rename listener --- .../mogo/module/authorize/fragment/AuthorizeFragment.kt | 4 ++-- ...IntentListener.kt => IVoiceAuthorizeIntentListener.kt} | 4 ++-- .../java/com/mogo/module/authorize/voice/VoiceManager.kt | 2 +- .../java/com/mogo/module/authorize/voice/VoiceUtil.kt | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/{IVoiceIntentListener.kt => IVoiceAuthorizeIntentListener.kt} (72%) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt index f1e1061717..324dd747c3 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt @@ -12,11 +12,11 @@ import com.mogo.module.authorize.util.AnalyticsUtil import com.mogo.module.authorize.util.AnalyticsUtil.INVOKE_TRACK_AUTHORIZE_CLICK import com.mogo.module.authorize.util.AnalyticsUtil.INVOKE_TRACK_AUTHORIZE_SHOW import com.mogo.module.authorize.voice.IVoiceCommandListener -import com.mogo.module.authorize.voice.IVoiceIntentListener +import com.mogo.module.authorize.voice.IVoiceAuthorizeIntentListener import com.mogo.module.authorize.voice.VoiceUtil import com.mogo.utils.logger.Logger -class AuthorizeFragment : MvpFragment(), AuthorizeContract.View, View.OnClickListener, IVoiceCommandListener, IVoiceIntentListener { +class AuthorizeFragment : MvpFragment(), AuthorizeContract.View, View.OnClickListener, IVoiceCommandListener, IVoiceAuthorizeIntentListener { companion object { const val TAG = "AuthorizeFragment" diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/IVoiceIntentListener.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/IVoiceAuthorizeIntentListener.kt similarity index 72% rename from modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/IVoiceIntentListener.kt rename to modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/IVoiceAuthorizeIntentListener.kt index f4b3d233d6..f5d2a4fcb6 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/IVoiceIntentListener.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/IVoiceAuthorizeIntentListener.kt @@ -4,9 +4,9 @@ import android.content.Intent import com.mogo.service.intent.IMogoIntentListener import com.mogo.utils.logger.Logger -private const val IVoiceIntentTAG = "IVoiceIntentListener" +private const val IVoiceIntentTAG = "IVoiceAuthorizeIntentListener" -interface IVoiceIntentListener : IMogoIntentListener, IVoiceBusinessListener { +interface IVoiceAuthorizeIntentListener : IMogoIntentListener, IVoiceBusinessListener { override fun onIntentReceived(cmd: String?, intent: Intent?) { Logger.i(IVoiceIntentTAG, "cmd -> $cmd") diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt index c664aa310d..8fdef5a631 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt @@ -25,7 +25,7 @@ object VoiceManager { } } - fun handleOnIntentCmd(cmd: String, intent: Intent, listener: IVoiceIntentListener) { + fun handleOnIntentCmd(cmd: String, intent: Intent, listener: IVoiceAuthorizeIntentListener) { Logger.i(TAG, "handleOnIntentCmd: cmd -> $cmd") when (cmd) { VOICE_INTENT_AGREE -> { diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt index 3063079c34..36cf023211 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt @@ -41,7 +41,7 @@ object VoiceUtil { fun registerAll( context: Context, voiceCommand: IVoiceCommandListener, - intentCommand: IVoiceIntentListener + intentCommand: IVoiceAuthorizeIntentListener ) { if (!hasRegister) { hasRegister = true @@ -53,7 +53,7 @@ object VoiceUtil { private fun registerAgree( context: Context, voiceCommand: IVoiceCommandListener, - intentCommand: IVoiceIntentListener + intentCommand: IVoiceAuthorizeIntentListener ) { Logger.i(TAG, "registerAgree") AIAssist.getInstance(context) @@ -67,7 +67,7 @@ object VoiceUtil { private fun registerDisAgree( context: Context, voiceCommand: IVoiceCommandListener, - intentCommand: IVoiceIntentListener + intentCommand: IVoiceAuthorizeIntentListener ) { Logger.i(TAG, "registerDisAgree") AIAssist.getInstance(context) @@ -78,7 +78,7 @@ object VoiceUtil { intentRegister?.registerIntentListener(VOICE_INTENT_DISAGREE, intentCommand) } - fun unregisterAll(context: Context, listener: IVoiceIntentListener) { + fun unregisterAll(context: Context, listener: IVoiceAuthorizeIntentListener) { Logger.i(TAG, "unregister All") AIAssist.getInstance(context).unregisterUnWakeupCommand(VOICE_REGISTER_AUTHORIZE_AGREE) AIAssist.getInstance(context).unregisterUnWakeupCommand(VOICE_REGISTER_AUTHORIZE_DISAGREE) From 5420c7e4ed581cc80dfaae7f88e66650b5996f80 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 1 Apr 2020 18:22:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B4=A9=E6=BA=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/apps/AppNavigatorFragment.java | 2 +- .../DiscreteScrollLayoutManager.java | 6 +++++- .../main/java/com/mogo/module/map/MapPresenter.java | 10 +++++++++- .../mogo/module/navi/ui/search/ChoosePathFragment.kt | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java index ef7e10856d..e77c4cd5f0 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -268,7 +268,7 @@ public class AppNavigatorFragment extends MvpFragment implements super( view ); initBroadcast(); } + private BroadcastReceiver broadcastReceiver; /** * opera type为0：0 实时路况开；1实时路况关 type为1：0 放大地图； 1缩小地图 type为2：0切换2d车上； 1切换2d北上；2切换3d车上支持 */ private void initBroadcast() { - BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { + broadcastReceiver = new BroadcastReceiver() { @Override public void onReceive( Context context, Intent intent ) { String action = intent.getAction(); @@ -211,6 +212,13 @@ public class MapPresenter extends Presenter< MapView > implements unregisterVoiceCmd(); } + @Override public void onDestroy(@NonNull LifecycleOwner owner) { + super.onDestroy(owner); + if (broadcastReceiver != null) { + getContext().unregisterReceiver(broadcastReceiver); + } + } + private void registerVoiceCmd() { for ( Map.Entry< String, String[] > entry : VoiceConstants.sVoiceCmds.entrySet() ) { 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 087058a975..e0f6d0aa41 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 @@ -212,7 +212,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB AIAssist.getInstance(context) .registerUnWakeupCommand("thirdPath", arrayOf(thirdPath), this) AIAssist.getInstance(context) - .registerUnWakeupCommand("startNavi", arrayOf(startNavi), this) + .registerUnWakeupCommand("startNavi", arrayOf(startNavi,"开始"), this) } From b108ef45ccf5797c9f2685f31085e0cd08f08e63 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Apr 2020 18:44:37 +0800 Subject: [PATCH 5/5] changed background --- .../src/main/res/layout/module_authorize_fragment.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml index d9b7c29f63..8399d8ee30 100644 --- a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml +++ b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#000000"> + android:background="#CC000000">