taskAsync(delayTime: Long = 0, job: suspend () -> T) = GlobalScope.async(ThreadPool) {
delay(delayTime)
job()
}
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
index c335dd18d9..c91b026b20 100644
--- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
@@ -23,7 +23,7 @@
160px
160px
- 30px
+ 10px
100px
100px
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/api/CallChatApi.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/api/CallChatApi.java
index 491fae50b7..8c66296c17 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/api/CallChatApi.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/api/CallChatApi.java
@@ -66,15 +66,15 @@ class CallChatApi {
driverInfo.setSn( onlineCar.getUserInfo().getSn() );
driverInfo.setUserHead( onlineCar.getUserInfo().getUserHead() );
driverInfo.setUserName( onlineCar.getUserInfo().getUserName() );
- mApiProvider.showUserWindow( TAG, driverInfo, context );
+ if ( mApiProvider != null ) {
+ mApiProvider.showUserWindow( TAG, driverInfo, context );
+ }
}
public void hideUserWindow( Context context ) {
- if ( mApiProvider != null ) {
- if ( mApiProvider == null ) {
- Logger.e( TAG, "no call chat api instance." );
- return;
- }
+ if ( mApiProvider == null ) {
+ Logger.e( TAG, "no call chat api instance." );
+ return;
}
mApiProvider.hideUserWindow( TAG, context, null );
}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java
index 8403901eef..b38917966c 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java
@@ -77,6 +77,11 @@ public class CustomRatingBar extends LinearLayout {
* */
private StepSize stepSize;
+ /*
+ *添加资源(空白心是白色还是灰色自定义属性)
+ * */
+ private boolean otherHeartImg;
+
@Override
public boolean isClickable() {
return mClickable;
@@ -159,14 +164,21 @@ public class CustomRatingBar extends LinearLayout {
context.getResources().getDimension(R.dimen.heart_ratingbar_height));
elementPadding = mTypedArray.getDimension(R.styleable.CustomRatingBar_elenmentPadding,
context.getResources().getDimension(R.dimen.ratingbar_padding));
+ /*
+ * 白天模式下 热心指数(白色)和个人中心(灰色)使用不同的资源
+ * 默认灰色
+ * */
+ otherHeartImg = mTypedArray.getBoolean(R.styleable.CustomRatingBar_OtherHeartImg, true);
elementStep = mTypedArray.getFloat(R.styleable.CustomRatingBar_elenmentStep, 1.0f);
stepSize = StepSize.fromStep(mTypedArray.getInt(R.styleable.CustomRatingBar_stepSize, 1));
elementCount = mTypedArray.getInteger(R.styleable.CustomRatingBar_elenmentCount, 5);
stepSize = StepSize.Half;
- Drawable drawable_empty_default = ContextCompat.getDrawable(context, R.drawable.icon_heart_unchoose);
- Drawable drawable_harf_default = ContextCompat.getDrawable(context, R.drawable.icon_heart_second);
+ Drawable drawable_empty_default = ContextCompat.getDrawable(context,
+ otherHeartImg == false ? R.drawable.icon_heart_unchoose : R.drawable.icon_heart_unchoose_other);
+ Drawable drawable_half_default = ContextCompat.getDrawable(context,
+ otherHeartImg == false ? R.drawable.icon_heart_second : R.drawable.icon_heart_second_other);
Drawable drawable_fill_default = ContextCompat.getDrawable(context, R.drawable.icon_heart_choose);
Drawable drawable_empty = mTypedArray.getDrawable(R.styleable.CustomRatingBar_elenmentEmpty);
@@ -175,7 +187,7 @@ public class CustomRatingBar extends LinearLayout {
elementEmptyDrawable = drawable_empty != null ? drawable_empty : drawable_empty_default;
elementFillDrawable = drawable_half != null ? drawable_half : drawable_fill_default;
- elementHarfDrawable = drawable_fill != null ? drawable_fill : drawable_harf_default;
+ elementHarfDrawable = drawable_fill != null ? drawable_fill : drawable_half_default;
mClickable = mTypedArray.getBoolean(R.styleable.CustomRatingBar_clickable, false);
mTypedArray.recycle();
for (int i = 0; i < elementCount; ++i) {
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second_other.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second_other.png
new file mode 100644
index 0000000000..1c49555541
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second_other.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose_other.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose_other.png
new file mode 100644
index 0000000000..09ab4af9e3
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose_other.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png
index 627be6d3cc..a562d17b93 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_second_other.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second_other.png
new file mode 100644
index 0000000000..e26dbe8a7b
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second_other.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose_other.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose_other.png
new file mode 100644
index 0000000000..c1dbeacc1d
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose_other.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml
new file mode 100644
index 0000000000..72ab058d93
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml
@@ -0,0 +1,6 @@
+
+
+
* 描述：加载各个模块
*/
-public class MainActivity extends MvpActivity implements MainView,
+public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView,
IMogoLocationListener,
IMogoMarkerClickListener,
IMogoADASControlStatusChangedListener {
@@ -69,16 +69,16 @@ public class MainActivity extends MvpActivity implement
@Override
protected int getLayoutId() {
- if (!DebugConfig.isMapBased()) {
+ if ( !DebugConfig.isMapBased() ) {
return R.layout.module_main_activity_main_no_map;
}
return R.layout.module_main_activity_main;
}
@Override
- protected void beforeSetContentView(Bundle savedInstanceState) {
+ protected void beforeSetContentView( Bundle savedInstanceState ) {
init();
- installSkinManager(savedInstanceState);
+ installSkinManager( savedInstanceState );
}
/**
@@ -86,120 +86,120 @@ public class MainActivity extends MvpActivity implement
*
* @param savedInstanceState
*/
- private void installSkinManager(Bundle savedInstanceState) {
- mServiceApis.getMapServiceApi().getMapViewInstanceHandler().createMapViewInstance(this);
- mServiceApis.getSkinSupportInstallerApi().install(getApplication());
- mServiceApis.getSkinSupportInstallerApi().onCompensateActivityCreated(this, savedInstanceState);
+ private void installSkinManager( Bundle savedInstanceState ) {
+ mServiceApis.getMapServiceApi().getMapViewInstanceHandler().createMapViewInstance( this );
+ mServiceApis.getSkinSupportInstallerApi().install( getApplication() );
+ mServiceApis.getSkinSupportInstallerApi().onCompensateActivityCreated( this, savedInstanceState );
}
@Override
protected void initViews() {
- getWindow().setBackgroundDrawable(null);
+ getWindow().setBackgroundDrawable( null );
- mApps = findViewById(R.id.module_main_id_apps_fragment_container);
- mEntrance = findViewById(R.id.module_main_id_entrance_fragment_container);
- mEventPanel = findViewById(R.id.module_main_id_event_panel_fragment_container);
- mFloatingLayout = findViewById(R.id.module_main_id_floating_view);
- mLeftShadowFrame = findViewById(R.id.module_main_id_map_left_shadow_frame);
- mCoverUpLayout = findViewById(R.id.module_main_id_cover_up);
- mLeftPanelLayout = findViewById(R.id.module_main_id_left_panel_fragment_container);
- mHistoryMessagePanel = findViewById(R.id.module_main_id_message_history_fragment_container);
+ mApps = findViewById( R.id.module_main_id_apps_fragment_container );
+ mEntrance = findViewById( R.id.module_main_id_entrance_fragment_container );
+ mEventPanel = findViewById( R.id.module_main_id_event_panel_fragment_container );
+ mFloatingLayout = findViewById( R.id.module_main_id_floating_view );
+ mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame );
+ mCoverUpLayout = findViewById( R.id.module_main_id_cover_up );
+ mLeftPanelLayout = findViewById( R.id.module_main_id_left_panel_fragment_container );
+ mHistoryMessagePanel = findViewById( R.id.module_main_id_message_history_fragment_container );
// 避免事件穿透导致地图被滑动
- mLeftShadowFrame.setOnClickListener(view -> {
- });
- FloatingViewHandler.init(mFloatingLayout);
+ mLeftShadowFrame.setOnClickListener( view -> {
+ } );
+ FloatingViewHandler.init( mFloatingLayout );
- mServiceApis.getOnlineCarPanelApi().initContainer(R.id.module_main_id_message_history_fragment_container, this);
- if (CallChatApi.getInstance().getApiProvider() != null) {
+ mServiceApis.getOnlineCarPanelApi().initContainer( R.id.module_main_id_message_history_fragment_container, this );
+ if ( CallChatApi.getInstance().getApiProvider() != null ) {
CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", R.id.module_main_id_message_history_fragment_container, this);
}
}
// 隐藏布局
protected void hideLayout() {
- mEntrance.setVisibility(View.GONE);
- mEventPanel.setVisibility(View.GONE);
- mFloatingLayout.setVisibility(View.GONE);
+ mEntrance.setVisibility( View.GONE );
+ mEventPanel.setVisibility( View.GONE );
+ mFloatingLayout.setVisibility( View.GONE );
}
// 显示布局
protected void showLayout() {
- mEntrance.setVisibility(View.VISIBLE);
- mEventPanel.setVisibility(View.VISIBLE);
- mFloatingLayout.setVisibility(View.VISIBLE);
+ mEntrance.setVisibility( View.VISIBLE );
+ mEventPanel.setVisibility( View.VISIBLE );
+ mFloatingLayout.setVisibility( View.VISIBLE );
}
@Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- ContextHolderUtil.holdContext(this);
+ protected void onCreate( @Nullable Bundle savedInstanceState ) {
+ super.onCreate( savedInstanceState );
+ ContextHolderUtil.holdContext( this );
mPresenter.postLoadModuleMsg();
}
private void init() {
- if (mServiceApis == null) {
+ if ( mServiceApis == null ) {
mServiceApis = MogoApisHandler.getInstance().getApis();
}
- mServiceApis.getShareManager().resetContext(this);
- mServiceApis.getAuthManagerApi().showAuth(this);
+ mServiceApis.getShareManager().resetContext( this );
+ mServiceApis.getAuthManagerApi().showAuth( this );
mMogoStatusManager = mServiceApis.getStatusManagerApi();
- mMogoStatusManager.setMainPageLaunchedStatus(TAG, true);
- AutopilotServiceManage.getInstance().init(getContext());
+ mMogoStatusManager.setMainPageLaunchedStatus( TAG, true );
+ AutopilotServiceManage.getInstance().init( getContext() );
}
@Override
public void loadModules() {
final long start = System.currentTimeMillis();
- MogoModulesManager.getInstance().init(this);
+ MogoModulesManager.getInstance().init( this );
loadSplash();
- if (DebugConfig.isMapBased()) {
- if (mServiceApis.getMapServiceApi() != null) {
- mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener(EventDispatchCenter.getInstance());
- mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener(EventDispatchCenter.getInstance());
- mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener(EventDispatchCenter.getInstance());
- mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener(this);
+ if ( DebugConfig.isMapBased() ) {
+ if ( mServiceApis.getMapServiceApi() != null ) {
+ mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() );
+ mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() );
+ mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() );
+ mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( this );
}
}
- if (DebugConfig.isSkinSupported()) {
+ if ( DebugConfig.isSkinSupported() ) {
initAdasControlStatusListener();
}
- if (DebugConfig.isMapBased()) {
- EventDispatchCenter.getInstance().setMapLoadedCallback(() -> {
- Logger.d(TAG, "map loaded." + Thread.currentThread().getName());
+ if ( DebugConfig.isMapBased() ) {
+ EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {
+ Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );
resetMapCenterPoint();
loadOthersModules();
- Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms");
- });
- MogoModulesManager.getInstance().loadMapModule(R.id.module_main_id_map_fragment_container);
+ Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" );
+ } );
+ MogoModulesManager.getInstance().loadMapModule( R.id.module_main_id_map_fragment_container );
} else {
loadOthersModules();
}
mMogoFragmentManager = mServiceApis.getFragmentManagerApi();
- mMogoFragmentManager.init(this, R.id.module_main_id_search_fragment);
- mMogoFragmentManager.initMessageHistoryContainerId(R.id.module_main_id_message_history_fragment_container);
- mMogoFragmentManager.registerMainFragmentStackTransactionListener((size) -> {
- if (size == 0) {
+ mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment );
+ mMogoFragmentManager.initMessageHistoryContainerId( R.id.module_main_id_message_history_fragment_container );
+ mMogoFragmentManager.registerMainFragmentStackTransactionListener( ( size ) -> {
+ if ( size == 0 ) {
showLayout();
- } else if (size == 1) {
+ } else if ( size == 1 ) {
hideLayout();
}
- });
+ } );
}
private void resetMapCenterPoint() {
// 右移地图中心点
MapCenterPointStrategy.init();
- MapCenterPointStrategy.setMapCenterPointByScene(mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS);
+ MapCenterPointStrategy.setMapCenterPointByScene( mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS );
}
private void loadOthersModules() {
@@ -213,66 +213,66 @@ public class MainActivity extends MvpActivity implement
}
private void initAdasControlStatusListener() {
- mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener(TAG, this);
- AdasConfigApiController.getInstance().registerAdasSettingUiListener(EventDispatchCenter.getInstance());
- AdasConfigApiController.getInstance().registerAdasSettingSkinModelListener(EventDispatchCenter.getInstance());
- AdasConfigApiController.getInstance().init(getApplicationContext());
- LoggerController.setPrinterLog(DebugConfig.isDebug());
+ mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this );
+ AdasConfigApiController.getInstance().registerAdasSettingUiListener( EventDispatchCenter.getInstance() );
+ AdasConfigApiController.getInstance().registerAdasSettingSkinModelListener( EventDispatchCenter.getInstance() );
+ AdasConfigApiController.getInstance().init( getApplicationContext() );
+ LoggerController.setPrinterLog( DebugConfig.isDebug() );
}
private void startBaseService() {
- Intent intent = new Intent(this, MogoMainService.class);
- startService(intent);
+ Intent intent = new Intent( this, MogoMainService.class );
+ startService( intent );
}
protected void loadContainerModules() {
- MogoModulesManager.getInstance().loadEntrancesModule(R.id.module_main_id_entrance_fragment_container);
- MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container);
- MogoModulesManager.getInstance().loadLeftPanelModule(R.id.module_main_id_left_panel_fragment_container);
+ MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container );
+ MogoModulesManager.getInstance().loadEventPanelModule( R.id.module_main_id_event_panel_fragment_container );
+ MogoModulesManager.getInstance().loadLeftPanelModule( R.id.module_main_id_left_panel_fragment_container );
}
@Override
public void hideCoverUpLayout() {
- Logger.d(TAG, "隐藏遮罩");
- mCoverUpLayout.setVisibility(View.GONE);
+ Logger.d( TAG, "隐藏遮罩" );
+ mCoverUpLayout.setVisibility( View.GONE );
mServiceApis.getAdasControllerApi().showADAS();
}
@Override
public void loadCardModules() {
- List providers = MogoModulesManager.getInstance().loadCardsModule();
+ List< IMogoModuleProvider > providers = MogoModulesManager.getInstance().loadCardsModule();
}
@Override
public void loadSplash() {
- MogoModulesManager.getInstance().loadSplashModule(R.id.module_main_id_splash_container);
+ MogoModulesManager.getInstance().loadSplashModule( R.id.module_main_id_splash_container );
}
@NonNull
@Override
protected MainPresenter createPresenter() {
- return new MainPresenter(this);
+ return new MainPresenter( this );
}
@Override
- public void onLocationChanged(MogoLocation location) {
- EventDispatchCenter.getInstance().onLocationChanged(location);
+ public void onLocationChanged( MogoLocation location ) {
+ EventDispatchCenter.getInstance().onLocationChanged( location );
}
@Override
- public boolean onMarkerClicked(IMogoMarker marker) {
- EventDispatchCenter.getInstance().onMarkerClicked(marker);
+ public boolean onMarkerClicked( IMogoMarker marker ) {
+ EventDispatchCenter.getInstance().onMarkerClicked( marker );
return false;
}
@Override
- public void onMapUiModeChanged(EnumMapUI mapUI) {
- switch (mapUI) {
+ public void onMapUiModeChanged( EnumMapUI mapUI ) {
+ switch ( mapUI ) {
case Type_Night:
- mServiceApis.getSkinSupportInstallerApi().loadSkin(SkinMode.Night);
+ mServiceApis.getSkinSupportInstallerApi().loadSkin( SkinMode.Night );
break;
case Type_Light:
- mServiceApis.getSkinSupportInstallerApi().loadSkin(SkinMode.Light);
+ mServiceApis.getSkinSupportInstallerApi().loadSkin( SkinMode.Light );
break;
}
}
@@ -280,26 +280,26 @@ public class MainActivity extends MvpActivity implement
@Override
protected void onResume() {
super.onResume();
- mMogoStatusManager.setMainPageResumeStatus(TAG, true);
- mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false);
- if (mCoverUpLayout.getVisibility() != View.VISIBLE) {
+ mMogoStatusManager.setMainPageResumeStatus( TAG, true );
+ mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false );
+ if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) {
mServiceApis.getAdasControllerApi().showADAS();
}
- if (mServiceApis.getLauncherApi() != null) {
- mServiceApis.getLauncherApi().setFloatButtonVisible(false);
+ if ( mServiceApis.getLauncherApi() != null ) {
+ mServiceApis.getLauncherApi().setFloatButtonVisible( false );
}
}
@Override
protected void onPause() {
super.onPause();
- mMogoStatusManager.setMainPageResumeStatus(TAG, false);
+ mMogoStatusManager.setMainPageResumeStatus( TAG, false );
mServiceApis.getAuthManagerApi().dismiss();
- if (shouldCloseADASPanelWhenPause()) {
+ if ( shouldCloseADASPanelWhenPause() ) {
mServiceApis.getAdasControllerApi().closeADAS();
}
- if (mServiceApis.getLauncherApi() != null) {
- mServiceApis.getLauncherApi().setFloatButtonVisible(true);
+ if ( mServiceApis.getLauncherApi() != null ) {
+ mServiceApis.getLauncherApi().setFloatButtonVisible( true );
}
}
@@ -313,18 +313,18 @@ public class MainActivity extends MvpActivity implement
@Override
protected void onStop() {
super.onStop();
- mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, true);
+ mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true );
}
@Override
public void onBackPressed() {
- if (mMogoFragmentManager == null
- || mMogoFragmentManager.getStackSize() <= 0) {
- if (DebugConfig.isLauncher()) {
+ if ( mMogoFragmentManager == null
+ || mMogoFragmentManager.getStackSize() <= 0 ) {
+ if ( DebugConfig.isLauncher() ) {
doWhenBackPressed();
return;
} else {
- if (doWhenBackPressed()) {
+ if ( doWhenBackPressed() ) {
return;
}
super.onBackPressed();
@@ -339,14 +339,14 @@ public class MainActivity extends MvpActivity implement
}
@Override
- protected void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- mPresenter.handleSchemeIntent(intent, true);
+ protected void onNewIntent( Intent intent ) {
+ super.onNewIntent( intent );
+ mPresenter.handleSchemeIntent( intent, true );
}
@Override
public IMogoServiceApis getApis() {
- if (mServiceApis == null) {
+ if ( mServiceApis == null ) {
mServiceApis = MogoApisHandler.getInstance().getApis();
}
return mServiceApis;
@@ -359,19 +359,19 @@ public class MainActivity extends MvpActivity implement
mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostAimlessModeListener();
mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostNaviListener();
mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostMapListener();
- mMogoStatusManager.setMainPageLaunchedStatus(TAG, false);
- mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false);
+ mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
+ mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false );
mMogoFragmentManager.unregisterMainFragmentStackTransactionListener();
mMogoFragmentManager = null;
mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy();
AdasConfigApiController.getInstance().release();
mServiceApis.getAdasControllerApi().release();
- Logger.d(TAG, "destroy.");
+ Logger.d( TAG, "destroy." );
mServiceApis.getRefreshStrategyControllerApi().clearAllData();
- AIAssist.getInstance(this).release();
+ AIAssist.getInstance( this ).release();
mServiceApis.getOnlineCarPanelApi().clear();
- if (CallChatApi.getInstance().getApiProvider() != null) {
- CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null);
+ if ( CallChatApi.getInstance().getApiProvider() != null ) {
+// CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null);
}
ContextHolderUtil.releaseContext();
MogoModulesManager.getInstance().onDestroy();
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 7b24eaced0..8f1dc8c03b 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
@@ -6,6 +6,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.main.MainActivity;
@@ -127,9 +128,7 @@ public class MogoModulesManager implements MogoModulesHandler {
@Override
public void loadEventPanelModule( int containerId ) {
- IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
- .build( MogoServicePaths.PATH_EVENT_PANEL )
- .navigation( getContext() );
+ IMogoModuleProvider provider = MogoApisHandler.getInstance().getApis().getEventPanelManager();
addFragment( provider, containerId );
}
diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
index 99b72ae3db..327e0c3010 100644
--- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
@@ -31,4 +31,9 @@
1920px
0px
+
+ 2px
+ 2px
+ 6px
+ 6px
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml
index 89a3dc55f4..7662141351 100644
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values/dimens.xml
@@ -33,6 +33,6 @@
2px
2px
- 6px
- 6px
+ 2px
+ 4px
\ No newline at end of file
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
index e4257b5efc..964039e1f0 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
@@ -26,6 +26,7 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener {
// 接收高德
public static final String AUTONAVI_STANDARD_BROADCAST_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND";
+ private EnumMapUI mLastAMapUiType = null;
public void register( IMogoIntentManager manager ) {
manager.registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this );
@@ -131,11 +132,17 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener {
// 高德改变黑夜白天模式后，传递给launcher，顺便改变其他
if ( extraState == 37 ) {
// 白天模式
+ mLastAMapUiType = EnumMapUI.Type_Light;
MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Light );
} else if ( extraState == 38 ) {
// 夜间模式
+ mLastAMapUiType = EnumMapUI.Type_Night;
MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Night );
}
}
}
+
+ public EnumMapUI getLastAMapUiType() {
+ return mLastAMapUiType;
+ }
}
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java
index 94d8c5d59a..9d0bf3daae 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java
@@ -103,6 +103,10 @@ class MapControlCommandHandler {
return;
}
+ if ( mCallback.getAMapLastType() == ui ) {
+ return;
+ }
+
int KEY_TYPE = 10048;
int state = 0;//2黑夜;1白天 ;0自动
switch ( ui ) {
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
index 3ff064cefc..9e34462381 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
@@ -296,6 +296,14 @@ public class MapPresenter extends Presenter< MapView > implements
mRegisterCenter.registerADASControlStatusChangedListener( TAG, this );
}
+ @Override
+ public EnumMapUI getAMapLastType() {
+ if ( mAutoNaviReceiver != null ) {
+ return mAutoNaviReceiver.getLastAMapUiType();
+ }
+ return null;
+ }
+
private void initBroadcast() {
mAutoNaviReceiver = new AutoNaviBroadcastIntentHandler();
mAutoNaviReceiver.setCallback( this );
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
index cd6263370d..0d866efc2f 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
@@ -36,4 +36,7 @@ public interface OnMapControlCallback {
// 缩放地图
void onZoomMap( boolean zoomIn );
+
+ // 高德地图上次类型
+ EnumMapUI getAMapLastType();
}
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index 9b7be826f9..4bdaa9eec7 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -101,7 +101,9 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
}
}
};
- ServiceMediaHandler.getCarsChattingApis().registerCallWindowStatusListener( MediaConstants.MODULE_TYPE, mContext, mCallProviderResponse);
+ if ( ServiceMediaHandler.getCarsChattingApis() != null ) {
+ ServiceMediaHandler.getCarsChattingApis().registerCallWindowStatusListener( MediaConstants.MODULE_TYPE, mContext, mCallProviderResponse);
+ }
isFirstPlay = true;
}
@@ -344,7 +346,9 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
public void onDestroy(){
Logger.d(TAG, "onDestroy");
- ServiceMediaHandler.getCarsChattingApis().unRegisterCallWindowStatusListener( MediaConstants.MODULE_TYPE, mContext);
+ if ( ServiceMediaHandler.getCarsChattingApis() != null ) {
+ ServiceMediaHandler.getCarsChattingApis().unRegisterCallWindowStatusListener( MediaConstants.MODULE_TYPE, mContext);
+ }
ServiceMediaHandler.getIMogoStatusManager().unregisterStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.ACC_STATUS,this);
}
}
diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle
index b5b990719a..8470868a53 100644
--- a/modules/mogo-module-search/build.gradle
+++ b/modules/mogo-module-search/build.gradle
@@ -58,14 +58,14 @@ dependencies {
implementation rootProject.ext.dependencies.mogocommons
implementation rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon
- implementation rootProject.ext.dependencies.gpssimulator
+// implementation rootProject.ext.dependencies.gpssimulator
} else {
implementation project(":libraries:mogo-map-api")
implementation project(":foudations:mogo-utils")
implementation project(":foudations:mogo-commons")
implementation project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
- implementation project(':modules:mogo-module-gps-simulator')
+// implementation project(':modules:mogo-module-gps-simulator')
}
implementation 'com.zhidaoauto.voice.controller:api:1.0.2'
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
index 6584886e78..138f55905e 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
@@ -1,13 +1,11 @@
package com.mogo.module.navi.constants;
-import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.marker.IMogoMarkerManager;
import com.mogo.map.navi.IMogoNavi;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.gps.simulator.IMogoGpsSimulatorManager;
import com.mogo.module.navi.cp.PersonalInfoManagerImpl;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.analytics.IMogoAnalytics;
@@ -31,7 +29,7 @@ public class SearchApisHolder {
private static final String TAG = "SearchApisHolder";
private static IMogoServiceApis sApis;
- private static IMogoGpsSimulatorManager sGpsSimulatorManager;
+// private static IMogoGpsSimulatorManager sGpsSimulatorManager;
private static PersonalInfoManagerImpl mPersonalInfoManager;
@@ -86,12 +84,12 @@ public class SearchApisHolder {
return getApis().getSettingManagerApi();
}
- public static IMogoGpsSimulatorManager getGpsSimulatorManager() {
- if ( sGpsSimulatorManager == null ) {
- sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
- }
- return sGpsSimulatorManager;
- }
+// public static IMogoGpsSimulatorManager getGpsSimulatorManager() {
+// if ( sGpsSimulatorManager == null ) {
+// sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
+// }
+// return sGpsSimulatorManager;
+// }
public static IMogoSearchManager getSearchManager() {
return getApis().getSearchManagerApi();
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
index 1ae8d81d6c..3b272bd6bc 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
@@ -221,11 +221,11 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
SettingManager.setGpsSimulator(isChecked)
- if (isChecked) {
- SearchApisHolder.getGpsSimulatorManager().open()
- } else {
- SearchApisHolder.getGpsSimulatorManager().close()
- }
+// if (isChecked) {
+// SearchApisHolder.getGpsSimulatorManager().open()
+// } else {
+// SearchApisHolder.getGpsSimulatorManager().close()
+// }
}
tb_navi.isChecked = SettingManager.isMonitor()
tb_gps.isChecked = SettingManager.isGpsSimulator()
diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle
index 41ad5573e9..ef590bb3e9 100644
--- a/modules/mogo-module-service/build.gradle
+++ b/modules/mogo-module-service/build.gradle
@@ -60,7 +60,7 @@ dependencies {
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon
- implementation rootProject.ext.dependencies.gpssimulator
+// implementation rootProject.ext.dependencies.gpssimulator
} else {
api project(":libraries:mogo-map")
api project(":libraries:mogo-map-api")
@@ -68,7 +68,7 @@ dependencies {
api project(":foudations:mogo-commons")
api project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
- implementation project(':modules:mogo-module-gps-simulator')
+// implementation project(':modules:mogo-module-gps-simulator')
}
}
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 6e4d0bfb59..6452f73baa 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
@@ -11,7 +11,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.common.entity.MarkerShowEntity;
-import com.mogo.module.gps.simulator.IMogoGpsSimulatorManager;
import com.mogo.module.service.marker.MapMarkerManager;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.adas.IMogoADASController;
@@ -59,11 +58,11 @@ public class MarkerServiceHandler {
private static IMogoLauncher sLauncher;
private static IMogoFragmentManager sFragmentManager;
private static ICarsChattingProvider sCarChatting;
- private static IMogoGpsSimulatorManager sGpsSimulatorManager;
+// private static IMogoGpsSimulatorManager sGpsSimulatorManager;
public static synchronized void init( final Context context ) {
- if ( sGpsSimulatorManager != null ) {
+ if ( sCarChatting != null ) {
return;
}
@@ -89,7 +88,7 @@ public class MarkerServiceHandler {
MapMarkerManager.getInstance().init( context );
- sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
+// sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
}
public static IMogoServiceApis getApis() {
@@ -168,9 +167,9 @@ public class MarkerServiceHandler {
return sCarChatting;
}
- public static IMogoGpsSimulatorManager getGpsSimulatorManager() {
- return sGpsSimulatorManager;
- }
+// public static IMogoGpsSimulatorManager getGpsSimulatorManager() {
+// return sGpsSimulatorManager;
+// }
//TODO -------------以下方法是临时过度使用的，后面统一使用，getMapMarkerManager进行调用
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 55c95def40..7e88cf83de 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -412,7 +412,9 @@ public class MogoServices implements IMogoMapListener,
MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel();
carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
- carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse);
+ if ( carsChattingProvider != null ) {
+ carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse);
+ }
}
public void init(Context context) {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index a7a19b4131..1bbd2b895a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -2,7 +2,6 @@ package com.mogo.module.service.intent;
import android.content.Context;
import android.content.Intent;
-import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.net.Uri;
@@ -26,7 +25,6 @@ import com.mogo.map.search.geo.MogoRegeocodeResult;
import com.mogo.map.search.geo.query.MogoRegeocodeQuery;
import com.mogo.module.common.dialog.WMDialog;
import com.mogo.module.service.MarkerServiceHandler;
-import com.mogo.module.service.MogoServiceProvider;
import com.mogo.module.service.R;
import com.mogo.service.entrance.ButtonIndex;
import com.mogo.utils.TipToast;
@@ -327,12 +325,12 @@ public class MockIntentHandler implements IntentHandler {
} );
}
break;
- case 15:
- MarkerServiceHandler.getGpsSimulatorManager().open();
- break;
- case 16:
- MarkerServiceHandler.getGpsSimulatorManager().close();
- break;
+// case 15:
+// MarkerServiceHandler.getGpsSimulatorManager().open();
+// break;
+// case 16:
+// MarkerServiceHandler.getGpsSimulatorManager().close();
+// break;
case 17:
DebugConfig.setRequestOnlineCarData( intent.getBooleanExtra( "status", true ) );
break;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index d1a58c38c1..a6bd55cd38 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -129,6 +129,7 @@ class LauncherCardRefresher {
switch ( msg.what ) {
case MSG_WAIT_NETWORK:
trtRequestNetworkConfigStrategy();
+ break;
case MSG_LOAD_NET_CONFIG:
loadNetworkConfigStrategy();
break;
@@ -526,9 +527,18 @@ class LauncherCardRefresher {
} else if ( datum instanceof TtsConfigData.NearRoads ) {
result = handleNearRoadsTtsConfig( ( ( TtsConfigData.NearRoads ) datum ) );
} else if ( datum instanceof TtsConfigData.OnlineCarVsExplorerWay ) {
- result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) );
- if ( !result ) {
+ if ( node.type == LauncherCardRefreshType.ExplorerWay ) {
+ result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) );
+ if ( !result ) {
+ node.type = LauncherCardRefreshType.OnlineCar;
+ result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) );
+ }
+ } else if( node.type == LauncherCardRefreshType.OnlineCar ){
result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) );
+ if ( !result ) {
+ node.type = LauncherCardRefreshType.ExplorerWay;
+ result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) );
+ }
}
}
if ( result ) {
@@ -594,7 +604,7 @@ class LauncherCardRefresher {
String tts = mContext.getString( R.string.module_service_launcher_card_tips );
String info = mContext.getString( R.string.module_service_launcher_card_info );
speakTTS( String.format( tts, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), false );
- notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay ), explorerWay.poiTotal, tts );
+ notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), explorerWay.poiTotal, tts );
return true;
}
@@ -611,7 +621,7 @@ class LauncherCardRefresher {
String tts = mContext.getString( R.string.module_service_launcher_card_tips );
String info = mContext.getString( R.string.module_service_launcher_card_info );
speakTTS( String.format( tts, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), false );
- notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar ), onlineCar.carTotal, tts );
+ notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), onlineCar.carTotal, tts );
return true;
}
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 03a09dc7d3..4900de38da 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
@@ -113,24 +113,26 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
MarkerServiceHandler.getActionManager().registerBizActionDoneListener( this );
MarkerServiceHandler.getApis().getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this );
- CallChatApi.getInstance().getApiProvider().registerUserWindowStatusListener( TAG, mContext, new ICallChatResponse() {
+ if ( CallChatApi.getInstance().getApiProvider() != null ) {
+ CallChatApi.getInstance().getApiProvider().registerUserWindowStatusListener( TAG, mContext, new ICallChatResponse() {
- @Override
- public void userWindowStatus( boolean show ) {
- try {
- if ( mLastCheckMarker == null ) {
- return;
+ @Override
+ public void userWindowStatus( boolean show ) {
+ try {
+ if ( mLastCheckMarker == null ) {
+ return;
+ }
+ if ( TextUtils.equals( mLastCheckMarker.getOwner(), ModuleNames.CARD_TYPE_USER_DATA )
+ && !show ) {
+ closeMarker( mLastCheckMarker );
+ }
+ } catch ( Exception e ) {
+ e.printStackTrace();
}
- if ( TextUtils.equals( mLastCheckMarker.getOwner(), ModuleNames.CARD_TYPE_USER_DATA )
- && !show ) {
- closeMarker( mLastCheckMarker );
- }
- } catch ( Exception e ) {
- e.printStackTrace();
}
- }
- } );
+ } );
+ }
}
/**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
index 291f75dfe3..a1c20acb9d 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
@@ -194,7 +194,9 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter {
params.put( CallChattingProviderConstant.CCPROVIDER_LON, location.getLon() + "" );
}
Logger.d( TAG, "call parameters: %s", params );
- MarkerServiceHandler.getCarChatting().call( params );
+ if ( MarkerServiceHandler.getCarChatting() != null ) {
+ MarkerServiceHandler.getCarChatting().call( params );
+ }
}
protected void loadImageHeader( final MarkerShowEntity markerShowEntity ) {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
index 86beee061c..85a394305a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
@@ -78,7 +78,9 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter
+ android:src="@drawable/module_common_close_selector" />
String name = noveltyInfo.getUserInfo().getUserName();
mogoDriverInfo.setUserName(name != null ? name : "");
mogoDriverInfo.setUserHead(noveltyInfo.getUserInfo().getUserHead());
- mCarsChattingProvider.showUserWindow(MODULE_NAME, mogoDriverInfo, this.itemView.getContext());
+ if ( mCarsChattingProvider != null ) {
+ mCarsChattingProvider.showUserWindow(MODULE_NAME, mogoDriverInfo, this.itemView.getContext());
+ }
} catch (Exception e) {
Log.d(TAG, "点击头像发生错误--triggerIVReportHead" + e);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
index c392ecc22a..834de905b1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
@@ -63,7 +63,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder "封路"
MarkerPoiTypeEnum.FOURS_ICE -> "道路结冰"
MarkerPoiTypeEnum.FOURS_FOG -> "浓雾"
@@ -333,7 +337,6 @@ class V2XEventPanelFragment : MvpFragment "实时路况"
else -> "实时路况"
}
- return typeName
}
/*
@@ -343,23 +346,19 @@ class V2XEventPanelFragment : MvpFragment {
try {
+ mRbScenarioHistory?.isChecked = true
mV2XScenarioHistoryFragment.fromVoice = true
- if (mRbScenarioHistory?.isChecked == true) {
- mV2XScenarioHistoryFragment.ttsForVoiceCheckout()
- } else {
- mRbScenarioHistory?.isChecked = true
- }
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
}
1 -> {
try {
- mV2XSurroundingFragment.fromVoice = true
if (mRbSurroundingEvent?.isChecked == true) {
mV2XSurroundingFragment.ttsForVoiceCheckout()
} else {
mRbSurroundingEvent?.isChecked = true
+ mV2XSurroundingFragment.fromVoice = true
}
} catch (e: java.lang.Exception) {
e.printStackTrace()
@@ -367,11 +366,11 @@ class V2XEventPanelFragment : MvpFragment {
try {
- mV2XShareEventsFragment.fromVoice = true
if (mRbShareEvents?.isChecked == true) {
mV2XShareEventsFragment.ttsForVoiceCheckout()
} else {
mRbShareEvents?.isChecked = true
+ mV2XShareEventsFragment.fromVoice = true
}
} catch (e: java.lang.Exception) {
e.printStackTrace()
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index 1ce7baece4..2d394ff5fd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -128,11 +128,11 @@ public class V2XScenarioHistoryFragment
mClHistoryList.setVisibility(View.GONE);
}
mV2XScenarioHistoryAdapter.notifyDataSetChanged();
- if (fromVoice == true){
+ ttsForHistoryFirstToday();
+ if (fromVoice == true) {
ttsForVoiceCheckout();
fromVoice = false;
}
- ttsForHistoryFirstToday();
}
});
}
@@ -155,9 +155,9 @@ public class V2XScenarioHistoryFragment
}
/*
- * 语音查询出行动态 TTS播报
- * */
- public void ttsForVoiceCheckout(){
+ * 语音查询出行动态 TTS播报
+ * */
+ public void ttsForVoiceCheckout() {
if (mV2XHistoryScenarioData.size() > 0) {
AIAssist.getInstance(V2XUtils.getApp()).
speakTTSVoice("为您找到以下动态请查看", null);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index 58ee3fa1a9..571707afcb 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -34,6 +34,7 @@ import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.anim.OnMarkerAnimationListener;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
+import com.mogo.module.common.entity.MarkerPoiTypeEnum;
import com.mogo.module.common.entity.MarkerShowEntity;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.v2x.R;
@@ -382,10 +383,14 @@ public class V2XSurroundingFragment extends MvpFragment {
close();
@@ -152,106 +152,109 @@ public class V2XRoadVideoWindow extends RelativeLayout implements
}
if (path.contains(".mp4")) {
startPlayWithVideoUrl(path);
- Bitmap firstBitmap = BitmapHelper.getVideoThumbnail(path);/*获取第一帧图*/
-
- simpleCoverVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() {
+ new Thread(new Runnable() {
@Override
- public void onAutoComplete(String url, Object... objects) {
- complete(firstBitmap, path);
- }
+ public void run() {
+ Bitmap firstBitmap = BitmapHelper.getVideoThumbnail(path);/*获取第一帧图*/
+ simpleCoverVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() {
+ @Override
+ public void onAutoComplete(String url, Object... objects) {
+ complete(firstBitmap, path);
+ }
- @Override
- public void onClickResume(String url, Object... objects) {
- thumbnailImage.setVisibility(View.GONE);
- playImageView.setVisibility(View.GONE);
- }
+ @Override
+ public void onClickResume(String url, Object... objects) {
+ thumbnailImage.setVisibility(View.GONE);
+ playImageView.setVisibility(View.GONE);
+ }
- @Override
- public void onClickStop(String url, Object... objects) {
- Log.d(TAG, "onClickStop");
- }
+ @Override
+ public void onClickStop(String url, Object... objects) {
+ Log.d(TAG, "onClickStop");
+ }
- @Override
- public void onStartPrepared(String url, Object... objects) {
- Log.d(TAG, "onStartPrepared");
- }
+ @Override
+ public void onStartPrepared(String url, Object... objects) {
+ Log.d(TAG, "onStartPrepared");
+ }
- @Override
- public void onPrepared(String url, Object... objects) {
- }
+ @Override
+ public void onPrepared(String url, Object... objects) {
+ }
- @Override
- public void onClickStartIcon(String url, Object... objects) {
- }
+ @Override
+ public void onClickStartIcon(String url, Object... objects) {
+ }
- @Override
- public void onClickStartError(String url, Object... objects) {
- }
+ @Override
+ public void onClickStartError(String url, Object... objects) {
+ }
- @Override
- public void onClickStopFullscreen(String url, Object... objects) {
- }
+ @Override
+ public void onClickStopFullscreen(String url, Object... objects) {
+ }
- @Override
- public void onClickResumeFullscreen(String url, Object... objects) {
- }
+ @Override
+ public void onClickResumeFullscreen(String url, Object... objects) {
+ }
- @Override
- public void onClickSeekbar(String url, Object... objects) {
- }
+ @Override
+ public void onClickSeekbar(String url, Object... objects) {
+ }
- @Override
- public void onClickSeekbarFullscreen(String url, Object... objects) {
- }
+ @Override
+ public void onClickSeekbarFullscreen(String url, Object... objects) {
+ }
- @Override
- public void onEnterFullscreen(String url, Object... objects) {
- }
+ @Override
+ public void onEnterFullscreen(String url, Object... objects) {
+ }
- @Override
- public void onQuitFullscreen(String url, Object... objects) {
- }
+ @Override
+ public void onQuitFullscreen(String url, Object... objects) {
+ }
- @Override
- public void onQuitSmallWidget(String url, Object... objects) {
- }
+ @Override
+ public void onQuitSmallWidget(String url, Object... objects) {
+ }
- @Override
- public void onEnterSmallWidget(String url, Object... objects) {
- }
+ @Override
+ public void onEnterSmallWidget(String url, Object... objects) {
+ }
- @Override
- public void onTouchScreenSeekVolume(String url, Object... objects) {
- }
+ @Override
+ public void onTouchScreenSeekVolume(String url, Object... objects) {
+ }
- @Override
- public void onTouchScreenSeekPosition(String url, Object... objects) {
- }
+ @Override
+ public void onTouchScreenSeekPosition(String url, Object... objects) {
+ }
- @Override
- public void onTouchScreenSeekLight(String url, Object... objects) {
- }
+ @Override
+ public void onTouchScreenSeekLight(String url, Object... objects) {
+ }
- @Override
- public void onPlayError(String url, Object... objects) {
- }
+ @Override
+ public void onPlayError(String url, Object... objects) {
+ }
- @Override
- public void onClickStartThumb(String url, Object... objects) {
- }
+ @Override
+ public void onClickStartThumb(String url, Object... objects) {
+ }
- @Override
- public void onClickBlank(String url, Object... objects) {
- }
+ @Override
+ public void onClickBlank(String url, Object... objects) {
+ }
- @Override
- public void onClickBlankFullscreen(String url, Object... objects) {
- Log.d(TAG, "onClickBlankFullscreen");
+ @Override
+ public void onClickBlankFullscreen(String url, Object... objects) {
+ Log.d(TAG, "onClickBlankFullscreen");
+ }
+ });
}
- });
+ }).start();
}
-
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
index 8c172c97c0..43926689b8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
@@ -125,7 +125,9 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
mogoDriverInfo.setSn("12345678");
mogoDriverInfo.setUserName("测试");
mogoDriverInfo.setUserHead("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1600872867592&di=994e371880ca6ae2814f553e0d0e4139&imgtype=0&src=http%3A%2F%2Fp3.ssl.cdn.btime.com%2Ft014c5d8a1e5cef12ba.jpg%3Fsize%3D506x543");
- V2XServiceManager.getCarsChattingProvider().showUserWindow("CAR_CALL_USER_TO_" + V2XConst.MODULE_NAME, mogoDriverInfo, context);
+ if ( V2XServiceManager.getCarsChattingProvider() != null ) {
+ V2XServiceManager.getCarsChattingProvider().showUserWindow("CAR_CALL_USER_TO_" + V2XConst.MODULE_NAME, mogoDriverInfo, context);
+ }
});
mBtnTriggerOpen.setOnClickListener(v ->
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java
index 49b45ee0df..6bf185b29c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java
@@ -111,18 +111,18 @@ public class V2XEventUgcScenario extends AbsV2XScenario impl
@Override
public void onViewRemoved(View view) {
- Logger.d(MODULE_NAME, "疲劳驾驶场景 关闭 Window 动画结束");
+ //Logger.d(MODULE_NAME, "疲劳驾驶场景 关闭 Window 动画结束");
}
@Override
public void beforeViewAddAnim(View view) {
- Logger.d(MODULE_NAME, "疲劳驾驶场景 展示 Window 开始");
+ //Logger.d(MODULE_NAME, "疲劳驾驶场景 展示 Window 开始");
}
@Override
public void beforeViewRemoveAnim(View view) {
- Logger.d(MODULE_NAME, "疲劳驾驶场景 关闭 Window 开始");
+ //Logger.d(MODULE_NAME, "疲劳驾驶场景 关闭 Window 开始");
// 重置场景提示的消息
setV2XMessageEntity(null);
V2XServiceManager.getMoGoV2XStatusManager().setFatigueDrivingWindowShow(TAG, false);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java
index 4ee595aae9..1278314df9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java
@@ -50,7 +50,9 @@ public class ChartingUtil {
}
Logger.d(MODULE_NAME, "调用车聊聊传入参数:\n" + params);
- V2XServiceManager.getCarsChattingProvider().call(params);
+ if ( V2XServiceManager.getCarsChattingProvider() != null ) {
+ V2XServiceManager.getCarsChattingProvider().call(params);
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -73,24 +75,26 @@ public class ChartingUtil {
} else {
Logger.d("", "不是我的分享");
}
- V2XServiceManager.getCarsChattingProvider().isOnLine(
- "CAR_CALL_TO_" + V2XConst.MODULE_NAME,
- V2XUtils.getApp(),
- sn,
- new ICallChatResponse() {
- @Override
- public void refuse(boolean b, int i) {
+ if ( V2XServiceManager.getCarsChattingProvider() != null ) {
+ V2XServiceManager.getCarsChattingProvider().isOnLine(
+ "CAR_CALL_TO_" + V2XConst.MODULE_NAME,
+ V2XUtils.getApp(),
+ sn,
+ new ICallChatResponse() {
+ @Override
+ public void refuse(boolean b, int i) {
- }
-
- @Override
- public void isOnLine(boolean onLine, @Nullable String errorMsg) {
- Logger.e(V2XConst.MODULE_NAME, "isOnLine：" + onLine + " errorMsg：" + errorMsg);
- if (chartStatusListener != null) {
- chartStatusListener.canCall(onLine);
}
- }
- });
+
+ @Override
+ public void isOnLine(boolean onLine, @Nullable String errorMsg) {
+ Logger.e(V2XConst.MODULE_NAME, "isOnLine：" + onLine + " errorMsg：" + errorMsg);
+ if (chartStatusListener != null) {
+ chartStatusListener.canCall(onLine);
+ }
+ }
+ });
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -104,18 +108,20 @@ public class ChartingUtil {
*/
public static void isCanCall(ChartStatusListener chartStatusListener) {
try {
- V2XServiceManager.getCarsChattingProvider().canCall(
- "CAR_CALL_TO_" + V2XConst.MODULE_NAME,
- V2XUtils.getApp(),
- new ICallChatResponse() {
- @Override
- public void canCall(boolean onLine) {
- Logger.e(V2XConst.MODULE_NAME, "isOnLine：" + onLine);
- if (chartStatusListener != null) {
- chartStatusListener.canCall(onLine);
+ if ( V2XServiceManager.getCarsChattingProvider() != null ) {
+ V2XServiceManager.getCarsChattingProvider().canCall(
+ "CAR_CALL_TO_" + V2XConst.MODULE_NAME,
+ V2XUtils.getApp(),
+ new ICallChatResponse() {
+ @Override
+ public void canCall(boolean onLine) {
+ Logger.e(V2XConst.MODULE_NAME, "isOnLine：" + onLine);
+ if (chartStatusListener != null) {
+ chartStatusListener.canCall(onLine);
+ }
}
- }
- });
+ });
+ }
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png
index c3372edaf2..c7c8180c9c 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml
deleted file mode 100644
index 2da39af66d..0000000000
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-