From ffbddc2c048d1147555ebfecad80b86e1fb436dd Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 14 Feb 2020 11:46:02 +0800 Subject: [PATCH 1/7] replace home icon --- .../extensions/entrance/EntranceFragment.java | 11 +---------- .../res/drawable-ldpi/module_map_ic_home.png | Bin 465 -> 396 bytes .../res/drawable-xhdpi/module_map_ic_home.png | Bin 831 -> 588 bytes .../res/layout/module_ext_layout_entrance.xml | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) mode change 100644 => 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_home.png diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 02e0ffbcfe..b901345e9b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -1,6 +1,5 @@ package com.mogo.module.extensions.entrance; -import android.graphics.BitmapFactory; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; @@ -11,15 +10,12 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.commons.analytics.AnalyticsUtils; import com.mogo.commons.mvp.MvpFragment; -import com.mogo.commons.storage.SpStorage; import com.mogo.map.MogoLatLng; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.location.MogoLocation; import com.mogo.map.marker.IMogoMarkerManager; -import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.model.MogoPoi; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.navi.IMogoNaviListener; @@ -33,7 +29,6 @@ import com.mogo.module.extensions.R; import com.mogo.module.extensions.dialog.NaviNoticeDialog; import com.mogo.module.extensions.navi.NaviInfoView; import com.mogo.module.share.ShareControl; -import com.mogo.module.share.dialog.LaucherShareDialog; import com.mogo.service.MogoServicePaths; import com.mogo.service.fragmentmanager.FragmentDescriptor; import com.mogo.service.fragmentmanager.IMogoFragmentManager; @@ -41,10 +36,6 @@ import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoAddressManager; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.windowview.IMogoWindowManager; -import com.mogo.utils.TipToast; - -import java.util.HashMap; /** * @author congtaowang @@ -101,6 +92,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent protected void initViews() { mMogoFragmentManager = ( IMogoFragmentManager ) ARouter.getInstance().build( MogoServicePaths.PATH_FRAGMENT_MANAGER ).navigation(); mMogoAddressManager = ( IMogoAddressManager ) ARouter.getInstance().build( MogoServicePaths.PATH_ADDRESS_MANAGER ).navigation(); + mCommonAddress = findViewById( R.id.module_entrance_id_common_address ); mSearch = findViewById( R.id.module_entrance_id_search ); @@ -154,7 +146,6 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent mSpeedLimit = findViewById( R.id.module_entrance_id_speed_limit_container ); mSpeedLimitValue = findViewById( R.id.module_entrance_id_speed_limit_value ); mSpeedLimitUnit = findViewById( R.id.module_entrance_id_speed_limit_unit ); - } @NonNull diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_home.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_home.png index 367de879589fe3bac14dc93589f310ea310e85d5..ff7674dcbd3ccddfbc78c9ae8299ec2a5157821b 100755 GIT binary patch delta 356 zcmV-q0h|8O1B?TZF@Hu$L_t(o3GG(93c@fHHR5A%vActVpU_Fc&E5ZSaPUh6U7Vc# z0S7^Fa1-1MuKs}tI@A-5(56jqLaNgZ9Q3|Uj;CpBrNWCHU;7BN8wQE6B84eZDyO&rH z<(bu=tuo(Z)H$=gWd84;k2PiSP)2i|9bgBH4!i*B1#R9c4Ys`i0000!5z<2`+wqzwXp zcn7=#-T^xYqA1#i9*o#k)||}%tz?jQR^b9Bs>*~e4G^cjx_@7)D3e6(Zl?Y)6LLGHS?bJ|TZbT^$3`;LpiGaJk`%{zuk@8XW0>0e zB&cb{X{C~kYC{P4fizS9okQw7#q^1Ia!!e@=Hjp1#NFJU)nyfj^23PmUwe%W6bs?V zvS6iJkX*%~g0}7i_@%07*qoM6N<$f^3z<>i_@% diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_home.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_home.png old mode 100644 new mode 100755 index e0ccc8bcb0658456d65804e9a517e74bd9c1aba9..80702ee564143937096e8036063967ad9fa2ee00 GIT binary patch literal 588 zcmV-S0<-;zP)Px%21!IgRA>e5Sg}q6F$}#!EQo;xAqLC z1!~D6zou!LRg6zy2e56}3M^OqL7+F-6YQq0>u*V5F+q^q2jB&4Qv#g0<{kc*Ao-lQ zt`ZS+ofO(aSt{C_-6(ZqY%JZ$6yb34%-;rtSZXnF>pl3 z)x`*R0PeyD&hF8#g;%tjrT8$y@tEC|h)XHX&i9b5=|RmecAb6b;?oK7jS5UqbK>1d~8A3PQMqAKj8a)qG@rJWdxhVDiO{Vt!>7?&nE#Ix2XB6v1W(Ww(GaYQu|6CKkCMoaZi9Tz@>rHf3* z6&K1kRZ;bp<@ccaE**g6cW0X;s`6fGMyj a3j6|pvUmZ?UL000004XF*Lt006O% z3;baP0008^NklzDEI*s4~hwj5tD-f zK@d@c3L%Fa0)pf&>d6Nff(J1|l8atM@Zcr!;3FUiBCfxZnWY#sGt<-EvZNaRbai!g z)xWBHdUm!}vt|{r3RnfK0#*U5fK|XMU=;{kfkvZo2=swXVI%z~?_1l1K^k<`3ZR_`z&I+8T~ELscc^%U&QvC(p46{CJONlFuDfzD`szz z2O<7Z>6#*I)-t#R4mXvx+I!^ltXWXHN}{(!AuO+oQLsxfnnu11;qOZKSCRGd-1e)< z&&X1s;5V|0xx5I;-QXEW-;vUv1*Hm!eGhmEQa>+{4=x`)(kw)dfEh(ji1xaMXRQ=% zO8JwdkGuLy*OjVxx=4D0%cXM;XcBVV`_i;kcWv;`bKvB!El{`I?3mZPx?wy62sRL-5Kym z#!2gyFNTq5 z8)uUkNB3VlsYw^H(e|a~7(1#-%`=!w6!Nhxf3-wuu@jx+S)7o}cy{~fq9q#R=tkMG zydainUWHn1-gdOrb}WzYirLZFub0l`wIUm!|Fq8AkjnFwKfEh5aBvXw!#n5?@SNP8 zV!J-043w4=X@eBX}002ov JPDHLkV1h>|fb;+W diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 73a1e40567..f28537c564 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -129,7 +129,7 @@ android:layout_height="@dimen/module_ext_operation_panel_vr_height" android:background="@drawable/module_ext_dw_top_corner_bkg" android:orientation="vertical" - android:visibility="gone"> + android:visibility="visible"> Date: Fri, 14 Feb 2020 11:49:20 +0800 Subject: [PATCH 2/7] hide vr button --- .../src/main/res/layout/module_ext_layout_entrance.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index f28537c564..73a1e40567 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -129,7 +129,7 @@ android:layout_height="@dimen/module_ext_operation_panel_vr_height" android:background="@drawable/module_ext_dw_top_corner_bkg" android:orientation="vertical" - android:visibility="visible"> + android:visibility="gone"> Date: Fri, 14 Feb 2020 12:03:46 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9A=84=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/icon_default_user_head.png | Bin 8569 -> 9303 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png index d5df99fa78a965e590311bc352567c4f5d3e6ced..dd862a9d65826bd0dcbf8bceadc1a696a27249bc 100644 GIT binary patch literal 9303 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 FV1lNLeTD!4 literal 8569 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 From 27bc05d4d0be0c1268158656b78081fe84b182cf Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 14 Feb 2020 13:28:37 +0800 Subject: [PATCH 4/7] add voice ui status listener --- .../com/mogo/module/service/MogoServiceProvider.java | 10 ++++++++++ .../com/mogo/module/service/receiver/MogoReceiver.java | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index c04af82978..8ac547a174 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -259,6 +259,7 @@ public class MogoServiceProvider implements IMogoModuleProvider, mIntentManager.registerIntentListener( Intent.ACTION_POWER_CONNECTED, this ); mIntentManager.registerIntentListener( Intent.ACTION_POWER_DISCONNECTED, this ); mIntentManager.registerIntentListener( MogoReceiver.ACTION_NWD_ACC, this ); + mIntentManager.registerIntentListener( MogoReceiver.ACTION_VOICE_UI, this ); } private void registerAIReceiver( Context context ) { @@ -285,6 +286,8 @@ public class MogoServiceProvider implements IMogoModuleProvider, // acc On filter.addAction( Intent.ACTION_POWER_CONNECTED ); filter.addAction( Intent.ACTION_POWER_DISCONNECTED ); + // 小智语音 + filter.addAction( MogoReceiver.ACTION_VOICE_UI ); try { context.getApplicationContext().registerReceiver( mAIAssistReceiver, filter ); Logger.i( TAG, "register voice receiver." ); @@ -612,6 +615,13 @@ public class MogoServiceProvider implements IMogoModuleProvider, } else if ( MogoReceiver.ACTION_NWD_ACC.equals( command ) ) { int state = intent.getByteExtra( MogoReceiver.PARAM_ACC_STATUS, ( byte ) 0 ); mStatusManager.setAccStatus( getModuleName(), state == 1 ); + } else if ( MogoReceiver.ACTION_VOICE_UI.equals( command ) ) { + String val = intent.getStringExtra( MogoReceiver.PARRAM_WAKE_STATUS ); + if ( TextUtils.equals( val, MogoReceiver.VALUE_DISMISS ) ) { + mStatusManager.setVoiceUIShow( TAG, false ); + } else if ( TextUtils.equals( val, MogoReceiver.VALUE_SHOW ) ) { + mStatusManager.setVoiceUIShow( TAG, true ); + } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java index fdf388bc9a..a29baef682 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java @@ -40,6 +40,12 @@ public class MogoReceiver extends BroadcastReceiver { // 诺威达 acc 状态 public static final String PARAM_ACC_STATUS = "extra_mcu_state"; + // 小智语音唤醒UI + public static final String ACTION_VOICE_UI = "com.zhidao.xiaozhi.wake.status"; + public static final String PARRAM_WAKE_STATUS = "WAKE_STATUS"; + public static final String VALUE_DISMISS = "dismiss"; + public static final String VALUE_SHOW = "show"; + private IMogoIntentManager mMogoIntentManager; public MogoReceiver( Context context ) { From a2b94a97ad37257a031f2f20b7dea738a9425249 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Fri, 14 Feb 2020 14:33:05 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/map/VoiceConstants.java | 2 +- .../navi/cp/AddressContentProvider.java | 10 +- .../mogo/module/navi/dialog/NoticeDialog.java | 91 ++++++++++ .../mogo/module/navi/manager/NaviManager.kt | 16 ++ .../navi/ui/search/SearchPresenter.java | 167 ++++++++++-------- .../navi/ui/setting/SettingAddressFragment.kt | 4 +- .../res/drawable/shape_react_blue_grident.xml | 9 + .../res/drawable/shape_react_gray_grident.xml | 9 + .../main/res/layout/dialog_common_notice.xml | 58 ++++++ .../res/layout/fragment_setting_address.xml | 41 ++++- .../main/res/layout/include_search_bar.xml | 3 +- .../main/res/mipmap-ldpi/icon_navi_home.png | Bin 478 -> 377 bytes .../main/res/mipmap-xhdpi/icon_navi_home.png | Bin 712 -> 531 bytes 13 files changed, 322 insertions(+), 88 deletions(-) create mode 100644 modules/mogo-module-search/src/main/java/com/mogo/module/navi/dialog/NoticeDialog.java create mode 100644 modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml create mode 100644 modules/mogo-module-search/src/main/res/drawable/shape_react_gray_grident.xml create mode 100644 modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java index eb2a1bc06c..d68f8b471a 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java @@ -40,7 +40,7 @@ public class VoiceConstants { */ public static final String CMD_MAP_HISTORY = "com.ileja.navi.map.history"; public static final String CMD_MAP_HISTORY_UN_WAKEUP = "CMD_MAP_HISTORY_UN_WAKEUP"; - public static final String[] CMD_MAP_HISTORY_TRIGGER_WORDS = {"导航历史"}; + public static final String[] CMD_MAP_HISTORY_TRIGGER_WORDS = {"查询导航历史记录"}; /** diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressContentProvider.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressContentProvider.java index 46b73b54de..4f49273f2c 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressContentProvider.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressContentProvider.java @@ -46,17 +46,17 @@ public class AddressContentProvider extends ContentProvider { Log.d( TAG, "query code: " + code ); final SearchPoi poi = getPoi( code ); MatrixCursor - cursor = new MatrixCursor( new String[]{DataConstants.HOME_ADDRESS_NAME, DataConstants.HOME_ADDRESS_LATITUDE, DataConstants.HOME_ADDRESS_LONGITUDE} ); + cursor = new MatrixCursor( new String[]{DataConstants.HOME_ADDRESS_NAME,DataConstants.HOME_ADDRESS, DataConstants.HOME_ADDRESS_LATITUDE, DataConstants.HOME_ADDRESS_LONGITUDE} ); if ( code == DataConstants.HOME_ADDRESS_CODE ) { - cursor = new MatrixCursor( new String[]{DataConstants.HOME_ADDRESS_NAME, DataConstants.HOME_ADDRESS_LATITUDE, DataConstants.HOME_ADDRESS_LONGITUDE} ); + cursor = new MatrixCursor( new String[]{DataConstants.HOME_ADDRESS_NAME,DataConstants.HOME_ADDRESS, DataConstants.HOME_ADDRESS_LATITUDE, DataConstants.HOME_ADDRESS_LONGITUDE} ); } else if ( code == DataConstants.COMPANY_ADDRESS_CODE ) { - cursor = new MatrixCursor( new String[]{DataConstants.COMPANY_ADDRESS_NAME, DataConstants.COMPANY_ADDRESS_LATITUDE, DataConstants.COMPANY_ADDRESS_LONGITUDE} ); + cursor = new MatrixCursor( new String[]{DataConstants.COMPANY_ADDRESS_NAME,DataConstants.COMPANY_ADDRESS, DataConstants.COMPANY_ADDRESS_LATITUDE, DataConstants.COMPANY_ADDRESS_LONGITUDE} ); } if ( cursor != null ) { if ( poi == null ) { - cursor.addRow( new Object[]{"", 0, 0} ); + cursor.addRow( new Object[]{"","", 0, 0} ); } else { - cursor.addRow( new Object[]{poi.getName(), poi.getLat(), poi.getLng()} ); + cursor.addRow( new Object[]{poi.getName(),poi.getAddress(), poi.getLat(), poi.getLng()} ); } } return cursor; diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/dialog/NoticeDialog.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/dialog/NoticeDialog.java new file mode 100644 index 0000000000..d1379e06c0 --- /dev/null +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/dialog/NoticeDialog.java @@ -0,0 +1,91 @@ +package com.mogo.module.navi.dialog; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.view.View; +import android.widget.TextView; +import androidx.annotation.NonNull; +import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.module.navi.R; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.map.IMogoMapService; + +/** + * @author lixiaopeng + * @description 通用分享dialog + * @since 2020-01-10 + */ +public class NoticeDialog extends Dialog implements View.OnClickListener { + private final String content; + private final String positive; + private TextView txtOk; + private Context mContext; + private View tvCancel; + private View.OnClickListener onClickListener; + private TextView tvContent; + + public NoticeDialog(@NonNull Context context,String content,String positive) { + super(context, R.style.Theme_AppCompat_Dialog); + this.mContext = context; + + this.content=content; + this.positive=positive; + + getWindow().setBackgroundDrawableResource(android.R.color.transparent); + } + + //public NoticeDialog(@NonNull Context context, int themeResId) { + // super(context, R.style.Theme_AppCompat_Dialog); + //} + + public void setOnClickListener(View.OnClickListener onClickListener) { + this.onClickListener = onClickListener; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + initView(); + setContent(content); + setPositiveButton(positive); + initListener(); + } + + private void initView() { + setContentView(R.layout.dialog_common_notice); + txtOk = findViewById(R.id.tv_dialog_ok); + tvCancel = findViewById(R.id.tv_dialog_cancel); + tvContent = findViewById(R.id.tv_dialog_content); + + } + + + private void initListener() { + txtOk.setOnClickListener(this); + tvCancel.setOnClickListener(this); + } + + + @Override + public void onClick(View view) { + int id = view.getId(); + + if (onClickListener != null) { + onClickListener.onClick(view); + } + dismiss(); + } + + public void setContent(String s) { + if (tvContent != null) { + tvContent.setText(s); + } + } + + public void setPositiveButton(String str) { + if (txtOk != null) { + txtOk.setText(str); + } + } +} diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt index 7f694ebeab..fc28306340 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt @@ -10,6 +10,9 @@ import com.mogo.module.common.MogoModulePaths import com.mogo.module.navi.constants.SearchServiceHolder import com.mogo.module.navi.ui.search.ChoosePathFragment import com.mogo.utils.logger.Logger +import androidx.core.content.ContextCompat.startActivity + + /** *@author zyz @@ -33,6 +36,8 @@ object NaviManager { val lat = intent.getDoubleExtra("LAT", 0.0) val lon = intent.getDoubleExtra("LON", 0.0) + showHome() + var newInstance = ChoosePathFragment.newInstance( MogoLatLng(lat,lon) @@ -42,9 +47,20 @@ object NaviManager { ) }else if (key_type == 10021) { SearchServiceHolder.getNavi().stopNavi() + }else if (key_type == 20009) { + showHome() + SearchServiceHolder.fragmentManager + .clearAll() } } } + + private fun showHome() { + val intent = Intent(Intent.ACTION_MAIN) + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK + intent.addCategory(Intent.CATEGORY_HOME) + context.startActivity(intent) + } } val inputFilter = IntentFilter() inputFilter.addAction(AUTONAVI_STANDARD_BROADCAST_RECV) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java index bf0a049789..c58e8b30c9 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java @@ -3,6 +3,7 @@ package com.mogo.module.navi.ui.search; import android.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; +import android.view.View; import android.widget.EditText; import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; @@ -19,11 +20,13 @@ import com.mogo.map.search.poisearch.IMogoPoiSearchListener; import com.mogo.map.search.poisearch.MogoPoiResult; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.module.common.TextWatcherAdapter; +import com.mogo.module.navi.R; import com.mogo.module.navi.bean.EntityConvertUtils; import com.mogo.module.navi.bean.SearchPoi; import com.mogo.module.navi.constants.DataConstants; import com.mogo.module.navi.constants.SearchServiceHolder; import com.mogo.module.navi.database.AppDataBase; +import com.mogo.module.navi.dialog.NoticeDialog; import com.mogo.service.MogoServicePaths; import com.mogo.service.map.IMogoMapService; import io.reactivex.Observable; @@ -46,25 +49,25 @@ import java.util.List; *

* 搜搜页逻辑处理 */ -public class SearchPresenter extends Presenter< SearchView > - { - +public class SearchPresenter extends Presenter { private CompositeDisposable mCompositeDisposable; - private IMogoMapService mMapService; + private IMogoMapService mMapService; - public SearchPresenter( SearchView view ) { - super( view ); + public SearchPresenter(SearchView view) { + super(view); mCompositeDisposable = new CompositeDisposable(); } @Override - public void onCreate( @NonNull LifecycleOwner owner ) { - super.onCreate( owner ); - attachSearchBoxTextWatcher( mView.getSearchBox() ); - mMapService = (IMogoMapService) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( getContext() ); + public void onCreate(@NonNull LifecycleOwner owner) { + super.onCreate(owner); + attachSearchBoxTextWatcher(mView.getSearchBox()); + mMapService = (IMogoMapService) ARouter.getInstance() + .build(MogoServicePaths.PATH_SERVICES_MAP) + .navigation(getContext()); loadHistories(); - } + } private void loadHistories() { Disposable subscribe = @@ -82,8 +85,8 @@ public class SearchPresenter extends Presenter< SearchView > addDisposable(subscribe); } - private void attachSearchBoxTextWatcher( EditText editText ) { - if ( editText == null ) { + private void attachSearchBoxTextWatcher(EditText editText) { + if (editText == null) { return; } editText.addTextChangedListener(watcherAdapter); @@ -91,14 +94,14 @@ public class SearchPresenter extends Presenter< SearchView > private final TextWatcherAdapter watcherAdapter = new TextWatcherAdapter() { @Override - public void afterTextChanged( Editable s ) { + public void afterTextChanged(Editable s) { // 避免 disable 设置内容时触发 final String input = s.toString(); - startSearchPoiByInput( input ); + startSearchPoiByInput(input); } }; - public void startSearchPoiByInput( String keyword ) { + public void startSearchPoiByInput(String keyword) { MogoInputtipsQuery mogoInputtipsQuery = new MogoInputtipsQuery(); mogoInputtipsQuery.setKeyword(keyword); @@ -111,59 +114,70 @@ public class SearchPresenter extends Presenter< SearchView > inputtipsSearch.setInputtipsListener(new IMogoInputtipsListener() { @Override public void onGetInputtips(List result) { - mView.renderSearchPoiResult(result,false); + mView.renderSearchPoiResult(result, false); } }); inputtipsSearch.requestInputtipsAsyn(); - } + /** * 缓存搜索到的导航地址 - * - * @param tip - * @return */ - public Single cacheSelectPoiItem( MogoTip tip ) { - return Single.create( emitter -> { - SearchPoi poi = EntityConvertUtils.tipToPoi( tip ); + public Single cacheSelectPoiItem(MogoTip tip) { + return Single.create(emitter -> { + SearchPoi poi = EntityConvertUtils.tipToPoi(tip); //ignore insert result - final List output = AppDataBase.getDatabase( getContext() ).poiDao().insert( poi ); - emitter.onSuccess( output ); - } ).subscribeOn( Schedulers.io() ).observeOn( AndroidSchedulers.mainThread() ); + final List output = AppDataBase.getDatabase(getContext()).poiDao().insert(poi); + emitter.onSuccess(output); + }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()); } - public void addDisposable( Disposable disposable ) { - mCompositeDisposable.add( disposable ); + public void addDisposable(Disposable disposable) { + mCompositeDisposable.add(disposable); } public void deleteAllCachedPoi() { - new AlertDialog.Builder( getContext() ) - .setMessage( "清空历史记录？" ) - .setPositiveButton( "立即清空", ( dlg, which ) -> { - dlg.dismiss(); + //new AlertDialog.Builder( getContext() ) + // .setMessage( "清空历史记录？" ) + // .setPositiveButton( "立即清空", ( dlg, which ) -> { + // dlg.dismiss(); + // deleteAllCachedPoiImpl(); + // } ) + // .setNegativeButton( "取消", ( dlg, which ) -> { + // dlg.dismiss(); + // } ) + // .create() + // .show(); + + NoticeDialog noticeDialog = new NoticeDialog(getContext(),"清空历史记录？","立即清空"); + + //noticeDialog.setContent("清空历史记录？"); + //noticeDialog.setPositiveButton("立即清空"); + + noticeDialog.setOnClickListener(new View.OnClickListener() { + @Override public void onClick(View v) { + if (v.getId() == R.id.tv_dialog_ok) { deleteAllCachedPoiImpl(); - } ) - .setNegativeButton( "取消", ( dlg, which ) -> { - dlg.dismiss(); - } ) - .create() - .show(); + } + } + }); + noticeDialog.show(); } private void deleteAllCachedPoiImpl() { - final Disposable disposable = AppDataBase.getDatabase( getContext() ) - .poiDao() - .getAll() - .map( input -> { - return AppDataBase.getDatabase( getContext() ).poiDao().deleteAll( input ); - } ) - .subscribeOn( Schedulers.io() ) - .observeOn( AndroidSchedulers.mainThread() ) - .subscribe( count -> { - mView.showHistory( null ); - } ); - mCompositeDisposable.add( disposable ); + final Disposable disposable = AppDataBase.getDatabase(getContext()) + .poiDao() + .getAll() + .map(input -> { + return AppDataBase.getDatabase(getContext()).poiDao().deleteAll(input); + }) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(count -> { + mView.showHistory(null); + }); + mCompositeDisposable.add(disposable); } // ///** @@ -197,9 +211,9 @@ public class SearchPresenter extends Presenter< SearchView > // // - private void emitterCommonAddress( SingleEmitter> emitter, SearchPoi poi ) { + private void emitterCommonAddress(SingleEmitter> emitter, SearchPoi poi) { String poiId = null; - switch ( mView.getSearchType() ) { + switch (mView.getSearchType()) { case SearchConstants.SEARCH_TYPE_MULTI_HOME: poiId = DataConstants.POI_ID_HOME; break; @@ -207,20 +221,20 @@ public class SearchPresenter extends Presenter< SearchView > poiId = DataConstants.POI_ID_COMPANY; break; } - if ( TextUtils.isEmpty( poiId ) ) { - emitter.onError( new IllegalArgumentException( "设置类型错误，请重试" ) ); + if (TextUtils.isEmpty(poiId)) { + emitter.onError(new IllegalArgumentException("设置类型错误，请重试")); return; } - if ( poi == null ) { - emitter.onError( new IllegalArgumentException( "位置类型转换错误，请重试" ) ); + if (poi == null) { + emitter.onError(new IllegalArgumentException("位置类型转换错误，请重试")); return; } - poi.setpId( poiId ); - poi.setType( mView.getSearchType() ); + poi.setpId(poiId); + poi.setType(mView.getSearchType()); //ignore insert result - final List output = AppDataBase.getDatabase( getContext() ).poiDao().insert( poi ); + final List output = AppDataBase.getDatabase(getContext()).poiDao().insert(poi); notifyAIAssistCommonAddressChanged(); - emitter.onSuccess( output ); + emitter.onSuccess(output); } private void notifyAIAssistCommonAddressChanged() { @@ -232,12 +246,11 @@ public class SearchPresenter extends Presenter< SearchView > //} } - - public void navi2Positon(){ + public void navi2Positon() { //mMapService.getNavi(getContext()).naviTo(); } - public void insert(SearchPoi searchPoi){ + public void insert(SearchPoi searchPoi) { Observable.create(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { AppDataBase.getDatabase(getContext()).poiDao().insert(searchPoi); @@ -245,23 +258,21 @@ public class SearchPresenter extends Presenter< SearchView > }).subscribeOn(Schedulers.io()).subscribe(); } - public void clearHistory(List list){ - Observable.create(new ObservableOnSubscribe() { - @Override public void subscribe(ObservableEmitter emitter) throws Exception { - AppDataBase.getDatabase(getContext()).poiDao().deleteAll(list); - } - }).subscribeOn(Schedulers.io()).subscribe(); - } - - + public void clearHistory(List list) { + Observable.create(new ObservableOnSubscribe() { + @Override public void subscribe(ObservableEmitter emitter) throws Exception { + AppDataBase.getDatabase(getContext()).poiDao().deleteAll(list); + } + }).subscribeOn(Schedulers.io()).subscribe(); + } @Override - public void onDestroy( @NonNull LifecycleOwner owner ) { - super.onDestroy( owner ); - if ( mView.getSearchBox() != null ) { - mView.getSearchBox().removeTextChangedListener( watcherAdapter ); + public void onDestroy(@NonNull LifecycleOwner owner) { + super.onDestroy(owner); + if (mView.getSearchBox() != null) { + mView.getSearchBox().removeTextChangedListener(watcherAdapter); } - if ( mCompositeDisposable != null && !mCompositeDisposable.isDisposed() ) { + if (mCompositeDisposable != null && !mCompositeDisposable.isDisposed()) { mCompositeDisposable.dispose(); mCompositeDisposable = null; } 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 f37fe4f6e1..cbffb47abd 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 @@ -31,9 +31,9 @@ import com.mogo.utils.UiThreadHandler import io.reactivex.Observable import io.reactivex.ObservableOnSubscribe import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.fragment_setting_address.et_navi_search +import kotlinx.android.synthetic.main.fragment_setting_address.iv_navi_back import kotlinx.android.synthetic.main.fragment_setting_address.tv_set_as_home -import kotlinx.android.synthetic.main.include_search_bar.et_navi_search -import kotlinx.android.synthetic.main.include_search_bar.iv_navi_back /** * @author zyz diff --git a/modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml b/modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml new file mode 100644 index 0000000000..804e5a8de3 --- /dev/null +++ b/modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/modules/mogo-module-search/src/main/res/drawable/shape_react_gray_grident.xml b/modules/mogo-module-search/src/main/res/drawable/shape_react_gray_grident.xml new file mode 100644 index 0000000000..377483211d --- /dev/null +++ b/modules/mogo-module-search/src/main/res/drawable/shape_react_gray_grident.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml b/modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml new file mode 100644 index 0000000000..ff78f98f77 --- /dev/null +++ b/modules/mogo-module-search/src/main/res/layout/dialog_common_notice.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml b/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml index 6decbd8fe6..2f0419dd2b 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml @@ -9,7 +9,46 @@ android:paddingTop="@dimen/dp_40" > - + + + + + + + Px$Gf6~2R9Fe^RXYm8KoCttf{m33)>dA{!qyX5dLmC@lR`nT^Z<4qKosnRpoQz( zI14ht{RXQUcr3d!@6F_8VY5s^91sV@0dXMQ0j1OsSOF*C1%yO};sdY*^6>7A0g*9q z1=@%;lMmlwiakxT!8!qgz7q94U^9YQd)6kExg4sXeoyMqBp;hc zfhTkslN|EZa5)q>dV0AG579+>fudbT$5!_j;FfBQ204xRA;5b6#ue_&Mh# zJ7ffPBOPWRyS6q^>;Rl6193^jyNC=)DFA> X?My1zrkCrk00000NkvXXu0mjfiYA^2 literal 478 zcmV<40U`d0P)Px$m`OxIR7ef&mA@|pQ4q&>j|c?`A`%p$BK`omL{1b6t>}q_zrkN{6^%+QQ7Ckx zR{0U7D21BjPNBII)@PW#Ja2FJ_N{Xw*_V88=FNP+Gy7&=_B=0N`2_L_=mdfw7z7g? z9S99e;0e^hMn{@UBW;LjtTLYeD-S^70@!J^3W8nyE%2(bBW!P5n^UkKoM?k@<0ZBP zo;7!l9cfE*3Qd9=EiCV~WEUnj3m%knhn==LPJ0T>gGViRi=B!qKyDOVDYt@MjN>N8 z5zc^`7COZaBnn8v=>x~Akyo*sB$8iizE=g=-R#8RRDh-ELgfV_7_$xaqE0ys)d>| zzCc#$%lAe1yeuaUwfCWu#fDFxMf)SopEXW1>TPcArg6M+_4kd~3YXP)Px$%}GQ-RA>e5SV2z1Fc54J*Iu~s0Nz2=UzC1^zJojOC@&~?E=W9~_l6lMuB@oG z9DD5qG%Kx~xa%G7?0VB=wUUSdF(3xSfEW-1Vn7Ut0Wly3nlsS%{RVn~o}g!_rO+S! z(*I_T;I;t%hPDvmY?}p1FzBU4WF7|b>IVrBmZhJ$AKdStkCqJ6-{6=2oe;NfxdMP^ z!U@42ECU<+qJO9#zpbN57 zzd)Y?_FtHPM<>4ii4WMdoo4%X5<`Z~-q}UQeaMHuCS((vZ*c}gne+FRV&mHae;npIjL*Y$wV`!@N1U}+MuXDhSUtcNCCYea69qUM^+v$|K7*~BOgA(a=BG1C zQq+yf`(PBo@W-6@&XN*s{Z^laR}vsU9b|!KBz5wqiVO@b5d&gC42S_SAO`*#1HTGL VS=U_b9%KLj002ovPDHLkV1n*A>v;eG literal 712 zcmV;(0yq7MP)L000001b5ch_0Itp) z=>Px%f=NU{RA>e5m(NR7Q545V4LA9-b*PB_3n?fze?zsf+ywm#;!YGn2npN?~JvYnJHij zm;$DNDPRhi0;Yf|5LSU!t91u#fU&Sl6;)@j0k8v{9pg+@)J_;$1{wjc+=OcVjz1fQ zHF8x3nFb%#aN=I5_y_*o$ZeHN#{i4qObsROCYT4O5+o*rua?UmsTz$x1n0>hvit-~ zjvilj`V-K$OK`>IboEN3{ot|g9{(%2nQokCBA3;Da3f>azwrEkJMHp<%gBrWSZ+XP?byj%cDesq+x}$K@3!Oo*XJ>gZq`of zemcp~`MLezM>o|`lem#QtFzup{NPLMK^y!nZpc&|MOmW_8sq57T$P&*TKN`~+<@(9 z$%0m1u4i^M_SZ{2`C5@3uE*SFuYa25=UB`p(_B9P?E4<%qdK7g0000 From bef0c77e4c1d7f4f143ed58cfd834e2e6d646ac6 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Fri, 14 Feb 2020 14:47:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8F=AA=E6=B7=BB=E5=8A=A0=E6=9C=89?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E7=9A=84=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/amap/search/InputtipsSearch.java | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/InputtipsSearch.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/InputtipsSearch.java index b96c2e2847..7ce2a7013f 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/InputtipsSearch.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/InputtipsSearch.java @@ -31,47 +31,48 @@ public class InputtipsSearch implements IMogoInputtipsSearch, Inputtips.Inputtip private InputtipsQuery mQuery; private IMogoInputtipsListener mListener; - public InputtipsSearch( Context context, MogoInputtipsQuery query ) { - mQuery = ObjectUtils.fromMogo( query ); - mClient = new Inputtips( context, mQuery ); - mClient.setInputtipsListener( this ); + public InputtipsSearch(Context context, MogoInputtipsQuery query) { + mQuery = ObjectUtils.fromMogo(query); + mClient = new Inputtips(context, mQuery); + mClient.setInputtipsListener(this); } @Override - public void setQuery( MogoInputtipsQuery query ) { - this.mQuery = ObjectUtils.fromMogo( query ); + public void setQuery(MogoInputtipsQuery query) { + this.mQuery = ObjectUtils.fromMogo(query); } @Override - public void setInputtipsListener( IMogoInputtipsListener listener ) { + public void setInputtipsListener(IMogoInputtipsListener listener) { this.mListener = listener; } @Override public void requestInputtipsAsyn() { - if ( mClient != null ) { + if (mClient != null) { mClient.requestInputtipsAsyn(); } } @Override - public void onGetInputtips( List< Tip > list, int i ) { - if ( i == 1000 ) { - if ( mListener != null ) { - mListener.onGetInputtips( getResult( list ) ); + public void onGetInputtips(List list, int i) { + if (i == 1000) { + if (mListener != null) { + mListener.onGetInputtips(getResult(list)); } } else { - Logger.e( TAG, "errorcode = " + i ); + Logger.e(TAG, "errorcode = " + i); } } - private List< MogoTip > getResult( List< Tip > tips ) { - List< MogoTip > mogoTips = new ArrayList<>(); - if ( tips != null ) { - for ( Tip tip : tips ) { - MogoTip mogoTip = ObjectUtils.fromAMap( tip ); - if ( mogoTip != null ) { - mogoTips.add( mogoTip ); + private List getResult(List tips) { + List mogoTips = new ArrayList<>(); + if (tips != null) { + //只添加有坐标的结果 + for (Tip tip : tips) { + MogoTip mogoTip = ObjectUtils.fromAMap(tip); + if (mogoTip != null && mogoTip.getPoint() != null) { + mogoTips.add(mogoTip); } } } From 2a057ce99c66be1c81770869bac0d8b47d80a965 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 14 Feb 2020 15:54:27 +0800 Subject: [PATCH 7/7] add type -1 --- .../tanlu/fragment/TanluCardViewFragment.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 efdbc1b618..ac8f087749 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 @@ -955,6 +955,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; String poiType = ""; if (event.type.equals("1")) { //上报路况 + poiType = "10001"; mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); } else if (event.type.equals("2")) { //交通检查 10002 poiType = "10002"; @@ -984,16 +985,18 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; Log.d(TAG, "onMarkerInfo share onCompleted ---!poiType--- else ---->"); } - //请求分享接口 - if (markerExploreWayList != null && markerExploreWayList.size() > 0) { - MarkerExploreWay markerExploreWay = markerExploreWayList.get(0); - if (markerExploreWay.getUserInfo() != null && !TextUtils.isEmpty(poiType)) { //上报路况不使用这个接口 - uploadShareInfo(poiType, event.imageUrl, markerExploreWay.getUserInfo().getUserName(), - markerExploreWay.getUserInfo().getUserHead()); + //请求分享接口,只有封路和交通检查走新接口，老接口只有上报拥堵使用，并且定时任务都是拥堵的type + if (poiType.equals("10002") || poiType.equals("10003")) { + if (markerExploreWayList != null && markerExploreWayList.size() > 0) { + MarkerExploreWay markerExploreWay = markerExploreWayList.get(0); + if (markerExploreWay.getUserInfo() != null && !TextUtils.isEmpty(poiType)) { //上报路况不使用这个接口 + uploadShareInfo(poiType, event.imageUrl, markerExploreWay.getUserInfo().getUserName(), + markerExploreWay.getUserInfo().getUserHead()); + } + } else { + Log.e(TAG, "onMarkerInfo share markerExploreWayList = null"); + uploadShareInfo(poiType, event.imageUrl, "", ""); } - } else { - Log.e(TAG, "onMarkerInfo share markerExploreWayList = null"); - uploadShareInfo(poiType, event.imageUrl, "", ""); } }