1.修改页面交互逻辑

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketProActivity.java

@@ -46,6 +46,7 @@ public class MesTicketProActivity extends WorkToolBarActivity {
     private List<MesProBean.ListBean> clientList;
     private MesProAdapter clientAdapter;
     private int page = 1;
+    private Map<String, Object> paramMap;
 
     @Override
     protected void initView() {
@@ -61,6 +62,8 @@ public class MesTicketProActivity extends WorkToolBarActivity {
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
         param = WorkUtils.pageMesKey();
+        paramMap = WorkUtils.simpleParam();
+        param.put("paramMap",paramMap);
         param.put("pageNum", 1);
         getData();
     }
@@ -133,7 +136,7 @@ public class MesTicketProActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
-        param.put("productName", etKey.getText().toString());
+        paramMap.put("productName", etKey.getText().toString());
         param.put("pageNum", 1);
         page = 1;
         getData();

app/src/main/res/layout/item_user_add3_add.xml

@@ -54,7 +54,7 @@
         android:orientation="vertical"
         android:paddingHorizontal="20mm">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -65,7 +65,6 @@
                 android:id="@+id/tv_desc1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
                 android:text="类型"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
@@ -73,16 +72,17 @@
 
             <EditText
                 android:id="@+id/et_content1"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
                 android:hint="请输入"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -93,7 +93,6 @@
                 android:id="@+id/tv_desc2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
                 android:text="容量"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
@@ -101,13 +100,15 @@
 
             <EditText
                 android:id="@+id/et_content2"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
                 android:hint="请输入"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/item_user_add3_add_ref.xml

@@ -54,7 +54,7 @@
         android:orientation="vertical"
         android:paddingHorizontal="20mm">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -65,7 +65,6 @@
                 android:id="@+id/tv_desc1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
                 android:text="型号"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
@@ -73,16 +72,18 @@
 
             <EditText
                 android:id="@+id/et_content1"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
                 android:hint="请输入"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -93,7 +94,6 @@
                 android:id="@+id/tv_desc2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
                 android:text="台数"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
@@ -101,7 +101,9 @@
 
             <EditText
                 android:id="@+id/et_content2"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
@@ -109,9 +111,9 @@
                 android:inputType="numberDecimal"
                 android:hint="请输入"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -129,13 +131,15 @@
 
             <EditText
                 android:id="@+id/et_content3"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
                 android:hint="请输入"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/item_user_add_factory_label.xml

@@ -55,7 +55,7 @@
         android:orientation="vertical"
         android:paddingHorizontal="20mm">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -73,16 +73,18 @@
 
             <EditText
                 android:id="@+id/et_content1"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
                 android:hint="请输入"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -100,16 +102,18 @@
 
             <EditText
                 android:id="@+id/et_content2"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
                 android:hint="请输入"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
             android:id="@+id/rl_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -128,7 +132,9 @@
 
             <EditText
                 android:id="@+id/et_content3"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
@@ -136,6 +142,6 @@
                 android:hint="请输入"
                 android:inputType="number"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/view_user_check.xml

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="20mm"
     android:background="#d1f8f8f8"
     android:orientation="vertical">