更改取数逻辑

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

@@ -54,6 +54,7 @@ import com.uas.collection.bean.ResourcesBean;
 import com.uas.collection.bean.StorageRechargeAloneBean;
 import com.uas.collection.bean.TestcollectDataBean;
 import com.uas.collection.camera.CaptureActivity;
+import com.uas.collection.camera.CodeUtils;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.tools.SharedPreUtil;
 import com.uas.collection.util.CameraUtil;
@@ -139,7 +140,9 @@ public class BreakdownRepairFragment extends BaseFragment{
     private RecyclerView rv_dataclassify;
     private ArrayList<StorageRechargeAloneBean> passclassify;
     private ClassifyAdapter classifyAdapter;
-
+    private ClearableEditText tv_newxin;
+    private ImageView storage_recharge_scan_iv;
+    private static final int SCAN_BARCODE_CODE = 111;
     @Override
     protected int getLayout() {
         return R.layout.fragment_breakdownrepair;
@@ -174,6 +177,8 @@ public class BreakdownRepairFragment extends BaseFragment{
         mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
         rv_datapassqty = root.findViewById(R.id.rv_datapassqty);
         rv_dataclassify = root.findViewById(R.id.rv_dataclassify);
+        tv_newxin = root.findViewById(R.id.tv_newxin);
+        storage_recharge_scan_iv = root.findViewById(R.id.storage_recharge_scan_iv);
 //        ce_length.setEnabled(false);
 //        ce_length.setFocusable(false);
 //        ce_length.setKeyListener(null);//重点
@@ -425,6 +430,28 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_dc_emcode.requestFocus();
             }
         });
+        storage_recharge_scan_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                tv_newxin.requestFocus();
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                        SharedPreUtil.saveString(mActivity, Constants.STORAGEERECHADD, "NO");
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+
+
+
         stringList = new ArrayList<>();
         //保存
         tv_save.setOnClickListener(new View.OnClickListener() {
@@ -896,6 +923,9 @@ public class BreakdownRepairFragment extends BaseFragment{
                         object_1.put("SR_LOCATION", alonedatatwo);
                     }
 
+                }else if (alonedata.equals("弹片")||alonedata.equals("误测")||alonedata.equals("DC线")){
+                    alonedatatwo = alonedata;
+                    object_1.put("SR_LOCATION", alonedatatwo);
                 }else {
                     if (StringUtil.isEmpty(selectedItemtwo.get(i).getQtyce())){
                         Qtycetwo="0";
@@ -975,7 +1005,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         object_1.put("SR_PASSQTY", "0");//通过数量
         object_1.put("SR_NGQTY", ec_passqtytrim);//NG数量
         object_1.put("SR_TYPE", "性能维修");//种类(数据采集/、外观维修/性能维修)
-        object_1.put("SR_SN", "");//SN号
+        object_1.put("SR_SN", tv_newxin.getText().toString().trim());//SN号
         object_1.put("SR_REMARK", "");//备注/其他
         object_1.put("SR_INMAN", "");//录入人
         object_1.put("SR_INDATE", "");//录入时间
@@ -1025,6 +1055,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                 setAdapterthree(mFeededListthree);
                 setAdapterqtytwo(passFeededListQty);
                 setclassifyAdapter(passclassify);
+                tv_newxin.setText("");
             }
 
             @Override
@@ -1059,13 +1090,11 @@ public class BreakdownRepairFragment extends BaseFragment{
         list.add("起机慢");
         list.add("短路");
         list.add("OCP不保护");
-        list.add("电压跳变");
-        list.add("拐点不良");
+        list.add("指示灯不亮");
         list.add("耐压不良");
         list.add("绝缘电阻");
         list.add("误测");
         list.add("能效不良");
-        list.add("DC短路");
         list.add("纹波小");
         list.add("其他");
         JSONObject jsonObject = new JSONObject();
@@ -1126,10 +1155,12 @@ public class BreakdownRepairFragment extends BaseFragment{
         list.add("R");
         list.add("LF");
         list.add("LED");
-        list.add("RT");
+        list.add("Q");
         list.add("EC");
         list.add("USB");
         list.add("DC线");
+        list.add("弹片");
+        list.add("误测");
         list.add("其他");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
@@ -1194,6 +1225,8 @@ public class BreakdownRepairFragment extends BaseFragment{
         list.add("短路");
         list.add("不出脚");
         list.add("错件");
+        list.add("断板");
+        list.add("板卡歪");
         list.add("其他");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
@@ -1374,6 +1407,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
     private void getlineDataList(){
         List<String> linelist=new ArrayList<>();
+        linelist.add("检焊目检");
         linelist.add("插件测试");
         linelist.add("线材目检");
         linelist.add("组装测试");
@@ -1742,6 +1776,9 @@ public class BreakdownRepairFragment extends BaseFragment{
             if (mList.get(i).getAlonedata().equals("其他")){
                 ((  SelectAdaptertwo.ListItemViewHolder) holder).ce_other.setVisibility(View.VISIBLE);
                 ((  SelectAdaptertwo.ListItemViewHolder) holder).line_vis.setVisibility(View.GONE);
+            }else if (mList.get(i).getAlonedata().equals("弹片")||mList.get(i).getAlonedata().equals("误测")||mList.get(i).getAlonedata().equals("DC线")){
+                ((  SelectAdaptertwo.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
+                ((  SelectAdaptertwo.ListItemViewHolder) holder).line_vis.setVisibility(View.GONE);
             }else {
                 ((  SelectAdaptertwo.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
                 ((  SelectAdaptertwo.ListItemViewHolder) holder).line_vis.setVisibility(View.VISIBLE);
@@ -2423,6 +2460,15 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
             }
         }
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.ce_de_code) {
+                    tv_newxin.setText(result);
+                    tv_newxin.setSelection(result.length());
+                }
+            }
+        }
 
     }
 

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

@@ -1927,6 +1927,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         linelist.add("线材目检");
         linelist.add("组装测试");
         linelist.add("组装外观目检");
+        linelist.add("敲击内响检测");
         linelist.add("包装外观目检");
 
         JSONObject jsonObject = new JSONObject();

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

@@ -338,6 +338,8 @@ public class LoginFragment extends BaseFragment implements AdapterView.OnItemSel
         SharedPreUtil.saveString(getContext(),"user_name",userName);
         //传递Handler
         VolleyUtil.setVolleyHandler(loginHandler);
+        SharedPreUtil.saveString(getActivity(),"userNames",userName);
+        SharedPreUtil.saveString(getActivity(),"passwords",password);
         //Volley请求服务器
         VolleyUtil.requestUserLogin(getActivity(), GloableParams.ADDRESS_LOGIN_APPLY, VolleyUtil.METHOD_POST,
                 pageType, maName, userName, password);

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

@@ -54,6 +54,7 @@ import com.uas.collection.bean.ResourcesBean;
 import com.uas.collection.bean.StorageRechargeAloneBean;
 import com.uas.collection.bean.TestcollectDataBean;
 import com.uas.collection.camera.CaptureActivity;
+import com.uas.collection.camera.CodeUtils;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.tools.SharedPreUtil;
 import com.uas.collection.util.CameraUtil;
@@ -137,7 +138,9 @@ public class StorageRechargeListFragment extends BaseFragment{
     private ClassifyAdapter classifyAdapter;
     private String ma_bomversion;
     private RecyclerView rv_dataclassify;
-
+    private ClearableEditText tv_newxin;
+    private ImageView storage_recharge_scan_iv;
+    private static final int SCAN_BARCODE_CODE = 111;
     @Override
     protected int getLayout() {
         return R.layout.fragment_storage_recharge_list;
@@ -178,8 +181,8 @@ public class StorageRechargeListFragment extends BaseFragment{
         rv_dataclassify = root.findViewById(R.id.rv_dataclassify);
         ce_work_code.setInputType(InputType.TYPE_CLASS_NUMBER);
         tv_dc_emcode.setInputType(InputType.TYPE_CLASS_NUMBER);
-
-
+        tv_newxin = root.findViewById(R.id.tv_newxin);
+        storage_recharge_scan_iv = root.findViewById(R.id.storage_recharge_scan_iv);
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
 //        ce_length.setEnabled(false);
 //        ce_length.setFocusable(false);
@@ -346,7 +349,25 @@ public class StorageRechargeListFragment extends BaseFragment{
 //            }
 //        });
 
-
+        storage_recharge_scan_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                tv_newxin.requestFocus();
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                        SharedPreUtil.saveString(mActivity, Constants.STORAGEERECHADD, "NO");
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
 
         iv_station.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -933,15 +954,16 @@ public class StorageRechargeListFragment extends BaseFragment{
             for (int i=0;i<selectedItemtwo.size();i++){
                 String alonedata = selectedItemtwo.get(i).getAlonedata();
                 if (alonedata.equals("其他")){
-                    input_AlonedaTwo=selectedItem.get(i).getInputce();
+                    input_AlonedaTwo=selectedItemtwo.get(i).getInputce();
                     if (StringUtil.isEmpty(input_AlonedaTwo)){
                         CommonUtil.toastNoRepeat(mActivity, "请填写不良原因");
                         return;
                     }else {
-                        input_AlonedaTwo=selectedItem.get(i).getAlonedata();
                         object_1.put("SR_REASON",input_AlonedaTwo);
                     }
-
+                }else {
+                    input_AlonedaTwo=selectedItemtwo.get(i).getAlonedata();
+                    object_1.put("SR_REASON",input_AlonedaTwo);
                 }
             }
         }
@@ -974,7 +996,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         object_1.put("SR_NGQTY", ec_passqtytrim);//NG数量
         object_1.put("SR_TYPE", "外观维修");//种类(数据采集/、外观维修/性能维修)
         object_1.put("SR_LOCATION", "");//位号
-        object_1.put("SR_SN","");//SN号
+        object_1.put("SR_SN",tv_newxin.getText().toString().trim());//SN号
         object_1.put("SR_REMARK", "");//备注/其他
         object_1.put("SR_INMAN", "");//录入人
         object_1.put("SR_INDATE", "");//录入时间
@@ -1022,6 +1044,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                 setAdapter(mFeededList);
                 setAdaptertwo(mFeededListtwo);
                 setclassifyAdapter(passclassify);
+                tv_newxin.setText("");
             }
 
             @Override
@@ -2072,6 +2095,16 @@ public class StorageRechargeListFragment extends BaseFragment{
                 }
             }
         }
+
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.ce_de_code) {
+                    tv_newxin.setText(result);
+                    tv_newxin.setSelection(result.length());
+                }
+            }
+        }
     }
 
 

app/src/main/java/com/uas/collection/util/VolleyRequest.java

@@ -1,5 +1,6 @@
 package com.uas.collection.util;
 
+import android.app.Activity;
 import android.text.TextUtils;
 
 import com.android.volley.AuthFailureError;
@@ -11,6 +12,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.collection.R;
 import com.uas.collection.application.PdaApplication;
+import com.uas.collection.global.GloableParams;
 import com.uas.collection.tools.SharedPreUtil;
 import com.uas.collection.tools.VolleyUtil;
 
@@ -120,7 +122,14 @@ public class VolleyRequest {
                         try {
                             LogUtil.e("responErr", errorToast);
                             if (errorToast.length() >= 500) {
-                                httpCallback.onFail(httpParams.getFlag(), "请求异常");
+                                Activity activity=new Activity();
+                                String maName = SharedPreUtil.getString(activity, Constants.FLAG.ACCOUNT_NAME_CACHE, null);
+                                String userName = SharedPreUtil.getString(activity, "userNames", null);
+                                String password = SharedPreUtil.getString(activity, "passwords", null);
+                                VolleyUtil.requestUserLogin(activity, GloableParams.ADDRESS_LOGIN_APPLY, VolleyUtil.METHOD_POST,
+                                        VolleyUtil.FRAGMENT_LOGIN, maName, userName, password);
+                                httpCallback.onFail(httpParams.getFlag(), "已重新登录，请再次操作");
+                                LogUtil.e("responErr1", "已重新登录，请再次操作");
                             } else {
                                 httpCallback.onFail(httpParams.getFlag(), errorToast);
                             }

app/src/main/java/com/uas/collection/util/VollyRequest.java

@@ -1,5 +1,6 @@
 package com.uas.collection.util;
 
+import android.app.Activity;
 import android.text.TextUtils;
 
 import com.android.volley.AuthFailureError;
@@ -10,6 +11,8 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.collection.R;
 import com.uas.collection.application.PdaApplication;
+import com.uas.collection.global.GloableParams;
+import com.uas.collection.tools.SharedPreUtil;
 import com.uas.collection.tools.VolleyUtil;
 
 import java.io.UnsupportedEncodingException;
@@ -113,7 +116,14 @@ public class VollyRequest {
                         try {
                             LogUtil.e("responErr", errorToast);
                             if (errorToast.length() >= 200) {
-                                httpCallback.onFail(httpParams.getFlag(), "请求异常");
+                                Activity activity=new Activity();
+                                String maName = SharedPreUtil.getString(activity, Constants.FLAG.ACCOUNT_NAME_CACHE, null);
+                                String userName = SharedPreUtil.getString(activity, "userNames", null);
+                                String password = SharedPreUtil.getString(activity, "passwords", null);
+                                VolleyUtil.requestUserLogin(activity, GloableParams.ADDRESS_LOGIN_APPLY, VolleyUtil.METHOD_POST,
+                                        VolleyUtil.FRAGMENT_LOGIN, maName, userName, password);
+                                httpCallback.onFail(httpParams.getFlag(), "已重新登录，请再次操作");
+//                                httpCallback.onFail(httpParams.getFlag(), "请求异常");
                             } else {
                                 httpCallback.onFail(httpParams.getFlag(), errorToast);
                             }

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

@@ -78,7 +78,7 @@
                         </LinearLayout>
 
                         <LinearLayout
-                            android:layout_marginTop="5dp"
+                            android:layout_marginTop="2dp"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
 
@@ -126,7 +126,7 @@
                             </LinearLayout>
                         </LinearLayout>
                         <LinearLayout
-                            android:layout_marginTop="5dp"
+                            android:layout_marginTop="2dp"
                             android:orientation="horizontal"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
@@ -169,7 +169,7 @@
                                 android:src="@drawable/search_48" />
                         </LinearLayout>
                         <LinearLayout
-                            android:layout_marginTop="5dp"
+                            android:layout_marginTop="2dp"
                             android:orientation="horizontal"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
@@ -226,7 +226,7 @@
                                 android:textColor="@color/black">
                             </TextView>
                             <LinearLayout
-                                android:layout_marginTop="5dp"
+                                android:layout_marginTop="2dp"
                                 android:orientation="horizontal"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content">
@@ -264,7 +264,7 @@
                         </LinearLayout>
 
                         <LinearLayout
-                            android:layout_marginTop="5dp"
+                            android:layout_marginTop="2dp"
                             android:orientation="horizontal"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
@@ -316,8 +316,8 @@
                         android:layout_marginLeft="5dp"
                         android:layout_margin="@dimen/dp_10"
                         android:id="@+id/iv_personnel_data"
-                        android:layout_width="200dp"
-                        android:layout_height="200dp"
+                        android:layout_width="185dp"
+                        android:layout_height="185dp"
                         android:scaleType="fitXY"
                         android:background="@drawable/bg_imageview_rauide">
                     </ImageView>
@@ -381,7 +381,6 @@
                     </android.support.v7.widget.RecyclerView>
                 </LinearLayout>
                 <LinearLayout
-                    android:layout_marginTop="10dp"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -420,7 +419,46 @@
                         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">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="采集条码："
+                        android:textSize="@dimen/dp_10"
+                        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_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" />
+                </LinearLayout>
 
 
             </LinearLayout>
@@ -435,7 +473,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"/>
                 <TextView
-                    android:layout_marginTop="@dimen/textsize_20"
                     android:id="@+id/tv_save"
                     android:layout_width="150dp"
                     android:layout_height="50dp"
@@ -443,7 +480,8 @@
                     android:layout_gravity="center"
                     android:gravity="center"
                     android:textSize="@dimen/textsize_20"
-                    android:background="@drawable/bg_button">
+                    android:background="@drawable/bg_button"
+                    android:layout_marginBottom="@dimen/textsize_20">
                 </TextView>
             </LinearLayout>
 

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

@@ -394,8 +394,44 @@
                                 </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>
 
 
 
@@ -442,7 +478,7 @@
 
                     <TextView
                         android:id="@+id/tv_save"
-                        android:layout_marginTop="50dp"
+                        android:layout_marginTop="30dp"
                         android:layout_width="150dp"
                         android:layout_height="50dp"
                         android:text="提交"

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

@@ -52,7 +52,7 @@
                 android:id="@+id/ce_qty"
                 android:background="@drawable/bg_line_edittext"
                 android:layout_gravity="center"
-                android:layout_width="@dimen/dp_40"
+                android:layout_width="20dp"
                 android:layout_height="@dimen/textsize_20"
                 android:layout_weight="1"
                 android:text="0"

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

@@ -381,7 +381,6 @@
                     </android.support.v7.widget.RecyclerView>
                 </LinearLayout>
                 <LinearLayout
-                    android:layout_marginTop="10dp"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -420,7 +419,46 @@
                         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_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="采集条码："
+                        android:textSize="@dimen/dp_10"
+                        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>

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

@@ -394,8 +394,46 @@
                     </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_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="采集条码："
+                        android:textSize="@dimen/dp_10"
+                        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>
 
 
 
@@ -442,7 +480,7 @@
 
         <TextView
             android:id="@+id/tv_save"
-            android:layout_marginTop="50dp"
+            android:layout_marginTop="30dp"
             android:layout_width="150dp"
             android:layout_height="50dp"
             android:text="提交"

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 16,
-            versionName      : "v1.0.6"
+            versionCode      : 22,
+            versionName      : "v1.1.2"
     ]
 
     depsVersion = [