From 7c606d2c9b725633f87274a2c1d57e5f2dbc0ffb Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 27 Oct 2023 17:01:29 +0800
Subject: [PATCH] 4444

---
 .../res/layout/datatab/layout/wl_item.xml     |   5 ++-
 .../main/res/layout/fragment_jcsjgl_wl.xml    |  12 ++---
 .../layout/item/layout/dialog_add_good.xml    |  12 +++--
 .../res/layout/item/layout/dialog_add_pf.xml  |  11 +++--
 .../main/res/layout/item/layout/wdsz_item.xml |  42 ++++++++++--------
 app/src/main/res/mipmap-xxxhdpi/topline.png   | Bin 0 -> 1752 bytes
 6 files changed, 48 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/topline.png

diff --git a/app/src/main/res/layout/datatab/layout/wl_item.xml b/app/src/main/res/layout/datatab/layout/wl_item.xml
index ba6e9010..7160d22d 100644
--- a/app/src/main/res/layout/datatab/layout/wl_item.xml
+++ b/app/src/main/res/layout/datatab/layout/wl_item.xml
@@ -28,11 +28,12 @@
                     android:id="@+id/name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="20dp"
-                    android:layout_alignParentLeft="true"
                     android:text="回锅肉"
-                    android:textSize="14dp"/>
+                    android:textAlignment="center"
+                    android:textSize="14dp" />
             </RelativeLayout>
 
 <!--            <RelativeLayout-->
diff --git a/app/src/main/res/layout/fragment_jcsjgl_wl.xml b/app/src/main/res/layout/fragment_jcsjgl_wl.xml
index ffb5b013..8f840cc8 100644
--- a/app/src/main/res/layout/fragment_jcsjgl_wl.xml
+++ b/app/src/main/res/layout/fragment_jcsjgl_wl.xml
@@ -90,7 +90,7 @@
                     <!-- 表头 -->
                     <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="26dp"
+                        android:layout_height="36dp"
                         android:background="@color/activity_background">
 
                         <TableLayout
@@ -112,11 +112,12 @@
                                     android:layout_weight="1">
 
                                     <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
-                                        android:layout_width="wrap_content"
+                                        android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:layout_alignParentLeft="true"
                                         android:layout_marginLeft="20dp"
-                                        android:text="物料名称" />
+                                        android:text="物料名称"
+                                        android:textAlignment="center"/>
                                 </RelativeLayout>
 
 <!--                                <RelativeLayout-->
@@ -138,11 +139,12 @@
                                     android:layout_weight="1">
 
                                     <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
-                                        android:layout_width="wrap_content"
+                                        android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:layout_alignParentLeft="true"
                                         android:layout_marginLeft="20dp"
-                                        android:text="用户操作" />
+                                        android:text="用户操作"
+                                        android:textAlignment="center"/>
                                 </RelativeLayout>
                             </TableRow>
                         </TableLayout>
diff --git a/app/src/main/res/layout/item/layout/dialog_add_good.xml b/app/src/main/res/layout/item/layout/dialog_add_good.xml
index 858a1ea6..6af1a54a 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_good.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_good.xml
@@ -165,10 +165,14 @@
                         android:layout_marginTop="30dp"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent">
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/recycler_view_wl"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"/>
+                            <ScrollView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent">
+                                <androidx.recyclerview.widget.RecyclerView
+                                    android:id="@+id/recycler_view_wl"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"/>
+                            </ScrollView>
                     </LinearLayout>
                 </RelativeLayout>
             </LinearLayout>
diff --git a/app/src/main/res/layout/item/layout/dialog_add_pf.xml b/app/src/main/res/layout/item/layout/dialog_add_pf.xml
index 317af878..afc23ebc 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_pf.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_pf.xml
@@ -223,13 +223,16 @@
 
 
                 <!-- 物料 -->
-                <androidx.recyclerview.widget.RecyclerView
+                <ScrollView
                     android:layout_marginTop="30dp"
-                    android:id="@+id/recycler_view_wl_click"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="0.5"/>
-
+                    android:layout_weight="0.5">
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recycler_view_wl_click"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+                </ScrollView>
             </LinearLayout>
         </RelativeLayout>
         <LinearLayout
diff --git a/app/src/main/res/layout/item/layout/wdsz_item.xml b/app/src/main/res/layout/item/layout/wdsz_item.xml
index d2be70de..1481d88f 100644
--- a/app/src/main/res/layout/item/layout/wdsz_item.xml
+++ b/app/src/main/res/layout/item/layout/wdsz_item.xml
@@ -11,13 +11,19 @@
         android:layout_height="wrap_content">
 
         <LinearLayout
-            android:layout_width="300dp"
+            android:layout_width="240dp"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:background="@color/activity_background1">
-
+            android:orientation="vertical">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/topline"/>
+            </RelativeLayout>
             <TextView
-                android:layout_marginTop="60dp"
+                android:layout_marginTop="0dp"
                 android:id="@+id/name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -29,12 +35,11 @@
 
             <RelativeLayout
                 android:layout_marginTop="30dp"
-                android:layout_marginLeft="40dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <LinearLayout
                     android:layout_centerInParent="true"
-                    android:layout_width="wrap_content"
+                    android:layout_width="175dp"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
                     <TextView
@@ -58,13 +63,12 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:layout_marginTop="10dp"
-                android:layout_marginLeft="40dp"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="30dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <LinearLayout
                     android:layout_centerInParent="true"
-                    android:layout_width="wrap_content"
+                    android:layout_width="175dp"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
                     <TextView
@@ -89,16 +93,16 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:layout_marginTop="10dp"
-                android:layout_marginLeft="40dp"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="30dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <LinearLayout
                     android:layout_centerInParent="true"
-                    android:layout_width="wrap_content"
+                    android:layout_width="175dp"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
                     <TextView
+                        android:layout_marginTop="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:text="自动加热："
@@ -117,13 +121,13 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="80dp"
+                android:layout_marginTop="30dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
+
                 <Button
                     android:id="@+id/save_value"
-                    android:layout_width="100dp"
+                    android:layout_width="160dp"
                     android:layout_height="26dp"
                     android:layout_centerInParent="true"
                     android:background="@drawable/bg_btn_login_selected"
diff --git a/app/src/main/res/mipmap-xxxhdpi/topline.png b/app/src/main/res/mipmap-xxxhdpi/topline.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c84548dc34d2df65c369170f1694bf1bd85dd5f
GIT binary patch
literal 1752
zcmdT^`#02S7=MPCmCLw|L9VBgMy7Jf5wWf%xrB8Y#?nPdY7sJSmCM2ErpyY-CW)18
zRj%LRAQjD;43-#|q}->*trG29bB@#g3H$u;zMtpw`8?12p7(sePnxsiUdi>!>j6O0
zZlARafY=PeSw9G)m9prZhPJoP2i$DXF8$vSFa!cYMn+~$K`Fv(tCW<Kq@<)k6_E1s
z@`w~L-xnf`41!qeAR!^~eJ#R*5@Zu#lnSmP=($!dAZ2A`k&Q$mA)AVdil7z3L?Tgu
z*ZQnUzBTprsMsOG#nBbMtR7rx6iLk1H47V!<hynkZ<Z@)irB7fcp@}<rs#5-p1U<K
z*@BpNsI`K<?L)w1py|31BlT3xTHKh_pm?>|KwOSQX{HS4cng-1BfWS7K*ZI~+QKb5
zZ-)C1RoPon)UVgd!+9F3YEhOu9K(CI@^gpic~PSCkrd+dWi`;RR9PK+u_RGe6mvz#
z)~darawx?}N-qfD)fMAj#ntSUdQ*8~I41JQ1dnyPoi><nz`?Nk4r)Gm!I-c5w(`ap
z4(6S-a?NKwx-zsbSVobM9AO}{S$&}=id?uX2Jbpbr~lZZw9wjaJBfoNL#mpS_7qXP
z^=rb|Dlhjmrm~y8A_O-JcW(&q(V-;I%A(iFeih3!Vye`d0QlTj>HmP$WU}MX(bqF;
zJpUTB+ZC}FAaE<aliu5&I=c?w#2Ec~3@59Q4)7yBi-RR$Ryxx-_{`NyjUv#K*^h<c
z)U77f%0X9-K7gpj;smY9H>kSq<VOM|R!5LpQtY{@*hBAurG<_(7H^|Br{mGkYu|y*
z2Zey$nK6(%bByD?amZ*(Jd<fd@t#@~S3Aud%Hn>08BaNT0SBjk3Qf>$SS|`TrFU_4
zQ+E$cj#LC{U5*D}4<4AG@=yJBR~HLwo0;V^rLp}bh!5qH$@M2mU2Rnj4!K+C^pD*w
zWIPN<y3f(~m~oFA2k@Sym*C-DlqW67IGvY$c!|nt<z~w2DnjC{b)BwWe|f;0?0YL-
zM~`kB3C6*APw)OQYG~c#TDnsOrPS0Xo)KLR5W%B;q=wa<@yOKazl}`?Q?>)d8P4;=
zqT2`O@yYfqf|=>8)n$Nz?ok4s!S^l<pKG?yG^g4q!SG3=x%V#TOs2accXPV<Bkl#{
zb#Rm9&7y}KDK>eK7ZO~}uHXZVzp!*o&kY&cHq_NdZ38%e_~FD|8k2S_%lw4nvgZZ>
z%w$Dw%<-i`jc4r97k?`uix#!sUn#q0Zpu6)9|t?4TjTSd)YP~$o){^6Fh2Q^0N#5B
zzplxAuRvmKAbEVE5dn631#PMwn_{FZ_~Jk@`mOza`3hQ)=~6B)!2zHpfXV8u_wpye
zuvuUW)~9o)?AWn(O|lSZ*p5~Dcwn*or4o##A%X+xJ1m8bOY0Y0<^0iSsNpWR5a<zT
zrhj9i{wxJRxQH1PT6~6ueX6L-h-3p)tG7<(mKb(CRV-J%m{ckXiN9rbb#liGnipP<
zF#H~)!Bw^WVQf|WFAuUDdC6rWkk~tOn`1)4Uwbo-hsNQum1u9{FDkU0LUCwpEGz$$
zWN7ACq|>iyk4}&5zn0N`^<t;ErVh$*;uE)q)Gu(FEyPhK);uv<xfC0t9ij=a$xl1q
zoZdls)1)8-KMI9q^i@_p4;r=v*w++Pyy{$W^^pYy8siMIDc!zz22<_{L!xzkektar
zo<#YIO-p)wZ5vX);aJsjht6oVS~Qns`KAnVPXbE>J=}G2@$Y?XG>b1?>eDt<uN6hI
ze!+Ednh-!*j=fg`GOfm3QWpD0DA{#aaR7$n$+s7+80gnKwCJi|Xb+&VQ~$1$02H`f
l6i7$*pt1M=i$tkad~4n4<mdb|r@!9b&c@ODo~7Tpe*q6yZ4m$f

literal 0
HcmV?d00001