From 6bb02e3cfe1c6b7f0392fe2098d5ddde16510a2d Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Wed, 17 Jan 2024 13:34:21 +0800
Subject: [PATCH] 333

---
 .../common/linktab/good/GoodLeftAdapter.java  |   6 +-
 app/src/main/res/layout/activity_log.xml      | 151 ++++++++-------
 .../main/res/layout/activity_orderlist.xml    | 173 ++++++++++--------
 app/src/main/res/layout/fragment_dingdan.xml  |   4 +-
 app/src/main/res/layout/fragment_gongneng.xml |   2 +-
 5 files changed, 185 insertions(+), 151 deletions(-)

diff --git a/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodLeftAdapter.java b/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodLeftAdapter.java
index 0665c2dc..65519e8d 100644
--- a/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodLeftAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodLeftAdapter.java
@@ -143,7 +143,11 @@ public class GoodLeftAdapter extends BaseQuickAdapter<LinkMode, BaseViewHolder>
         for (LinkMode it : Fdata) {
             it.isChoose = false;
         }
-        Fdata.get(position).isChoose = true;
+
+        if(position<Fdata.size())
+        {
+            Fdata.get(position).isChoose = true;
+        }
         notifyDataSetChanged();
     }
 }
diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
index 219f0479..e4315c2b 100644
--- a/app/src/main/res/layout/activity_log.xml
+++ b/app/src/main/res/layout/activity_log.xml
@@ -25,81 +25,96 @@
                 android:orientation="vertical">
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="30dp">
+                    android:layout_height="wrap_content">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true">
-                        <EditText
-                            android:id="@+id/starttime"
-                            android:layout_width="140dp"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:padding="3dp"
-                            android:textColor="@color/foreground"
-                            android:background="@drawable/input_bj"
-                            android:layout_marginLeft="5dp"
-                            android:maxLines="1"
-                            android:focusable="false"
-                            android:text="2023-02-33 00:00:00"
-                            android:textSize="@dimen/textSize"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:textColor="@color/foreground"
-                            android:text="--">
-                        </TextView>
-                        <EditText
-                            android:id="@+id/stoptime"
-                            android:layout_width="140dp"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:padding="3dp"
-                            android:focusable="false"
-                            android:textColor="@color/foreground"
-                            android:background="@drawable/input_bj"
-                            android:layout_marginLeft="5dp"
-                            android:maxLines="1"
-                            android:text="2023-02-33 00:00:00"
-                            android:textSize="@dimen/textSize"/>
-                        <TextView
-                            android:layout_width="wrap_content"
+                        android:orientation="vertical">
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:textColor="@color/foreground"
-                            android:text="日志类型">
-                        </TextView>
-                        <Spinner
-                            android:id="@+id/rzlx"
-                            android:layout_width="wrap_content"
-                            android:layout_height="26dp"
-                            style="@style/commonSpinnerStyle"/>
-                        <EditText
-                            android:id="@+id/edittext"
-                            android:layout_width="200dp"
+                            android:layout_alignParentBottom="true">
+                            <EditText
+                                android:id="@+id/starttime"
+                                android:layout_width="140dp"
+                                android:layout_height="wrap_content"
+                                android:inputType="text"
+                                android:padding="3dp"
+                                android:textColor="@color/foreground"
+                                android:background="@drawable/input_bj"
+                                android:layout_marginLeft="5dp"
+                                android:maxLines="1"
+                                android:focusable="false"
+                                android:text="2023-02-33 00:00:00"
+                                android:textSize="@dimen/textSize"/>
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:textColor="@color/foreground"
+                                android:text="--">
+                            </TextView>
+                            <EditText
+                                android:id="@+id/stoptime"
+                                android:layout_width="140dp"
+                                android:layout_height="wrap_content"
+                                android:inputType="text"
+                                android:padding="3dp"
+                                android:focusable="false"
+                                android:textColor="@color/foreground"
+                                android:background="@drawable/input_bj"
+                                android:layout_marginLeft="5dp"
+                                android:maxLines="1"
+                                android:text="2023-02-33 00:00:00"
+                                android:textSize="@dimen/textSize"/>
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:textColor="@color/foreground"
+                                android:text="日志类型">
+                            </TextView>
+                            <Spinner
+                                android:id="@+id/rzlx"
+                                android:layout_width="wrap_content"
+                                android:layout_height="26dp"
+                                style="@style/commonSpinnerStyle"/>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:padding="3dp"
-                            android:textColor="@color/foreground"
-                            android:background="@drawable/input_bj"
-                            android:layout_marginLeft="5dp"
-                            android:hint="请输入查询条件"
-                            android:maxLines="1"
-                            android:textSize="@dimen/textSize"/>
-                        <Button
-                            android:id="@+id/button"
-                            android:text="查询"
-                            android:background="@drawable/bg_btn_login_selected"
-                            android:textSize="@dimen/textSize"
-                            android:layout_marginLeft="5dp"
-                            android:layout_gravity="center"
-                            android:layout_width="120dp"
-                            android:layout_height="26dp"
-                            android:textColor="@color/white"
-                            />
+                            android:layout_alignParentBottom="true">
+                            <EditText
+                                android:id="@+id/edittext"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:inputType="text"
+                                android:padding="3dp"
+                                android:textColor="@color/foreground"
+                                android:background="@drawable/input_bj"
+                                android:layout_marginLeft="5dp"
+                                android:hint="请输入查询条件"
+                                android:maxLines="1"
+                                android:textSize="@dimen/textSize"/>
+                            <Button
+                                android:id="@+id/button"
+                                android:text="查询"
+                                android:background="@drawable/bg_btn_login_selected"
+                                android:textSize="@dimen/textSize"
+                                android:layout_marginLeft="5dp"
+                                android:layout_gravity="center"
+                                android:layout_width="120dp"
+                                android:layout_height="26dp"
+                                android:textColor="@color/white"
+                                />
+                        </LinearLayout>
                     </LinearLayout>
 
+
+
                 </RelativeLayout>
 
                 <RelativeLayout
diff --git a/app/src/main/res/layout/activity_orderlist.xml b/app/src/main/res/layout/activity_orderlist.xml
index 90a33f74..08f252fd 100644
--- a/app/src/main/res/layout/activity_orderlist.xml
+++ b/app/src/main/res/layout/activity_orderlist.xml
@@ -26,94 +26,107 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="30dp">
-
+                    android:layout_height="wrap_content">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true">
+                        android:orientation="vertical">
 
-                        <EditText
-                            android:id="@+id/starttime"
-                            android:layout_width="140dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/input_bj"
-                            android:focusable="false"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:padding="3dp"
-                            android:text="2023-02-33 00:00:00"
-                            android:textSize="@dimen/textSize"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:text="--"></TextView>
+                            android:layout_alignParentBottom="true">
 
-                        <EditText
-                            android:id="@+id/stoptime"
-                            android:layout_width="140dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/input_bj"
-                            android:focusable="false"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:padding="3dp"
-                            android:text="2023-02-33 00:00:00"
-                            android:textSize="@dimen/textSize"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:text="制作状态"></TextView>
-
-                        <Spinner
-                            android:id="@+id/rzlx"
-                            style="@style/commonSpinnerStyle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="26dp" />
-
-                        <EditText
-                            android:id="@+id/edittext"
-                            android:layout_width="200dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/input_bj"
-                            android:hint="请输入查询条件"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:padding="3dp"
-                            android:textColor="@color/foreground"
-                            android:textSize="@dimen/textSize"/>
-
-                        <Button
-                            android:id="@+id/button"
-                            android:layout_width="120dp"
-                            android:layout_height="26dp"
-                            android:layout_gravity="center"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/bg_btn_login_selected"
-                            android:text="查询"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/textSize" />
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="10dp"
-                            android:text="数量："></TextView>
-                        <TextView
-                            android:id="@+id/count"
-                            android:layout_width="wrap_content"
+                            <EditText
+                                android:id="@+id/starttime"
+                                android:layout_width="140dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/input_bj"
+                                android:focusable="false"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:padding="3dp"
+                                android:text="2023-02-33 00:00:00"
+                                android:textSize="@dimen/textSize"/>
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:text="--"></TextView>
+
+                            <EditText
+                                android:id="@+id/stoptime"
+                                android:layout_width="140dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/input_bj"
+                                android:focusable="false"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:padding="3dp"
+                                android:text="2023-02-33 00:00:00"
+                                android:textSize="@dimen/textSize"/>
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:text="制作状态"></TextView>
+
+                            <Spinner
+                                android:id="@+id/rzlx"
+                                style="@style/commonSpinnerStyle"
+                                android:layout_width="wrap_content"
+                                android:layout_height="26dp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:text="129"
-                            android:textColor="@color/deep_purple_primary"></TextView>
+                            android:layout_alignParentBottom="true">
+
+                            <EditText
+                                android:id="@+id/edittext"
+                                android:layout_width="200dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/input_bj"
+                                android:hint="请输入查询条件"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:padding="3dp"
+                                android:textColor="@color/foreground"
+                                android:textSize="@dimen/textSize"/>
+
+                            <Button
+                                android:id="@+id/button"
+                                android:layout_width="120dp"
+                                android:layout_height="26dp"
+                                android:layout_gravity="center"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_btn_login_selected"
+                                android:text="查询"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/textSize" />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:text="数量："></TextView>
+                            <TextView
+                                android:id="@+id/count"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="5dp"
+                                android:text="129"
+                                android:textColor="@color/deep_purple_primary"></TextView>
+                        </LinearLayout>
                     </LinearLayout>
 
+
                 </RelativeLayout>
 
                 <RelativeLayout
@@ -240,6 +253,8 @@
                     </LinearLayout>
                 </RelativeLayout>
             </LinearLayout>
+
+
         </RelativeLayout>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_dingdan.xml b/app/src/main/res/layout/fragment_dingdan.xml
index 3a372545..61c5e1a2 100644
--- a/app/src/main/res/layout/fragment_dingdan.xml
+++ b/app/src/main/res/layout/fragment_dingdan.xml
@@ -28,7 +28,7 @@
                     android:layout_weight="1"
                     android:orientation="vertical">
                     <LinearLayout
-                        android:id="@+id/ddgl"
+                        android:id="@+id/xltj"
                         android:layout_marginTop="20dp"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
@@ -62,7 +62,7 @@
                     android:layout_weight="1"
                     android:orientation="vertical">
                     <LinearLayout
-                        android:id="@+id/xltj"
+                        android:id="@+id/ddgl"
                         android:layout_marginTop="20dp"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_gongneng.xml b/app/src/main/res/layout/fragment_gongneng.xml
index 804326d9..d1435d37 100644
--- a/app/src/main/res/layout/fragment_gongneng.xml
+++ b/app/src/main/res/layout/fragment_gongneng.xml
@@ -130,7 +130,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginTop="15dp"
                 android:layout_weight="1">
 
                 <RelativeLayout