yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gh' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source
This commit is contained in:
liujing
2021-10-30 19:50:10 +08:00
parent 7b38151065 4789358cb4
commit e55aa6b905
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java
View File

@@ -60,8 +60,8 @@ public class NoticeBannerView extends ConstraintLayout {
noticeBannerCheck = findViewById(R.id.notice_push_banner_check);
noticeBannerCheck.setOnClickListener(v -> {
// mNoticeTrafficDialog = new NoticeTrafficDialog(mContext);
// mNoticeTrafficDialog.show();
mNoticeTrafficDialog = new NoticeTrafficDialog(mContext);
mNoticeTrafficDialog.show();
});
}

8
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java
View File

@@ -39,9 +39,11 @@ class NoticeTrafficAdapter extends RecyclerView.Adapter {
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
NoticeValue value = data.get(position);
((TrafficInfoHolder) holder).keyText.setText(value.getKey());
((TrafficInfoHolder) holder).valueText.setText(value.getValue());
if (data.size() > position) {
NoticeValue value = data.get(position);
((TrafficInfoHolder) holder).keyText.setText(value.getKey());
((TrafficInfoHolder) holder).valueText.setText(value.getValue());
}
}
@Override

13
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
*/
public class NoticeTrafficDialog extends BaseFloatDialog {
private Context mContext;
private RecyclerView mRecyclerView;
private NoticeTrafficInfoView mRecyclerView;
public NoticeTrafficDialog(@NonNull Context context) {
super(context);
@@ -31,13 +31,14 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
}
public void initView() {
mRecyclerView = findViewById(R.id.traffic_info_recyclerView);
//网格布局
GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
mRecyclerView.setLayoutManager(layoutManager);
layoutManager.setOrientation(GridLayoutManager.VERTICAL);
setContentView(R.layout.notice_dialog_traffic_police);
//网格绘制
try {
mRecyclerView = findViewById(R.id.traffic_info_recyclerView);
//网格布局
GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
mRecyclerView.setLayoutManager(layoutManager);
layoutManager.setOrientation(GridLayoutManager.VERTICAL);
NoticeTrafficInfoGridItemDivider gridLayoutDivider = new NoticeTrafficInfoGridItemDivider(1,
(mContext.getResources().getColor(R.color.notice_dialog_back)));
mRecyclerView.addItemDecoration(gridLayoutDivider);

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
View File

@@ -44,7 +44,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/notice_traffic_dialog_title" />
<!--事故来源等事故详情-->
<androidx.recyclerview.widget.RecyclerView
<com.mogo.eagle.core.function.hmi.ui.notice.NoticeTrafficInfoView
android:id="@+id/traffic_info_recyclerView"
android:layout_width="@dimen/notice_traffic_info_width"
android:layout_height="@dimen/notice_traffic_info_height"