diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java index 560a07eeac..81cf94a343 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java @@ -89,7 +89,7 @@ public class NoticeBannerView extends ConstraintLayout { noticeBannerCheck.setOnClickListener(v -> { mNoticeTrafficDialog = new NoticeTrafficDialog(mContext, mPushData); mNoticeTrafficDialog.show(); -// WarningFloat.dismiss(WaringConst.MODULE_NAME); + WarningFloat.dismiss(WaringConst.MODULE_NAME); }); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java index db6f84ca19..9b2db5c224 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java @@ -139,7 +139,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog { mRecyclerView.setLayoutManager(layoutManager); layoutManager.setOrientation(GridLayoutManager.VERTICAL); NoticeTrafficInfoGridItemDivider gridLayoutDivider = new NoticeTrafficInfoGridItemDivider(1, - (mContext.getResources().getColor(R.color.notice_check_dialog_bg_color))); + (mContext.getResources().getColor(R.color.notice_traffic_line))); mRecyclerView.addItemDecoration(gridLayoutDivider); } catch (Exception e) { e.printStackTrace(); @@ -383,21 +383,11 @@ public class NoticeTrafficDialog extends BaseFloatDialog { laiYuan.setValue(info.getUploadType()); dataArrayList.add(laiYuan); - NoticeValue zeRen = new NoticeValue(); - zeRen.setKey("责 任 方:"); - zeRen.setValue("--"); - dataArrayList.add(zeRen); - NoticeValue cTime = new NoticeValue(); cTime.setKey("事故时间:"); cTime.setValue(DateTimeUtils.getTimeText(info.getDataCreateTime(), DateTimeUtils.MM_Yue_dd_Ri_HH_mm)); dataArrayList.add(cTime); - NoticeValue p = new NoticeValue(); - p.setKey("责 任 人:"); - p.setValue("--"); - dataArrayList.add(p); - NoticeValue hTime = new NoticeValue(); hTime.setKey("处理时间:"); hTime.setValue(DateTimeUtils.getTimeText(info.getDataHandleTime(), DateTimeUtils.MM_Yue_dd_Ri_HH_mm)); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml index cdf77e827f..85570384fa 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="@dimen/notice_traffic_back__width" android:layout_height="@dimen/notice_traffic_back__height" + android:layout_gravity="center" android:background="@drawable/notice_dialog_check_background"> + android:layout_height="wrap_content" + android:paddingTop="4px" + android:background="@color/notice_banner_blue"> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml index 5caff3edca..d9bae6a025 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml @@ -4,6 +4,6 @@ #1F9BFE #5A8EFD #E63B4577 - #D5D5D4 + #CCD5D5D4 #3B4577 \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml b/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml index 2aa7d13372..c04a002a1a 100644 --- a/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml +++ b/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml @@ -48,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_marginRight="@dimen/notice_current_time_margin_small" android:gravity="center_vertical" android:text="02:23" android:layout_marginBottom="@dimen/notice_time_bottom" @@ -72,7 +71,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_marginLeft="@dimen/notice_current_time_margin_small" android:layout_marginBottom="@dimen/notice_time_bottom" android:text="08:66" android:gravity="center_vertical" diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 139d0d6104..265d067c33 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -3,6 +3,8 @@ 20px 52px + 65px + 200px 300px 300px 60px @@ -60,7 +62,6 @@ 35px 26px - 15px 600px 30px 18px