diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java index fff8ed9203..3aeb34605d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java @@ -28,9 +28,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo private MogoImageView mIvReportHead; private ImageView pushVideoClose; - // 弹窗状态监听 -// private CameraLiveWindowStatusListener mWindowStatusListener; - // 直播30秒自动关闭 private static Handler handlerV2XEvent = new Handler(); private static Runnable runnableV2XEvent; @@ -84,9 +81,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo } countDownV2XEvent(entity); -// if (mWindowStatusListener != null) { -// mWindowStatusListener.onViewShow(); -// } } } @@ -97,16 +91,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo @Override public void close() { - // 修改地图比例 -// V2XServiceManager.getMoGoStatusManager().setUserInteractionStatus(MODULE_NAME, true, false); - // 锁车就是将地图视图移植中心点,因为行驶中的车和地图要相对的跟随 -// MarkerUtils.resetMapZoom(16); - - // 如果窗体处于展示的时候 -// if (mWindowStatusListener != null) { -// mWindowStatusListener.onViewClose(); -// } - // 停止倒计时 if (handlerV2XEvent != null && runnableV2XEvent != null) { handlerV2XEvent.removeCallbacks(runnableV2XEvent); @@ -119,12 +103,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo .removeView(this); } - -// @Override -// public void setWindowStatusListener(CameraLiveWindowStatusListener listener) { -// this.mWindowStatusListener = listener; -// } - /** * 窗体倒计时 TODO */ diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java index 2374b039fa..c116e42b25 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java @@ -25,10 +25,10 @@ import com.mogo.utils.logger.Logger; /** - * vr模式下,红绿灯消息 AdasNoticeHelper + * vr模式下,摄像头消息 AdasNoticeHelper */ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener { - private static final String TAG = "liyz"; + private static final String TAG = "CameraLiveNoticeHelper"; private Context mContext; private static IMogoMarker mMogoMarker; private CloudRoadData mCloudRoadData; @@ -84,22 +84,23 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid()); + Log.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid()); if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) { if (isVrMode == isVrModeMarker) { // do nothing. + Log.e(TAG, "-------------1------------"); } else { if (isVrMode) { addVrCameraMarker(mCloudRoadData); isVrModeMarker = true; + Log.d(TAG, "-------------2------------"); } else { addNormalCameraMarker(mCloudRoadData); + Log.d(TAG, "-------------3------------"); isVrModeMarker = false; } } } else { - Logger.d(TAG, "mCurrentUuid != ----------"); mCurrentUuid = mCloudRoadData.getUuid(); if (isVrMode) { + Log.d(TAG, "-------------4------------"); addVrCameraMarker(mCloudRoadData); isVrModeMarker = true; } else { + Log.d(TAG, "-------------5------------"); addNormalCameraMarker(mCloudRoadData); isVrModeMarker = false; } diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index ea9ab4a5eb..0b834a7848 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -88,7 +88,7 @@ 1058px - 760px + 822px 700px 544px 117px 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 6acb0415ac..084475dd0d 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 @@ -150,7 +150,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { mPauseImage = mWindowView.findViewById(R.id.window_play_pause_new); if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new); } int yPos = @@ -294,7 +294,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { if( mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) { // kw音乐做的容错 if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_play); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new); } if (mAnimCircleImageView != null) { mAnimCircleImageView.startAnim(); @@ -314,7 +314,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { // GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options)); }else{ Logger.e(TAG, "mMediaInfoData == null "); - mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img); + mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img_new); } } } else { @@ -371,7 +371,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { updateWindowUI(false); if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_play); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new); } if (mAnimCircleImageView != null) { @@ -396,7 +396,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { Log.d(TAG, "onMusicPause: ===" + mMediaInfoData); if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new); } if (mAnimCircleImageView != null) { @@ -421,7 +421,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { Log.d(TAG, "onMusicStopped===" + mMediaInfoData); if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new); } if (mAnimCircleImageView != null) { diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png new file mode 100644 index 0000000000..fcc9015490 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png new file mode 100644 index 0000000000..86f936f702 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png new file mode 100644 index 0000000000..78e5680e91 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png differ diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml index d36414c4b7..606fb00f07 100644 --- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml +++ b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml @@ -32,7 +32,8 @@ android:id="@+id/window_circle_img_new" android:layout_width="@dimen/module_media_pop_window_anim_img_size_new" android:layout_height="@dimen/module_media_pop_window_anim_img_size_new" - android:src="@drawable/module_media_default_music_img" + android:src="@drawable/module_media_default_music_img_new" + android:scaleType="fitCenter" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -43,7 +44,7 @@ android:layout_width="@dimen/module_media_pop_window_pause" android:layout_height="@dimen/module_media_pop_window_pause" android:background="@drawable/module_media_play_bg_selector" - android:src="@drawable/module_media_window_pop_play" + android:src="@drawable/module_media_window_pop_play_new" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml index f9fba40b16..75bfb5e9d1 100644 --- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml @@ -71,7 +71,7 @@ 80px 101px 60px - 116px + 115px 230px 14px 35px diff --git a/modules/mogo-module-media/src/main/res/values/colors.xml b/modules/mogo-module-media/src/main/res/values/colors.xml index b6ca26aca2..7c39678a81 100644 --- a/modules/mogo-module-media/src/main/res/values/colors.xml +++ b/modules/mogo-module-media/src/main/res/values/colors.xml @@ -3,5 +3,7 @@ #fff #7affffff #444E6E - #80ffffff + #f6ffffff + #1Affffff + #ffffff diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_tip_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_tip_bg.png new file mode 100644 index 0000000000..22404daa42 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_tip_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml index 79822a5547..847361a586 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml @@ -2,20 +2,20 @@ + android:layout_width="@dimen/dp_822" + android:layout_height="@dimen/dp_182" + android:background="@drawable/v2x_tip_bg" + android:clipChildren="true"> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml index f4c376b7ad..df06979f90 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml @@ -2,24 +2,26 @@ @@ -34,11 +37,11 @@ + android:background="@drawable/v2x_tip_bg"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.409" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.463" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.463" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml index e3f3c2d6c6..4411a57baf 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml @@ -2,8 +2,8 @@ 80px - 120px + 182px 64px 60px