修复 性能维修 不良现象没有数据问题, 调整输入框UI,修改性能维修,外观维修产品代码

app/build.gradle

@@ -45,10 +45,10 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_EQUIPMENT_STORAGE_RELEASE_${releaseInfo}.apk"
+                    fileName = "瑞梓数据采集标准版UAS_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
-                    fileName = "UAS_EQUIPMENT_STORAGE_DEBUG_${debugInfo}.apk"
+                    fileName = "瑞梓数据采集标准版UAS_DEBUG_${debugInfo}.apk"
                 }
                 outputFileName = fileName
             }

app/src/main/java/com/uas/hycollection/fragment/BreakdownRepairFragment.java

@@ -730,6 +730,7 @@ public class BreakdownRepairFragment extends BaseFragment {
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                             bean.setMA_BOMVERSION(data.getString("MA_BOMVERSION"));
                             bean.setSR_NGQTY(data.getString("SR_NGQTY"));
+                            bean.setPR_SPEC(data.getString("PR_SPEC"));
                             linecodeBeanList.add(bean);
                         }
                         ipAndlinecodePortAdapter.setmList(linecodeBeanList);
@@ -1400,7 +1401,9 @@ public class BreakdownRepairFragment extends BaseFragment {
                 ma_id = ipAndPortBeans.get(position).getMA_ID();
                 pr_code = ipAndPortBeans.get(position).getPR_CODE();
                 pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
-                ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
+                //修改值
+                //ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
+                ma_bomversion = ipAndPortBeans.get(position).getPR_SPEC();
                 sr_linecode = ipAndPortBeans.get(position).getSR_LINECODE();
                 sr_badname = ipAndPortBeans.get(position).getSR_BADNAME();
                 SR_NGQTY = ipAndPortBeans.get(position).getSR_NGQTY();     //不良品数量
@@ -1439,6 +1442,7 @@ public class BreakdownRepairFragment extends BaseFragment {
                 tv_dc_emcode.requestFocus();
                 ce_work_code.setFocusable(false);
 
+                recycleDataone(sr_badname);
                 getReapirInfo(at_station.getText().toString().trim(),ma_code,ce_wuli.getText().toString().trim());
                 closeListPopupWindow();
                 selectAdapterQty.notifyDataSetChanged();

app/src/main/java/com/uas/hycollection/fragment/DataCollectionFragment.java

@@ -62,7 +62,6 @@ import com.uas.hycollection.bean.StorageRechargeAloneBean;
 import com.uas.hycollection.bean.TestcollectDataBean;
 import com.uas.hycollection.camera.CaptureActivity;
 import com.uas.hycollection.global.GloableParams;
-import com.uas.hycollection.tools.GsonUtil;
 import com.uas.hycollection.tools.SharedPreUtil;
 import com.uas.hycollection.util.CameraUtil;
 import com.uas.hycollection.util.CommonUtil;
@@ -648,7 +647,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             et_linecode_smts.setText(work_order_flow);
             tv_macode.setText(""+plan_number);
             tv_pr_code.setText(""+product_code);//pr_code ma_bomversion
-            tv_pr_detail.setText(""+product_name);
+            tv_pr_detail.setText(""+product_name);      //产品名称
         }
 
     }

app/src/main/res/drawable/bg_edittext_line_normal.xml

@@ -2,6 +2,6 @@
 <!--未获得焦点下EditText-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#ffffff"/>
-    <corners android:radius="0dip"/>
-    <stroke android:width="0.5dp" android:color="@color/gray1"/>
+    <corners android:radius="1dp"/>
+    <stroke android:width="1.5dp" android:color="@color/gray1"/>
 </shape>

app/src/main/res/layout-large/fragment_breakdownrepair.xml

@@ -4,58 +4,61 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+
     <ScrollView
-        android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
 
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="0dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:layout_height="wrap_content">
+                android:orientation="vertical">
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
                     <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp_10"
                         android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:orientation="vertical">
 
                         <LinearLayout
-                            android:layout_marginTop="5dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:text="工单流水："
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/dp_10"
-                                android:text="工单流水：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/ce_work_code"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入工单流水"
                                     android:inputType="number"
-                                    android:hint="请输入工单流水" />
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:id="@+id/iv_work_code"
@@ -66,47 +69,49 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
-                                android:layout_gravity="center"
                                 android:id="@+id/iv_popuwindow"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:background="@drawable/bg_button"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
 
                         <LinearLayout
-                            android:layout_marginTop="2dp"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp">
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="计划单号："
-                                android:textSize="@dimen/dp_10"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="计划单号："
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/dp_10"></TextView>
+
                             <LinearLayout
-                                android:orientation="horizontal"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
                                 <FrameLayout
-                                    android:layout_weight="1"
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
 
                                     <AutoCompleteTextView
                                         android:id="@+id/tv_macode"
                                         style="@style/EditTextLineStyle"
                                         android:layout_height="25dp"
-                                        android:inputType="number"
-                                        android:hint=""
                                         android:focusable="false"
-                                        android:textSize="@dimen/dp_10"/>
+                                        android:hint=""
+                                        android:inputType="number"
+                                        android:textSize="@dimen/dp_10" />
 
                                     <ImageView
                                         android:layout_width="wrap_content"
@@ -116,41 +121,43 @@
                                         android:src="@drawable/wrong"
                                         android:visibility="gone" />
                                 </FrameLayout>
+
                                 <ImageView
                                     android:layout_width="30dp"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center"
-                                    android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
+                                    android:layout_marginRight="10dp"
                                     android:clickable="false" />
                             </LinearLayout>
                         </LinearLayout>
+
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:text="产品代码："
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/dp_10"
-                                android:text="产品代码：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/tv_pr_code"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
                                     android:focusable="false"
-                                    android:hint="" />
+                                    android:hint=""
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:layout_width="wrap_content"
@@ -160,41 +167,43 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
+
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:text="产品名称："
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/dp_10"
-                                android:text="产品名称：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/tv_pr_detail"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
-                                    android:inputType="number"
                                     android:focusable="false"
-                                    android:hint="" />
+                                    android:hint=""
+                                    android:inputType="number"
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:layout_width="wrap_content"
@@ -204,12 +213,13 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
 
@@ -220,28 +230,29 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="人员编号："
-                                android:textSize="@dimen/dp_10"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="人员编号："
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/dp_10"></TextView>
+
                             <LinearLayout
-                                android:layout_marginTop="2dp"
-                                android:orientation="horizontal"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal">
+
                                 <FrameLayout
-                                    android:layout_weight="1"
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
 
                                     <AutoCompleteTextView
                                         android:id="@+id/tv_dc_emcode"
                                         style="@style/EditTextLineStyle"
                                         android:layout_height="25dp"
-                                        android:hint="请输入人员编号"
                                         android:focusable="false"
-                                        android:textSize="@dimen/dp_10"/>
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10" />
 
                                     <ImageView
                                         android:id="@+id/iv_dc_emcode_delete"
@@ -252,56 +263,55 @@
                                         android:src="@drawable/wrong"
                                         android:visibility="gone" />
                                 </FrameLayout>
+
                                 <ImageView
                                     android:id="@+id/iv_dc_emcode"
                                     android:layout_width="30dp"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center"
-                                    android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
+                                    android:layout_marginRight="10dp"
                                     android:clickable="false"
-                                    android:visibility="gone"
-                                    />
+                                    android:visibility="gone" />
 
                                 <ImageView
                                     android:id="@+id/iv_number_search_for"
                                     android:layout_width="30dp"
                                     android:layout_height="match_parent"
                                     android:layout_gravity="center"
-                                    android:background="@drawable/bg_button"
-                                    android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
-                                    android:src="@drawable/search_48"
-                                    />
+                                    android:layout_marginRight="10dp"
+                                    android:background="@drawable/bg_button"
+                                    android:src="@drawable/search_48" />
 
                             </LinearLayout>
                         </LinearLayout>
 
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
-                                android:textSize="@dimen/dp_10"
+                                android:text="不良归属："
                                 android:textColor="@color/black"
-                                android:text="不良归属：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/at_station"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
-                                    android:hint="请输入不良归属" />
+                                    android:hint="请输入不良归属"
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:id="@+id/iv_station"
@@ -312,183 +322,194 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
                                 android:id="@+id/iv_resources"
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:background="@drawable/bg_button"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
+
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
-                                android:textSize="@dimen/dp_10"
+                                android:text="物理线别："
                                 android:textColor="@color/black"
-                                android:text="物理线别：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
+
                                 <com.uas.hycollection.view.ClearableEditText
                                     android:id="@+id/ce_wuli"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
                                     android:focusable="false"
-                                    android:hint="请输入物理线别"/>
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入物理线别" />
                             </FrameLayout>
+
                             <ImageView
                                 android:id="@+id/iv_wuli"
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:background="@drawable/bg_button"
                                 android:src="@drawable/search_48" />
+
                         </LinearLayout>
 
 
                     </LinearLayout>
 
                     <ImageView
-                        android:visibility="gone"
-                        android:layout_marginLeft="5dp"
-                        android:layout_margin="@dimen/dp_10"
                         android:id="@+id/iv_personnel_data"
                         android:layout_width="185dp"
                         android:layout_height="185dp"
+                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginLeft="5dp"
+                        android:background="@drawable/bg_imageview_rauide"
                         android:scaleType="fitXY"
-                        android:background="@drawable/bg_imageview_rauide">
-                    </ImageView>
+                        android:visibility="gone"></ImageView>
 
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="不良现象："
                         android:textColor="@color/black"
-                        android:textSize="@dimen/dp_10"
-                        android:text="不良现象：">
-                    </TextView>
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_one"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:visibility="gone"
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:text="不良位号：">
-                    </TextView>
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="不良位号："
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_two"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:text="不良原因：">
-                    </TextView>
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="不良原因："
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_three"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
                         android:text="不良归类："
-                        android:textSize="@dimen/dp_10"
-                        android:textColor="@color/black">
-                    </TextView>
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_dataclassify"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
 
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
                         android:text="不良数量："
-                        android:textSize="@dimen/dp_10"
-                        android:textColor="@color/black">
-                    </TextView>
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_datapassqty"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
                         android:text="采集条码："
-                        android:textSize="@dimen/dp_10"
-                        android:textColor="@color/black">
-                    </TextView>
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
 
                     <FrameLayout
-                        android:layout_weight="1"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
                         <com.uas.hycollection.view.ClearableEditText
                             android:id="@+id/tv_newxin"
                             style="@style/EditTextStyle"
@@ -502,64 +523,65 @@
                     </FrameLayout>
 
                     <ImageView
-                        android:visibility="gone"
                         android:id="@+id/storage_recharge_scan_iv"
                         android:layout_width="30dp"
                         android:layout_height="match_parent"
                         android:layout_gravity="center"
                         android:layout_marginLeft="5dp"
                         android:layout_marginRight="10dp"
-                        android:src="@drawable/ic_edittext_scan" />
+                        android:src="@drawable/ic_edittext_scan"
+                        android:visibility="gone" />
                 </LinearLayout>
 
 
             </LinearLayout>
+
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="0.4">
+                android:layout_weight="0.4"
+                android:orientation="vertical">
+
                 <com.bin.david.form.core.SmartTable
                     android:id="@+id/jlt_storage_in_filter_list_st"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
+
                 <TextView
                     android:id="@+id/tv_save"
                     android:layout_width="150dp"
                     android:layout_height="50dp"
-                    android:text="提交"
                     android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textSize="@dimen/textsize_20"
+                    android:layout_marginBottom="@dimen/textsize_20"
                     android:background="@drawable/bg_button"
-                    android:layout_marginBottom="@dimen/textsize_20">
-                </TextView>
+                    android:gravity="center"
+                    android:text="提交"
+                    android:textSize="@dimen/textsize_20"></TextView>
             </LinearLayout>
 
 
         </LinearLayout>
 
     </ScrollView>
+
     <com.uas.hycollection.view.ClearableEditText
         android:id="@+id/tv_hintshow"
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_marginLeft="5dp"
         android:layout_marginTop="5dp"
-        android:text=""
-        android:gravity="top"
-        android:textSize="15sp"
         android:layout_marginRight="@dimen/dp_10"
-        android:focusable="false"
         android:background="@drawable/bg_line_edittext"
-        android:visibility="gone">
-    </com.uas.hycollection.view.ClearableEditText>
+        android:focusable="false"
+        android:gravity="top"
+        android:text=""
+        android:textSize="15sp"
+        android:visibility="gone"></com.uas.hycollection.view.ClearableEditText>
 
     <TextView
         android:id="@+id/tv_gonema_code"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone">
-    </TextView>
+        android:visibility="gone"></TextView>
 </LinearLayout>

app/src/main/res/layout-large/fragment_datacollection.xml

@@ -1,76 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:orientation="vertical">
-<!--    <android.support.design.widget.AppBarLayout-->
-<!--        android:background="@color/white"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_weight="1"-->
-<!--        android:layout_height="match_parent">-->
-
-<!--        <android.support.design.widget.CollapsingToolbarLayout-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="match_parent"-->
-<!--            app:contentScrim="@color/colorPrimary"-->
-<!--            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed">-->
-<!--            <android.support.v4.widget.NestedScrollView-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="match_parent">-->
+    <!--    <android.support.design.widget.AppBarLayout-->
+    <!--        android:background="@color/white"-->
+    <!--        android:layout_width="match_parent"-->
+    <!--        android:layout_weight="1"-->
+    <!--        android:layout_height="match_parent">-->
+
+    <!--        <android.support.design.widget.CollapsingToolbarLayout-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="match_parent"-->
+    <!--            app:contentScrim="@color/colorPrimary"-->
+    <!--            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed">-->
+    <!--            <android.support.v4.widget.NestedScrollView-->
+    <!--                android:layout_width="match_parent"-->
+    <!--                android:layout_height="match_parent">-->
     <ScrollView
-        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:background="@color/white">
+
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
-            android:layout_weight="1">
+            android:orientation="vertical">
+
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/white">
+                android:background="@color/white"
+                android:orientation="horizontal">
 
                 <LinearLayout
-                    android:orientation="vertical"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/dp_10"
                     android:layout_weight="3"
-                    android:layout_marginLeft="@dimen/dp_10">
+                    android:orientation="vertical">
+
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
+
                         <LinearLayout
-                            android:orientation="vertical"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
-                            android:layout_weight="2">
+                            android:layout_weight="2"
+                            android:orientation="vertical">
+
                             <TableLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
-                                android:layout_weight="1"
                                 android:layout_marginTop="@dimen/spacing_big"
+                                android:layout_weight="1"
                                 android:stretchColumns="1">
-                                <TableRow>
 
+                                <TableRow>
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
                                         android:gravity="center"
                                         android:text="工单流水:"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:textColor="@color/black"></TextView>
+
                                     <LinearLayout
-                                        android:orientation="horizontal"
                                         android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal">
 
                                         <FrameLayout
                                             android:layout_width="0dp"
@@ -82,8 +86,8 @@
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="24dp"
                                                 android:layout_marginLeft="23dp"
-                                                android:inputType="number"
-                                                android:hint="请输入工单流水" />
+                                                android:hint="请输入工单流水"
+                                                android:inputType="number" />
 
                                             <ImageView
                                                 android:id="@+id/iocout_smts"
@@ -94,26 +98,27 @@
                                                 android:src="@drawable/wrong"
                                                 android:visibility="gone" />
                                         </FrameLayout>
+
                                         <ImageView
-                                            android:layout_gravity="center"
                                             android:id="@+id/iv_popuwindow"
                                             android:layout_width="30dp"
                                             android:layout_height="match_parent"
-                                            android:layout_marginRight="10dp"
+                                            android:layout_gravity="center"
                                             android:layout_marginLeft="5dp"
+                                            android:layout_marginRight="10dp"
                                             android:background="@drawable/bg_button"
                                             android:src="@drawable/search_48" />
                                     </LinearLayout>
                                 </TableRow>
-                                <TableRow
-                                    android:layout_marginTop="5dp">
+
+                                <TableRow android:layout_marginTop="5dp">
+
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="计划单号:"
                                         android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:text="计划单号:"
+                                        android:textColor="@color/black"></TextView>
 
                                     <LinearLayout
                                         android:layout_width="match_parent"
@@ -129,30 +134,30 @@
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="24dp"
                                                 android:layout_marginLeft="23dp"
-                                                android:hint=""
-                                                android:focusable="false"/>
+                                                android:focusable="false"
+                                                android:hint="" />
 
                                         </FrameLayout>
+
                                         <ImageView
                                             android:layout_width="30dp"
                                             android:layout_height="wrap_content"
                                             android:layout_gravity="center"
-                                            android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
-                                            android:clickable="false"
-                                            />
+                                            android:layout_marginRight="10dp"
+                                            android:clickable="false" />
                                     </LinearLayout>
                                 </TableRow>
 
-                                <TableRow
-                                    android:layout_marginTop="5dp">
+                                <TableRow android:layout_marginTop="5dp">
+
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="产品代码:"
                                         android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:text="产品代码:"
+                                        android:textColor="@color/black"></TextView>
+
                                     <LinearLayout
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content">
@@ -167,35 +172,33 @@
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="24dp"
                                                 android:layout_marginLeft="23dp"
-                                                android:hint=""
-                                                android:focusable="false"/>
+                                                android:focusable="false"
+                                                android:hint="" />
 
                                         </FrameLayout>
+
                                         <ImageView
                                             android:layout_width="30dp"
                                             android:layout_height="wrap_content"
                                             android:layout_gravity="center"
-                                            android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
-                                            android:clickable="false"
-                                            />
+                                            android:layout_marginRight="10dp"
+                                            android:clickable="false" />
                                     </LinearLayout>
 
 
-
-
                                 </TableRow>
 
 
-                                <TableRow
-                                    android:layout_marginTop="5dp">
+                                <TableRow android:layout_marginTop="5dp">
+
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="产品名称:"
                                         android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:text="产品名称:"
+                                        android:textColor="@color/black"></TextView>
+
                                     <LinearLayout
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content">
@@ -210,35 +213,33 @@
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="24dp"
                                                 android:layout_marginLeft="23dp"
-                                                android:hint=""
-                                                android:focusable="false"/>
+                                                android:focusable="false"
+                                                android:hint="" />
 
                                         </FrameLayout>
+
                                         <ImageView
                                             android:layout_width="30dp"
                                             android:layout_height="wrap_content"
                                             android:layout_gravity="center"
-                                            android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
-                                            android:clickable="false"
-                                            />
+                                            android:layout_marginRight="10dp"
+                                            android:clickable="false" />
                                     </LinearLayout>
 
 
-
-
                                 </TableRow>
 
 
-                                <TableRow
-                                    android:layout_marginTop="5dp">
+                                <TableRow android:layout_marginTop="5dp">
+
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="人员编号:"
                                         android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:text="人员编号:"
+                                        android:textColor="@color/black"></TextView>
+
                                     <LinearLayout
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content">
@@ -255,7 +256,7 @@
                                                 android:layout_marginLeft="23dp"
                                                 android:focusable="false"
                                                 android:hint="请输入人员编号"
-                                                android:text="ZUZHUANG"/>
+                                                android:text="ZUZHUANG" />
 
                                             <ImageView
                                                 android:id="@+id/iv_dc_emcode_delete"
@@ -266,46 +267,45 @@
                                                 android:src="@drawable/wrong"
                                                 android:visibility="gone" />
                                         </FrameLayout>
+
                                         <ImageView
                                             android:id="@+id/iv_dc_emcode"
                                             android:layout_width="30dp"
                                             android:layout_height="wrap_content"
                                             android:layout_gravity="center"
-                                            android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
+                                            android:layout_marginRight="10dp"
                                             android:clickable="false"
-                                            android:visibility="gone"
-                                            />
+                                            android:visibility="gone" />
 
                                         <ImageView
                                             android:id="@+id/iv_number_search_for"
                                             android:layout_width="30dp"
                                             android:layout_height="match_parent"
                                             android:layout_gravity="center"
-                                            android:background="@drawable/bg_button"
-                                            android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
-                                            android:src="@drawable/search_48"
-                                            />
+                                            android:layout_marginRight="10dp"
+                                            android:background="@drawable/bg_button"
+                                            android:src="@drawable/search_48" />
 
                                     </LinearLayout>
 
 
+                                </TableRow>
 
+                                <TableRow android:layout_marginTop="5dp">
 
-                                </TableRow>
-                                <TableRow
-                                    android:layout_marginTop="5dp">
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="物理线体:"
                                         android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:text="物理线体:"
+                                        android:textColor="@color/black"></TextView>
+
                                     <LinearLayout
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content">
+
                                         <FrameLayout
                                             android:layout_width="0dp"
                                             android:layout_height="wrap_content"
@@ -334,31 +334,28 @@
                                             android:layout_width="30dp"
                                             android:layout_height="match_parent"
                                             android:layout_gravity="center"
-                                            android:background="@drawable/bg_button"
-                                            android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
-                                            android:src="@drawable/search_48"
-                                            />
+                                            android:layout_marginRight="10dp"
+                                            android:background="@drawable/bg_button"
+                                            android:src="@drawable/search_48" />
                                     </LinearLayout>
 
 
-
-
                                 </TableRow>
 
-                                <TableRow
-                                    android:layout_marginTop="5dp">
+                                <TableRow android:layout_marginTop="5dp">
+
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="岗位资源:"
                                         android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:text="岗位资源:"
+                                        android:textColor="@color/black"></TextView>
+
                                     <LinearLayout
-                                        android:orientation="horizontal"
                                         android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal">
 
                                         <FrameLayout
                                             android:layout_width="0dp"
@@ -395,19 +392,20 @@
                                 </TableRow>
 
                                 <TableRow
-                                    android:visibility="gone"
-                                    android:layout_marginTop="@dimen/dp_10">
+                                    android:layout_marginTop="@dimen/dp_10"
+                                    android:visibility="gone">
+
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="不良现象"
                                         android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
+                                        android:text="不良现象"
+                                        android:textColor="@color/black"></TextView>
+
                                     <LinearLayout
-                                        android:orientation="horizontal"
                                         android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal">
 
                                         <FrameLayout
                                             android:layout_width="0dp"
@@ -430,223 +428,222 @@
                                                 android:src="@drawable/wrong"
                                                 android:visibility="gone" />
                                         </FrameLayout>
+
                                         <ImageView
                                             android:id="@+id/iv_unhealthy"
-                                            android:layout_gravity="center"
                                             android:layout_width="30dp"
                                             android:layout_height="match_parent"
-                                            android:layout_marginRight="10dp"
+                                            android:layout_gravity="center"
                                             android:layout_marginLeft="5dp"
+                                            android:layout_marginRight="10dp"
                                             android:background="@drawable/bg_button"
                                             android:src="@drawable/search_48" />
                                     </LinearLayout>
                                 </TableRow>
                             </TableLayout>
                         </LinearLayout>
+
                         <LinearLayout
-                            android:visibility="gone"
-                            android:orientation="vertical"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
-                            android:layout_weight="0.8"
                             android:layout_marginLeft="@dimen/textsize_20"
-                            android:layout_marginRight="@dimen/textsize_20">
+                            android:layout_marginRight="@dimen/textsize_20"
+                            android:layout_weight="0.8"
+                            android:orientation="vertical"
+                            android:visibility="gone">
+
                             <TextView
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text=""
                                 android:layout_gravity="center"
-                                android:gravity="center">
-                            </TextView>
+                                android:gravity="center"
+                                android:text=""/>
+
                             <ImageView
                                 android:id="@+id/iv_personnel_data"
                                 android:layout_width="match_parent"
                                 android:layout_height="200dp"
-                                android:scaleType="fitXY"
                                 android:background="@drawable/bg_imageview_rauide"
-                                >
-                            </ImageView>
+                                android:scaleType="fitXY"/>
+
                             <android.support.v7.widget.RecyclerView
-                                android:visibility="gone"
                                 android:id="@+id/rv_data"
                                 android:layout_width="match_parent"
-                                android:layout_height="match_parent">
-                            </android.support.v7.widget.RecyclerView>
+                                android:layout_height="match_parent"
+                                android:visibility="gone"/>
 
                         </LinearLayout>
+
                     </LinearLayout>
+
                     <TableLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:stretchColumns="1">
-                        <TableRow
-                            android:layout_marginTop="5dp">
+
+                        <TableRow android:layout_marginTop="5dp">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="不良现象:"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="不良现象:"
+                                android:textColor="@color/black"/>
+
                             <android.support.v7.widget.RecyclerView
                                 android:id="@+id/rv_datachange"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
+                                android:layout_height="wrap_content"/>
                         </TableRow>
+
                         <TableRow
                             android:id="@+id/tb_master"
-                            android:visibility="gone"
-                            android:layout_marginTop="5dp">
+                            android:layout_marginTop="5dp"
+                            android:visibility="gone">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="原件位号:"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="原件位号:"
+                                android:textColor="@color/black"></TextView>
+
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:orientation="vertical">
+
                                 <android.support.v7.widget.RecyclerView
                                     android:id="@+id/rv_master_copy"
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
-                                </android.support.v7.widget.RecyclerView>
+                                    android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
+
                                 <android.support.v7.widget.RecyclerView
                                     android:id="@+id/rv_original_copy"
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
-                                </android.support.v7.widget.RecyclerView>
+                                    android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                             </LinearLayout>
 
                         </TableRow>
 
                         <TableRow
                             android:id="@+id/tb_color"
-                            android:visibility="gone"
-                            android:layout_marginTop="5dp">
+                            android:layout_marginTop="5dp"
+                            android:visibility="gone">
+
                             <TextView
                                 android:id="@+id/tv_mastercolor"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="原件位号:"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="原件位号:"
+                                android:textColor="@color/black"></TextView>
+
                             <android.support.v7.widget.RecyclerView
                                 android:id="@+id/rv_mastercolor"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
+                                android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                         </TableRow>
 
-                        <TableRow
-                            android:layout_marginTop="5dp">
+                        <TableRow android:layout_marginTop="5dp">
+
                             <TextView
                                 android:id="@+id/tv_undesirable"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="不良原因:"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="不良原因:"
+                                android:textColor="@color/black"></TextView>
+
                             <android.support.v7.widget.RecyclerView
                                 android:id="@+id/rv_undesirable"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
+                                android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                         </TableRow>
 
 
-                        <TableRow
-                            android:layout_marginTop="5dp">
+                        <TableRow android:layout_marginTop="5dp">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="不良数量:"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="不良数量:"
+                                android:textColor="@color/black"></TextView>
+
                             <android.support.v7.widget.RecyclerView
                                 android:id="@+id/rv_datapassqty"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
+                                android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                         </TableRow>
                     </TableLayout>
 
                 </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1.5"
                     android:orientation="vertical">
+
                     <com.bin.david.form.core.SmartTable
                         android:id="@+id/jlt_storage_in_filter_list_st"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_weight="1"/>
+                        android:layout_weight="1" />
 
                     <RelativeLayout
-                        android:background="@color/white"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:background="@color/white">
+
                         <TextView
-                            android:layout_alignParentRight="true"
-                            android:layout_marginTop="@dimen/dp_10"
                             android:id="@+id/tv_save"
                             android:layout_width="150dp"
                             android:layout_height="50dp"
-                            android:text="提交"
+                            android:layout_alignParentRight="true"
                             android:layout_gravity="center"
-                            android:gravity="center"
-                            android:layout_marginBottom="@dimen/dp_10"
+                            android:layout_marginTop="@dimen/dp_10"
                             android:layout_marginRight="50dp"
-                            android:textSize="@dimen/textsize_20"
-                            android:background="@drawable/bg_button">
-                        </TextView>
+                            android:layout_marginBottom="@dimen/dp_10"
+                            android:background="@drawable/bg_button"
+                            android:gravity="center"
+                            android:text="提交"
+                            android:textSize="@dimen/textsize_20"></TextView>
                     </RelativeLayout>
                 </LinearLayout>
 
             </LinearLayout>
 
 
-
         </LinearLayout>
     </ScrollView>
 
 
+    <!--            </android.support.v4.widget.NestedScrollView>-->
 
-
-<!--            </android.support.v4.widget.NestedScrollView>-->
-
-<!--        </android.support.design.widget.CollapsingToolbarLayout>-->
-<!--    </android.support.design.widget.AppBarLayout>-->
-
-
-
+    <!--        </android.support.design.widget.CollapsingToolbarLayout>-->
+    <!--    </android.support.design.widget.AppBarLayout>-->
 
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_10">
+        android:layout_marginBottom="@dimen/dp_10"
+        android:orientation="horizontal">
+
         <TextView
             android:id="@+id/tv_em_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="人员名称：">
-        </TextView>
+            android:text="人员名称："></TextView>
+
         <TextView
             android:id="@+id/tv_station"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/textsize_20"
-            android:text="当前岗位：">
-        </TextView>
+            android:text="当前岗位："></TextView>
     </LinearLayout>
 
 

app/src/main/res/layout-large/fragment_storage_recharge_list.xml

@@ -350,7 +350,6 @@
                                             android:id="@+id/ce_wuli"
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="30dp"
-                                            android:textSize="@dimen/dp_10"
                                             android:focusable="false"
                                             android:hint="请输入物理线别"/>
                                     </FrameLayout>

app/src/main/res/layout-large/recyclerview_itembreak.xml

@@ -40,6 +40,7 @@
             android:layout_marginLeft="@dimen/dp_10"
             android:textColor="@color/black"
             android:textSize="@dimen/dp_10"
+            android:visibility="gone"
              />
         <LinearLayout
             android:visibility="gone"

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

@@ -4,58 +4,61 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+
     <ScrollView
-        android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
 
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="0dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:layout_height="wrap_content">
+                android:orientation="vertical">
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
                     <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp_10"
                         android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:orientation="vertical">
 
                         <LinearLayout
-                            android:layout_marginTop="5dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:text="工单流水："
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/dp_10"
-                                android:text="工单流水：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/ce_work_code"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入工单流水"
                                     android:inputType="number"
-                                    android:hint="请输入工单流水" />
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:id="@+id/iv_work_code"
@@ -66,47 +69,49 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
-                                android:layout_gravity="center"
                                 android:id="@+id/iv_popuwindow"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:background="@drawable/bg_button"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
 
                         <LinearLayout
-                            android:layout_marginTop="2dp"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp">
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="计划单号："
-                                android:textSize="@dimen/dp_10"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="计划单号："
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/dp_10"></TextView>
+
                             <LinearLayout
-                                android:orientation="horizontal"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
                                 <FrameLayout
-                                    android:layout_weight="1"
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
 
                                     <AutoCompleteTextView
                                         android:id="@+id/tv_macode"
                                         style="@style/EditTextLineStyle"
                                         android:layout_height="25dp"
-                                        android:inputType="number"
-                                        android:hint=""
                                         android:focusable="false"
-                                        android:textSize="@dimen/dp_10"/>
+                                        android:hint=""
+                                        android:inputType="number"
+                                        android:textSize="@dimen/dp_10" />
 
                                     <ImageView
                                         android:layout_width="wrap_content"
@@ -116,41 +121,43 @@
                                         android:src="@drawable/wrong"
                                         android:visibility="gone" />
                                 </FrameLayout>
+
                                 <ImageView
                                     android:layout_width="30dp"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center"
-                                    android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
+                                    android:layout_marginRight="10dp"
                                     android:clickable="false" />
                             </LinearLayout>
                         </LinearLayout>
+
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:text="产品代码："
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/dp_10"
-                                android:text="产品代码：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/tv_pr_code"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
                                     android:focusable="false"
-                                    android:hint="" />
+                                    android:hint=""
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:layout_width="wrap_content"
@@ -160,41 +167,43 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
+
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:text="产品名称："
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/dp_10"
-                                android:text="产品名称：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/tv_pr_detail"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
-                                    android:inputType="number"
                                     android:focusable="false"
-                                    android:hint="" />
+                                    android:hint=""
+                                    android:inputType="number"
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:layout_width="wrap_content"
@@ -204,12 +213,13 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
 
@@ -220,28 +230,29 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="人员编号："
-                                android:textSize="@dimen/dp_10"
                                 android:layout_gravity="center"
-                                android:textColor="@color/black">
-                            </TextView>
+                                android:text="人员编号："
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/dp_10"></TextView>
+
                             <LinearLayout
-                                android:layout_marginTop="2dp"
-                                android:orientation="horizontal"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal">
+
                                 <FrameLayout
-                                    android:layout_weight="1"
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
 
                                     <AutoCompleteTextView
                                         android:id="@+id/tv_dc_emcode"
                                         style="@style/EditTextLineStyle"
                                         android:layout_height="25dp"
-                                        android:hint="请输入人员编号"
                                         android:focusable="false"
-                                        android:textSize="@dimen/dp_10"/>
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10" />
 
                                     <ImageView
                                         android:id="@+id/iv_dc_emcode_delete"
@@ -252,56 +263,55 @@
                                         android:src="@drawable/wrong"
                                         android:visibility="gone" />
                                 </FrameLayout>
+
                                 <ImageView
                                     android:id="@+id/iv_dc_emcode"
                                     android:layout_width="30dp"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center"
-                                    android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
+                                    android:layout_marginRight="10dp"
                                     android:clickable="false"
-                                    android:visibility="gone"
-                                    />
+                                    android:visibility="gone" />
 
                                 <ImageView
                                     android:id="@+id/iv_number_search_for"
                                     android:layout_width="30dp"
                                     android:layout_height="match_parent"
                                     android:layout_gravity="center"
-                                    android:background="@drawable/bg_button"
-                                    android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
-                                    android:src="@drawable/search_48"
-                                    />
+                                    android:layout_marginRight="10dp"
+                                    android:background="@drawable/bg_button"
+                                    android:src="@drawable/search_48" />
 
                             </LinearLayout>
                         </LinearLayout>
 
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
-                                android:textSize="@dimen/dp_10"
+                                android:text="不良归属："
                                 android:textColor="@color/black"
-                                android:text="不良归属：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
 
                                 <AutoCompleteTextView
                                     android:id="@+id/at_station"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
-                                    android:hint="请输入不良归属" />
+                                    android:hint="请输入不良归属"
+                                    android:textSize="@dimen/dp_10" />
 
                                 <ImageView
                                     android:id="@+id/iv_station"
@@ -312,183 +322,193 @@
                                     android:src="@drawable/wrong"
                                     android:visibility="gone" />
                             </FrameLayout>
+
                             <ImageView
                                 android:id="@+id/iv_resources"
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:background="@drawable/bg_button"
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
+
                         <LinearLayout
-                            android:layout_marginTop="2dp"
-                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
-                                android:textSize="@dimen/dp_10"
+                                android:text="物理线别："
                                 android:textColor="@color/black"
-                                android:text="物理线别：">
-                            </TextView>
+                                android:textSize="@dimen/dp_10"></TextView>
 
                             <FrameLayout
-                                android:layout_weight="1"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
+
                                 <com.uas.hycollection.view.ClearableEditText
                                     android:id="@+id/ce_wuli"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="25dp"
-                                    android:textSize="@dimen/dp_10"
                                     android:focusable="false"
-                                    android:hint="请输入物理线别"/>
+                                    android:hint="请输入物理线别" />
                             </FrameLayout>
+
                             <ImageView
                                 android:id="@+id/iv_wuli"
-                                android:layout_gravity="center"
                                 android:layout_width="30dp"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="10dp"
+                                android:layout_gravity="center"
                                 android:layout_marginLeft="5dp"
+                                android:layout_marginRight="10dp"
                                 android:background="@drawable/bg_button"
                                 android:src="@drawable/search_48" />
+
                         </LinearLayout>
 
 
                     </LinearLayout>
 
                     <ImageView
-                        android:visibility="gone"
-                        android:layout_marginLeft="5dp"
-                        android:layout_margin="@dimen/dp_10"
                         android:id="@+id/iv_personnel_data"
                         android:layout_width="185dp"
                         android:layout_height="185dp"
+                        android:layout_margin="@dimen/dp_10"
+                        android:layout_marginLeft="5dp"
+                        android:background="@drawable/bg_imageview_rauide"
                         android:scaleType="fitXY"
-                        android:background="@drawable/bg_imageview_rauide">
-                    </ImageView>
+                        android:visibility="gone"></ImageView>
 
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="不良现象："
                         android:textColor="@color/black"
-                        android:textSize="@dimen/dp_10"
-                        android:text="不良现象：">
-                    </TextView>
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_one"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:visibility="gone"
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:text="不良位号：">
-                    </TextView>
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="不良位号："
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_two"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:text="不良原因：">
-                    </TextView>
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="不良原因："
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_three"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
                         android:text="不良归类："
-                        android:textSize="@dimen/dp_10"
-                        android:textColor="@color/black">
-                    </TextView>
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_dataclassify"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
 
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
                         android:text="不良数量："
-                        android:textSize="@dimen/dp_10"
-                        android:textColor="@color/black">
-                    </TextView>
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_datapassqty"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
                 </LinearLayout>
+
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_10"
                         android:text="采集条码："
-                        android:textSize="@dimen/dp_10"
-                        android:textColor="@color/black">
-                    </TextView>
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"></TextView>
 
                     <FrameLayout
-                        android:layout_weight="1"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
                         <com.uas.hycollection.view.ClearableEditText
                             android:id="@+id/tv_newxin"
                             style="@style/EditTextStyle"
@@ -502,64 +522,65 @@
                     </FrameLayout>
 
                     <ImageView
-                        android:visibility="gone"
                         android:id="@+id/storage_recharge_scan_iv"
                         android:layout_width="30dp"
                         android:layout_height="match_parent"
                         android:layout_gravity="center"
                         android:layout_marginLeft="5dp"
                         android:layout_marginRight="10dp"
-                        android:src="@drawable/ic_edittext_scan" />
+                        android:src="@drawable/ic_edittext_scan"
+                        android:visibility="gone" />
                 </LinearLayout>
 
 
             </LinearLayout>
+
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="0.4">
+                android:layout_weight="0.4"
+                android:orientation="vertical">
+
                 <com.bin.david.form.core.SmartTable
                     android:id="@+id/jlt_storage_in_filter_list_st"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
+
                 <TextView
                     android:id="@+id/tv_save"
                     android:layout_width="150dp"
                     android:layout_height="50dp"
-                    android:text="提交"
                     android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textSize="@dimen/textsize_20"
+                    android:layout_marginBottom="@dimen/textsize_20"
                     android:background="@drawable/bg_button"
-                    android:layout_marginBottom="@dimen/textsize_20">
-                </TextView>
+                    android:gravity="center"
+                    android:text="提交"
+                    android:textSize="@dimen/textsize_20"></TextView>
             </LinearLayout>
 
 
         </LinearLayout>
 
     </ScrollView>
+
     <com.uas.hycollection.view.ClearableEditText
         android:id="@+id/tv_hintshow"
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_marginLeft="5dp"
         android:layout_marginTop="5dp"
-        android:text=""
-        android:gravity="top"
-        android:textSize="15sp"
         android:layout_marginRight="@dimen/dp_10"
-        android:focusable="false"
         android:background="@drawable/bg_line_edittext"
-        android:visibility="gone">
-    </com.uas.hycollection.view.ClearableEditText>
+        android:focusable="false"
+        android:gravity="top"
+        android:text=""
+        android:textSize="15sp"
+        android:visibility="gone"></com.uas.hycollection.view.ClearableEditText>
 
     <TextView
         android:id="@+id/tv_gonema_code"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone">
-    </TextView>
+        android:visibility="gone"></TextView>
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
-    <string name="app_name">数据采集标准版</string>
-    <string name="app_name_mes">数据采集标准版</string>
+    <string name="app_name">瑞梓数据采集标准版</string>
+    <string name="app_name_mes">瑞梓数据采集标准版</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_connect_server_fragment">ConnectServerFragment</string>

build.gradle

@@ -63,8 +63,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 37,
-            versionName      : "v1.3.1"
+            versionCode      : 39,
+            versionName      : "v1.3.3"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,18 +1,18 @@
-#Mon Aug 19 15:21:26 CST 2024
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
-D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\GongSi\\AS_XiangMu\\HUAYUN-DATA-COLLETION\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+#Wed Apr 09 11:24:40 CST 2025
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_bottom.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_bottom.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\default_ptr_rotate.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\default_ptr_rotate.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_flip.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_flip.png
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_horizontal.xml=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_horizontal.xml
+D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-hdpi\\indicator_arrow.png=D\:\\AndroidData\\HUAYUN-DATA-COLLETION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\indicator_arrow.png