界面优化

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

@@ -1689,7 +1689,6 @@ public class BreakdownRepairFragment extends BaseFragment{
         TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
         ImageView search_im = contView.findViewById(R.id.search_im);
         LinearLayout line_top = contView.findViewById(R.id.line_top);
-        line_top.setVisibility(View.GONE);
         rv_line_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
         rv_line_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
         rv_line_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
@@ -1711,7 +1710,49 @@ public class BreakdownRepairFragment extends BaseFragment{
         search_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                getfuzzySearchSourceData(edit_et.getText().toString().trim(),"弹框");
+                String mSearchStr = edit_et.getText().toString().trim();
+                if (!mSearchStr.isEmpty()) {
+                    List<LineCodeEntity> thisList = new ArrayList<>();
+                    for(int i=0;i<wulilist.size();i++){
+                        if(wulilist.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(wulilist.get(i));
+                        }
+                        if(i == wulilist.size() -1){
+                            ipAndwuliPortAdapter = new IpAndwuliPortAdapter(thisList);
+                            rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                        }
+                        List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+                            lineCodeEntities.get(j).setChecked(false);
+                        }
+                        ipAndwuliPortAdapter.notifyDataSetChanged();
+                    }
+
+
+                } else {
+                    ipAndwuliPortAdapter = new IpAndwuliPortAdapter(wulilist);
+                    rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+                    List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+                        lineCodeEntities.get(i).setChecked(false);
+                    }
+                    ipAndwuliPortAdapter.notifyDataSetChanged();
+
+                }
+                ipAndwuliPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                        li_code = lineCodeEntities.get(position).getLI_CODE();
+                        for (int i = 0; i < lineCodeEntities.size(); i++) {
+                            lineCodeEntities.get(i).setChecked(false);
+                        }
+                        lineCodeEntities.get(position).setChecked(true);
+                        ipAndwuliPortAdapter.notifyDataSetChanged();
+                    }
+                });
             }
         });
         ipAndwuliPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

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

@@ -1973,7 +1973,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
         ImageView search_im = contView.findViewById(R.id.search_im);
         LinearLayout line_top = contView.findViewById(R.id.line_top);
-        line_top.setVisibility(View.GONE);
         rv_line_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
         rv_line_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
         rv_line_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
@@ -1997,8 +1996,52 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         search_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                getfuzzySearchSourceData(edit_et.getText().toString().trim(),"弹框");
+                String mSearchStr = edit_et.getText().toString().trim();
+                if (!mSearchStr.isEmpty()) {
+                    List<ResourcesBean> thisList = new ArrayList<>();
+                    for(int i=0;i<resourcesBeanList.size();i++){
+                        if(resourcesBeanList.get(i).getSC_CODE().contains(mSearchStr)){
+                            thisList.add(resourcesBeanList.get(i));
+                        }
+                        if(i == resourcesBeanList.size() -1){
+                            ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                            rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                        }
+                        List<ResourcesBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+                            lineCodeEntities.get(j).setChecked(false);
+                        }
+                        ipAndResourcesPortAdapter.notifyDataSetChanged();
+                    }
+
+
+                } else {
+                    ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(resourcesBeanList);
+                    rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                    List<ResourcesBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+                        lineCodeEntities.get(i).setChecked(false);
+                    }
+                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+
+                }
+                ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        List<ResourcesBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+                        sc_code = ipAndPortBeans.get(position).getSC_CODE();
+                        st_remark = ipAndPortBeans.get(position).getST_REMARK();
+                        for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                            ipAndPortBeans.get(i).setChecked(false);
+                        }
+                        ipAndPortBeans.get(position).setChecked(true);
+                        ipAndResourcesPortAdapter.notifyDataSetChanged();
+                    }
+                });
             }
+
         });
 
         ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@@ -2119,7 +2162,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
         ImageView search_im = contView.findViewById(R.id.search_im);
         LinearLayout line_top = contView.findViewById(R.id.line_top);
-        line_top.setVisibility(View.GONE);
         rv_getline_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
         rv_getline_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
         rv_getline_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
@@ -2142,7 +2184,49 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         search_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                String mSearchStr = edit_et.getText().toString().trim();
+                if (!mSearchStr.isEmpty()) {
+                    List<LineCodeEntity> thisList = new ArrayList<>();
+                    for(int i=0;i<codeEntityArrayList.size();i++){
+                        if(codeEntityArrayList.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(codeEntityArrayList.get(i));
+                        }
+                        if(i == codeEntityArrayList.size() -1){
+                            getLinePortAdapter = new GetLinePortAdapter(thisList);
+                            rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                        }
+                        List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+                            lineCodeEntities.get(j).setChecked(false);
+                        }
+                        getLinePortAdapter.notifyDataSetChanged();
+                    }
 
+
+                } else {
+                    getLinePortAdapter = new GetLinePortAdapter(codeEntityArrayList);
+                    rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+                    List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+                        lineCodeEntities.get(i).setChecked(false);
+                    }
+                    getLinePortAdapter.notifyDataSetChanged();
+
+                }
+                getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                        li_code = lineCodeEntities.get(position).getLI_CODE();
+                        for (int i = 0; i < lineCodeEntities.size(); i++) {
+                            lineCodeEntities.get(i).setChecked(false);
+                        }
+                        lineCodeEntities.get(position).setChecked(true);
+                        getLinePortAdapter.notifyDataSetChanged();
+                    }
+                });
             }
         });
 

app/src/main/java/com/uas/collection/fragment/QuantityStatisticsFragment.java

@@ -632,7 +632,6 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
         ImageView search_im = contView.findViewById(R.id.search_im);
         LinearLayout line_top = contView.findViewById(R.id.line_top);
-        line_top.setVisibility(View.GONE);
         rv_getline_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
         rv_getline_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
         rv_getline_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
@@ -655,7 +654,49 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         search_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                String mSearchStr = edit_et.getText().toString().trim();
+                if (!mSearchStr.isEmpty()) {
+                    List<LineCodeEntity> thisList = new ArrayList<>();
+                    for(int i=0;i<codeEntityArrayList.size();i++){
+                        if(codeEntityArrayList.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(codeEntityArrayList.get(i));
+                        }
+                        if(i == codeEntityArrayList.size() -1){
+                            getLinePortAdapter = new GetLinePortAdapter(thisList);
+                            rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                        }
+                        List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+                            lineCodeEntities.get(j).setChecked(false);
+                        }
+                        getLinePortAdapter.notifyDataSetChanged();
+                    }
 
+
+                } else {
+                    getLinePortAdapter = new GetLinePortAdapter(codeEntityArrayList);
+                    rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+                    List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+                        lineCodeEntities.get(i).setChecked(false);
+                    }
+                    getLinePortAdapter.notifyDataSetChanged();
+
+                }
+                getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                        li_code = lineCodeEntities.get(position).getLI_CODE();
+                        for (int i = 0; i < lineCodeEntities.size(); i++) {
+                            lineCodeEntities.get(i).setChecked(false);
+                        }
+                        lineCodeEntities.get(position).setChecked(true);
+                        getLinePortAdapter.notifyDataSetChanged();
+                    }
+                });
             }
         });
 

app/src/main/java/com/uas/collection/fragment/StorageRechargeListFragment.java

@@ -1458,7 +1458,6 @@ public class StorageRechargeListFragment extends BaseFragment{
         TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
         ImageView search_im = contView.findViewById(R.id.search_im);
         LinearLayout line_top = contView.findViewById(R.id.line_top);
-        line_top.setVisibility(View.GONE);
         rv_line_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
         rv_line_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
         rv_line_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
@@ -1480,7 +1479,49 @@ public class StorageRechargeListFragment extends BaseFragment{
         search_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                getfuzzySearchSourceData(edit_et.getText().toString().trim(),"弹框");
+                String mSearchStr = edit_et.getText().toString().trim();
+                if (!mSearchStr.isEmpty()) {
+                    List<LineCodeEntity> thisList = new ArrayList<>();
+                    for(int i=0;i<wulilist.size();i++){
+                        if(wulilist.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(wulilist.get(i));
+                        }
+                        if(i == wulilist.size() -1){
+                            ipAndwuliPortAdapter = new IpAndwuliPortAdapter(thisList);
+                            rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                        }
+                        List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+                            lineCodeEntities.get(j).setChecked(false);
+                        }
+                        ipAndwuliPortAdapter.notifyDataSetChanged();
+                    }
+
+
+                } else {
+                    ipAndwuliPortAdapter = new IpAndwuliPortAdapter(wulilist);
+                    rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
+                    List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+                        lineCodeEntities.get(i).setChecked(false);
+                    }
+                    ipAndwuliPortAdapter.notifyDataSetChanged();
+
+                }
+                ipAndwuliPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        List<LineCodeEntity> lineCodeEntities = ipAndwuliPortAdapter.getmList();
+                        li_code = lineCodeEntities.get(position).getLI_CODE();
+                        for (int i = 0; i < lineCodeEntities.size(); i++) {
+                            lineCodeEntities.get(i).setChecked(false);
+                        }
+                        lineCodeEntities.get(position).setChecked(true);
+                        ipAndwuliPortAdapter.notifyDataSetChanged();
+                    }
+                });
             }
         });
         ipAndwuliPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

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

@@ -52,7 +52,7 @@
                                 <AutoCompleteTextView
                                     android:id="@+id/ce_work_code"
                                     style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
+                                    android:layout_height="25dp"
                                     android:textSize="@dimen/dp_10"
                                     android:inputType="number"
                                     android:hint="请输入工单流水" />
@@ -102,7 +102,7 @@
                                     <AutoCompleteTextView
                                         android:id="@+id/tv_macode"
                                         style="@style/EditTextLineStyle"
-                                        android:layout_height="30dp"
+                                        android:layout_height="25dp"
                                         android:inputType="number"
                                         android:hint=""
                                         android:focusable="false"
@@ -147,7 +147,7 @@
                                 <AutoCompleteTextView
                                     android:id="@+id/tv_pr_code"
                                     style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
+                                    android:layout_height="25dp"
                                     android:textSize="@dimen/dp_10"
                                     android:focusable="false"
                                     android:hint="" />
@@ -190,7 +190,7 @@
                                 <AutoCompleteTextView
                                     android:id="@+id/tv_pr_detail"
                                     style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
+                                    android:layout_height="25dp"
                                     android:textSize="@dimen/dp_10"
                                     android:inputType="number"
                                     android:focusable="false"
@@ -238,7 +238,7 @@
                                     <AutoCompleteTextView
                                         android:id="@+id/tv_dc_emcode"
                                         style="@style/EditTextLineStyle"
-                                        android:layout_height="30dp"
+                                        android:layout_height="25dp"
                                         android:inputType="number"
                                         android:hint="请输入人员编号"
                                         android:textSize="@dimen/dp_10"/>
@@ -285,7 +285,7 @@
                                 <AutoCompleteTextView
                                     android:id="@+id/at_station"
                                     style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
+                                    android:layout_height="25dp"
                                     android:textSize="@dimen/dp_10"
                                     android:hint="请输入不良归属" />
 
@@ -329,7 +329,7 @@
                                 <com.uas.collection.view.ClearableEditText
                                     android:id="@+id/ce_wuli"
                                     style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
+                                    android:layout_height="25dp"
                                     android:textSize="@dimen/dp_10"
                                     android:focusable="false"
                                     android:hint="请输入物理线别"/>

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

@@ -479,12 +479,31 @@
                             android:layout_margin="@dimen/dp_10"
                             android:background="@drawable/bg_imageview_rauide">
                         </ImageView>
-
-                        <com.bin.david.form.core.SmartTable
-                            android:id="@+id/jlt_storage_in_filter_list_st"
+                        <LinearLayout
+                            android:orientation="vertical"
                             android:layout_width="0dp"
                             android:layout_weight="0.9"
-                            android:layout_height="match_parent" />
+                            android:layout_height="match_parent">
+                            <com.bin.david.form.core.SmartTable
+                                android:id="@+id/jlt_storage_in_filter_list_st"
+                                android:layout_width="match_parent"
+                                android:layout_weight="1"
+                                android:layout_height="match_parent" />
+                            <TextView
+                                android:id="@+id/tv_save"
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:layout_width="150dp"
+                                android:layout_height="50dp"
+                                android:text="提交"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:textSize="@dimen/textsize_20"
+                                android:background="@drawable/bg_button">
+                            </TextView>
+                        </LinearLayout>
+
+
+
                     </LinearLayout>
 
                     <com.uas.collection.view.ClearableEditText
@@ -510,17 +529,7 @@
                         android:visibility="gone">
                     </TextView>
 
-                    <TextView
-                        android:id="@+id/tv_save"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_width="150dp"
-                        android:layout_height="50dp"
-                        android:text="提交"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:textSize="@dimen/textsize_20"
-                        android:background="@drawable/bg_button">
-                    </TextView>
+
                 </LinearLayout>
 
 

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

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

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

@@ -5,529 +5,538 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     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">-->
-    <LinearLayout
-        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">
-        <LinearLayout
-            android:orientation="horizontal"
+
+        <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:layout_marginLeft="5dp"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="2">
+            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">
                 <LinearLayout
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="@dimen/dp_10"
                     android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
+                    android:layout_height="match_parent">
                     <LinearLayout
-                        android:layout_marginTop="5dp"
+                        android:orientation="horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="工单流水："
-                            android:textColor="@color/black">
-                        </TextView>
 
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-
-                            <AutoCompleteTextView
-                                android:id="@+id/ce_work_code"
-                                style="@style/EditTextLineStyle"
-                                android:layout_height="30dp"
-                                android:inputType="number"
-                                android:hint="请输入工单流水" />
-
-                            <ImageView
-                                android:id="@+id/iv_work_code"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center|right"
-                                android:layout_marginRight="13dp"
-                                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"
+                        <LinearLayout
                             android:layout_marginLeft="5dp"
-                            android:background="@drawable/bg_button"
-                            android:src="@drawable/search_48" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_marginTop="5dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:layout_width="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:text="计划单号："
-                            android:layout_gravity="center"
-                            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"
-                                android:layout_weight="1">
-
-                                <AutoCompleteTextView
-                                    android:id="@+id/tv_macode"
-                                    style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
-                                    android:focusable="false"
-                                    android:hint="" />
-
-                                <ImageView
-                                    android:id="@+id/iv_macode_delete"
+                            android:layout_weight="2">
+                            <LinearLayout
+                                android:layout_marginRight="5dp"
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:orientation="vertical"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <LinearLayout
+                                    android:layout_marginTop="5dp"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:text="工单流水："
+                                        android:textColor="@color/black">
+                                    </TextView>
+
+                                    <FrameLayout
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1">
+
+                                        <AutoCompleteTextView
+                                            android:id="@+id/ce_work_code"
+                                            style="@style/EditTextLineStyle"
+                                            android:layout_height="30dp"
+                                            android:inputType="number"
+                                            android:hint="请输入工单流水" />
+
+                                        <ImageView
+                                            android:id="@+id/iv_work_code"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_gravity="center|right"
+                                            android:layout_marginRight="13dp"
+                                            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_marginLeft="5dp"
+                                        android:background="@drawable/bg_button"
+                                        android:src="@drawable/search_48" />
+                                </LinearLayout>
+                                <LinearLayout
+                                    android:layout_marginTop="5dp"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="计划单号："
+                                        android:layout_gravity="center"
+                                        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"
+                                            android:layout_weight="1">
+
+                                            <AutoCompleteTextView
+                                                android:id="@+id/tv_macode"
+                                                style="@style/EditTextLineStyle"
+                                                android:layout_height="30dp"
+                                                android:focusable="false"
+                                                android:hint="" />
+
+                                            <ImageView
+                                                android:id="@+id/iv_macode_delete"
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                android:layout_gravity="center|right"
+                                                android:layout_marginRight="13dp"
+                                                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_marginLeft="5dp"
+                                            android:src="@drawable/search_48" />
+                                    </LinearLayout>
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_marginTop="5dp"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="产品代码："
+                                        android:layout_gravity="center"
+                                        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"
+                                            android:layout_weight="1">
+
+                                            <AutoCompleteTextView
+                                                android:id="@+id/tv_pr_code"
+                                                style="@style/EditTextLineStyle"
+                                                android:layout_height="30dp"
+                                                android:focusable="false"
+                                                android:hint="" />
+
+                                            <ImageView
+                                                android:id="@+id/iv_pr_code_delete"
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                android:layout_gravity="center|right"
+                                                android:layout_marginRight="13dp"
+                                                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:clickable="false"
+                                            />
+                                    </LinearLayout>
+                                </LinearLayout>
+
+
+                                <LinearLayout
+                                    android:layout_marginTop="5dp"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="产品名称："
+                                        android:layout_gravity="center"
+                                        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"
+                                            android:layout_weight="1">
+
+                                            <AutoCompleteTextView
+                                                android:id="@+id/tv_pr_detail"
+                                                style="@style/EditTextLineStyle"
+                                                android:layout_height="30dp"
+                                                android:focusable="false"
+                                                android:hint="" />
+
+                                            <ImageView
+                                                android:id="@+id/iv_detail_delete"
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                android:layout_gravity="center|right"
+                                                android:layout_marginRight="13dp"
+                                                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:clickable="false"
+                                            />
+                                    </LinearLayout>
+                                </LinearLayout>
+
+
+                                <LinearLayout
+                                    android:layout_marginTop="5dp"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="人员编号："
+                                        android:layout_gravity="center"
+                                        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"
+                                            android:layout_weight="1">
+
+                                            <AutoCompleteTextView
+                                                android:id="@+id/tv_dc_emcode"
+                                                style="@style/EditTextLineStyle"
+                                                android:layout_height="30dp"
+                                                android:inputType="number"
+                                                android:hint="请输入人员编号" />
+
+                                            <ImageView
+                                                android:id="@+id/iv_dc_emcode_delete"
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                android:layout_gravity="center|right"
+                                                android:layout_marginRight="13dp"
+                                                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:clickable="false"
+                                            />
+                                    </LinearLayout>
+                                </LinearLayout>
+                                <LinearLayout
+                                    android:layout_marginTop="5dp"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:text="不良归属："
+                                        android:textColor="@color/black">
+                                    </TextView>
+
+                                    <FrameLayout
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1">
+
+                                        <AutoCompleteTextView
+                                            android:id="@+id/at_station"
+                                            style="@style/EditTextLineStyle"
+                                            android:layout_height="30dp"
+                                            android:hint="请输入不良归属" />
+
+                                        <ImageView
+                                            android:id="@+id/iv_station"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_gravity="center|right"
+                                            android:layout_marginRight="13dp"
+                                            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_marginLeft="5dp"
+                                        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">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:textColor="@color/black"
+                                        android:text="物理线别：">
+                                    </TextView>
+
+                                    <FrameLayout
+                                        android:layout_weight="1"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content">
+                                        <com.uas.collection.view.ClearableEditText
+                                            android:id="@+id/ce_wuli"
+                                            style="@style/EditTextLineStyle"
+                                            android:layout_height="30dp"
+                                            android:textSize="@dimen/dp_10"
+                                            android:focusable="false"
+                                            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_marginLeft="5dp"
+                                        android:background="@drawable/bg_button"
+                                        android:src="@drawable/search_48" />
+                                </LinearLayout>
+
+                            </LinearLayout>
+                            <LinearLayout
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="center|right"
-                                    android:layout_marginRight="13dp"
-                                    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_marginLeft="5dp"
-                                android:src="@drawable/search_48" />
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_marginTop="5dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="产品代码："
-                            android:layout_gravity="center"
-                            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"
-                                android:layout_weight="1">
-
-                                <AutoCompleteTextView
-                                    android:id="@+id/tv_pr_code"
-                                    style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
-                                    android:focusable="false"
-                                    android:hint="" />
-
-                                <ImageView
-                                    android:id="@+id/iv_pr_code_delete"
+                                    android:layout_gravity="center"
+                                    android:text="不良现象："
+                                    android:textColor="@color/black">
+                                </TextView>
+                                <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>
+                            </LinearLayout>
+                            <LinearLayout
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="center|right"
-                                    android:layout_marginRight="13dp"
-                                    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:clickable="false"
-                                />
-                        </LinearLayout>
-                    </LinearLayout>
+                                    android:layout_gravity="center"
+                                    android:text="不良原因："
+                                    android:textColor="@color/black">
+                                </TextView>
+                                <android.support.v7.widget.RecyclerView
+                                    android:id="@+id/rv_datachangetwo"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                </android.support.v7.widget.RecyclerView>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:text="不良归类："
+                                    android:textColor="@color/black">
+                                </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>
+                            </LinearLayout>
+
+
+                            <LinearLayout
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    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>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_marginTop="5dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:text="采集条码："
+                                    android:textColor="@color/black">
+                                </TextView>
+
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                    <com.uas.collection.view.ClearableEditText
+                                        android:id="@+id/tv_newxin"
+                                        style="@style/EditTextStyle"
+                                        android:layout_height="20dp"
+                                        android:background="@drawable/bg_line_edittext"
+                                        android:focusable="true"
+                                        android:focusableInTouchMode="true"
+                                        android:hint=""
+                                        android:imeOptions="actionSend"
+                                        android:textColor="@color/black" />
+                                </FrameLayout>
+                                <ImageView
+                                    android:visibility="gone"
+                                    android:id="@+id/storage_recharge_scan_iv"
+                                    android:layout_gravity="center"
+                                    android:layout_width="30dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:src="@drawable/ic_edittext_scan" />
+                            </LinearLayout>
 
 
-                    <LinearLayout
-                        android:layout_marginTop="5dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="产品名称："
-                            android:layout_gravity="center"
-                            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"
-                                android:layout_weight="1">
-
-                                <AutoCompleteTextView
-                                    android:id="@+id/tv_pr_detail"
-                                    style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
-                                    android:focusable="false"
-                                    android:hint="" />
+                        </LinearLayout>
 
-                                <ImageView
-                                    android:id="@+id/iv_detail_delete"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center|right"
-                                    android:layout_marginRight="13dp"
-                                    android:src="@drawable/wrong"
-                                    android:visibility="gone" />
-                            </FrameLayout>
-                            <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="wrap_content"
+                        <ImageView
+                            android:id="@+id/iv_personnel_data"
+                            android:layout_width="190dp"
+                            android:layout_height="190dp"
+                            android:scaleType="fitXY"
+                            android:layout_margin="@dimen/dp_10"
+                            android:background="@drawable/bg_imageview_rauide">
+                        </ImageView>
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="0dp"
+                            android:layout_weight="0.9"
+                            android:layout_height="match_parent">
+                            <com.bin.david.form.core.SmartTable
+                                android:id="@+id/jlt_storage_in_filter_list_st"
+                                android:layout_width="match_parent"
+                                android:layout_weight="1"
+                                android:layout_height="match_parent" />
+                            <TextView
+                                android:id="@+id/tv_save"
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:layout_width="150dp"
+                                android:layout_height="50dp"
+                                android:text="提交"
                                 android:layout_gravity="center"
-                                android:layout_marginRight="10dp"
-                                android:layout_marginLeft="5dp"
-                                android:clickable="false"
-                                />
+                                android:gravity="center"
+                                android:textSize="@dimen/textsize_20"
+                                android:background="@drawable/bg_button">
+                            </TextView>
                         </LinearLayout>
-                    </LinearLayout>
 
 
-                    <LinearLayout
-                        android:layout_marginTop="5dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="人员编号："
-                            android:layout_gravity="center"
-                            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"
-                                android:layout_weight="1">
-
-                                <AutoCompleteTextView
-                                    android:id="@+id/tv_dc_emcode"
-                                    style="@style/EditTextLineStyle"
-                                    android:layout_height="30dp"
-                                    android:inputType="number"
-                                    android:hint="请输入人员编号" />
 
-                                <ImageView
-                                    android:id="@+id/iv_dc_emcode_delete"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center|right"
-                                    android:layout_marginRight="13dp"
-                                    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:clickable="false"
-                                />
-                        </LinearLayout>
                     </LinearLayout>
-                    <LinearLayout
-                        android:layout_marginTop="5dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="不良归属："
-                            android:textColor="@color/black">
-                        </TextView>
 
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-
-                            <AutoCompleteTextView
-                                android:id="@+id/at_station"
-                                style="@style/EditTextLineStyle"
-                                android:layout_height="30dp"
-                                android:hint="请输入不良归属" />
-
-                            <ImageView
-                                android:id="@+id/iv_station"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center|right"
-                                android:layout_marginRight="13dp"
-                                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_marginLeft="5dp"
-                            android:background="@drawable/bg_button"
-                            android:src="@drawable/search_48" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_marginTop="2dp"
-                        android:orientation="horizontal"
+                    <com.uas.collection.view.ClearableEditText
+                        android:id="@+id/tv_hintshow"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:textColor="@color/black"
-                            android:text="物理线别：">
-                        </TextView>
-
-                        <FrameLayout
-                            android:layout_weight="1"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-                            <com.uas.collection.view.ClearableEditText
-                                android:id="@+id/ce_wuli"
-                                style="@style/EditTextLineStyle"
-                                android:layout_height="30dp"
-                                android:textSize="@dimen/dp_10"
-                                android:focusable="false"
-                                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_marginLeft="5dp"
-                            android:background="@drawable/bg_button"
-                            android:src="@drawable/search_48" />
-                    </LinearLayout>
+                        android:layout_height="150dp"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginTop="10dp"
+                        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.collection.view.ClearableEditText>
 
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="不良现象："
-                        android:textColor="@color/black">
-                    </TextView>
-                    <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>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="不良原因："
-                        android:textColor="@color/black">
-                    </TextView>
-                    <android.support.v7.widget.RecyclerView
-                        android:id="@+id/rv_datachangetwo"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
-                </LinearLayout>
 
-                <LinearLayout
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
                     <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="不良归类："
-                        android:textColor="@color/black">
-                    </TextView>
-                    <android.support.v7.widget.RecyclerView
-                        android:id="@+id/rv_dataclassify"
+                        android:id="@+id/tv_gonema_code"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    </android.support.v7.widget.RecyclerView>
-                </LinearLayout>
-
-
-                <LinearLayout
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="不良数量："
-                        android:textColor="@color/black">
+                        android:layout_height="match_parent"
+                        android:visibility="gone">
                     </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>
-                </LinearLayout>
 
-                <LinearLayout
-                    android:layout_marginTop="5dp"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="采集条码："
-                        android:textColor="@color/black">
-                    </TextView>
 
-                    <FrameLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <com.uas.collection.view.ClearableEditText
-                            android:id="@+id/tv_newxin"
-                            style="@style/EditTextStyle"
-                            android:layout_height="20dp"
-                            android:background="@drawable/bg_line_edittext"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:hint=""
-                            android:imeOptions="actionSend"
-                            android:textColor="@color/black" />
-                    </FrameLayout>
-                    <ImageView
-                        android:visibility="gone"
-                        android:id="@+id/storage_recharge_scan_iv"
-                        android:layout_gravity="center"
-                        android:layout_width="30dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginLeft="5dp"
-                        android:src="@drawable/ic_edittext_scan" />
                 </LinearLayout>
 
 
+            </android.support.v4.widget.NestedScrollView>
 
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_personnel_data"
-                android:layout_width="190dp"
-                android:layout_height="190dp"
-                android:scaleType="fitXY"
-                android:layout_margin="@dimen/dp_10"
-                android:background="@drawable/bg_imageview_rauide">
-            </ImageView>
-
-            <com.bin.david.form.core.SmartTable
-                android:id="@+id/jlt_storage_in_filter_list_st"
-                android:layout_width="0dp"
-                android:layout_weight="0.9"
-                android:layout_height="match_parent" />
-        </LinearLayout>
-
-        <com.uas.collection.view.ClearableEditText
-            android:id="@+id/tv_hintshow"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="10dp"
-            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.collection.view.ClearableEditText>
-
-
-        <TextView
-            android:id="@+id/tv_gonema_code"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone">
-        </TextView>
-
-        <TextView
-            android:id="@+id/tv_save"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="150dp"
-            android:layout_height="50dp"
-            android:text="提交"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="@dimen/textsize_20"
-            android:background="@drawable/bg_button">
-        </TextView>
-    </LinearLayout>
-
-
-    <!--            </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>

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 23,
-            versionName      : "v1.1.3"
+            versionCode      : 24,
+            versionName      : "v1.1.4"
     ]
 
     depsVersion = [