diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index b355c40d13..7cf051ce91 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -62,7 +62,9 @@ public class MogoApplication extends AbsMogoApplication { crashSystem.setDebug( BuildConfig.DEBUG ); Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.VERBOSE ); - MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) ); + if( DebugConfig.isMapBased() ){ + MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) ); + } MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) ); if ( DebugConfig.isLauncher() ) { @@ -72,7 +74,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG ) ); MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) ); - if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) { + if ( DebugConfig.isMapBased() ) { MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java index 8c00446e99..5e5c66109a 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java @@ -338,11 +338,13 @@ public class NaviClient implements IMogoNavi { return; } if ( mAimlessModeStatus && !isNaviing() ) { + mAMapNavi.startSpeak(); mAMapNavi.startAimlessMode( AimLessMode.CAMERA_AND_SPECIALROAD_DETECTED ); mAimlessStatus = true; Logger.d( TAG, "开启巡航成功" ); } else { mAimlessStatus = false; + mAMapNavi.stopSpeak(); Logger.d( TAG, "开启巡航失败" ); } } @@ -353,6 +355,7 @@ public class NaviClient implements IMogoNavi { return; } mAMapNavi.stopAimlessMode(); + mAMapNavi.stopSpeak(); mAimlessStatus = false; Logger.d( TAG, "关闭巡航成功" ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java index dea7792240..5b70818cc9 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -75,9 +75,9 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi mAnim = new AnimWrapper( mAIAssist ); boolean naviStatus = AppServiceHandler.getApis().getMapServiceApi().getNavi( getContext() ).isNaviing(); - if ( naviStatus ) { - setCurrentXiaoZhiEmoji( AnimRes.EmojiType.Navigation ); - } +// if ( naviStatus ) { +// setCurrentXiaoZhiEmoji( AnimRes.EmojiType.Navigation ); +// } mAIAssist.setOnClickListener( new OnAiAssistClickListener() ); mAIAssistContainer.setOnClickListener( view -> { @@ -109,12 +109,12 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi @Override public void setCurrentXiaoZhiEmoji( AnimRes.EmojiType type ) { - boolean started = mAnim.isStarted(); - mAnim.stop(); - mAnim.setCurrentAnim( type ); - if ( started ) { - mAnim.start(); - } +// boolean started = mAnim.isStarted(); +// mAnim.stop(); +// mAnim.setCurrentAnim( type ); +// if ( started ) { +// mAnim.start(); +// } } @Override diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt index e92db55b72..6e6f4ac846 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt @@ -4,9 +4,6 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager -import com.mogo.module.common.utils.CarSeries -import com.mogo.module.common.utils.CarSeries.CAR_SERIES_C80X -import com.mogo.module.common.utils.CarSeries.CAR_SERIES_F80X import com.mogo.module.guide.GuideConstant.Companion.PATH_GUIDE_MODULE_NAME import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.SharedPreferenceUtil.hasGuide @@ -50,9 +47,7 @@ object GuideBizManager { Logger.d("GuideBizManager", "removeGuideFragmentToStack") setGuideFinish() setGuideRecord() - serviceApi?.let { - it.fragmentManagerApi.pop() - } + serviceApi?.fragmentManagerApi?.pop() serviceApi?.adasControllerApi?.showADAS() } diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index 62b7e4e96a..e1ebdfcbef 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter + implementation rootProject.ext.dependencies.callchatprovider annotationProcessor rootProject.ext.dependencies.aroutercompiler compileOnly rootProject.ext.dependencies.adasapi compileOnly rootProject.ext.dependencies.adasconfigapi 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 95c4d02378..0f28fa8859 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 @@ -21,6 +21,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.common.api.CallChatApi; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.main.cards.MogoModulesManager; @@ -111,6 +112,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme FloatingViewHandler.init( mFloatingLayout ); mServiceApis.getOnlineCarPanelApi().initContainer( R.id.module_main_id_message_history_fragment_container, this ); + CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", R.id.module_main_id_message_history_fragment_container, this); } // 隐藏布局 @@ -277,7 +279,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onResume() { super.onResume(); mMogoStatusManager.setMainPageResumeStatus( TAG, true ); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { mServiceApis.getAdasControllerApi().showADAS(); @@ -291,8 +292,10 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onPause() { super.onPause(); mMogoStatusManager.setMainPageResumeStatus( TAG, false ); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); mServiceApis.getAuthManagerApi().dismiss(); + if ( shouldCloseADASPanelWhenPause() ) { + mServiceApis.getAdasControllerApi().closeADAS(); + } if ( mServiceApis.getLauncherApi() != null ) { mServiceApis.getLauncherApi().setFloatButtonVisible( true ); } @@ -309,9 +312,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onStop() { super.onStop(); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true ); - if ( shouldCloseADASPanelWhenPause() ) { - mServiceApis.getAdasControllerApi().closeADAS(); - } } @Override @@ -368,6 +368,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getRefreshStrategyControllerApi().clearAllData(); AIAssist.getInstance( this ).release(); mServiceApis.getOnlineCarPanelApi().clear(); + CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); SchemeIntent.getInstance().clear(); 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 a41cde3874..55c95def40 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 @@ -755,6 +755,10 @@ public class MogoServices implements IMogoMapListener, return; } + if (!mStatusManager.isMainPageOnResume()) { + return; + } + if (mStatusManager.isV2XShow()) { return; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java index 27d5712049..40174d9ab3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefreshType.java @@ -6,7 +6,7 @@ public enum LauncherCardRefreshType { Weather( "News", "weather", "天气" ), News( "NearRoads", "news", "新闻" ), NearRoads( "ExplorerWay", "nearRoads", "近路" ), - // TrafficRestriction( "NearRoads", "trafficRestriction" ), + TrafficRestriction( "NearRoads", "trafficRestriction", "限行" ), ExplorerWay( "OnlineCar", "friendAndPois", "道路事件" ), OnlineCar( "Weather", "friendAndPois", "车友" ); 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 8613b384c7..d1a58c38c1 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 @@ -33,6 +33,7 @@ import com.mogo.utils.storage.SharedPrefsMgr; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -455,6 +456,9 @@ class LauncherCardRefresher { if ( trafficRestriction == null || TextUtils.isEmpty( trafficRestriction.tts ) ) { continue; } + final Map< String, Object > properties = new HashMap<>(); + properties.put( "type", LauncherCardRefreshType.TrafficRestriction.name() ); + MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "v2x_play", properties ); speakTTS( trafficRestriction.tts, false ); return; } @@ -618,6 +622,10 @@ class LauncherCardRefresher { */ private void writeNextLoadType( LauncherCardRefreshType type ) { SharedPrefsMgr.getInstance( mContext ).putString( KEY_LAST_LOAD_TTS_TYPE, type.getNext() ); + + final Map< String, Object > properties = new HashMap<>(); + properties.put( "type", type.name() ); + MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "v2x_play", properties ); Logger.d( TAG, "本次播报：%s，下次播报：%s", type.name(), LauncherCardRefreshType.valueOf( type.getNext() ).name() ); SharedPrefsMgr.getInstance( mContext ).putLong( KEY_LAST_LOAD_TTS_DATE, System.currentTimeMillis() ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index 00c3f832c4..691fbe525f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -75,30 +75,37 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog break; case VOICE_QUERY_HISTORY_INDEX: Log.d("语音指令","VOICE_QUERY_HISTORY_INDEX"); - Intent startForHis = new Intent( Intent.ACTION_VIEW ); - startForHis.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); - startForHis.setData( Uri.parse( "mogo://launcher/main/switch2?type=showHistoryPanel" ) ); - context.startActivity( startForHis ); + showPanelByStatus("showHistoryPanel", 0); break; case VOICE_QUERY_SURROUNDING_INDEX: Log.d("语音指令","VOICE_QUERY_SURROUNDING_INDEX"); - Intent startForSurrounding = new Intent( Intent.ACTION_VIEW ); - startForSurrounding.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); - startForSurrounding.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSurroundingPanel" ) ); - context.startActivity( startForSurrounding ); + showPanelByStatus("showSurroundingPanel", 1); break; case VOICE_QUERY_HEART_INDEX: Log.d("语音指令","VOICE_QUERY_HEART_INDEX"); - Intent start = new Intent( Intent.ACTION_VIEW ); - start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); - start.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSharePanel" ) ); - context.startActivity( start ); + showPanelByStatus("showSharePanel", 2); break; default: break; } } + /** + * 根据主页状态调用不同打开方式 + * @param target 面板类型 + * @param type 面板位置索引 + */ + private void showPanelByStatus(String target, int type){ + if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) { + MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type); + } else { + Intent start = new Intent( Intent.ACTION_VIEW ); + start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); + start.setData( Uri.parse( "mogo://launcher/main/switch2?type="+target ) ); + context.startActivity( start ); + } + } + @Override public void onCmdSelected(String cmd) { Logger.d(TAG, "收到免唤醒词指令: " + cmd); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java index b7a6665727..08c4d3abe2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java @@ -77,17 +77,31 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { - Logger.d(V2XConst.MODULE_NAME, "反馈有用"); + Logger.d(V2XConst.MODULE_NAME, "反馈有用 position = " + position); roadReportTrue(exploreWay); + showView(true); }); mUnHeartLikeView.setOnClickCallListener(v -> { - Logger.d(V2XConst.MODULE_NAME, "反馈无用"); + Logger.d(V2XConst.MODULE_NAME, "反馈无用 position = " + position); roadReportErr(exploreWay); + showView(true); }); } + private void showView(boolean isAlreadyShow) { + if (isAlreadyShow) { + mHeartLikeView.setVisibility(View.GONE); + mUnHeartLikeView.setVisibility(View.GONE); + } else { + mHeartLikeView.setVisibility(View.VISIBLE); + mUnHeartLikeView.setVisibility(View.VISIBLE); + } + } + /** * 反馈路况正确 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java index 2da020805c..ed99977aa1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java @@ -32,7 +32,7 @@ import com.mogo.module.v2x.voice.V2XVoiceManager; public class V2XFatigueDrivingVH extends V2XBaseViewHolder { private TextView mTvAddress, mTvAddressDistance; - private ImageView mIvToNav; + private ImageView mIvToNav, mIvClose; private MarkerExploreWay mNoveltyInfo; private V2XPushMessageEntity mV2XPushMessageEntity; @@ -45,7 +45,9 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { mTvAddress = itemView.findViewById(R.id.tvAddress); mTvAddressDistance = itemView.findViewById(R.id.tvAddressDistance); mIvToNav = itemView.findViewById(R.id.ivToNav); + mIvClose = itemView.findViewById(R.id.ivClose); mIvToNav.setOnClickListener(v -> triggerStartNavi(mNoveltyInfo)); + mIvClose.setOnClickListener(v -> V2XFatigueDrivingScenario.getInstance().close()); // 设置视图状态监听 itemView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/BackRefreshInfo.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/BackRefreshInfo.java new file mode 100644 index 0000000000..2291ee041c --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/BackRefreshInfo.java @@ -0,0 +1,10 @@ +package com.mogo.module.v2x.entity.panel; + +import java.io.Serializable; + +/** + * 返回刷新 + */ +public class BackRefreshInfo implements Serializable { + +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 6898259774..3eb198c1d0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -9,7 +9,6 @@ import android.text.Spanned import android.text.style.AbsoluteSizeSpan import android.text.style.ForegroundColorSpan import android.text.style.StyleSpan -import android.util.Log import android.view.View import android.widget.ImageView import android.widget.RadioButton @@ -31,6 +30,7 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME import com.mogo.module.v2x.V2XServiceManager import com.mogo.module.v2x.adapter.V2XEventPagerAdapter import com.mogo.module.v2x.adapter.V2XSurroundingDetailAdapter +import com.mogo.module.v2x.entity.panel.BackRefreshInfo import com.mogo.module.v2x.entity.panel.SurroundingConstruction import com.mogo.module.v2x.presenter.EventPanelPresenter import com.mogo.module.v2x.utils.TrackUtils @@ -211,6 +211,7 @@ class V2XEventPanelFragment : MvpFragment mV2XScenarioHistoryFragment.ttsForVoiceCheckout() - 1 -> mV2XSurroundingFragment.ttsForVoiceCheckout() - else -> mV2XShareEventsFragment.ttsForVoiceCheckout() - } - } catch (e: java.lang.Exception) { - - } - - } else { - showPanel() - selectWithItem(item) - } + showPanel() + selectWithItem(item) } + private fun initDetail() { mDetailRecyclerView!!.addItemDecoration(SpacesItemDecoration(resources.getDimension(R.dimen.share_item_padding).toInt())) mSurroundingDetailAdapter = V2XSurroundingDetailAdapter(activity, markerExploreWays) @@ -355,7 +344,11 @@ class V2XEventPanelFragment : MvpFragment { try { mV2XScenarioHistoryFragment.fromVoice = true - mRbScenarioHistory?.isChecked = true + if (mRbScenarioHistory?.isChecked == true) { + mV2XScenarioHistoryFragment.ttsForVoiceCheckout() + } else { + mRbScenarioHistory?.isChecked = true + } } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -363,7 +356,11 @@ class V2XEventPanelFragment : MvpFragment { try { mV2XSurroundingFragment.fromVoice = true - mRbSurroundingEvent?.isChecked = true + if (mRbSurroundingEvent?.isChecked == true) { + mV2XSurroundingFragment.ttsForVoiceCheckout() + } else { + mRbSurroundingEvent?.isChecked = true + } } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -371,7 +368,11 @@ class V2XEventPanelFragment : MvpFragment { try { mV2XShareEventsFragment.fromVoice = true - mRbShareEvents?.isChecked = true + if (mRbShareEvents?.isChecked == true) { + mV2XShareEventsFragment.ttsForVoiceCheckout() + } else { + mRbShareEvents?.isChecked = true + } } catch (e: java.lang.Exception) { e.printStackTrace() } 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 6e444aa4f9..58ee3fa1a9 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 @@ -42,6 +42,7 @@ import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.adapter.V2XShareEventAdapter; import com.mogo.module.v2x.adapter.V2XSurroundingAdapter; import com.mogo.module.v2x.adapter.V2XSurroundingDetailAdapter; +import com.mogo.module.v2x.entity.panel.BackRefreshInfo; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; import com.mogo.module.v2x.presenter.SurroundingEventPresenter; @@ -55,6 +56,8 @@ import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.Collection; @@ -125,7 +128,6 @@ public class V2XSurroundingFragment extends MvpFragment { ivCar.setImageResource(R.drawable.icon_car_red) - ivCarTop.visibility = View.VISIBLE } // 取快递 V2XPoiTypeEnum.ALERT_TRAFFIC_EXPRESS -> { ivCar.setImageResource(R.drawable.v_to_x_marker_express) - ivBg.visibility = View.GONE } // 顺风车 V2XPoiTypeEnum.ALERT_TRAFFIC_TAXI -> { ivCar.setImageResource(R.drawable.v_to_x_marker_taxi) - ivBg.visibility = View.GONE } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java index 0318dd5296..c307a293ce 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java @@ -41,7 +41,7 @@ public class V2XAnimationScenario extends AbsV2XScenario { @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { boolean isV2XAnimationShow = V2XServiceManager.getMoGoV2XStatusManager().isV2XAnimationShow(); if (isV2XAnimationShow) { close(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java index 9a3ad242f3..f8154af9af 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java @@ -59,7 +59,7 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { boolean isWindowShow = V2XServiceManager.getMoGoV2XStatusManager().isLeftLiveVideoShow(); if (isWindowShow) { close(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java index 2132f366c0..13417215ee 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java @@ -51,7 +51,7 @@ public class V2XIllegalParkScenario extends AbsV2XScenario i Logger.w(MODULE_NAME, "处理推送场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { setV2XMessageEntity(v2XMessageEntity); show(); } else { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index eb1620f712..cddb478e41 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -96,7 +96,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING, getV2XMessageEntity().getContent().getNoveltyInfo()); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { showWindow(); } @@ -197,7 +197,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp @Override public void onViewAdded(View view) { Logger.d(MODULE_NAME, "展示 Window 动画结束"); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { if (getV2XMessageEntity() != null && getV2XMessageEntity().isNeedAddLine() == true) { drawPOI(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java index 10da5513fe..dfbca41438 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java @@ -81,7 +81,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario> i saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING, mV2XPushMessageEntity); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { if (getV2XMessageEntity() != null && !V2XServiceManager.getMoGoV2XStatusManager().isOtherSeekHelpWindowShow()) { show(); 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 96bd61f965..4e9ef2e810 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 @@ -51,7 +51,7 @@ public class V2XEventUgcScenario extends AbsV2XScenario impl setV2XMessageEntity(v2XMessageEntity); if (v2XMessageEntity != null) { if (v2XMessageEntity.isShowState() - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { show(); } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse.xml rename to modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml index 728d647def..e6ffe54e9d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml @@ -10,7 +10,8 @@ android:paddingTop="@dimen/dp_42" android:paddingEnd="@dimen/dp_62" android:paddingBottom="@dimen/dp_42" - app:roundLayoutRadius="@dimen/dp_40"> + app:roundLayoutRadius="@dimen/dp_40" + tools:layout_height="wrap_content"> @@ -40,6 +41,7 @@ android:id="@+id/tvAddress" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_20" android:textColor="@color/v2x_FFF_333" @@ -69,8 +71,18 @@ android:id="@+id/ivToNav" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" + android:layout_marginEnd="@dimen/dp_40" android:src="@drawable/selector_nav_btn" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ivClose" + app:layout_constraintTop_toTopOf="parent" /> + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index cad8477a05..6516a9ead7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -8,69 +8,79 @@ android:paddingStart="@dimen/dp_62" android:paddingTop="@dimen/dp_42" android:paddingEnd="@dimen/dp_62" - android:paddingBottom="@dimen/dp_42"> + android:paddingBottom="@dimen/dp_42" + tools:layout_height="wrap_content"> - + app:layout_constraintTop_toTopOf="parent"> - + - + - + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml b/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml index 231eec52a2..79c46cd09d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml @@ -24,24 +24,11 @@ android:id="@+id/ivCar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:rotation="90" + android:rotation="45" app:layout_constraintBottom_toBottomOf="@+id/ivBg" app:layout_constraintEnd_toEndOf="@+id/ivBg" app:layout_constraintStart_toStartOf="@+id/ivBg" app:layout_constraintTop_toTopOf="@+id/ivBg" tools:src="@drawable/v_to_x_warning_car_red" /> - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index 028b4ceb1f..79f85e14d1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -24,9 +24,9 @@ android:id="@+id/btnCloseWindow" android:layout_width="@dimen/dp_88" android:layout_height="@dimen/dp_88" - android:layout_marginEnd="@dimen/dp_28" + android:layout_marginEnd="@dimen/dp_32" android:layout_marginBottom="@dimen/dp_40" - android:background="@drawable/v2x_panel_close" + android:background="@drawable/v2x_selector_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_colse_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_colse_light.xml rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml