From 36c27387c3d5040e83d5efa680d65939031d4df5 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sat, 14 Mar 2020 11:33:05 +0800 Subject: [PATCH 1/6] opt, add apis --- gradle.properties | 5 +-- .../impl/amap/marker/AMapMarkerWrapper.java | 4 +-- .../common/entity/MarkerShowEntity.java | 12 +++++++ .../extensions/entrance/EntranceFragment.java | 31 +++++++------------ .../com/mogo/module/main/MainActivity.java | 1 - .../com/mogo/module/main/MainPresenter.java | 2 +- .../module/service/MarkerServiceHandler.java | 10 ++++-- .../actionmanager/MogoActionHandler.java | 20 ++++++++++++ .../actionmanager/MogoActionManager.java | 17 ++++++++++ .../service/marker/MapMarkerManager.java | 29 ++++++++++++++++- .../com/mogo/service/IMogoServiceApis.java | 7 +++++ .../service/module/IMogoActionManager.java | 21 +++++++++++++ .../module/IMogoBizActionDoneListener.java | 17 ++++++++++ .../mogo/service/impl/MogoServiceApis.java | 6 ++++ 14 files changed, 149 insertions(+), 33 deletions(-) create mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoBizActionDoneListener.java diff --git a/gradle.properties b/gradle.properties index c511005017..9baaf57a30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,7 +64,4 @@ MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.0-SNAPSHOT # 新鲜水 -MOGO_MODULE_FRESH_NEWS_VERSION=1.0.2-SNAPSHOT - -# 卡片效果 -CARD_LIBRARY_VERSION=1.0.0-SNAPSHOT \ No newline at end of file +MOGO_MODULE_FRESH_NEWS_VERSION=1.0.2-SNAPSHOT \ No newline at end of file diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java index 79e0163162..7750973c1e 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java @@ -164,9 +164,7 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { } if ( mMarker != null ) { mMarker.setMarkerOptions( options ); - if ( mMarker.getObject() instanceof IMogoMarker ) { - ( ( IMogoMarker ) mMarker.getObject() ).setObject( opt.getObject() ); - } + setObject( opt.getObject() ); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java index 067330a211..69b2df5411 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java @@ -2,6 +2,9 @@ package com.mogo.module.common.entity; import android.text.TextUtils; +import com.mogo.map.marker.IMogoMarker; + +import java.lang.ref.WeakReference; import java.util.Objects; /** @@ -27,6 +30,7 @@ public class MarkerShowEntity { private Object bindObj; //Marker 经纬度位置信息 private MarkerLocation markerLocation; + private IMogoMarker mMarker; public boolean isChecked() { return isChecked; @@ -99,6 +103,14 @@ public class MarkerShowEntity { Objects.equals(markerLocation, that.markerLocation); } + public void setMarker( IMogoMarker marker ) { + this.mMarker = marker; + } + + public IMogoMarker getMarker() { + return mMarker; + } + @Override public int hashCode() { return Objects.hash(iconUrl, textContent, markerType, bindObj, markerLocation); 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 f5307f0292..1b576b3f47 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.Rect; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; @@ -30,6 +29,7 @@ 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.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.fragmentmanager.FragmentDescriptor; @@ -40,7 +40,6 @@ import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.statusmanager.IMogoStatusManager; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -74,6 +73,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent private TextView mSpeedLimitValue; private View mSpeedLimitUnit; + private IMogoServiceApis mApis; private IMogoMapService mService; private IMogoMapUIController mMApUIController; private IMogoLocationClient mMogoLocationClient; @@ -100,12 +100,11 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent @Override protected void initViews() { - mMogoFragmentManager = ( IMogoFragmentManager ) ARouter.getInstance() - .build( MogoServicePaths.PATH_FRAGMENT_MANAGER ) - .navigation(); - mMogoAddressManager = ( IMogoAddressManager ) ARouter.getInstance() - .build( MogoServicePaths.PATH_ADDRESS_MANAGER ) - .navigation(); + + mApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation( getContext() ); + + mMogoFragmentManager = mApis.getFragmentManagerApi(); + mMogoAddressManager = mApis.getAddressManagerApi(); mCommonAddress = findViewById( R.id.module_entrance_id_common_address ); @@ -197,21 +196,13 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent @Override public void onActivityCreated( @Nullable Bundle savedInstanceState ) { super.onActivityCreated( savedInstanceState ); - mService = ( IMogoMapService ) ARouter.getInstance() - .build( MogoServicePaths.PATH_SERVICES_MAP ) - .navigation( getContext() ); - mMogoRegisterCenter = ( IMogoRegisterCenter ) ARouter.getInstance() - .build( MogoServicePaths.PATH_REGISTER_CENTER ) - .navigation( getContext() ); + mService = mApis.getMapServiceApi(); + mMogoRegisterCenter = mApis.getRegisterCenterApi(); mMApUIController = mService.getMapUIController(); mMogoLocationClient = mService.getSingletonLocationClient( getContext() ); mMogoNavi = mService.getNavi( getContext() ); - mAnalytics = ( IMogoAnalytics ) ARouter.getInstance() - .build( MogoServicePaths.PATH_UTILS_ANALYTICS ) - .navigation( getContext() ); - mMogoStatusManager = ( IMogoStatusManager ) ARouter.getInstance() - .build( MogoServicePaths.PATH_STATUS_MANAGER ) - .navigation( getContext() ); + mAnalytics = mApis.getAnalyticsApi(); + mMogoStatusManager = mApis.getStatusManagerApi(); mMogoRegisterCenter.registerMogoNaviListener( ExtensionsModuleConst.TYPE_ENTRANCE, this ); mMogoRegisterCenter.registerMogoMapListener( ExtensionsModuleConst.TYPE_ENTRANCE, this ); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index c35c364661..0b5c5734dd 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -314,7 +314,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public boolean onMarkerClicked( IMogoMarker marker ) { - switch2Card( marker.getOwner(), false ); if ( mMogoModuleHandler != null ) { mMogoModuleHandler.onMarkerClicked( marker ); } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java index 5117d35f27..e498d26f28 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java @@ -73,7 +73,7 @@ public class MainPresenter extends Presenter< MainView > { if ( TextUtils.isEmpty( cardInfo.mCardName ) ) { return; } - mView.switch2Card( cardInfo.mCardName, true ); + mView.switch2Card( cardInfo.mCardName, cardInfo.mLockCar ); } ); mAnalytics = ( IMogoAnalytics ) ARouter.getInstance().build( MogoServicePaths.PATH_UTILS_ANALYTICS ).navigation( getContext() ); mCardStartShowTime = System.currentTimeMillis(); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 3c0e0baaf8..338c1b121d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -17,6 +17,7 @@ import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.service.connection.IMogoSocketManager; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.map.IMogoMapService; +import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.statusmanager.IMogoStatusManager; @@ -36,15 +37,14 @@ public class MarkerServiceHandler { private static IMogoMarkerManager mMarkerManager; private static IMogoNavi mNavi; private static IMogoMapUIController mMapUIController; - private static IMogoLocationClient mLocationClient; - private static IMogoStatusManager mMogoStatusManager; private static IMogoImageloader mImageloader; private static IMogoSocketManager mMogoSocketManager; private static IMogoCardManager mMogoCardManager; private static IMogoAnalytics mMogoAnalytics; private static IMogoRegisterCenter mRegisterCenter; + private static IMogoActionManager mActionManager; private static MapMarkerManager mMapMarkerManager; @@ -56,12 +56,12 @@ public class MarkerServiceHandler { mMogoSocketManager = mApis.getSocketManagerApi( context ); mMogoCardManager = mApis.getCardManagerApi(); mMogoAnalytics = mApis.getAnalyticsApi(); - mMarkerManager = mMapService.getMarkerManager( context ); mNavi = mMapService.getNavi( context ); mMapUIController = mMapService.getMapUIController(); mLocationClient = mMapService.getSingletonLocationClient( context ); mRegisterCenter = mApis.getRegisterCenterApi(); + mActionManager = mApis.getActionManagerApi(); mMapMarkerManager = MapMarkerManager.getInstance(); mMapMarkerManager.init( context ); @@ -115,6 +115,10 @@ public class MarkerServiceHandler { return mRegisterCenter; } + public static IMogoActionManager getActionManager() { + return mActionManager; + } + //TODO -------------以下方法是临时过度使用的，后面统一使用，getMapMarkerManager进行调用 /** diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionHandler.java index 18f11f37dc..71d13ecbe1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionHandler.java @@ -3,6 +3,7 @@ package com.mogo.module.service.actionmanager; import android.content.Context; import android.text.TextUtils; +import com.mogo.service.module.IMogoBizActionDoneListener; import com.mogo.service.module.MogoAction; import com.mogo.service.module.IMogoActionListener; import com.mogo.service.module.IMogoActionManager; @@ -43,6 +44,8 @@ public class MogoActionHandler implements IMogoActionManager { private Map< String, List< IMogoActionListener > > mListeners = new ConcurrentHashMap<>(); + private IMogoBizActionDoneListener mBizActionDoneListener; + @Override public void registerActionListener( String biz, IMogoActionListener listener ) { if ( TextUtils.isEmpty( biz ) || listener == null ) { @@ -90,4 +93,21 @@ public class MogoActionHandler implements IMogoActionManager { } } } + + @Override + public void registerBizActionDoneListener( IMogoBizActionDoneListener listener ) { + mBizActionDoneListener = listener; + } + + @Override + public void unregisterBizActionDoneListener() { + mBizActionDoneListener = null; + } + + @Override + public void bizInvoke( String biz, int position, Object data ) { + if ( mBizActionDoneListener != null ) { + mBizActionDoneListener.onBizActionDone( biz, position, data ); + } + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java index 69e7cca49c..58d1a9110a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java @@ -3,7 +3,9 @@ package com.mogo.module.service.actionmanager; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.map.MogoOverlayManager; import com.mogo.service.MogoServicePaths; +import com.mogo.service.module.IMogoBizActionDoneListener; import com.mogo.service.module.MogoAction; import com.mogo.service.module.IMogoActionListener; import com.mogo.service.module.IMogoActionManager; @@ -32,6 +34,21 @@ public class MogoActionManager implements IMogoActionManager { MogoActionHandler.getInstance().invoke( biz, action ); } + @Override + public void registerBizActionDoneListener( IMogoBizActionDoneListener listener ) { + MogoActionHandler.getInstance().registerBizActionDoneListener( listener ); + } + + @Override + public void unregisterBizActionDoneListener() { + MogoActionHandler.getInstance().unregisterBizActionDoneListener(); + } + + @Override + public void bizInvoke( String biz, int position, Object data ) { + MogoActionHandler.getInstance().bizInvoke( biz, position, data ); + } + @Override public void init( Context context ) { MogoActionHandler.getInstance().init( context ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index ecaac0e88b..a97c161bc3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -9,6 +9,7 @@ import com.mogo.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; +import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.marker.MogoMarkersHandler; import com.mogo.module.common.entity.MarkerCardResult; @@ -27,6 +28,7 @@ import com.mogo.module.service.datamanager.MogoDataHandler; import com.mogo.module.service.utils.ViewUtils; import com.mogo.service.cardmanager.IMogoCardChangedListener; import com.mogo.service.connection.IMogoOnMessageListener; +import com.mogo.service.module.IMogoBizActionDoneListener; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.logger.Logger; @@ -48,7 +50,8 @@ import java.util.Map; */ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessageListener< MarkerResponse >, - IMogoCardChangedListener { + IMogoCardChangedListener, + IMogoBizActionDoneListener { private static final String TAG = "MapMarkerManager"; // 是否选中在线卡片及气泡，语音搜索触发 private boolean mIsAISearchOnlineData = false; @@ -91,6 +94,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, // 长连接 MarkerServiceHandler.getMogoSocketManager().registerOnMessageListener( 401001, this ); MarkerServiceHandler.getMogoCardManager().registerCardChangedListener( "LAUNCHER_MARKER_MODULE", this ); + MarkerServiceHandler.getActionManager().registerBizActionDoneListener( this ); } // ACC ON 的时候重置为true，ACC OFF 设置为 false @@ -728,6 +732,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, markers.add( marker ); setMarkersSmall( markers ); } + markerShowEntity.setMarker( marker ); return marker; } @@ -763,4 +768,26 @@ public class MapMarkerManager implements IMogoMarkerClickListener, public String getCurrentModuleName() { return mCurrentModuleName; } + + @Override + public void onBizActionDone( String biz, int position, Object data ) { + Logger.d( TAG, "biz = %s, position = %s", biz, position ); + if ( !( data instanceof MarkerShowEntity ) ) { + return; + } + if ( ( ( MarkerShowEntity ) data ).getMarker() != null ) { + onMarkerClicked( ( ( MarkerShowEntity ) data ).getMarker() ); + } else { + IMogoMarkerManager markerManager = MarkerServiceHandler.getMarkerManager(); + List< IMogoMarker > markers = markerManager.getMarkers( biz ); + if ( markers != null ) { + for ( IMogoMarker marker : markers ) { + if ( marker.getObject() == data ) { + onMarkerClicked( marker ); + break; + } + } + } + } + } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java index 49bdc2a625..c113db6fa8 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java @@ -13,6 +13,7 @@ import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoActionManager; +import com.mogo.service.module.IMogoAddressManager; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.module.IMogoSearchManager; import com.mogo.service.module.IMogoSettingManager; @@ -154,4 +155,10 @@ public interface IMogoServiceApis extends IProvider { * @return */ IMogoRefreshStrategyController getRefreshStrategyControllerApi(); + + /** + * 地址操作 + * @return + */ + IMogoAddressManager getAddressManagerApi(); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoActionManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoActionManager.java index efb6a8a9a8..a2d70f818c 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoActionManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoActionManager.java @@ -33,4 +33,25 @@ public interface IMogoActionManager extends IProvider { * @param action 动作 */ void invoke( String biz, MogoAction action ); + + /** + * 主模块注册业务回调 + * + * @param listener + */ + void registerBizActionDoneListener( IMogoBizActionDoneListener listener ); + + /** + * 主模块注销业务回调 + */ + void unregisterBizActionDoneListener(); + + /** + * 业务回调信息到主模块 + * + * @param biz + * @param position + * @param data + */ + void bizInvoke( String biz, int position, Object data ); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoBizActionDoneListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoBizActionDoneListener.java new file mode 100644 index 0000000000..c4a349df8e --- /dev/null +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoBizActionDoneListener.java @@ -0,0 +1,17 @@ +package com.mogo.service.module; + +/** + * @author congtaowang + * @since 2020-03-12 + *

+ * 业务回调各自的当前动作 + */ +public interface IMogoBizActionDoneListener { + + /** + * @param biz 业务 + * @param position 位置 + * @param data 数据 + */ + void onBizActionDone( String biz, int position, Object data ); +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index 62f0fd3466..8edffef86e 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -22,6 +22,7 @@ import com.mogo.service.impl.singleton.SingletonsHolder; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoActionManager; +import com.mogo.service.module.IMogoAddressManager; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.module.IMogoSearchManager; import com.mogo.service.module.IMogoSettingManager; @@ -141,6 +142,11 @@ public class MogoServiceApis implements IMogoServiceApis { return getApiInstance( IMogoRefreshStrategyController.class, MogoServicePaths.PATH_REFRESH_STRATEGY_API ); } + @Override + public IMogoAddressManager getAddressManagerApi() { + return getApiInstance( IMogoAddressManager.class, MogoServicePaths.PATH_ADDRESS_MANAGER ); + } + private static < T extends IProvider > T getApiInstance( Class< T > clazz, String path ) { T inst = SingletonsHolder.get( clazz ); if ( inst == null ) { From 7524c3b42d585f30a09c312f62eeeb52fd55e2ef Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sat, 14 Mar 2020 13:30:48 +0800 Subject: [PATCH 2/6] opt --- app/build.gradle | 14 +++++++++++--- .../java/com/mogo/map/impl/amap/hook/BnHooker.java | 4 ++++ .../module/service/marker/MapMarkerManager.java | 5 ++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ad5fcc5f39..94aa2c83dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,13 +39,11 @@ android { debug { signingConfig signingConfigs.release debuggable = true - buildConfigField 'int', 'NET_ENV', '2' } release { minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - buildConfigField 'int', 'NET_ENV', '2' } } compileOptions { @@ -53,11 +51,12 @@ android { targetCompatibility 1.8 } - flavorDimensions "default" + flavorDimensions "product", "env" productFlavors { //诺威达 nwd { + dimension "product" sourceSets { main { manifest.srcFile 'src/nwd/AndroidManifest.xml' @@ -65,12 +64,21 @@ android { } } zhidao { + dimension "product" sourceSets { main { manifest.srcFile 'src/main/AndroidManifest.xml' } } } + qa { + dimension "env" + buildConfigField 'int', 'NET_ENV', '2' + } + online { + dimension "env" + buildConfigField 'int', 'NET_ENV', '3' + } } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java index ffb6c4c7ed..420548776c 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java @@ -3,6 +3,7 @@ package com.mogo.map.impl.amap.hook; import com.amap.api.maps.AMap; import com.autonavi.base.amap.api.mapcore.IAMapDelegate; import com.autonavi.base.amap.mapcore.interfaces.IAMapListener; +import com.mogo.utils.logger.Logger; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; @@ -43,6 +44,9 @@ public class BnHooker implements InvocationHandler { if ( method.getName().equals( "setRenderFps" ) ) { return method.invoke( host, 10 ); } + if ( method.getName().equals( "drawFrame" ) ) { + Logger.d(TAG, "drawFrame"); + } return method.invoke( host, args ); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index a97c161bc3..d93f347338 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -782,7 +782,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener, List< IMogoMarker > markers = markerManager.getMarkers( biz ); if ( markers != null ) { for ( IMogoMarker marker : markers ) { - if ( marker.getObject() == data ) { + if ( !( marker.getObject() instanceof MarkerShowEntity ) ) { + continue; + } + if ( ( ( MarkerShowEntity ) marker.getObject() ).getBindObj() == data ) { onMarkerClicked( marker ); break; } From 75e5a5f916ae21883811baed6b2b25ab04e3f6c1 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 14 Mar 2020 14:33:57 +0800 Subject: [PATCH 3/6] pull to psu h --- .../mogo/module/apps/model/NavigatorApp.java | 58 ++++++++++++++++++ .../mogo/module/apps/model/NavigatorApps.java | 34 ++++++++++ .../res/drawable-ldpi/module_apps_ic_apps.png | Bin 0 -> 2267 bytes .../res/drawable-ldpi/module_apps_ic_chat.png | Bin 0 -> 5242 bytes .../module_apps_ic_chat_unchecked.png | Bin 0 -> 3125 bytes .../drawable-ldpi/module_apps_ic_interest.png | Bin 0 -> 4070 bytes .../module_apps_ic_interest_unchecked.png | Bin 0 -> 1892 bytes .../module_apps_ic_media_center_checked.png | Bin 0 -> 2937 bytes .../res/drawable-ldpi/module_apps_ic_news.png | Bin 0 -> 3637 bytes .../module_apps_ic_news_unchecked.png | Bin 0 -> 2636 bytes .../module_apps_ic_online_car.png | Bin 0 -> 4882 bytes .../module_apps_ic_online_car_unchecked.png | Bin 0 -> 2468 bytes .../drawable-ldpi/module_apps_ic_tanlu.png | Bin 0 -> 4013 bytes .../module_apps_ic_tanlu_unchecked.png | Bin 0 -> 2418 bytes .../src/main/res/values/colors.xml | 20 ++++++ .../res/drawable-ldpi/module_apps_bg_card.png | Bin 0 -> 25173 bytes .../module_main_card_cover_up_bottom.png | Bin 0 -> 713 bytes .../module_main_card_cover_up_bottom.png | Bin 0 -> 1577 bytes .../MogoRefreshStrategyController.java | 28 +++++++++ .../IMogoRefreshStrategyController.java | 20 ++++++ 20 files changed, 160 insertions(+) create mode 100644 modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApp.java create mode 100644 modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_apps.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_chat.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_chat_unchecked.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_interest.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_interest_unchecked.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_media_center_checked.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_news.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_news_unchecked.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_online_car.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_online_car_unchecked.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_tanlu.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_tanlu_unchecked.png create mode 100644 modules/mogo-module-apps/src/main/res/values/colors.xml create mode 100644 modules/mogo-module-main/src/main/res/drawable-ldpi/module_apps_bg_card.png create mode 100644 modules/mogo-module-main/src/main/res/drawable-ldpi/module_main_card_cover_up_bottom.png create mode 100644 modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_card_cover_up_bottom.png create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java create mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApp.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApp.java new file mode 100644 index 0000000000..d5f7df5b9b --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApp.java @@ -0,0 +1,58 @@ +package com.mogo.module.apps.model; + +import androidx.annotation.DrawableRes; + +/** + * @author congtaowang + * @since 2020-03-13 + *

+ * app + */ +public class NavigatorApp { + + @DrawableRes + public int mIconId; + @DrawableRes + public int mUncheckedIconId; + public String mName; + public String mModuleType; + + public NavigatorApp( int mIconId,int mUncheckedIconId, String mName, String mModuleType ) { + this.mIconId = mIconId; + this.mUncheckedIconId = mUncheckedIconId; + this.mName = mName; + this.mModuleType = mModuleType; + } + + public int getmIconId() { + return mIconId; + } + + public void setmIconId(int mIconId) { + this.mIconId = mIconId; + } + + public int getmUncheckedIconId() { + return mUncheckedIconId; + } + + public void setmUncheckedIconId(int mUncheckedIconId) { + this.mUncheckedIconId = mUncheckedIconId; + } + + public String getmName() { + return mName; + } + + public void setmName(String mName) { + this.mName = mName; + } + + public String getmModuleType() { + return mModuleType; + } + + public void setmModuleType(String mModuleType) { + this.mModuleType = mModuleType; + } +} diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java new file mode 100644 index 0000000000..1f0f3d61af --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java @@ -0,0 +1,34 @@ +package com.mogo.module.apps.model; + +import com.mogo.module.apps.R; +import com.mogo.module.common.ModuleNames; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author congtaowang + * @since 2020-03-13 + *

+ * app + */ +public class NavigatorApps { + + //integers.add(R.drawable.module_apps_ic_online_car); + //integers.add(R.drawable.module_apps_ic_interest); + //integers.add(R.drawable.module_apps_ic_news); + //integers.add(R.drawable.module_apps_ic_media_center); + //integers.add(R.drawable.module_apps_ic_chat_icon); + //integers.add(R.drawable.module_apps_ic_tanlu); + + public static List< NavigatorApp > getApps() { + List< NavigatorApp > apps = new ArrayList<>(); + apps.add( new NavigatorApp( R.drawable.module_apps_ic_online_car,R.drawable.module_apps_ic_online_car_unchecked, "在线车辆", ModuleNames.CARD_TYPE_USER_DATA ) ); + apps.add( new NavigatorApp( R.drawable.module_apps_ic_interest, R.drawable.module_apps_ic_interest_unchecked,"新鲜事", ModuleNames.CARD_TYPE_NOVELTY ) ); + apps.add( new NavigatorApp( R.drawable.module_apps_ic_news,R.drawable.module_apps_ic_news_unchecked, "首页", ModuleNames.CARD_TYPE_BUSINESS_OPERATION ) ); + apps.add( new NavigatorApp( R.drawable.module_apps_ic_media_center, R.drawable.module_apps_ic_media_center_checked, "媒体中心", ModuleNames.CARD_TYPE_SHARE_MUSIC ) ); + apps.add( new NavigatorApp( R.drawable.module_apps_ic_chat_icon, R.drawable.module_apps_ic_chat_unchecked,"车聊聊", ModuleNames.CARD_TYPE_CARS_CHATTING ) ); + apps.add( new NavigatorApp( R.drawable.module_apps_ic_tanlu, R.drawable.module_apps_ic_tanlu_unchecked,"探路", ModuleNames.CARD_TYPE_ROAD_CONDITION ) ); + return apps; + } +} diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_apps.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_apps.png new file mode 100644 index 0000000000000000000000000000000000000000..a56017fd578b0e600a1204b8853450c4f4c70785 GIT binary patch literal 2267 zcmV<12qgE3P)Px-l}SWFRA>d&T3cuxMHv2P&*^CrliJi6AFRftwMA@#A}C_9rhQOBi;9Bv#mkdb z3SK}&6sdwBf)AEjpS&Ovp;)Cg@%#SWJ>7G% z=X5ts+c;s*%+AjI^L_JQW_C74rYSx2&{K^=$Br*Gp4Vw5(`LoH$`NU_VlUwkM$9Qs zWYmcBmyzP2b)5Z|&uji}O!Df^e2Pl*T#6o>7TnC5#RX-YCm2+kCsJlT?&W8Rwzp;RDNu6&|tbTt1M zH1IGw&OU=-`bt)092)wxv9bQc&70pJNh&!pk?!tQ%dGWY6=UWk6@E_btQ|JSS-WFL z&#okLGD#XOTfXXX5&JSooEI&`V(`bhv#q1EFnDO-=h!xp%92u+W#%!&>zUB3=)~y?_Hh5JcByoD+=mvOTSGCR;vL4~Pzivs(>S|;V>f;kNF;hqo zA+e}+#KV-V_!_THO7W7+}z&YdEoHjfx&3AGSlKZ zp&>TfVg{CpkyxY9%7}2WyI|`?6h+!H)-uH!=~s$c+;+Glb`vVj+gh=Bal5p&&F2PE zAy_Qq@M5vpO?u36yMN#}85$ajK#VVYYN}D|Hos3CN;+28*jel z3##$U3D^Ce$XYg2)1o$l4PcF~<&Qc#7U;}!b{&(^GIK2lc|${^bT3~463_c20Nw*& zS4p7kVnYvYkOcE0>a(-z$_J`-hfS+uM;q0MHzLbW=0qk=ZUM94gf0dYIw#C0r$q}p z6eMR{HG~nd~g_ zFbMn5AKVfNg7-Dzn-??$PH7U~h1fo;Z+1tI@uetLBADtr486oxGQq=oR14PP6%4cQ z0dY}%13Bv;&xPIDluY)Lao{ELgbe=}w6h1I3AxCzFV* zXk+JRVcIydNuTl~V^ZIsCp~BFtQr9kp9FJggfnj)B}2`S1Q*D@{@%07t873HbjxID zDth6=Si5!^~@R3WRuY zdUh&++22S0l<)WM4#lU=9Ym8;X?x{n<>cAto|We2OEJTYI{scsLWd15IC`tLOd>!f@TVVX4J$2pdoOQaG((m7#N`Oc;I8K?Lki*$*s$ z9VVlM05;t4g&V+-Oi42|C7KU&H6_Lvlt~U3Nsyq`9W>jeOFY?kc(jjhfh8vspdk~} zOfoKVeV?F~;3FhM^P=yBK4URk1ZrSb^a>_NXP$Mu4}670{KwiR;g3rW4!=+EXg^^m zZ5Eo9uMtNVy72vi+gx8GaD4R{FjRD$XBBMUmK>?A@+ zf;(9?F_2I)xYv4WB#2%#uhEgb96WePN%$)ypdxC8ug8j;+5id6ZlIMUD71|Yu&b^` zPa^Pg>wnemVN@F$KmI z`-aY?(mbyfrX1{ybabBtdy&NMA3m4i;p5t;)(@to>^P`Igq@ZzU$qAB3Xj$jFjJmk z&G~5i_MUYi9!_8>@pBivHid3WT`z0_7!_+|)UsH2;6UF*dwbVmJijy2X2um^&M$4- z_VMpgU}Z%3fT!F%x`)l(9BnvL%GQ|mJ9qSaQHf^~5jNmAyK6c+uSRiUWrvG;k56#B zw)eaphoQ_zq7C@X4uLWKJ}fF^8q35&Ow~ljYJ`pd*tf5E-M!sg-J$%IxV^ZV;m6P= zEiY92en`A!;g=P0DfkrkblkJ^T}PjQIel=pajI%0+L1oP&s_-3w_^1>Z{JU%V{#c_ zbc%EAvUb5uA|hwl_=BgAhj(9klx-%a`7oDe#9IZd)F+yGXNljMF%8i^Bp<{!_b3&h&6HJuND plm77x@#P5W@sDTHKb`-0_8-HUQ(%`l1Frx8002ovPDHLkV1oaWM=SsU literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_chat.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_chat.png new file mode 100644 index 0000000000000000000000000000000000000000..d099b857d97ca6e6b568640feb9dfb6d90652f73 GIT binary patch literal 5242 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 P00000NkvXXu0mjfk)sZ$ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_interest.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_interest.png new file mode 100644 index 0000000000000000000000000000000000000000..d2fac8cf3a25c751e211b0d0fb0e91461aca356c GIT binary patch literal 4070 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 Y52l*Px# literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_interest_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_interest_unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..c7d89c68ad0d97e2799d372aefddb422773fafcb GIT binary patch literal 1892 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_news.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_news.png new file mode 100644 index 0000000000000000000000000000000000000000..c86bcef363fef82f862632c2fba7d7c7d5daad9d GIT binary patch literal 3637 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 Hu0mjfYfB>F literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_news_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_news_unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..77343ff931707838ab8a621013f0edf4bae74261 GIT binary patch literal 2636 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 Eg1OOo82|tP literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_online_car_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_online_car_unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..318e9535a09358396093e07c768a65ca734bf5e7 GIT binary patch literal 2468 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 T(4?^R00000NkvXXu0mjfHb(Dc literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_tanlu_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_tanlu_unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..4b451a11783600fb9cb1f2d1ed98da674c2559f2 GIT binary patch literal 2418 zcmV-&361uNP)Px;EJ;K`RA>dwS!-|{M-lGX-P7q#l25YbL{el+w(MB4EZYgVzy&yp5EQmkI1uMy z8z=m+3rKhr@FSs8g`o0>Ul3CK0IHBvc{uq8`~gdHMaFiKIDSwzAu^6+NtSa`A|=-I z9(%jP*L%08d+h1%Bq3?4wq~ZMyQh1md#1NX&?1%QhreB_OoYA!c8#VqYe|ZGh-487 z;YBS4iD@b2q!eOMAu)jV<=Wc%w@;jC3oeETVj)cS?mbc+2+IdZ8qMId1Hvo$@RLL# zDD^gxdPe%Re{}!(#GQQT6LIIIh^0Wtd>RY=l|*I>YfGJk@}{Pgw0Cv=VLV@6c`34g z|98t~X6_u5B)^G?w0tMa3189_k!bfcmA~<~mtG3xL<6Lp6=`WXvez(;=Y$~G{F0R6 z0+;LAj*eIUoy%-$Hl((;HbqgYo`wVe7)rRZ;VIBOBj2cjV~N zqeZuFg7@*6-9`b_w3p7J1nZ1Nr;T63@b4-r2lcbm0-b5DW5uXrsoA5*%=q! zQ4uyL-U%F!_hwpwrG`V6ufk7{Wt!K~N7yGocpwwe^1-V=#(#sxpB>=94-t~<5NX>Ha&nk1uu`;U^(A;^wG8gnszC|;2CRmNfFeP06%-Fu+W;a`DndweXP z2JV+9ZC|l=ARIQE^I_nGYwSKmW<-*5<8sol815(a_2)>Kkr*6nck>$2_$bM32%f_s zGE1vS`M8fn0P$j8MUR5Y-X@x{hsFeXP3w?QvVAgr2=4jm2NXGj6 zv*Kq!sBUR_ypEl{F#|$&Fpkym{Ri=*$blVIVc{6~laRiu zlu=w0w9Zx^eM0kpX|2;A)o1l!OK>dDl-RL9{oJ{AJ0fOt+i+jW} zj0`Bw;9%2ZWb*Gj#z;*179gMnrV#3gNf5Swh?Sk zD4dIR9CZNdo>8m&A$W{(1oKVgY zn#5+=Uf4vk!%x&bO!``O;#h%2 zx<>y)+O*$>#A_|^329@!q?aQ2L}AMf`?gS^au<30nHP(3)glCqoZ1HwA~@#~x@#wm z?fyB9Z+*(zdOk_{oa2vY8*e&BhIcL6$x1M{NXfc5u0;cr(O16P|nIl64JO3fM|;jZaMZY0bIk$uo2|jofe*A$%!K zrUi{&l35WqD*_xgF?&AUQ%Te7ThjQ)0g5=o?U<@scYGkFq0M|m%EawxJcJeHxXQ%m z9=<^3=YK}7$-xwgXxAvJisLekO&2cCtO(Dgjt^S=6KTdb9wbA>f4@_4soe~=6yZk} zN85-IdWJ7rUTAGQmTOhdYqaLduStyrV;Jd`?p+6#(Ur9fo>v)t-CLWEoB;6*M|Z`d ziP3XlI#v7i1gvNihxI`BsaHSXp7n>wFGbBQhu*|Y-%7&FE(U^YuAyXLN1fJh*mgl~7e!~dj!ufgud>Gh&ov=L1t_@WT<_ckK4 zw@Pd4abF}d@fS>7Y{O=2K_55%kjnnsPMV(gW6~^}#caXJ-+JrhlLFc>Tg$Y#5q<6w z?c7c;lGeWWo0X#k1a!GvFWO45ym3Xi!_Qr)hPl0x3%1~VXXh($+}V<(2*26!a~Evd z*??#1maQd8jA%;1FH;3jQvtobS3lzCF2o2ArjD(Ee$ed_&vbRYb}LnuG({MJ-|RMS zY;t1@kvd#KMOB_Z-FY%4aTb*?$+Qwh<~KVWX&s5M;Z1|$qxUu=NOT8zu z&5@TPHZy)H;zt&KpMZ6i+3H*5j|$U#sB~S07*qoM6N<$f+()7qW}N^ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/values/colors.xml b/modules/mogo-module-apps/src/main/res/values/colors.xml new file mode 100644 index 0000000000..6fb34a3513 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/values/colors.xml @@ -0,0 +1,20 @@ + + + #008577 + #00574B + #D81B60 + #ff080625 + #FFFFFF + #00000000 + #1AFFFFFF + #99FFFFFF + #CCFFFFFF + #7FFFFFFF + #00BFFF + #4DFFFFFF + #4D080625 + + #080625 + #3E7FFC + + diff --git a/modules/mogo-module-main/src/main/res/drawable-ldpi/module_apps_bg_card.png b/modules/mogo-module-main/src/main/res/drawable-ldpi/module_apps_bg_card.png new file mode 100644 index 0000000000000000000000000000000000000000..3e68a54a4aea37fa9b737ac1d1e255f81e42a6b9 GIT binary patch literal 25173 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 A{Qv*} literal 0 HcmV?d00001 diff --git a/modules/mogo-module-main/src/main/res/drawable-ldpi/module_main_card_cover_up_bottom.png b/modules/mogo-module-main/src/main/res/drawable-ldpi/module_main_card_cover_up_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..84957fe2917063319221f1788daef2c26a493ff2 GIT binary patch literal 713 zcmV;)0yh1LP)Px%gGod|RCodHn@?*KK^Vq&H!8JS?Y-g`PAE_V+(zI!tnLf|BZ`stgv@2aupMf_sJM(Vd?CS$amoa<67SxM?2#7$D1h6YwAG>?&3TnC}Eu1*# zJ{9>PR7(UzKm@V`QU?Vm*^VjhY<6b)&i7r*r@zn<{U zuN3tmR7V6vKm?2c-9rcAI-E0^m|UaL__6l=+kHz^F9ISU0!0y^d*~q4bF5iHaO)H- zHP?K#G(0l$cA)>_jW~`kF+oiPL_h>iivV{@t7~6xKYTDgiyGUAE^ARtY$hlFX0G|g zx$PH2Lswm?RJxobNk7)lhAh2^fCz}dpA%?zyWPc&_Qvz+>6iDOO;+FIEw>OsO6Yw! zXiDpF%%H4zC~jf%nEKT!mC8Hps34UMsr2};T4gM4ru z8YkJ9%8K4Lyw2$yOiAOa%rJAu>}?R3RF!=9e8;Iggth{+ZxAWPnp z5f`nY&=f2vF&Pl`A|L{X5}+@z*f}6!PefSDj>C>N&Ym8j*wX$Rbu9uS zAOcwe^aOo@xgLk4*XEfXDe->$xd6wTCLCJa=DK4CLWXzBKRlZbGhD3 vH;I4<{OttR@cisE_g22_jk$0G&R^6Q8=Y?&GyV~b9jm~eIhB}Vf_QO;qh97^nEUc#V0x@qMa?OA zZesuXM0#lTv-%e4`_09p2i=4h0|}MFX_U+6Bab;n#lcQ*U-inY9XD>jEWl{PvjCt4 z!^P`Y*;S2qVj=O`^{=lfb%vz9-@H{4LlGCqQnqwC%@JJRECce^?W+7!sC3f@(B%;{4{&k_^!5H%E&D?s=_cwVx++rBDS2M;xg zH7b}$Dbq9^06HEOo30Q>BfK^Kl}vWP}|%AQf0ZR?CAu z7kjzb&;teN!{oPW%qX`kk1x{Mz#Mb6H^<^tTo|@Y+#VK9i6uyF$ z-$g(JC}Oya2WnQ#It}sI6hG0wqfy0%ot@?~e7Evo$VvXA0-IYFY1ML)xLjUbVU@&3 zvVXEyLxHVzhrjgh<3C-yj2`*u+!X@RXB){sXQ*qfrSwT0yfup%qCZLgI-02}gIHuV zVGyVTWCM*F=oler5I=kMfy%?fjXmG$ERX4{B4Ho3^$^H<%cxp20R3}DVA^%s+}!aJ z5hsneLmIWK=?bp``L&OR6i)z)vwkA+24#v_n|qIkkM<|vwKsM+702Q}NXXU_y7+oeFEA;+cb-~SVd z6#U(SfSSFiX@tP$t@FMhM0 zb{B~5dDp%_wQ`)Api_$qBcT;hV)E0?C+B4+XF=5Wk}@BNsyRqjhnS=qn?=<2VkZPA zR!g@1(37&kvNZi$CoEzt){2GVkZxG8J~8@j*@=E;rD(>OP1u$xB^O4-Py0oOonUn! zn>Bits=!BUYd3bmqOT?B%&M9v?~jXx$Ud6GPW73#Jdr!OTyz7qp;~_E$sZntCYsR^ zl%P-4rWS%_x#V3%mSYDm^H)>zPinP__yX}R)U2AJT)7F74!4pJ@&+nKux(uvYp}V-x0H8jb z()7=lW=e3wmCozgk~>E!$m|(LP0+BH<|9$wt}J|l;z-zQN;+}PHOh90Tu$z5o8siv zZXFsZgMP0>8MG{|b&`tFpR^?(TV`{n@G%PNlvJAD9D19xx5KCXytu?kO5U>JM^SA9 y>x13C{lRiR)_?O(r>pI&OibLuh9!DhUyLVBE>sfRvicWxKOn#-$eZOAbLxNoCdW+x literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java new file mode 100644 index 0000000000..51aaf27073 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java @@ -0,0 +1,28 @@ +package com.mogo.module.service.strategy; + +import android.content.Context; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.module.service.MogoServices; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.strategy.IMogoRefreshStrategyController; + +/** + * @author congtaowang + * @since 2020-03-13 + *

+ * 描述 + */ +@Route( path = MogoServicePaths.PATH_REFRESH_STRATEGY_API ) +public class MogoRefreshStrategyController implements IMogoRefreshStrategyController { + + @Override + public void restartAutoRefreshAtTime( int delay ) { + MogoServices.getInstance().restartAutoRefreshAtTime( delay ); + } + + @Override + public void init( Context context ) { + + } +} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java new file mode 100644 index 0000000000..72356ea315 --- /dev/null +++ b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoRefreshStrategyController.java @@ -0,0 +1,20 @@ +package com.mogo.service.strategy; + +import com.alibaba.android.arouter.facade.template.IProvider; + +/** + * @author congtaowang + * @since 2020-03-13 + *

+ * 刷新策略控制 + */ +public interface IMogoRefreshStrategyController extends IProvider { + + /** + * 中断当前刷新，在 delay ms 后再次刷新 + * + * @param delay 单位（ms） 0 为则立即刷新，为负值则忽略 + */ + void restartAutoRefreshAtTime( int delay ); + +} \ No newline at end of file From bef5a7b52771ed7c92040277085bfe30d2501fe2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sat, 14 Mar 2020 15:16:24 +0800 Subject: [PATCH 4/6] opt --- .../service/marker/MapMarkerManager.java | 55 +++++++++++-------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index d93f347338..07353d8002 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -130,19 +130,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, mIsMarkerClicked = true; Logger.d( TAG, "onMarkerClicked 点击了大而全中的Marker：" + marker ); try { - if ( mLastCheckMarker != null ) { - // 判断点击的是否是同一个 - if ( marker.equals( mLastCheckMarker ) ) { - Logger.d( TAG, "onMarkerClicked 与上一次点击的Marker一样，不做处理：" + marker ); - return false; - } - // 将上次选中 Marker 设置为未选中状态 - closeMarker( mLastCheckMarker ); + boolean result = switchMarkerOpenStatus( marker ); + if ( !result ) { + return false; } - // 将当前的Marker设置为选中 - openMarker( marker ); - // 数据统计代码 final Map< String, Object > properties = new HashMap<>(); switch ( mLastCheckMarker.getOwner() ) { @@ -191,6 +183,28 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return false; } + /** + * 切换当前选中marker和上一个选中的状态 + * + * @param marker + * @return + */ + private boolean switchMarkerOpenStatus( IMogoMarker marker ) { + if ( mLastCheckMarker != null ) { + // 判断点击的是否是同一个 + if ( marker.equals( mLastCheckMarker ) ) { + Logger.d( TAG, "onMarkerClicked 与上一次点击的Marker一样，不做处理：" + marker ); + return false; + } + // 将上次选中 Marker 设置为未选中状态 + closeMarker( mLastCheckMarker ); + } + + // 将当前的Marker设置为选中 + openMarker( marker ); + return true; + } + // 对指定类型高亮处理 public synchronized void highlightedMarker( final String typeTag ) { @@ -772,23 +786,16 @@ public class MapMarkerManager implements IMogoMarkerClickListener, @Override public void onBizActionDone( String biz, int position, Object data ) { Logger.d( TAG, "biz = %s, position = %s", biz, position ); - if ( !( data instanceof MarkerShowEntity ) ) { - return; - } - if ( ( ( MarkerShowEntity ) data ).getMarker() != null ) { - onMarkerClicked( ( ( MarkerShowEntity ) data ).getMarker() ); + if ( data instanceof MarkerShowEntity && + ( ( MarkerShowEntity ) data ).getMarker() != null ) { + switchMarkerOpenStatus( ( ( MarkerShowEntity ) data ).getMarker() ); } else { IMogoMarkerManager markerManager = MarkerServiceHandler.getMarkerManager(); List< IMogoMarker > markers = markerManager.getMarkers( biz ); if ( markers != null ) { - for ( IMogoMarker marker : markers ) { - if ( !( marker.getObject() instanceof MarkerShowEntity ) ) { - continue; - } - if ( ( ( MarkerShowEntity ) marker.getObject() ).getBindObj() == data ) { - onMarkerClicked( marker ); - break; - } + IMogoMarker marker = markers.get( position ); + if ( marker != null ) { + switchMarkerOpenStatus( marker ); } } } From 64048f48ddb554b16ff6f488896b80e12c11c037 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sat, 14 Mar 2020 15:52:02 +0800 Subject: [PATCH 5/6] add polyline option --- .../com/mogo/map/impl/amap/utils/ObjectUtils.java | 3 +++ .../com/mogo/map/overlay/MogoPolylineOptions.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java index e2f3c11892..5004072c76 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java @@ -726,6 +726,9 @@ public class ObjectUtils { target.geodesic( options.isGeodesic() ); target.setDottedLine( options.isDottedLine() ); target.useGradient( options.isGradient() ); + if ( options.getColorValues() != null ) { + target.colorValues( options.getColorValues() ); + } target.transparency( options.getTransparency() ); target.aboveMaskLayer( options.isAboveMaskLayer() ); target.lineCapType( PolylineOptions.LineCapType.LineCapRound ); diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java index a9cd740f09..9ac5f29631 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java @@ -30,6 +30,7 @@ public class MogoPolylineOptions { private float mTransparency = 1.0F; private boolean mIsAboveMaskLayer = false; private boolean mIsPointsUpdated = false; + private List< Integer > mColorValues; public MogoPolylineOptions() { this.mPoints = new ArrayList<>(); @@ -168,6 +169,15 @@ public class MogoPolylineOptions { return this; } + /** + * @param colors + * @return + */ + public MogoPolylineOptions colorValues( List< Integer > colors ) { + mColorValues = colors; + return this; + } + public List< MogoLatLng > getPoints() { return mPoints; } @@ -211,4 +221,8 @@ public class MogoPolylineOptions { public boolean isPointsUpdated() { return mIsPointsUpdated; } + + public List< Integer > getColorValues() { + return mColorValues; + } } From a15a41a27b596319efb169bb49be8fdab0e77516 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sat, 14 Mar 2020 16:55:48 +0800 Subject: [PATCH 6/6] delete unwake oil price voice --- .idea/misc.xml | 2 +- .../com/mogo/module/extensions/ExtensionsModuleConst.java | 4 ++-- .../module/extensions/entrance/EntrancePresenter.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file 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 190ca76a37..10026c2762 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 @@ -39,7 +39,7 @@ public class ExtensionsModuleConst { public static final String[] CMD_UPLOAD_BLOCK = {"上报拥堵"}; public static final String[] CMD_TRAFFIC_CHECK = {"上报交通检查"}; public static final String[] CMD_ROAD_CLOSURE = {"上报封路"}; - public static final String[] CMD_SHARE_OIL_PRICE = {"分享油价"}; +// public static final String[] CMD_SHARE_OIL_PRICE = {"分享油价"}; //上报拥堵 public static final String UPLOAD_ROAD_BLOCK = "command_upload_block"; @@ -48,7 +48,7 @@ public class ExtensionsModuleConst { //上报封路 public static final String UPLOAD_ROAD_CLOSURE = "command_upload_road_closure"; //分享油价 - public static final String SHARE_OIL_PRICE = "command_share_oil_price"; +// public static final String SHARE_OIL_PRICE = "command_share_oil_price"; /*** 探路 结束 **/ //埋点 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 57c5a9c31c..205666e137 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 @@ -48,8 +48,8 @@ public class EntrancePresenter extends Presenter { ExtensionsModuleConst.CMD_TRAFFIC_CHECK, mogoVoiceListener); AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.UPLOAD_ROAD_CLOSURE, ExtensionsModuleConst.CMD_ROAD_CLOSURE, mogoVoiceListener); - AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.SHARE_OIL_PRICE, - ExtensionsModuleConst.CMD_SHARE_OIL_PRICE, mogoVoiceListener); +// AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.SHARE_OIL_PRICE, +// ExtensionsModuleConst.CMD_SHARE_OIL_PRICE, mogoVoiceListener); } /** @@ -67,8 +67,8 @@ public class EntrancePresenter extends Presenter { uploadTrfficCheck(); } else if (cmd.equals(ExtensionsModuleConst.UPLOAD_ROAD_CLOSURE)) { //上报封路 uploadRoadClosed(); - } else if (cmd.equals(ExtensionsModuleConst.SHARE_OIL_PRICE)) { //分享油价 - shareOilPrice(); +// } else if (cmd.equals(ExtensionsModuleConst.SHARE_OIL_PRICE)) { //分享油价 +// shareOilPrice(); } }