修改了升级逻辑，数据采集界面增加人员编号采集带出人员照片

app/src/main/java/com/uas/collection/activity/HomeActivity.java

@@ -54,7 +54,7 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
         setContentView(R.layout.activity_home);
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("设备管理系统");
+        actionbarTextVeiw.setText("数据采集");
         menuGridView.setNumColumns(3);
         gridItemList = DataSourceManager.getDataSourceManager().getHomeGridItemList();
         SimpleAdapter adapter = new SimpleAdapter(this, gridItemList, R.layout.item_grid,

app/src/main/java/com/uas/collection/activity/IndexActivity.java

@@ -172,7 +172,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         mEmNameTv = findViewById(R.id.em_name_tv);
         tv_metrimal_name=findViewById(R.id.tv_metrimal_name);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("设备管理系统");
+        actionbarTextVeiw.setText("数据采集");
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         mPositionR = findViewById(R.id.index_position_resource);
         mScName = (TextView) findViewById(R.id.scname_tv);

app/src/main/java/com/uas/collection/bean/VersionUpgradeBean.java

@@ -0,0 +1,52 @@
+package com.uas.collection.bean;
+
+/**
+ * Created by cjh-sail on 2023-06-25
+ */
+public class VersionUpgradeBean {
+    public String PP_PDACODE;
+    public String PP_VERSIONNUM;
+    public String PP_ATTACH;
+    public String PP_REMARK;
+    public String PP_VERSIONNAME;
+
+    public String getPP_PDACODE() {
+        return PP_PDACODE;
+    }
+
+    public void setPP_PDACODE(String PP_PDACODE) {
+        this.PP_PDACODE = PP_PDACODE;
+    }
+
+    public String getPP_VERSIONNUM() {
+        return PP_VERSIONNUM;
+    }
+
+    public void setPP_VERSIONNUM(String PP_VERSIONNUM) {
+        this.PP_VERSIONNUM = PP_VERSIONNUM;
+    }
+
+    public String getPP_ATTACH() {
+        return PP_ATTACH;
+    }
+
+    public void setPP_ATTACH(String PP_ATTACH) {
+        this.PP_ATTACH = PP_ATTACH;
+    }
+
+    public String getPP_REMARK() {
+        return PP_REMARK;
+    }
+
+    public void setPP_REMARK(String PP_REMARK) {
+        this.PP_REMARK = PP_REMARK;
+    }
+
+    public String getPP_VERSIONNAME() {
+        return PP_VERSIONNAME;
+    }
+
+    public void setPP_VERSIONNAME(String PP_VERSIONNAME) {
+        this.PP_VERSIONNAME = PP_VERSIONNAME;
+    }
+}

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

@@ -10,7 +10,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -222,30 +221,30 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
             }
         });
-        ce_product_bar_code.addTextChangedListener(new TextWatcher() {
-            private CharSequence temp;
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                temp = s;
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                int selectionStart = ce_product_bar_code.getSelectionStart();
-                int selectionEnd = ce_product_bar_code.getSelectionEnd();
-                ce_product_bar_code.getSelectionStart();
-                Log.e("gongbiao1", "" + selectionStart);
-                if (temp.length() > Integer.parseInt(ce_length.getText().toString().trim())) {
-                    s.delete(selectionStart - 1, selectionEnd);
-                    ce_product_bar_code.setText(s);
-                }
-            }
-        });
+//        ce_product_bar_code.addTextChangedListener(new TextWatcher() {
+//            private CharSequence temp;
+//            @Override
+//            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+//
+//            }
+//
+//            @Override
+//            public void onTextChanged(CharSequence s, int start, int before, int count) {
+//                temp = s;
+//            }
+//
+//            @Override
+//            public void afterTextChanged(Editable s) {
+//                int selectionStart = ce_product_bar_code.getSelectionStart();
+//                int selectionEnd = ce_product_bar_code.getSelectionEnd();
+//                ce_product_bar_code.getSelectionStart();
+//                Log.e("gongbiao1", "" + selectionStart);
+//                if (temp.length() > Integer.parseInt(ce_length.getText().toString().trim())) {
+//                    s.delete(selectionStart - 1, selectionEnd);
+//                    ce_product_bar_code.setText(s);
+//                }
+//            }
+//        });
         ce_length.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -459,7 +458,10 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
 
     public void getNewSNData(String va_code){
-        if (ce_product_bar_code.getText().toString().trim().length() > Integer.parseInt(ce_length.getText().toString().trim())) {
+        if (ce_length.getText().toString().trim().isEmpty()){
+            ce_length.setText("0");
+        }
+        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
             CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
             return;
         }
@@ -547,7 +549,10 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
 
     public void getNewSaveData(){
-        if (ce_product_bar_code.getText().toString().trim().length() > Integer.parseInt(ce_length.getText().toString().trim())) {
+        if (ce_length.getText().toString().trim().isEmpty()){
+            ce_length.setText("0");
+        }
+        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
             CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
             return;
         }

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

@@ -1,5 +1,6 @@
 package com.uas.collection.fragment;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -45,8 +46,10 @@ import com.uas.collection.bean.IpAndPortBean;
 import com.uas.collection.bean.LinecodeBean;
 import com.uas.collection.bean.ResourcesBean;
 import com.uas.collection.bean.TestcollectDataBean;
+import com.uas.collection.camera.CaptureActivity;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.tools.SharedPreUtil;
+import com.uas.collection.util.CameraUtil;
 import com.uas.collection.util.CommonUtil;
 import com.uas.collection.util.Constants;
 import com.uas.collection.util.FastjsonUtil;
@@ -84,9 +87,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     private TextView tv_pr_code;
     private TextView tv_pr_detail;
     private ImageView iv_resources_delete;
-    private AutoCompleteTextView ce_unhealthy;
     private ImageView iv_unhealthy_delete;
-    private ImageView iv_unhealthy;
     private SmartTable mSmartTable;
     private Column<String> va_classColumn,va_codeColumn,va_statusColumn;
     private TableData<TestcollectDataBean> mTableData;
@@ -112,7 +113,12 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     private TextView tv_em_name;
     private TextView tv_station;
     private String em_name;
-
+    private String pr_code;
+    private String pr_detail;
+    private ClearableEditText tv_dc_emcode;
+    private ImageView iv_dc_emcode;
+    private int mFocusId;
+    private static final int SCAN_BARCODE_CODESD = 925;
     @Override
     protected int getLayout() {
         return R.layout.fragment_datacollection;
@@ -143,16 +149,15 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         iv_resources = root.findViewById(R.id.iv_resources);
         ce_bit_number = root.findViewById(R.id.ce_bit_number);
         ec_passqty = root.findViewById(R.id.ec_passqty);
-        ce_unhealthy = root.findViewById(R.id.ce_unhealthy);
         iv_unhealthy_delete = root.findViewById(R.id.iv_unhealthy_delete);
-        iv_unhealthy = root.findViewById(R.id.iv_unhealthy);
         iv_personnel_data = root.findViewById(R.id.iv_personnel_data);
 
         mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
         rv_data = root.findViewById(R.id.rv_data);
         tv_em_name = root.findViewById(R.id.tv_em_name);
         tv_station = root.findViewById(R.id.tv_station);
-
+        tv_dc_emcode = root.findViewById(R.id.tv_dc_emcode);
+        iv_dc_emcode = root.findViewById(R.id.iv_dc_emcode);
 
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
 
@@ -307,31 +312,61 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         });
 
         /**----------------------------------不良现象------------------------------**/
-        iv_unhealthy_delete.setOnClickListener(new View.OnClickListener() {
+
+//        iv_unhealthy.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+////                initunhealthyPopupWindow();
+//            }
+//        });
+
+
+
+        tv_save.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ce_unhealthy.setText("");
-                ce_unhealthy.requestFocus();
+
+                getNewData();
             }
         });
 
-        iv_unhealthy.setOnClickListener(new View.OnClickListener() {
+        tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String dc_emcode = tv_dc_emcode.getText().toString().trim();
+                    getOrImage(dc_emcode);
+                    return true;
+                }
+                return false;
+            }
+        });
+        iv_dc_emcode.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                initunhealthyPopupWindow();
+                tv_dc_emcode.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_CODESD);
+                        SharedPreUtil.saveString(mActivity, Constants.STORAGEERECHADD, "NO");
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
             }
         });
 
 
 
-        tv_save.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
 
-                getNewData();
-            }
-        });
-        getOrImage();
+
 
     }
 
@@ -346,8 +381,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     /**
      * 关于人员资料
      */
-    public void getOrImage(){
-        String em_code = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMCODE, null);
+    public void getOrImage(String em_code){
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
@@ -835,10 +869,9 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     public void getNewData(){
         String ce_work_codetrim = et_linecode_smts.getText().toString().trim();
         String at_stationtrim = ce_resources.getText().toString().trim();
-        String ce_unhealthytrim = ce_unhealthy.getText().toString().trim();
         String ce_bit_numbertrim = ce_bit_number.getText().toString().trim();
         if (ce_bit_numbertrim.isEmpty()){
-            ce_bit_numbertrim="1";
+            ce_bit_numbertrim="0";
         }
         String ec_passqtytrim = ec_passqty.getText().toString().trim();
         if (ec_passqtytrim.isEmpty()){
@@ -852,7 +885,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         object_1.put("SR_SOURCECODE", at_stationtrim);//资源
         object_1.put("SR_PASSQTY", "0");//通过数量
         object_1.put("SR_NGQTY", ec_passqtytrim);//NG数量
-        object_1.put("SR_BADNAME",ce_unhealthytrim);//不良现象
+        object_1.put("SR_BADNAME","ce_unhealthytrim");//不良现象
         object_1.put("SR_TYPE", "数据采集");//种类(数据采集/、外观维修/性能维修)
         object_1.put("SR_LOCATION", ce_bit_numbertrim);//位号
         object_1.put("SR_REASON", "");//原因
@@ -923,14 +956,12 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         });
 
         ipAndlinecodePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-
-
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<LinecodeBean> ipAndPortBeans = ipAndlinecodePortAdapter.getmList();
                 ma_code = ipAndPortBeans.get(position).getMA_CODE();
-
+                pr_code = ipAndPortBeans.get(position).getPR_CODE();
+                pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -945,6 +976,8 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             @Override
             public void onClick(View v) {
                 et_linecode_smts.setText(ma_code);
+                tv_pr_code.setText("产品编号  "+pr_code);
+                tv_pr_detail.setText("产品名称  "+pr_detail);
                 closeListPopupWindow();
             }
         });
@@ -1194,7 +1227,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ce_unhealthy.setText(st_remark);
                 closeListPopupWindow();
             }
         });
@@ -1297,6 +1329,19 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     }
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+        if (requestCode == SCAN_BARCODE_CODESD && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(com.uas.collection.camera.CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.tv_dc_emcode) {
+                    tv_dc_emcode.setText(result);
+                    tv_dc_emcode.setSelection(result.length());
+                    getOrImage(result);
+                }
+            }
+        }
 
     }
     @Override

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

@@ -248,32 +248,32 @@ public class StorageRechargeListFragment extends BaseFragment{
                 }
             }
         });
-        ce_product_bar_code.addTextChangedListener(new TextWatcher() {
-
-            private CharSequence temp;
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                temp = s;
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                int selectionStart = ce_product_bar_code.getSelectionStart();
-                int selectionEnd = ce_product_bar_code.getSelectionEnd();
-                ce_product_bar_code.getSelectionStart();
-                if (temp.length() > Integer.parseInt(ce_length.getText().toString().trim())) {
-                    s.delete(selectionStart - 1, selectionEnd);
-                    ce_product_bar_code.setText(s);
-                }
-
-            }
-        });
+//        ce_product_bar_code.addTextChangedListener(new TextWatcher() {
+//
+//            private CharSequence temp;
+//
+//            @Override
+//            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+//
+//            }
+//
+//            @Override
+//            public void onTextChanged(CharSequence s, int start, int before, int count) {
+//                temp = s;
+//            }
+//
+//            @Override
+//            public void afterTextChanged(Editable s) {
+//                int selectionStart = ce_product_bar_code.getSelectionStart();
+//                int selectionEnd = ce_product_bar_code.getSelectionEnd();
+//                ce_product_bar_code.getSelectionStart();
+//                if (temp.length() > Integer.parseInt(ce_length.getText().toString().trim())) {
+//                    s.delete(selectionStart - 1, selectionEnd);
+//                    ce_product_bar_code.setText(s);
+//                }
+//
+//            }
+//        });
 
         ce_length.addTextChangedListener(new TextWatcher() {
             @Override
@@ -516,7 +516,10 @@ public class StorageRechargeListFragment extends BaseFragment{
 
 
     public void getNewSNData(String va_code){
-        if (ce_product_bar_code.getText().toString().trim().length() > Integer.parseInt(ce_length.getText().toString().trim())) {
+        if (ce_length.getText().toString().trim().isEmpty()){
+            ce_length.setText("0");
+        }
+        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
             CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
             return;
         }
@@ -577,7 +580,10 @@ public class StorageRechargeListFragment extends BaseFragment{
         });
     }
     public void getNewSaveData(){
-        if (ce_product_bar_code.getText().toString().trim().length() > Integer.parseInt(ce_length.getText().toString().trim())) {
+        if (ce_length.getText().toString().trim().isEmpty()){
+            ce_length.setText("0");
+        }
+        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
             CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
             return;
         }

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

@@ -13,10 +13,12 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.collection.R;
+import com.uas.collection.bean.VersionUpgradeBean;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.util.AndroidUtil;
 import com.uas.collection.util.CommonUtil;
@@ -32,6 +34,8 @@ import com.uas.collection.util.down.ProgressResponseBody;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.uas.collection.util.Constants.CONSTANT.APK_FILE_NAME;
 import static com.uas.collection.util.Constants.CONSTANT.APK_FILE_PATH;
@@ -148,16 +152,42 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                         progressDialog.dismiss();
                         String result = o.toString();
                         JSONObject resultObject = JSON.parseObject(result);
-                        JSONObject dataObject = resultObject.getJSONObject("data");
-                        if (dataObject != null) {
-                            mNewVersionTv.setText(FastjsonUtil.getText(dataObject, "pp_versionname"));
-                            mMsgTextView.setText(FastjsonUtil.getText(dataObject, "pp_remark"));
+                        JSONArray dataArray = resultObject.getJSONArray("data");
+                        List<VersionUpgradeBean> list=new ArrayList<>();
+                        list.clear();
+                        if (dataArray != null && dataArray.size() > 0) {
+                            for (int i = 0; i < dataArray.size(); i++) {
+                                JSONObject dataObject = dataArray.getJSONObject(i);
+                                if (dataObject != null) {
+                                    VersionUpgradeBean jltStorageInBean = new VersionUpgradeBean();
+                                    if (FastjsonUtil.getText(dataObject, "PP_PDACODE").equals("UAS数据采集")){
+                                        jltStorageInBean.setPP_PDACODE(FastjsonUtil.getText(dataObject, "PP_PDACODE"));
+                                        jltStorageInBean.setPP_VERSIONNUM(FastjsonUtil.getText(dataObject, "PP_VERSIONNUM"));
+                                        jltStorageInBean.setPP_ATTACH(FastjsonUtil.getText(dataObject, "PP_ATTACH"));
+                                        jltStorageInBean.setPP_REMARK(FastjsonUtil.getText(dataObject, "PP_REMARK"));
+                                        jltStorageInBean.setPP_VERSIONNAME(FastjsonUtil.getText(dataObject, "PP_VERSIONNAME"));
+                                        list.add(jltStorageInBean);
+                                        mUpgradeButton.setVisibility(View.VISIBLE);
+                                    }else {
+                                        mUpgradeButton.setVisibility(View.GONE);
+                                    }
 
-                            mAttachId = FastjsonUtil.getText(dataObject, "pp_attach");
-                            if (!TextUtils.isEmpty(mAttachId)) {
-                                mUpgradeButton.setVisibility(View.VISIBLE);
-                            } else {
-                                mUpgradeButton.setVisibility(View.VISIBLE);
+                                }
+                            }
+                        }
+                        if (list == null || list.size() == 0){
+                            mUpgradeButton.setVisibility(View.GONE);
+                        }else {
+                            for (int i=0;i<list.size();i++){
+                                VersionUpgradeBean versionUpgradeBean = list.get(0);
+                                mNewVersionTv.setText(versionUpgradeBean.getPP_VERSIONNAME());
+                                mMsgTextView.setText(versionUpgradeBean.getPP_REMARK());
+                                mAttachId = versionUpgradeBean.getPP_ATTACH();
+                                if (!TextUtils.isEmpty(mAttachId)) {
+                                    mUpgradeButton.setVisibility(View.VISIBLE);
+                                } else {
+                                    mUpgradeButton.setVisibility(View.VISIBLE);
+                                }
                             }
                         }
                     }

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

@@ -93,8 +93,46 @@
                     </TextView>
                 </LinearLayout>
 
+                <TableRow
+                    android:layout_marginTop="20dp">
+                    <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"
+                        android:layout_marginLeft="23dp">
+                        <com.uas.collection.view.ClearableEditText
+                            android:id="@+id/tv_dc_emcode"
+                            style="@style/EditTextLineStyle"
+                            android:text=""
+                            android:hint="请输入人员编号"
+                            android:layout_width="match_parent"
+                            android:layout_height="30dp"
+                            android:layout_weight="1"
+                            android:textColor="@color/black"
+                            />
+
+                        <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"
+                            android:src="@drawable/ic_edittext_scan" />
+                    </LinearLayout>
+
+
 
 
+                </TableRow>
+
                 <TableRow
                     android:layout_marginTop="20dp">
                     <TextView
@@ -176,6 +214,7 @@
                     </LinearLayout>
                 </TableRow>
                 <TableRow
+                    android:visibility="gone"
                     android:layout_marginTop="20dp">
                     <TextView
                         android:layout_width="wrap_content"
@@ -221,7 +260,21 @@
                             android:src="@drawable/search_48" />
                     </LinearLayout>
                 </TableRow>
-
+                <TableRow
+                    android:layout_marginTop="20dp">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="不良现象"
+                        android:layout_gravity="center"
+                        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>
+                </TableRow>
                 <TableRow
                     android:layout_marginTop="20dp">
                     <TextView

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

@@ -11,7 +11,7 @@
         android:textColor="@color/white"
         android:id="@+id/tv_root_chin_connectserver_fragment"
         style="@style/RootText"
-        android:text="设备管理系统" />
+        android:text="数据采集" />
 
     <TextView
         android:textStyle="bold"

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

@@ -11,7 +11,7 @@
         android:textColor="@color/white"
         android:id="@+id/tv_root_chin_connectserver_fragment"
         style="@style/RootText"
-        android:text="设备管理系统" />
+        android:text="数据采集" />
 
     <TextView
         android:textStyle="bold"

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

@@ -22,7 +22,7 @@
     <string name="text_btn_close">关闭</string>
     <string name="text_print_success">打印成功</string>
     <!--Connect Server Fragment-->
-    <string name="text_fragment_serverconnect_title">设备管理系统</string>
+    <string name="text_fragment_serverconnect_title">数据采集</string>
     <string name="hint_fragment_serverconnect_ip">请输入需要登录的服务器IP</string>
     <string name="hint_fragment_serverconnect_port">请输入端口</string>
     <string name="hint_fragment_serverconnect_site">请输入站点</string>
@@ -56,7 +56,7 @@
     <string name="text_fragment_chin_root">深圳市优软科技有限公司</string>
     <string name="text_fragment_eng_root">Copyright @ 2019 All Rights Reserved</string>
     <!--Main Menu-->
-    <string name="title_activity_menu">设备管理系统</string>
+    <string name="title_activity_menu">数据采集</string>
     <string name="title_activity_function">FunctionActivity</string>
     <!--InMakeMaterial-->
     <string name="text_search_fragment_inmake">出入库单号</string>

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

@@ -1,4 +1,4 @@
-#Tue Jun 13 15:26:55 CST 2023
+#Wed Jun 28 17:18:16 CST 2023
 D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
 D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml