diff --git a/gradle.properties b/gradle.properties index f9c2f77a2d..411204833e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,13 +71,13 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.24 +MOGO_MODULE_V2X_VERSION=1.1.27 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.2.1.1 +TANLULIB_VERSION=1.2.1.2 ## 产品库必备配置 applicationId=com.mogo.launcer diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable/module_map_ic_move2_current_location.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png new file mode 100644 index 0000000000..c1183aff8d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png differ diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java index 9416d12b43..f3fec2a330 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java @@ -1,6 +1,5 @@ package com.mogo.module.main; -import android.content.Intent; import android.location.Location; import android.view.MotionEvent; @@ -21,11 +20,6 @@ import com.mogo.map.navi.MogoNaviInfo; import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.main.registercenter.MogoRegisterCenterHandler; -import com.mogo.module.service.receiver.AccStatusReceiver; -import com.mogo.module.service.receiver.MogoReceiver; -import com.mogo.service.intent.IMogoIntentListener; -import com.mogo.service.intent.IMogoIntentManager; -import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.utils.logger.Logger; import java.util.Iterator; @@ -43,8 +37,7 @@ public class EventDispatchCenter implements IMogoCarLocationChangedListener2, IMogoMapListener, IMogoNaviListener2, - IMogoLocationListener, - IMogoIntentListener { + IMogoLocationListener { private static volatile EventDispatchCenter sInstance; @@ -66,12 +59,6 @@ public class EventDispatchCenter implements private static final String TAG = "DispatchCenter"; - public void registerReceiver( IMogoIntentManager intentManager ) { - intentManager.registerIntentListener( Intent.ACTION_POWER_CONNECTED, this ); - intentManager.registerIntentListener( Intent.ACTION_POWER_DISCONNECTED, this ); - intentManager.registerIntentListener( AccStatusReceiver.ACTION_NWD_ACC, this ); - } - @Override public boolean onMarkerClicked( IMogoMarker marker ) { IMogoMarkerClickListener listener = MogoRegisterCenterHandler.getInstance().getMarkerListener( marker.getOwner() ); @@ -437,32 +424,6 @@ public class EventDispatchCenter implements Logger.i( TAG, "onLocationChanged event cost " + ( System.currentTimeMillis() - start ) + "ms" ); } - @Override - public void onIntentReceived( String intentStr, Intent intent ) { - - Iterator< IMogoModuleLifecycle > iterator = MogoRegisterCenterHandler.getInstance().getLifecycleListeners(); - if ( Intent.ACTION_POWER_CONNECTED.equals( intentStr ) ) { - while ( iterator.hasNext() ) { - IMogoModuleLifecycle lifecycle = iterator.next(); - if ( lifecycle != null ) { - lifecycle.accOn(); - } - } - } else if ( Intent.ACTION_POWER_DISCONNECTED.equals( intentStr ) ) { - } else if ( AccStatusReceiver.ACTION_NWD_ACC.equals( intentStr ) ) { - int state = intent.getByteExtra( AccStatusReceiver.PARAM_ACC_STATUS, ( byte ) 0 ); - if ( state == 1 ) { - while ( iterator.hasNext() ) { - IMogoModuleLifecycle lifecycle = iterator.next(); - if ( lifecycle != null ) { - lifecycle.accOn(); - } - } - } - } - } - - @Override public void onArriveDestination() { Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 876d4c01d2..71d7303ea9 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -60,7 +60,6 @@ public class MogoModulesManager implements MogoModulesHandler { throw new NullPointerException( "activity can't be null." ); } this.mActivity = activity; - EventDispatchCenter.getInstance().registerReceiver( apis.getIntentManagerApi() ); } private Context getContext() { diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 2153c9a17e..c00caf03df 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -1,19 +1,12 @@ package com.mogo.module.share.dialog; import android.content.Context; -import android.graphics.PixelFormat; -import android.os.Build; -import android.view.Gravity; -import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.TextView; -import androidx.annotation.NonNull; - import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.module.common.dialog.BaseFloatDialog; -import com.mogo.module.common.utils.CarSeries; import com.mogo.module.share.R; import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.share.manager.ISeekHelpListener; @@ -23,7 +16,6 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.statusmanager.IMogoStatusManager; -import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; import java.util.HashMap; diff --git a/modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_left.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_left.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_left.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_left.png diff --git a/modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_right.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_right.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_right.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_right.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_accident.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_block_up.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_dense_fog.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_real_time_traffic.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_road_closure.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_road_construction.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_road_icy.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_seek_help.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_stagnant_water.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_traffic_check.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_left.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_left.png new file mode 100644 index 0000000000..058a752bf6 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_left.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_right.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_right.png new file mode 100644 index 0000000000..bbcedd2484 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_right.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png new file mode 100644 index 0000000000..9dd6d425c9 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png new file mode 100644 index 0000000000..b504cffe87 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png new file mode 100644 index 0000000000..6a16103d0e Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png new file mode 100644 index 0000000000..7defe6986d Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png new file mode 100644 index 0000000000..d20dacee3a Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png new file mode 100644 index 0000000000..3c2ba1225c Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png new file mode 100644 index 0000000000..53585d40d1 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png new file mode 100644 index 0000000000..30f26921aa Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png new file mode 100644 index 0000000000..f125b9f22e Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png new file mode 100644 index 0000000000..1b5af5fe54 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index e3a6a7987d..f5012a4dce 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml @@ -2,8 +2,7 @@ + android:layout_height="match_parent"> * 卡片生命周期 */ +@Deprecated public interface IMogoModuleLifecycle { /** diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java index 908af22c34..47a501fb53 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java @@ -13,4 +13,14 @@ public interface IMogoStatusChangedListener { * @param isTrue true - accOn、adas ui show、voice ui show、push ui show、v2x ui show */ void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ); + + /** + * 是否需要黏性状态: 先改变状态,后注册监听 + * + * @param descriptor 状态 + * @return 默认不需要 + */ + default boolean requestStickyStatus( StatusDescriptor descriptor ) { + return false; + } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStickyStatusChangedListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStickyStatusChangedListener.java new file mode 100644 index 0000000000..60a79be75f --- /dev/null +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStickyStatusChangedListener.java @@ -0,0 +1,18 @@ +package com.mogo.service.statusmanager; + +/** + * @author congtaowang + * @since 2020-01-04 + *

+ * 状态控制器监听 + */ +public interface IMogoStickyStatusChangedListener extends IMogoStatusChangedListener { + + /** + * 是否需要黏性状态: 先改变状态,后注册监听 + * + * @param descriptor 状态 + * @return 默认不需要 + */ + boolean requestStickyStatus( StatusDescriptor descriptor ); +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index 06a9ce1779..a16ca51607 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -8,6 +8,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.service.MogoServicePaths; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; +import com.mogo.service.statusmanager.IMogoStickyStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; @@ -227,14 +228,21 @@ public class MogoStatusManager implements IMogoStatusManager { } @Override - public void registerStatusChangedListener( String tag, StatusDescriptor descriptor, IMogoStatusChangedListener listeners ) { - if ( listeners == null || descriptor == null ) { + public void registerStatusChangedListener( String tag, StatusDescriptor descriptor, IMogoStatusChangedListener listener ) { + if ( listener == null || descriptor == null ) { return; } if ( !mListeners.containsKey( descriptor ) ) { mListeners.put( descriptor, new ArrayList<>() ); } - mListeners.get( descriptor ).add( listeners ); + mListeners.get( descriptor ).add( listener ); + + if ( listener instanceof IMogoStickyStatusChangedListener && listener.requestStickyStatus( descriptor ) ) { + Boolean val = mStatus.get( descriptor ); + if ( val != null ) { + listener.onStatusChanged( descriptor, get_bool_val( descriptor ) ); + } + } } @Override