From b4d5ff977ba0a5f0b06b72288916197c93b2705a Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 28 Apr 2020 14:56:04 +0800 Subject: [PATCH 1/2] delete close voice --- .../mogo/module/extensions/entrance/EntrancePresenter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7662f0ac2a..a587a7282c 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 @@ -65,7 +65,7 @@ public class EntrancePresenter extends Presenter< EntranceView > implements IMog } private void registerUnWake() { - AIAssist.getInstance( mContext ).registerUnWakeupCommand( ExtensionsModuleConst.CLOSE, ExtensionsModuleConst.CMD_CLOSE, mogoVoiceListener ); +// AIAssist.getInstance( mContext ).registerUnWakeupCommand( ExtensionsModuleConst.CLOSE, ExtensionsModuleConst.CMD_CLOSE, mogoVoiceListener ); AIAssist.getInstance( mContext ).registerUnWakeupCommand( ExtensionsModuleConst.CANCLE_SHARE, ExtensionsModuleConst.CMD_CANCLE_SHARE, mogoVoiceListener ); //探路相关上报 AIAssist.getInstance( mContext ).registerUnWakeupCommand( ExtensionsModuleConst.UPLOAD_ROAD_BLOCK, ExtensionsModuleConst.CMD_UPLOAD_BLOCK, mogoVoiceListener ); @@ -82,7 +82,7 @@ public class EntrancePresenter extends Presenter< EntranceView > implements IMog Log.d( TAG, "免唤醒 mogoVoiceListener needAuthorize = " + mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) + " >>>cmd = " + cmd ); mVoiceCmdType = cmd; if ( cmd.equals( ExtensionsModuleConst.CANCLE_SHARE ) - || cmd.equals( ExtensionsModuleConst.CLOSE ) ) { //取消分享，关闭页面 + /*|| cmd.equals( ExtensionsModuleConst.CLOSE ) */) { //取消分享，关闭页面 if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) { mIMogoAuthorizeModuleManager.invokeAuthorization( AUTHORIZE_TYPE_LAUNCHER_SHARE ); } else { From d7e024e62ff086abbb0f4f61295f303c9b845b7e Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 28 Apr 2020 15:45:04 +0800 Subject: [PATCH 2/2] code opt --- .../navi/ui/search/BaseSearchFragment.java | 77 --------- .../module/navi/ui/search/SearchFragment.java | 149 ------------------ .../navi/ui/setting/SettingAddressFragment.kt | 17 +- 3 files changed, 4 insertions(+), 239 deletions(-) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java index 0c64b6f1d6..a1651a052a 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java @@ -87,83 +87,6 @@ public abstract class BaseSearchFragment extends BaseFragment implements SearchV mSearchBox = view.findViewById(R.id.et_navi_search); } - /** - * 显示我的位置，并且可设置为家 - */ - //private void multiSearchMyLocationUI() { - // mUiMode = SearchConstants.UI_MODE_MULTI_MY_LOCATION; - // mSearchBox.setEnabled( false ); - // mMyLocation.setVisibility( View.GONE ); - // mChoicePoint.setVisibility( View.GONE ); - // mCurrentLocation.setVisibility( View.GONE ); - // mSearchResult.setVisibility( View.GONE ); - // mActionButton.setVisibility( View.VISIBLE ); - // mActionButton.setText( SearchUtils.getSearchTypeActionName( mSearchType ) ); - // mSearchBox.setCompoundDrawables( null, null, null, null ); - // //removeChoicePointMarker(); - // mSearchBox.setTag( null ); - // if ( mSearchBox.getLayoutParams() instanceof RelativeLayout.LayoutParams ) { - // final RelativeLayout.LayoutParams params = ( ( RelativeLayout.LayoutParams ) mSearchBox.getLayoutParams() ); - // params.addRule( RelativeLayout.LEFT_OF, R.id.amap_search_action_setting ); - // mSearchBox.setPadding( 0, 0, WindowUtils.dip2px( mContext, 15 ), 0 ); - // mSearchBox.setLayoutParams( params ); - // } - //} - - /** - * 显示我的位置，并且可设置为家 - */ - //private void multiSearchChoicePointUI() { - // mUiMode = SearchConstants.UI_MODE_MULTI_CHOICE_POINT; - // mSearchBox.setEnabled( false ); - // mMyLocation.setVisibility( View.GONE ); - // mChoicePoint.setVisibility( View.GONE ); - // mCurrentLocation.setVisibility( View.GONE ); - // mSearchResult.setVisibility( View.GONE ); - // mActionButton.setVisibility( View.VISIBLE ); - // mActionButton.setText( SearchUtils.getSearchTypeActionName( mSearchType ) ); - // mSearchBox.setCompoundDrawables( null, null, null, null ); - // mSearchBox.setTag( null ); - // if ( mSearchBox.getLayoutParams() instanceof RelativeLayout.LayoutParams ) { - // final RelativeLayout.LayoutParams params = ( ( RelativeLayout.LayoutParams ) mSearchBox.getLayoutParams() ); - // params.addRule( RelativeLayout.LEFT_OF, R.id.amap_search_action_setting ); - // mSearchBox.setPadding( 0, 0, WindowUtils.dip2px( mContext, 15 ), 0 ); - // mSearchBox.setLayoutParams( params ); - // } - //} - private void saveCurrentLocationAsCommonAddress() { - //if ( mLastAMapLocation == null ) { - // shortToast( "定位失败，请重试" ); - // return; - //} - //final Disposable disposable = mSearchPresenter.cacheCommonAddressPoi( mLastAMapLocation ).subscribe( output -> { - // Toast.makeText( mContext, "设置成功！", Toast.LENGTH_SHORT ).show(); - // mActionSuccess = true; - //}, error -> { - // if ( error instanceof Exception) { - // Toast.makeText( mContext, ( (Exception) error ).getMessage(), Toast.LENGTH_SHORT ).show(); - // mActionSuccess = false; - // } - //} ); - //mSearchPresenter.addDisposable( disposable ); - } - - private void saveRegeoAddressAsCommonAddress() { - //if ( mSearchBox.getTag() instanceof RegeocodeAddress ) { - // final Disposable disposable = mSearchPresenter.cacheCommonAddressPoi( ( ( RegeocodeAddress ) mSearchBox.getTag() ) ).subscribe( output -> { - // Toast.makeText( mContext, "设置成功！", Toast.LENGTH_SHORT ).show(); - // mActionSuccess = true; - // }, error -> { - // if ( error instanceof Exception) { - // Toast.makeText( mContext, ( (Exception) error ).getMessage(), Toast.LENGTH_SHORT ).show(); - // mActionSuccess = false; - // } - // } ); - // mSearchPresenter.addDisposable( disposable ); - //} else { - // Toast.makeText( mContext, "请选择位置", Toast.LENGTH_SHORT ).show(); - //} - } // view interface 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 c4ed93e604..00a7321047 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 @@ -231,91 +231,6 @@ public class SearchFragment extends BaseSearchFragment .registerUnWakeupCommand(WASH_CMD, new String[] { "洗车" }, this); } - private void push(Fragment fragment, String tag) { - FragmentDescriptor.Builder builder = new FragmentDescriptor.Builder(); - builder.fragment(fragment); - FragmentDescriptor build = - builder.tag(tag).build(); - SearchServiceHolder.INSTANCE.getFragmentManager().push(build); - } - - /** - * 显示我的位置，并且可设置为家 - */ - //private void multiSearchMyLocationUI() { - // mUiMode = SearchConstants.UI_MODE_MULTI_MY_LOCATION; - // mSearchBox.setEnabled( false ); - // mMyLocation.setVisibility( View.GONE ); - // mChoicePoint.setVisibility( View.GONE ); - // mCurrentLocation.setVisibility( View.GONE ); - // mSearchResult.setVisibility( View.GONE ); - // mActionButton.setVisibility( View.VISIBLE ); - // mActionButton.setText( SearchUtils.getSearchTypeActionName( mSearchType ) ); - // mSearchBox.setCompoundDrawables( null, null, null, null ); - // //removeChoicePointMarker(); - // mSearchBox.setTag( null ); - // if ( mSearchBox.getLayoutParams() instanceof RelativeLayout.LayoutParams ) { - // final RelativeLayout.LayoutParams params = ( ( RelativeLayout.LayoutParams ) mSearchBox.getLayoutParams() ); - // params.addRule( RelativeLayout.LEFT_OF, R.id.amap_search_action_setting ); - // mSearchBox.setPadding( 0, 0, WindowUtils.dip2px( mContext, 15 ), 0 ); - // mSearchBox.setLayoutParams( params ); - // } - //} - - /** - * 显示我的位置，并且可设置为家 - */ - //private void multiSearchChoicePointUI() { - // mUiMode = SearchConstants.UI_MODE_MULTI_CHOICE_POINT; - // mSearchBox.setEnabled( false ); - // mMyLocation.setVisibility( View.GONE ); - // mChoicePoint.setVisibility( View.GONE ); - // mCurrentLocation.setVisibility( View.GONE ); - // mSearchResult.setVisibility( View.GONE ); - // mActionButton.setVisibility( View.VISIBLE ); - // mActionButton.setText( SearchUtils.getSearchTypeActionName( mSearchType ) ); - // mSearchBox.setCompoundDrawables( null, null, null, null ); - // mSearchBox.setTag( null ); - // if ( mSearchBox.getLayoutParams() instanceof RelativeLayout.LayoutParams ) { - // final RelativeLayout.LayoutParams params = ( ( RelativeLayout.LayoutParams ) mSearchBox.getLayoutParams() ); - // params.addRule( RelativeLayout.LEFT_OF, R.id.amap_search_action_setting ); - // mSearchBox.setPadding( 0, 0, WindowUtils.dip2px( mContext, 15 ), 0 ); - // mSearchBox.setLayoutParams( params ); - // } - //} - private void saveCurrentLocationAsCommonAddress() { - //if ( mLastAMapLocation == null ) { - // shortToast( "定位失败，请重试" ); - // return; - //} - //final Disposable disposable = mSearchPresenter.cacheCommonAddressPoi( mLastAMapLocation ).subscribe( output -> { - // Toast.makeText( mContext, "设置成功！", Toast.LENGTH_SHORT ).show(); - // mActionSuccess = true; - //}, error -> { - // if ( error instanceof Exception) { - // Toast.makeText( mContext, ( (Exception) error ).getMessage(), Toast.LENGTH_SHORT ).show(); - // mActionSuccess = false; - // } - //} ); - //mSearchPresenter.addDisposable( disposable ); - } - - private void saveRegeoAddressAsCommonAddress() { - //if ( mSearchBox.getTag() instanceof RegeocodeAddress ) { - // final Disposable disposable = mSearchPresenter.cacheCommonAddressPoi( ( ( RegeocodeAddress ) mSearchBox.getTag() ) ).subscribe( output -> { - // Toast.makeText( mContext, "设置成功！", Toast.LENGTH_SHORT ).show(); - // mActionSuccess = true; - // }, error -> { - // if ( error instanceof Exception) { - // Toast.makeText( mContext, ( (Exception) error ).getMessage(), Toast.LENGTH_SHORT ).show(); - // mActionSuccess = false; - // } - // } ); - // mSearchPresenter.addDisposable( disposable ); - //} else { - // Toast.makeText( mContext, "请选择位置", Toast.LENGTH_SHORT ).show(); - //} - } @Override public void renderSearchPoiResult(List datums, boolean showDelete) { @@ -379,70 +294,6 @@ public class SearchFragment extends BaseSearchFragment } - //@Override - //public void renderChoicePointResult( RegeocodeAddress address ) { - // if ( address == null ) { - // mSearchBox.setTag( null ); - // mSearchBox.setText( "" ); - // return; - // } - // mSearchBox.setTag( address ); - // mSearchBox.setText( address.getFormatAddress() ); - //} - // - //@Override - //public void renderErrorView() { - // - //} - // - //@Override - //public void renderContentView() { - // - //} - - // view interface end - - ///** - // * 屏幕中心marker 跳动 - // */ - //@Override - //public void startJumpAnimation() { - // - // final AMap aMap = mUiController.getAMapServiceVisitor().getMap(); - // - // if ( mChoicePointMaker != null ) { - // //根据屏幕距离计算需要移动的目标点 - // final LatLng latLng = mChoicePointMaker.getPosition(); - // Point point = aMap.getProjection().toScreenLocation( latLng ); - // point.y -= WindowUtils.dip2px( mContext, 125 ); - // LatLng target = aMap.getProjection() - // .fromScreenLocation( point ); - // //使用TranslateAnimation,填写一个需要移动的目标点 - // Animation animation = new TranslateAnimation( target ); - // animation.setInterpolator( new Interpolator() { - // @Override - // public float getInterpolation( float input ) { - // // 模拟重加速度的interpolator - // if ( input <= 0.5 ) { - // return ( float ) ( 0.5f - 2 * ( 0.5 - input ) * ( 0.5 - input ) ); - // } else { - // return ( float ) ( 0.5f - Math.sqrt( ( input - 0.5f ) * ( 1.5f - input ) ) ); - // } - // } - // } ); - // //整个移动所需要的时间 - // animation.setDuration( 600 ); - // //设置动画 - // mChoicePointMaker.setAnimation( animation ); - // //开始动画 - // mChoicePointMaker.startAnimation(); - // - // } - //} - - private void navi2Location(SearchPoi searchPoi) { - - } /** * 退出搜索，进行清理 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 1419754974..099248bac1 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 @@ -4,41 +4,33 @@ import android.graphics.BitmapFactory import android.os.Bundle import android.text.TextUtils import android.view.View -import android.view.animation.BounceInterpolator -import android.widget.Toast import androidx.fragment.app.Fragment -import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.map.MogoLatLng import com.mogo.map.listener.IMogoMapListener import com.mogo.map.marker.IMogoMarker import com.mogo.map.marker.MogoMarkerOptions -import com.mogo.map.marker.anim.OnMarkerAnimationListener import com.mogo.map.search.geo.IMogoGeoSearchListener import com.mogo.map.search.geo.MogoGeocodeResult import com.mogo.map.search.geo.MogoRegeocodeResult import com.mogo.map.search.geo.query.MogoRegeocodeQuery -import com.mogo.module.common.MogoModulePaths import com.mogo.module.common.adapter.MogoMapListenerAdapter -import com.mogo.module.common.map.MapCenterPointStrategy -import com.mogo.module.common.map.Scene import com.mogo.module.navi.R import com.mogo.module.navi.R.string import com.mogo.module.navi.bean.EntityConvertUtils import com.mogo.module.navi.bean.SearchPoi import com.mogo.module.navi.constants.AMapConstants -import com.mogo.module.navi.manager.AddressManager import com.mogo.module.navi.constants.DataConstants import com.mogo.module.navi.constants.SearchServiceHolder import com.mogo.module.navi.cp.AddressHelper import com.mogo.module.navi.database.AppDataBase +import com.mogo.module.navi.manager.AddressManager import com.mogo.module.navi.ui.base.BaseFragment +import com.mogo.utils.TipToast 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.fragment_setting_address.* /** * @author zyz @@ -131,8 +123,7 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener { } tv_set_as_home.setOnClickListener { if (selectPoi == null) { - Toast.makeText(context, "请选择", Toast.LENGTH_SHORT) - .show() + TipToast.shortTip("请选择") return@setOnClickListener } insert(selectPoi!!)