diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java
index 90f2d5473a..0289c8c34e 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java
@@ -16,7 +16,7 @@ import org.w3c.dom.Text;
/**
* @author liujing
- * @description 点击自动驾驶icon显示指标详情结果
+ * @description 点击自动驾驶icon显示各个检测指标结果
* @since: 9/23/21
*/
public class CheckInfoAdapter extends RecyclerView.Adapter {
@@ -40,6 +40,13 @@ public class CheckInfoAdapter extends RecyclerView.Adapter {
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+ if (position == 0 || position == 2){
+ ((CheckInfoViewHolder)holder).checkIcon.setVisibility(View.GONE);
+ ((CheckInfoViewHolder)holder).mTextView.setText("模块名称");
+ }else if (position == 1 || position == 3){
+ ((CheckInfoViewHolder)holder).checkIcon.setVisibility(View.GONE);
+ ((CheckInfoViewHolder)holder).mTextView.setText("运行状态");
+ }
}
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java
index c874688a9c..61cba5efdf 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java
@@ -19,7 +19,7 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager;
* @description 描述
* @since: 9/22/21
*/
-public class CheckInfoGridItemDivider extends RecyclerView.ItemDecoration {
+public class CheckInfoGridItemDivider extends RecyclerView.ItemDecoration {
private String TAG = getClass().getSimpleName();
private static final int[] ATTRS = new int[]{android.R.attr.listDivider};
private Drawable divider;
@@ -107,6 +107,18 @@ public class CheckInfoGridItemDivider extends RecyclerView.ItemDecoration {
divider.draw(c);
}
+ //待修改为右侧
+ private void drawVerticalForLastColum(Canvas c, View child) {
+ final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+ .getLayoutParams();
+ int left = child.getLeft() + params.leftMargin - divider.getIntrinsicWidth();
+ int top = child.getTop() - params.topMargin;
+ int right = child.getLeft() + params.leftMargin;
+ int bottom = top + child.getHeight() + divider.getIntrinsicHeight();
+ divider.setBounds(left, top, right, bottom);
+ divider.draw(c);
+ }
+
public void drawVertical(Canvas c, RecyclerView parent) {
final int childCount = parent.getChildCount();
for (int i = 0; i < childCount; i++) {
@@ -123,6 +135,9 @@ public class CheckInfoGridItemDivider extends RecyclerView.ItemDecoration {
if (isFirstColum(parent, i, getSpanCount(parent))) { //画第一列左边分割线
drawVerticalForFirstColum(c, child);
}
+ if (isLastColum(parent, i, getSpanCount(parent), childCount)) {//画最后一列分割线
+ drawVerticalForLastColum(c, child);
+ }
}
}
@@ -166,8 +181,7 @@ public class CheckInfoGridItemDivider extends RecyclerView.ItemDecoration {
// 如果是最后一行，则不需要绘制底部
if (pos >= childCount)
return true;
- } else
- {
+ } else {
// 如果是最后一行，则不需要绘制底部
if ((pos + 1) % spanCount == 0) {
return true;
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java
index b0a9b1060a..0fc65015b1 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java
@@ -35,14 +35,18 @@ public class CheckInfoListDialog extends BaseFloatDialog {
public void initView() {
setContentView(R.layout.check_info_list);
mRecyclerView = findViewById(R.id.check_list_recycler);
-// GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
-// mRecyclerView.setLayoutManager(layoutManager);
- //表示竖直显示.默认VERTICAL
-// layoutManager.setOrientation(GridLayoutManager.HORIZONTAL);
-// CheckInfoGridItemDivider gridLayoutDivider = new CheckInfoGridItemDivider(2, Color.parseColor("#CCCCCC"));
-// mRecyclerView.addItemDecoration(gridLayoutDivider);
+ //网格布局
+ GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
+ mRecyclerView.setLayoutManager(layoutManager);
+ layoutManager.setOrientation(GridLayoutManager.VERTICAL);
+ //网格绘制
+ try {
+ CheckInfoGridItemDivider gridLayoutDivider = new CheckInfoGridItemDivider(2, Color.parseColor("#CCCCCC"));
+ mRecyclerView.addItemDecoration(gridLayoutDivider);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
mRecyclerView.setAdapter(new CheckInfoAdapter(mContext));
-
//关闭按钮
findViewById(R.id.cancel_info_list_button).setOnClickListener(v -> {
cancel();
diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml
index 3bb21ea884..decaf5275f 100644
--- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml
+++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml
@@ -21,9 +21,9 @@
android:src="@drawable/check_right" />
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file