Merge branch 'lk' into dev_MogoAP_eagle-930_210926_8.0.12

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java

@@ -2,10 +2,12 @@ package com.mogo.eagle.core.function.check.view;
 
 import android.content.Context;
 import android.graphics.Color;
+import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -25,7 +27,7 @@ import java.util.List;
 public class CheckInfoListDialog extends BaseFloatDialog {
 
     private static final String TAG = "CheckInfoListDialog";
-    private RecyclerView mRecyclerView;
+    private CheckInfoRecyclerView mRecyclerView;
     private Context mContext;
     private TextView titleView;
     private int span;
@@ -33,7 +35,6 @@ public class CheckInfoListDialog extends BaseFloatDialog {
     private CheckResultData mCheckResultData;
     private List<CheckResultData.CheckListItem> result = new ArrayList<>();
 
-
     public CheckInfoListDialog(@NonNull Context context, String style, CheckResultData checkResultData) {
         super(context);
         mContext = context;
@@ -76,6 +77,9 @@ public class CheckInfoListDialog extends BaseFloatDialog {
     }
 
     public List showInfoResult() {
+
+//        List<CheckResultData.CheckListItem> test = new ArrayList();//测试数据
+
         if (result.size() > 0) {
             result.clear();
         }
@@ -98,10 +102,12 @@ public class CheckInfoListDialog extends BaseFloatDialog {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            Log.d(TAG, "检测指标结果值===" + result.toString());
         } catch (Exception e) {
 
         }
+//        test.addAll(result);
+//        test.addAll(result);
+//        test.addAll(result);
         return result;
     }
 
@@ -113,4 +119,5 @@ public class CheckInfoListDialog extends BaseFloatDialog {
     public void dismiss() {
         super.dismiss();
     }
+
 }

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoRecyclerView.java

@@ -0,0 +1,48 @@
+package com.mogo.eagle.core.function.check.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.eagle.core.function.check.R;
+
+/**
+ * @author liujing
+ * @description 描述
+ * @since: 9/29/21
+ */
+public class CheckInfoRecyclerView extends RecyclerView {
+    private int maxHeight = (int) getContext().getResources().getDimension(R.dimen.check_height);
+    private int maxWeight = (int) getContext().getResources().getDimension(R.dimen.check_width);
+
+    public CheckInfoRecyclerView(@NonNull Context context) {
+        super(context);
+    }
+
+    public CheckInfoRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CheckInfoRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthSpec, int heightSpec) {
+        super.onMeasure(widthSpec, heightSpec);
+        boolean needLimit = false;
+        if (maxHeight >= 0) {
+            needLimit = true;
+        }
+        if (needLimit) {
+            int limitHeight = getMeasuredHeight();
+            if (getMeasuredHeight() > maxHeight) {
+                limitHeight = maxHeight;
+            }
+            setMeasuredDimension(maxWeight, maxHeight);
+        }
+    }
+}

core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml

@@ -20,7 +20,7 @@
         android:id="@+id/check_info_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_69"
+        android:layout_marginTop="@dimen/dp_70"
         android:gravity="center"
         android:text="自检结果"
         android:textColor="#fff"
@@ -29,17 +29,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <com.mogo.eagle.core.function.check.view.CheckInfoRecyclerView
         android:id="@+id/check_list_recycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_143"
-        android:layout_marginTop="@dimen/dp_184"
+        android:layout_marginTop="@dimen/dp_66"
         android:layout_marginRight="@dimen/dp_143"
         android:layout_marginBottom="@dimen/dp_80"
         android:background="@drawable/check_recycler_shape"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/check_info_title" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-check/src/main/res/values/dimens.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="check_width">1900px</dimen>
+    <dimen name="check_height">876px</dimen>
+</resources>