diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java index d2d473c0dd..5331e73b53 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java @@ -41,8 +41,8 @@ class NoticeTrafficAdapter extends RecyclerView.Adapter { public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { if (data.size() > position) { NoticeValue value = data.get(position); - ((TrafficInfoHolder) holder).keyText.setText(value.getKey()); - ((TrafficInfoHolder) holder).valueText.setText(value.getValue()); + ((TrafficInfoHolder) holder).keyText.setText("测试title"); + ((TrafficInfoHolder) holder).valueText.setText("当前是测试数据,请查看测试来源"); } } 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 0f21d0fe2a..8dd4767063 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 @@ -8,6 +8,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.eagle.core.function.hmi.R; import com.mogo.module.common.dialog.BaseFloatDialog; +import com.mogo.module.common.view.SpacesItemDecoration; +import com.mogo.utils.ResourcesHelper; import java.util.List; @@ -18,7 +20,7 @@ import java.util.List; */ public class NoticeTrafficDialog extends BaseFloatDialog { private Context mContext; - private NoticeTrafficInfoView mRecyclerView; + private RecyclerView mRecyclerView; public NoticeTrafficDialog(@NonNull Context context) { super(context); @@ -36,11 +38,11 @@ public class NoticeTrafficDialog extends BaseFloatDialog { try { mRecyclerView = findViewById(R.id.traffic_info_recyclerView); //网格布局 - GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4); + GridLayoutManager layoutManager = new GridLayoutManager(mContext, 2); mRecyclerView.setLayoutManager(layoutManager); layoutManager.setOrientation(GridLayoutManager.VERTICAL); NoticeTrafficInfoGridItemDivider gridLayoutDivider = new NoticeTrafficInfoGridItemDivider(1, - (mContext.getResources().getColor(R.color.notice_dialog_back))); + (mContext.getResources().getColor(R.color.notice_check_dialog_bg_color))); mRecyclerView.addItemDecoration(gridLayoutDivider); } catch (Exception e) { e.printStackTrace(); 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 997f8fcf9f..2e7e119cd3 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 @@ -33,7 +33,7 @@ - @@ -74,6 +78,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml index c129b62ead..309ac015d8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -8,7 +8,7 @@ 506px 1300px 1210px - 1160px + 1150px 290px 32px @@ -24,11 +24,12 @@ 54px 56px 62px + 80px 150px 180px 220px + 395px 580px 588px 1066px - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml index 2b9accd28e..48d41bd53e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml @@ -8,7 +8,7 @@ 506px 1300px 1210px - 1160px + 1150px 290px 32px @@ -24,9 +24,11 @@ 54px 56px 62px + 80px 150px 180px 220px + 395px 580px 588px 1066px