增加人员编号放大镜功能, 增加数据采集功能页缓存,修改了签名文件位置,修改build.gradle与gradle-wapper.properties文件插件地址.

.idea/codeStyles/Project.xml

@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/gradle.xml

@@ -4,11 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-5.0" />
+        <option name="gradleHome" value="E:/gradle/gradle-5.4" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/jarRepositories.xml

@@ -11,61 +11,6 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google2" />
-      <option name="name" value="Google2" />
-      <option name="url" value="https://maven.google.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\Android\android-sdk\extras\m2repository" />
-      <option name="name" value="D:\Android\android-sdk\extras\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../Android/android-sdk/extras/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\Android\android-sdk\extras\google\m2repository" />
-      <option name="name" value="D:\Android\android-sdk\extras\google\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../Android/android-sdk/extras/google/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\Android\android-sdk\extras\android\m2repository" />
-      <option name="name" value="D:\Android\android-sdk\extras\android\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../Android/android-sdk/extras/android/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/m2repository" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\android\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/android/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\google\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/google/m2repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="name" value="D:\AndroidRel\AndroidSdk\extras\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidRel/AndroidSdk/extras/m2repository/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="maven4" />
       <option name="name" value="maven4" />
@@ -81,6 +26,21 @@
       <option name="name" value="maven3" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/google" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven5" />
+      <option name="name" value="maven5" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google2" />
+      <option name="name" value="Google2" />
+      <option name="url" value="https://maven.google.com/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="maven" />
       <option name="name" value="maven" />
@@ -91,5 +51,10 @@
       <option name="name" value="maven2" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/jcenter" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/runConfigurations.xml

@@ -4,9 +4,6 @@
     <option name="ignoredProducers">
       <set>
         <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
       </set>
     </option>
   </component>

app/build.gradle

@@ -9,7 +9,7 @@ android {
         pda_storage {
             keyAlias 'uas_hyuncollection_alias'
             keyPassword 'pdakeystone'
-            storeFile file('D:\\SignatureFile\\hyunpdakeystone.jks')
+            storeFile file('C:\\sigin\\hyunpdakeystone.jks')
             storePassword 'pdakeystone'
         }
     }

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

@@ -12,6 +12,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
@@ -69,6 +70,7 @@ import com.uas.hycollection.util.LogUtil;
 import com.uas.hycollection.util.MyArrayAdapter;
 import com.uas.hycollection.util.MyLayoutManager;
 import com.uas.hycollection.util.StringUtil;
+import com.uas.hycollection.util.VolleyRequest;
 import com.uas.hycollection.util.VollyRequest;
 import com.uas.hycollection.view.ClearableEditText;
 
@@ -151,6 +153,11 @@ public class BreakdownRepairFragment extends BaseFragment{
     private String li_code;
     private String sr_linecode;
     private String sr_badname;
+    private ImageView iv_number_search_for;
+    private ArrayList<LineCodeEntity> personnelList;
+    private GetLinePortAdapter getLinePortAdapter;
+    private String li_personne_id;
+    private RecyclerView rv_getline_ip_port_data;
 
     @Override
     protected int getLayout() {
@@ -188,6 +195,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         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);
+        iv_number_search_for = root.findViewById(R.id.iv_number_search_for);
         ce_wuli = root.findViewById(R.id.ce_wuli);
         iv_wuli = root.findViewById(R.id.iv_wuli);
 //        ce_length.setEnabled(false);
@@ -200,6 +208,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     protected void initEvents() {
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
         listSama = new ArrayList<>();
+        personnelList = new ArrayList<>();
         WindowManager wm = mActivity.getWindowManager();
         int screenWith = wm.getDefaultDisplay().getWidth()/5;
         mSmartTable.getConfig().setMinTableWidth(screenWith)
@@ -466,7 +475,12 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
 
-
+        iv_number_search_for.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                initGetPersonnelID();
+            }
+        });
 
         stringList = new ArrayList<>();
         //保存
@@ -496,7 +510,22 @@ public class BreakdownRepairFragment extends BaseFragment{
         });
 
 
-
+//        String work_order_flow = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_WORK_ORDER_FLOW, "");
+//        String plan_number = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PLAN_NUMBER, "");
+//        String product_code = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PRODUCT_CODE, "");
+//        String product_name = SharedPreUtil.getString(mActivity, SharedPreUtil.XN_PRODUCT_NAME, "");
+//
+//        Log.e("aaa", "记录最后一次存的工单流水:" + work_order_flow);
+//        Log.e("aaa", "记录最后一次存的计划单号:" + plan_number);
+//        Log.e("aaa", "记录最后一次存的 PRODUCT_CODE:" + product_code);
+//        Log.e("aaa", "记录最后一次存的 PRODUCT_NAME:" + product_name);
+//
+//        if (!TextUtils.isEmpty(work_order_flow)) {
+//            ce_work_code.setText(work_order_flow);
+//            tv_macode.setText(""+plan_number);
+//            tv_pr_code.setText(""+product_code);//pr_code ma_bomversion
+//            tv_pr_detail.setText(""+product_name);
+//        }
 
     }
 
@@ -1406,6 +1435,12 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
                 ipAndPortBeans.get(position).setChecked(true);
                 ipAndlinecodePortAdapter.notifyDataSetChanged();
+
+                //增加缓存,记录最后一次存的工单
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.XN_WORK_ORDER_FLOW, ma_id);  //工单流水
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.XN_PLAN_NUMBER, ma_code); //计划单号
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.XN_PRODUCT_CODE, ma_bomversion);   //产品代码
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.XN_PRODUCT_NAME, pr_detail);  //产品名称
             }
         });
 
@@ -2791,7 +2826,198 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
             }
         }
+    }
+
+    private void initGetPersonnelID() {
+        getLinePortAdapter = new GetLinePortAdapter(personnelList);
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_line_pup, null);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        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);
+        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));
+        getLinePortAdapter.setmList(personnelList);
+        rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+        getPersonnelID();
+
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView = mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+        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<personnelList.size();i++){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(personnelList.get(i));
+                        }
+                        if(i == personnelList.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(personnelList);
+                    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_personne_id = 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();
+                    }
+                });
+            }
+        });
+
+        getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                li_personne_id = 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();
+            }
+        });
+
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!StringUtil.isEmpty(li_personne_id)){
+                    tv_dc_emcode.setText(li_personne_id);
+                }else {
+                    CommonUtil.toastNoRepeat(mActivity,"请选择人员编号");
+                    return;
+                }
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+
+    }
+
+    private void getPersonnelID() {
+        //        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADD_GET_PERSONNEL_ID)
+                .method(Request.Method.POST)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                personnelList.clear();
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    if (dataArray != null) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                LineCodeEntity lineCodeEntity = new LineCodeEntity();
+                                lineCodeEntity.setLI_CODE(FastjsonUtil.getText(dataObject, "EM_CODE"));
+                                lineCodeEntity.setLI_NAME(FastjsonUtil.getText(dataObject, "EM_NAME"));
+                                personnelList.add(lineCodeEntity);
+                            }
+                        }
+                    }
+                    if (personnelList.size() == 0) {
+                        CommonUtil.toastNoRepeat(mActivity, "人员编号数据为空");
+                    } else {
+                        setcodelineAdapter(personnelList);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+    private void setcodelineAdapter(ArrayList<LineCodeEntity> mList) {
+        getLinePortAdapter.setmList(mList);
+        getLinePortAdapter.notifyDataSetChanged();
+        rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+    }
+
+    private class GetLinePortAdapter extends BaseQuickAdapter<LineCodeEntity, BaseViewHolder> {
+        private List<LineCodeEntity> mmmmList;
+
+        public List<LineCodeEntity> getmList() {
+            return mmmmList;
+        }
+
+        public void setmList(List<LineCodeEntity> mList) {
+            this.mmmmList = mList;
+        }
+        public LineCodeEntity getBeanByPositon(int position){
+            return mmmmList.get(position);
+        }
+
+        private GetLinePortAdapter(@Nullable List<LineCodeEntity> data) {
+            super(R.layout.fuzzy_ipandport_item, data);
+            this.mmmmList = data;
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, LineCodeEntity item) {
+            helper.setText(R.id.macode_ip__Tv,item.getLI_NAME()+"("+item.getLI_CODE()+")");
+            LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
+            if (item.getChecked()) {
+                line_true.setSelected(true);
+            } else {
+                line_true.setSelected(false);
+            }
+        }
     }
 
 }

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

@@ -62,6 +62,7 @@ import com.uas.hycollection.bean.StorageRechargeAloneBean;
 import com.uas.hycollection.bean.TestcollectDataBean;
 import com.uas.hycollection.camera.CaptureActivity;
 import com.uas.hycollection.global.GloableParams;
+import com.uas.hycollection.tools.GsonUtil;
 import com.uas.hycollection.tools.SharedPreUtil;
 import com.uas.hycollection.util.CameraUtil;
 import com.uas.hycollection.util.CommonUtil;
@@ -136,6 +137,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     private AutoCompleteTextView tv_dc_line;
     private ImageView iv_dc_emcode;
     private ImageView iv_dc_line;
+    private ImageView iv_number_search_for;
     private int mFocusId;
     private static final int SCAN_BARCODE_CODESD = 925;
     private static final int SCAN_BARCODE_LINE = 888;
@@ -175,8 +177,10 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     private String ma_bomversion;
     private InputMethodManager imm;
     private ArrayList<LineCodeEntity> codeEntityArrayList;
+    private ArrayList<LineCodeEntity> personnelList;
     private GetLinePortAdapter getLinePortAdapter;
     private String li_code;
+    private String li_personne_id;
     private RecyclerView rv_getline_ip_port_data;
 
 
@@ -216,6 +220,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         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);
+        iv_number_search_for = root.findViewById(R.id.iv_number_search_for);
         rv_datachange = root.findViewById(R.id.rv_datachange);
         rv_datapassqty = root.findViewById(R.id.rv_datapassqty);
         tv_macode = root.findViewById(R.id.tv_macode);
@@ -250,6 +255,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     protected void initDatas() {
         resourcesBeanList = new ArrayList<>();
         codeEntityArrayList = new ArrayList<>();
+        personnelList = new ArrayList<>();
         WindowManager wm = mActivity.getWindowManager();
         int screenWith = wm.getDefaultDisplay().getWidth()/3;
         mSmartTable.getConfig().setMinTableWidth(screenWith)
@@ -536,10 +542,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         handleFeededDataTwo(dataArray);
 
 
-
-
-
-
         tv_save.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -607,6 +609,13 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             }
         });
 
+        iv_number_search_for.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                initGetPersonnelID();
+            }
+        });
+
         recycleDataundesirable();
 
         sc_codecolleone = SharedPreUtil.getString(mActivity, "sc_codecolleone", null);
@@ -629,12 +638,176 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 //            }
 
 
+        String work_order_flow = SharedPreUtil.getString(mActivity, SharedPreUtil.SJ_WORK_ORDER_FLOW, "");
+        String plan_number = SharedPreUtil.getString(mActivity, SharedPreUtil.SJ_PLAN_NUMBER, "");
+        String product_code = SharedPreUtil.getString(mActivity, SharedPreUtil.SJ_PRODUCT_CODE, "");
+        String product_name = SharedPreUtil.getString(mActivity, SharedPreUtil.SJ_PRODUCT_NAME, "");
+
+        if (!TextUtils.isEmpty(work_order_flow)) {
+            et_linecode_smts.setText(work_order_flow);
+            tv_macode.setText(""+plan_number);
+            tv_pr_code.setText(""+product_code);//pr_code ma_bomversion
+            tv_pr_detail.setText(""+product_name);
+        }
+
+    }
+
+    private void initGetPersonnelID() {
+        getLinePortAdapter = new GetLinePortAdapter(personnelList);
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_line_pup, null);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        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);
+        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));
+        getLinePortAdapter.setmList(personnelList);
+        rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+        getPersonnelID();
+
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView = mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+        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<personnelList.size();i++){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(personnelList.get(i));
+                        }
+                        if(i == personnelList.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(personnelList);
+                    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_personne_id = 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();
+                    }
+                });
+            }
+        });
 
+        getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                li_personne_id = 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();
+            }
+        });
+
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!StringUtil.isEmpty(li_personne_id)){
+                    tv_dc_emcode.setText(li_personne_id);
+                }else {
+                    CommonUtil.toastNoRepeat(mActivity,"请选择人员编号");
+                    return;
+                }
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
 
     }
+
+    private void getPersonnelID() {
+//        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADD_GET_PERSONNEL_ID)
+                .method(Request.Method.POST)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                personnelList.clear();
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    if (dataArray != null) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                LineCodeEntity lineCodeEntity = new LineCodeEntity();
+                                lineCodeEntity.setLI_CODE(FastjsonUtil.getText(dataObject, "EM_CODE"));
+                                lineCodeEntity.setLI_NAME(FastjsonUtil.getText(dataObject, "EM_NAME"));
+                                personnelList.add(lineCodeEntity);
+                            }
+                        }
+                    }
+                    if (personnelList.size() == 0) {
+                        CommonUtil.toastNoRepeat(mActivity, "人员编号数据为空");
+                    } else {
+                        setcodelineAdapter(personnelList);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
     private void handleFeededDataTwo(JSONArray dataArray) {
         StorageRechargeAloneBean bean;
         passFeededListQty.clear();
@@ -838,8 +1011,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     }
 
 
-
-
     private class IpAndPortAdapter extends BaseQuickAdapter<IpAndPortBean, BaseViewHolder> {
         private List<IpAndPortBean> mmmmList;
 
@@ -965,13 +1136,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 
 
 
-
-
-
-
-
-
-
     private class IpAndunhealthyPortAdapter extends BaseQuickAdapter<ResourcesBean, BaseViewHolder> {
         private List<ResourcesBean> mmmmList;
 
@@ -1004,7 +1168,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 
 
     public void getfuzzySearchData(String inoutNo,String sone){
-
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_SMT_FUZZY_SEARCH)
                 .method(Request.Method.GET)
@@ -1497,6 +1660,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         rv_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
         ipAndlinecodePortAdapter.setmList(linecodeBeanList);
         rv_ip_port_data.setAdapter(ipAndlinecodePortAdapter);
+
         getfuzzySearchData(edit_et.getText().toString().trim(),"弹框");
 
         editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
@@ -1534,10 +1698,16 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 }
                 ipAndPortBeans.get(position).setChecked(true);
                 ipAndlinecodePortAdapter.notifyDataSetChanged();
+
+                //增加缓存,记录最后一次存的工单
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.SJ_WORK_ORDER_FLOW, ma_id);  //工单流水
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.SJ_PLAN_NUMBER, ma_code); //计划单号
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.SJ_PRODUCT_CODE, ma_bomversion);   //产品代码
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.SJ_PRODUCT_NAME, pr_detail);  //产品名称
+
             }
         });
 
-
         //确定
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1563,7 +1733,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         cancle_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
                 closeListPopupWindow();
             }
         });
@@ -1899,9 +2068,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 
 
 
-
-
-
     /**
      * 不良现象
      */
@@ -2191,7 +2357,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         cancle_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
                 closeListPopupWindow();
             }
         });
@@ -2345,7 +2510,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
                 if (!StringUtil.isEmpty(li_code)){
                     tv_dc_line.setText(li_code);
                 }else {
@@ -2360,7 +2524,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         cancle_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
                 closeListPopupWindow();
             }
         });
@@ -2461,23 +2624,11 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     }
 
     private void setcodelineAdapter(ArrayList<LineCodeEntity> mList) {
-        getLinePortAdapter.setmList(codeEntityArrayList);
+        getLinePortAdapter.setmList(mList);
         getLinePortAdapter.notifyDataSetChanged();
         rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
     public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         private int checkedPosition = -1;
         private boolean onBind;

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

@@ -178,6 +178,11 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     private GetLinePortAdapter getLinePortAdapter;
     private String li_code;
     private RecyclerView rv_getline_ip_port_data;
+
+    private ImageView iv_number_search_for;
+    private ArrayList<LineCodeEntity> personnelList;
+    private String li_personne_id;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_quantitystatistics;
@@ -222,6 +227,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         rv_undesirable = root.findViewById(R.id.rv_undesirable);
         iv_dc_emcode_delete = root.findViewById(R.id.iv_dc_emcode_delete);
         iv_dc_line_delete = root.findViewById(R.id.iv_dc_line_delete);
+        iv_number_search_for = root.findViewById(R.id.iv_number_search_for);
         tv_undesirable = root.findViewById(R.id.tv_undesirable);
         rv_master_copy = root.findViewById(R.id.rv_master_copy);
         rv_original_copy = root.findViewById(R.id.rv_original_copy);
@@ -248,6 +254,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     protected void initDatas() {
         resourcesBeanList = new ArrayList<>();
         codeEntityArrayList = new ArrayList<>();
+        personnelList = new ArrayList<>();
         WindowManager wm = mActivity.getWindowManager();
         int screenWith = wm.getDefaultDisplay().getWidth()/3;
         mSmartTable.getConfig().setMinTableWidth(screenWith)
@@ -459,7 +466,12 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
             }
         });
 
-
+        iv_number_search_for.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                initGetPersonnelID();
+            }
+        });
 
         ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(resourcesBeanList);
         iv_resources.setOnClickListener(new View.OnClickListener() {
@@ -588,7 +600,22 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
 
 
 
-
+//        String work_order_flow = SharedPreUtil.getString(mActivity, SharedPreUtil.CC_WORK_ORDER_FLOW, "");
+//        String plan_number = SharedPreUtil.getString(mActivity, SharedPreUtil.CC_PLAN_NUMBER, "");
+//        String product_code = SharedPreUtil.getString(mActivity, SharedPreUtil.CC_PRODUCT_CODE, "");
+//        String product_name = SharedPreUtil.getString(mActivity, SharedPreUtil.CC_PRODUCT_NAME, "");
+//
+//        Log.e("aaa", "记录最后一次存的工单流水:" + work_order_flow);
+//        Log.e("aaa", "记录最后一次存的计划单号:" + plan_number);
+//        Log.e("aaa", "记录最后一次存的 PRODUCT_CODE:" + product_code);
+//        Log.e("aaa", "记录最后一次存的 PRODUCT_NAME:" + product_name);
+//
+//        if (!TextUtils.isEmpty(work_order_flow)) {
+//            et_linecode_smts.setText(work_order_flow);
+//            tv_macode.setText(""+plan_number);
+//            tv_pr_code.setText(""+product_code);//pr_code ma_bomversion
+//            tv_pr_detail.setText(""+product_name);
+//        }
 
     }
     private void handleFeededDataTwo(JSONArray dataArray) {
@@ -833,7 +860,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     }
 
     private void setcodelineAdapter(ArrayList< LineCodeEntity > mList) {
-        getLinePortAdapter.setmList(codeEntityArrayList);
+        getLinePortAdapter.setmList(mList);
         getLinePortAdapter.notifyDataSetChanged();
         rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
     }
@@ -1574,6 +1601,12 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                 }
                 ipAndPortBeans.get(position).setChecked(true);
                 ipAndlinecodePortAdapter.notifyDataSetChanged();
+
+                //增加缓存,记录最后一次存的工单
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.CC_WORK_ORDER_FLOW, ma_id);  //工单流水
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.CC_PLAN_NUMBER, ma_code); //计划单号
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.CC_PRODUCT_CODE, ma_bomversion);   //产品代码
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.CC_PRODUCT_NAME, pr_detail);  //产品名称
             }
         });
 
@@ -3157,4 +3190,161 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     public void onDestroy() {
         super.onDestroy();
     }
+
+    private void initGetPersonnelID() {
+        getLinePortAdapter = new GetLinePortAdapter(personnelList);
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_line_pup, null);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        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);
+        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));
+        getLinePortAdapter.setmList(personnelList);
+        rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+        getPersonnelID();
+
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView = mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+        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<personnelList.size();i++){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(personnelList.get(i));
+                        }
+                        if(i == personnelList.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(personnelList);
+                    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_personne_id = 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();
+                    }
+                });
+            }
+        });
+
+        getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                li_personne_id = 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();
+            }
+        });
+
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!StringUtil.isEmpty(li_personne_id)){
+                    tv_dc_emcode.setText(li_personne_id);
+                }else {
+                    CommonUtil.toastNoRepeat(mActivity,"请选择人员编号");
+                    return;
+                }
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+
+    }
+
+    private void getPersonnelID() {
+        //        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADD_GET_PERSONNEL_ID)
+                .method(Request.Method.POST)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                personnelList.clear();
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    if (dataArray != null) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                LineCodeEntity lineCodeEntity = new LineCodeEntity();
+                                lineCodeEntity.setLI_CODE(FastjsonUtil.getText(dataObject, "EM_CODE"));
+                                lineCodeEntity.setLI_NAME(FastjsonUtil.getText(dataObject, "EM_NAME"));
+                                personnelList.add(lineCodeEntity);
+                            }
+                        }
+                    }
+                    if (personnelList.size() == 0) {
+                        CommonUtil.toastNoRepeat(mActivity, "人员编号数据为空");
+                    } else {
+                        setcodelineAdapter(personnelList);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
 }

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

@@ -12,6 +12,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
@@ -69,6 +70,7 @@ import com.uas.hycollection.util.LogUtil;
 import com.uas.hycollection.util.MyArrayAdapter;
 import com.uas.hycollection.util.MyLayoutManager;
 import com.uas.hycollection.util.StringUtil;
+import com.uas.hycollection.util.VolleyRequest;
 import com.uas.hycollection.util.VollyRequest;
 import com.uas.hycollection.view.ClearableEditText;
 
@@ -148,6 +150,12 @@ public class StorageRechargeListFragment extends BaseFragment{
     private String li_code;
     private String sr_linecode;
     private String sr_badname;
+    private ImageView iv_number_search_for;
+    private ArrayList<LineCodeEntity> personnelList;
+    private GetLinePortAdapter getLinePortAdapter;
+    private String li_personne_id;
+    private RecyclerView rv_getline_ip_port_data;
+
 
     @Override
     protected int getLayout() {
@@ -185,6 +193,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
         iv_pr_code_delete = root.findViewById(R.id.iv_pr_code_delete);
         iv_detail_delete = root.findViewById(R.id.iv_detail_delete);
+        iv_number_search_for = root.findViewById(R.id.iv_number_search_for);
         rv_datapassqty = root.findViewById(R.id.rv_datapassqty);
         rv_dataclassify = root.findViewById(R.id.rv_dataclassify);
         ce_work_code.setInputType(InputType.TYPE_CLASS_NUMBER);
@@ -201,6 +210,7 @@ public class StorageRechargeListFragment extends BaseFragment{
     @Override
     protected void initDatas() {
         mFeededList = new ArrayList<>();
+        personnelList = new ArrayList<>();
         myAdapter = new SelectAdapter(mFeededList);
         LinearLayoutManager layoutmanager = new LinearLayoutManager(mActivity);
         MyLayoutManager layout = new MyLayoutManager();
@@ -383,6 +393,12 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
         });
 
+        iv_number_search_for.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                initGetPersonnelID();
+            }
+        });
 
         /**----------------------------人员编号------------------------------------**/
         tv_dc_emcode.addTextChangedListener(new TextWatcher() {
@@ -511,7 +527,183 @@ public class StorageRechargeListFragment extends BaseFragment{
         va_qtyColumn = new Column<String>("数量", "SR_NGQTY");
         va_sr_badnameremark = new Column<String>("不良归类", "SR_BADNAMEREMARK");
         va_timeColumn = new Column<String>("时间", "SR_INDATE");
+
+
+//        String work_order_flow = SharedPreUtil.getString(mActivity, SharedPreUtil.WG_WORK_ORDER_FLOW, "");
+//        String plan_number = SharedPreUtil.getString(mActivity, SharedPreUtil.WG_PLAN_NUMBER, "");
+//        String product_code = SharedPreUtil.getString(mActivity, SharedPreUtil.WG_PRODUCT_CODE, "");
+//        String product_name = SharedPreUtil.getString(mActivity, SharedPreUtil.WG_PRODUCT_NAME, "");
+//
+//        Log.e("aaa", "记录最后一次存的工单流水:" + work_order_flow);
+//        Log.e("aaa", "记录最后一次存的计划单号:" + plan_number);
+//        Log.e("aaa", "记录最后一次存的 PRODUCT_CODE:" + product_code);
+//        Log.e("aaa", "记录最后一次存的 PRODUCT_NAME:" + product_name);
+//
+//        if (!TextUtils.isEmpty(work_order_flow)) {
+//            ce_work_code.setText(work_order_flow);
+//            tv_macode.setText(""+plan_number);
+//            tv_pr_code.setText(""+product_code);//pr_code ma_bomversion
+//            tv_pr_detail.setText(""+product_name);
+//        }
+
     }
+
+    private void initGetPersonnelID() {
+        getLinePortAdapter = new GetLinePortAdapter(personnelList);
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_line_pup, null);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        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);
+        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));
+        getLinePortAdapter.setmList(personnelList);
+        rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+        getPersonnelID();
+
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView = mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+        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<personnelList.size();i++){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                            thisList.add(personnelList.get(i));
+                        }
+                        if(i == personnelList.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(personnelList);
+                    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_personne_id = 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();
+                    }
+                });
+            }
+        });
+
+        getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+                li_personne_id = 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();
+            }
+        });
+
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!StringUtil.isEmpty(li_personne_id)){
+                    tv_dc_emcode.setText(li_personne_id);
+                }else {
+                    CommonUtil.toastNoRepeat(mActivity,"请选择人员编号");
+                    return;
+                }
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+
+    }
+
+    private void getPersonnelID() {
+        //        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADD_GET_PERSONNEL_ID)
+                .method(Request.Method.POST)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                personnelList.clear();
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    if (dataArray != null) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                LineCodeEntity lineCodeEntity = new LineCodeEntity();
+                                lineCodeEntity.setLI_CODE(FastjsonUtil.getText(dataObject, "EM_CODE"));
+                                lineCodeEntity.setLI_NAME(FastjsonUtil.getText(dataObject, "EM_NAME"));
+                                personnelList.add(lineCodeEntity);
+                            }
+                        }
+                    }
+                    if (personnelList.size() == 0) {
+                        CommonUtil.toastNoRepeat(mActivity, "人员编号数据为空");
+                    } else {
+                        setcodelineAdapter(personnelList);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
     public void getReapirInfo(String bgcode,String ma_code,String li_code){
 
         if (ce_work_code.getText().toString().trim().isEmpty()){
@@ -573,10 +765,11 @@ public class StorageRechargeListFragment extends BaseFragment{
         });
     }
 
-
-
-
-
+    private void setcodelineAdapter(ArrayList<LineCodeEntity> mList) {
+        getLinePortAdapter.setmList(mList);
+        getLinePortAdapter.notifyDataSetChanged();
+        rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+    }
 
 
     String temeindate;
@@ -1216,6 +1409,12 @@ public class StorageRechargeListFragment extends BaseFragment{
                 }
                 ipAndPortBeans.get(position).setChecked(true);
                 ipAndlinecodePortAdapter.notifyDataSetChanged();
+
+                //增加缓存,记录最后一次存的工单
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_WORK_ORDER_FLOW, ma_id);  //工单流水
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_PLAN_NUMBER, ma_code); //计划单号
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_PRODUCT_CODE, ma_bomversion);   //产品代码
+                SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_PRODUCT_NAME, pr_detail);  //产品名称
             }
         });
 
@@ -2394,6 +2593,35 @@ public class StorageRechargeListFragment extends BaseFragment{
         }
     }
 
+    private class GetLinePortAdapter extends BaseQuickAdapter<LineCodeEntity, BaseViewHolder> {
+        private List<LineCodeEntity> mmmmList;
+
+        public List<LineCodeEntity> getmList() {
+            return mmmmList;
+        }
+
+        public void setmList(List<LineCodeEntity> mList) {
+            this.mmmmList = mList;
+        }
+        public LineCodeEntity getBeanByPositon(int position){
+            return mmmmList.get(position);
+        }
+
+        private GetLinePortAdapter(@Nullable List<LineCodeEntity> data) {
+            super(R.layout.fuzzy_ipandport_item, data);
+            this.mmmmList = data;
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, LineCodeEntity item) {
+            helper.setText(R.id.macode_ip__Tv,item.getLI_NAME()+"("+item.getLI_CODE()+")");
+            LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
+            if (item.getChecked()) {
+                line_true.setSelected(true);
+            } else {
+                line_true.setSelected(false);
+            }
+        }
+    }
 
 
 }

app/src/main/java/com/uas/hycollection/global/GloableParams.java

@@ -340,6 +340,8 @@ public class GloableParams {
     public static String ADDRESS_SPM_FUZZYSEARCHSOURCE;
     public static String ADDRESS_SPM_FUZZYSEARCHBADCODE;
 
+    public static String ADD_GET_PERSONNEL_ID;        //获取人员编号接口
+
     /**
      * 新版设备管理
      */
@@ -371,6 +373,10 @@ public class GloableParams {
     public static String ADDRESSTAIL_GET_FUZZYSEARCHSOURCE="/api/pda/smt/fuzzySearchSource.action";
     public static String ADDRESSTAIL_GET_TESTCOLLECTDATA="/api/pda/smt/testcollectData.action";
     public static String ADDRESSTAIL_GET_GETMAKERECORD="/oa/device/getMakerecord.action";
+
+    //人员编号
+    public static String ADDRESSTAIL_GET_PERSONNEL_ID="/api/pda/spm/getEmployee.action";
+
     //线别筛选
     private static final String ADDRESSTAIL_SPM_GETLINE = "/api/pda/spm/getLine.action";
     private static final String ADDRESSTAIL_SPM_GETBADINFO = "/api/pda/smt/getBadInfo.action";
@@ -379,7 +385,6 @@ public class GloableParams {
     private static final String ADDRESSTAIL_SPM_FUZZYSEARCHSOURCE = "/api/pda/smt/fuzzySearchSource.action";
 
 
-
     /**
      * 高登
      */
@@ -1519,5 +1524,7 @@ public class GloableParams {
         GloableParams.ADDRESS_SPM_GETREAPIRINFO= uriHead + GloableParams.ADDRESSTAIL_SPM_GETREAPIRINFO;
         GloableParams.ADDRESS_SPM_FUZZYSEARCHSOURCE= uriHead + GloableParams.ADDRESSTAIL_SPM_FUZZYSEARCHSOURCE;
         GloableParams.ADDRESS_SPM_FUZZYSEARCHBADCODE= uriHead + GloableParams.ADDRESSTAIL_SMT_FUZZY_FUZZYSEARCHBADCODE;
+
+        GloableParams.ADD_GET_PERSONNEL_ID= uriHead + GloableParams.ADDRESSTAIL_GET_PERSONNEL_ID;
     }
 }

app/src/main/java/com/uas/hycollection/tools/SharedPreUtil.java

@@ -22,6 +22,50 @@ public class SharedPreUtil {
     public static final String KEY_SCMAKE_FEEDER = "key_scmake_feeder";
 
 
+    /**数据采集**/
+    //工单流水
+    public static final String SJ_WORK_ORDER_FLOW = "SJ_Work_order_flow";
+    //计划单号
+    public static final String SJ_PLAN_NUMBER = "SJ_Plan_number";
+    //产品代码
+    public static final String SJ_PRODUCT_CODE = "SJ_product_code";
+    //产品名称
+    public static final String SJ_PRODUCT_NAME = "SJ_product_name";
+
+    /**外观维修**/
+    //工单流水
+    public static final String WG_WORK_ORDER_FLOW = "WG_Work_order_flow";
+    //计划单号
+    public static final String WG_PLAN_NUMBER = "WG_Plan_number";
+    //产品代码
+    public static final String WG_PRODUCT_CODE = "WG_product_code";
+    //产品名称
+    public static final String WG_PRODUCT_NAME = "WG_product_name";
+
+
+    /**性能维修**/
+    //工单流水
+    public static final String XN_WORK_ORDER_FLOW = "XN_Work_order_flow";
+    //计划单号
+    public static final String XN_PLAN_NUMBER = "XN_Plan_number";
+    //产品代码
+    public static final String XN_PRODUCT_CODE = "XN_product_code";
+    //产品名称
+    public static final String XN_PRODUCT_NAME = "XN_product_name";
+
+
+    /**产出统计**/
+    //工单流水
+    public static final String CC_WORK_ORDER_FLOW = "GC_Work_order_flow";
+    //计划单号
+    public static final String CC_PLAN_NUMBER = "GC_Plan_number";
+    //产品代码
+    public static final String CC_PRODUCT_CODE = "GC_product_code";
+    //产品名称
+    public static final String CC_PRODUCT_NAME = "GC_product_name";
+
+
+
     //清除IP和PORT的所有缓存
     public static void removeAll(Context pContext) {
         if (sharedPreUtil == null) {

app/src/main/java/com/uas/hycollection/util/Constants.java

@@ -117,7 +117,6 @@ public interface Constants {
         //SOP缓存
         String NOTICE_MONITOR_SETTING="monitor_login";
 
-
         //保存登录密码
         String LOGINPASSOWRD = "loginpassowrd";
 

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

@@ -240,6 +240,7 @@
                                         style="@style/EditTextLineStyle"
                                         android:layout_height="25dp"
                                         android:hint="请输入人员编号"
+                                        android:focusable="false"
                                         android:textSize="@dimen/dp_10"/>
 
                                     <ImageView
@@ -258,7 +259,21 @@
                                     android:layout_gravity="center"
                                     android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
-                                    android:clickable="false" />
+                                    android:clickable="false"
+                                    android:visibility="gone"
+                                    />
+
+                                <ImageView
+                                    android:id="@+id/iv_number_search_for"
+                                    android:layout_width="30dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_gravity="center"
+                                    android:background="@drawable/bg_button"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:src="@drawable/search_48"
+                                    />
+
                             </LinearLayout>
                         </LinearLayout>
 

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

@@ -253,6 +253,7 @@
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="24dp"
                                                 android:layout_marginLeft="23dp"
+                                                android:focusable="false"
                                                 android:hint="请输入人员编号"
                                                 android:text="ZUZHUANG"/>
 
@@ -273,7 +274,20 @@
                                             android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
                                             android:clickable="false"
+                                            android:visibility="gone"
+                                            />
+
+                                        <ImageView
+                                            android:id="@+id/iv_number_search_for"
+                                            android:layout_width="30dp"
+                                            android:layout_height="match_parent"
+                                            android:layout_gravity="center"
+                                            android:background="@drawable/bg_button"
+                                            android:layout_marginRight="10dp"
+                                            android:layout_marginLeft="5dp"
+                                            android:src="@drawable/search_48"
                                             />
+
                                     </LinearLayout>
 
 

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

@@ -249,6 +249,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:focusable="false"
                                             android:hint="请输入人员编号" />
 
                                         <ImageView
@@ -268,7 +269,20 @@
                                         android:layout_marginRight="10dp"
                                         android:layout_marginLeft="5dp"
                                         android:clickable="false"
+                                        android:visibility="gone"
                                         />
+
+                                    <ImageView
+                                        android:id="@+id/iv_number_search_for"
+                                        android:layout_width="30dp"
+                                        android:layout_height="match_parent"
+                                        android:layout_gravity="center"
+                                        android:background="@drawable/bg_button"
+                                        android:layout_marginRight="10dp"
+                                        android:layout_marginLeft="5dp"
+                                        android:src="@drawable/search_48"
+                                        />
+
                                 </LinearLayout>
 
 

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

@@ -250,6 +250,7 @@
                                                 android:id="@+id/tv_dc_emcode"
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="30dp"
+                                                android:focusable="false"
                                                 android:hint="请输入人员编号" />
 
                                             <ImageView
@@ -269,7 +270,20 @@
                                             android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
                                             android:clickable="false"
+                                            android:visibility="gone"
+                                            />
+
+                                        <ImageView
+                                            android:id="@+id/iv_number_search_for"
+                                            android:layout_width="30dp"
+                                            android:layout_height="match_parent"
+                                            android:layout_gravity="center"
+                                            android:background="@drawable/bg_button"
+                                            android:layout_marginRight="10dp"
+                                            android:layout_marginLeft="5dp"
+                                            android:src="@drawable/search_48"
                                             />
+
                                     </LinearLayout>
                                 </LinearLayout>
                                 <LinearLayout

build.gradle

@@ -13,6 +13,7 @@ buildscript {
         }
     }
     dependencies {
+        //classpath 'com.android.tools.build:gradle:3.6.4'
         classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
@@ -58,8 +59,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 34,
-            versionName      : "v1.2.4"
+            versionCode      : 33,
+            versionName      : "v1.2.3"
     ]
 
     depsVersion = [

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -6,13 +6,5 @@ package com.handmark.pulltorefresh.library;
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
   public static final String LIBRARY_PACKAGE_NAME = "com.handmark.pulltorefresh.library";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 33;
-  public static final String VERSION_NAME = "v1.2.3";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="33"
-    android:versionName="v1.2.3" >
+    android:versionCode="2110"
+    android:versionName="2.1.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":33,"versionName":"v1.2.3","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\debug\jniLibs"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\debug\shaders"/></dataSet></merger>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidData\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\main\assets"/><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GongSi\AS_XiangMu\HUAYUN-DATA-COLLETION\HUAYUN-DATA-COLLETION\pda_libs\pulltoreflashlibrary\src\debug\assets"/></dataSet></merger>

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

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