修改接口请求成功提示文字颜色

app/src/main/java/com/uas/rd_equipment/camera/CaptureFragment.java

@@ -81,9 +81,8 @@ public class CaptureFragment extends Fragment implements SurfaceHolder.Callback
             }
         }
 
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_capture, null);
-        }
+
+        view = inflater.inflate(R.layout.fragment_capture, null);
 
         viewfinderView =  view.findViewById(R.id.viewfinder_view);
         surfaceView =  view.findViewById(R.id.preview_view);

app/src/main/java/com/uas/rd_equipment/fragment/AddEquipmentGrantFragment.java

@@ -715,7 +715,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                CommonUtil.toastNoRepeat(mActivity, "删除成功");
+                CommonUtil.toastYESRepeat(mActivity, "删除成功");
                 getDatalistCodes("",work_code_code.getText().toString().trim());
             }
 
@@ -774,7 +774,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 getDatalistCodes("",work_code_code.getText().toString().trim());
-                CommonUtil.toastNoRepeat(mActivity, "保存成功");
+                CommonUtil.toastYESRepeat(mActivity, "保存成功");
                 storage_recharge_collect_et.setText("");
             }
 

app/src/main/java/com/uas/rd_equipment/fragment/FinishedGoodsCollectFragment.java

@@ -683,7 +683,7 @@ public class FinishedGoodsCollectFragment extends BaseFragment implements View.O
                                 mGoodsProdcodeTv.setText(mGoodsProdcodeResult);
                                 mOrdercodeTv.setText(mOrdercodeResult);
                                 mCollectMsgCet.setText(null);
-                                CommonUtil.toastNoRepeat(getActivity(), "采集成功");
+                                CommonUtil.toastYESRepeat(getActivity(), "采集成功");
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -986,7 +986,7 @@ public class FinishedGoodsCollectFragment extends BaseFragment implements View.O
                                     }
 
                                 }
-                                CommonUtil.toastNoRepeat(getActivity(), "清除数据成功");
+                                CommonUtil.toastYESRepeat(getActivity(), "清除数据成功");
                                 getActivity().getSupportFragmentManager().popBackStack();
                             } catch (Exception e) {
 //                                e.printStackTrace();

app/src/main/java/com/uas/rd_equipment/fragment/FinishedGoodsStorageFragment.java

@@ -988,7 +988,7 @@ public class FinishedGoodsStorageFragment extends BaseFragment implements View.O
                                     Toast.makeText(getActivity(), getResources().getString(R.string.submit_success), Toast.LENGTH_SHORT).show();
 
                                 } else {
-                                    CommonUtil.toastNoRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
+                                    CommonUtil.toastYESRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
 
                                 }
                             }

app/src/main/java/com/uas/rd_equipment/fragment/IOCOutMakeMaterialOper.java

@@ -751,7 +751,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             tvBarcodeCollectionSuccess.setVisibility(View.VISIBLE);
                             tvBarcodeCollectionSuccess.setText("采集成功");
 
-                            CommonUtil.toastNoRepeat(getActivity(), "采集成功");
+                            CommonUtil.toastYESRepeat(getActivity(), "采集成功");
 
                             Object next = dataObject.get("next");
                             if (next != null && !"null".equals(next.toString())) {
@@ -913,7 +913,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     public void onSuccess(int flag, Object o) throws Exception {
         if (flag == FLAG_CONFIRM_POST) {
             progressDialog.dismiss();
-            CommonUtil.toastNoRepeat(mActivity, "过账成功");
+            CommonUtil.toastYESRepeat(mActivity, "过账成功");
         }
     }
 
@@ -1711,7 +1711,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     } else {
                                         mCollectModelBtn.setText("离线");
                                         mCollectModel = 0;
-                                        CommonUtil.toastNoRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
+                                        CommonUtil.toastYESRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
 
                                     }
                                 }
@@ -2008,7 +2008,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     }
 
                                 }
-                                CommonUtil.toastNoRepeat(getActivity(), "清除数据成功");
+                                CommonUtil.toastYESRepeat(getActivity(), "清除数据成功");
                                 getActivity().getSupportFragmentManager().popBackStack();
                             } catch (Exception e) {
                                 CommonUtil.toastNoRepeat(getActivity(), "清除失败");

app/src/main/java/com/uas/rd_equipment/fragment/MaterialCollectionFragment.java

@@ -579,7 +579,7 @@ public class MaterialCollectionFragment extends BaseFragment {
                                     } else {
                                         ((RadioButton) mCollectionTypeRg.findViewById(R.id.material_collection_outline_rb)).setChecked(true);
                                         mModeType = 0;
-                                        CommonUtil.toastNoRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
+                                        CommonUtil.toastYESRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
                                     }
                                 }
                             } catch (Exception e) {
@@ -1024,7 +1024,7 @@ public class MaterialCollectionFragment extends BaseFragment {
                                     }
 
                                 }
-                                CommonUtil.toastNoRepeat(getActivity(), "清除数据成功");
+                                CommonUtil.toastYESRepeat(getActivity(), "清除数据成功");
                                 getActivity().getSupportFragmentManager().popBackStack();
                             } catch (Exception e) {
 //                                e.printStackTrace();

app/src/main/java/com/uas/rd_equipment/fragment/MaterialStorageFragment.java

@@ -512,7 +512,7 @@ public class MaterialStorageFragment extends BaseFragment implements TextWatcher
                                     if (failCount == 0) {
                                         Toast.makeText(getActivity(), getResources().getString(R.string.submit_success), Toast.LENGTH_SHORT).show();
                                     } else {
-                                        CommonUtil.toastNoRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
+                                        CommonUtil.toastYESRepeat(getActivity(), successCount + "条数据提交成功\n" + failCount + "条数据提交失败");
 
                                     }
                                 }

app/src/main/java/com/uas/rd_equipment/fragment/ProduceMassageBindingFragment.java

@@ -96,7 +96,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     private PopupWindow mMenuPopupWindow;
     private Fragment mFragment;
     private SmartTable mSmartTable;
-    private Column<String> va_classColumn,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_inmancolumn,va_DELETEColumn;
+    private Column<String> va_sourcecode,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_inmancolumn,va_DELETEColumn;
     private TableData<MakerecordBean> mTableData;
     private List<MakerecordBean> mFilterStorageInBeans;
     private ImageView mScanImageView;
@@ -109,13 +109,14 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     private AutoCompleteTextView et_linecode_smts;
     private ImageView iocout_smts;
     private ImageView iv_popuwindow;
-    private AutoCompleteTextView ce_resources;
+    private TextView ce_resources;
     private ImageView iv_resources_delete;
     private ImageView iv_resources;
     private TextView tv_pr_code;
     private TextView tv_pr_detail;
     private TextView tv_save;
     private RadioGroup rg_change;
+    private RadioButton rb_pepole;
     private RadioButton rb_equipment;
     private RadioButton rb_fixture;
     private RadioButton rb_ingredients;
@@ -140,10 +141,11 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     private List<String> masterFuncList;
     private String maFunName = null;
     private ImageView shaopwork_id;
-    private List<String> stringList;
-    private Set<String> setstring;
+
     private ImageView tv_dc_emcode_delete;
     private List<User> list;
+    private TextView tv_changeresources;
+    private User user;
 
     @Override
     protected int getLayout() {
@@ -172,6 +174,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         tv_pr_detail = root.findViewById(R.id.tv_pr_detail);
         tv_save = root.findViewById(R.id.tv_save);
         rg_change = root.findViewById(R.id.rg_change);
+        rb_pepole = root.findViewById(R.id.rb_pepole);
         rb_equipment = root.findViewById(R.id.rb_equipment);
         rb_fixture = root.findViewById(R.id.rb_fixture);
         rb_ingredients = root.findViewById(R.id.rb_ingredients);
@@ -182,6 +185,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         masterSpinner = (Spinner) root.findViewById(R.id.sp_login);
         shaopwork_id = root.findViewById(R.id.shaopwork_id);
         tv_dc_emcode_delete = root.findViewById(R.id.tv_dc_emcode_delete);
+        tv_changeresources = root.findViewById(R.id.tv_changeresources);
 
 
     }
@@ -219,12 +223,12 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
 
 
 
+        va_sourcecode = new Column<String>("岗位资源", "MBR_SOURCECODE");
+        va_inmancolumn = new Column<String>("操作员", "MBR_INMAN");
+        va_codeColumn = new Column<String>("日期", "MBR_INDATE");
+//        va_classColumn = new Column<String>("单据编号", "MBR_MAKECODE");
         va_vendnameColumn = new Column<String>("设备编号", "MBR_BARCODE");
-        va_vendnameColumn.setFixed(true);
         va_vendcodeColumn = new Column<String>("名称", "PR_DETAIL");
-        va_codeColumn = new Column<String>("日期", "MBR_INDATE");
-        va_inmancolumn = new Column<String>("操作员", "MBR_INMAN");
-        va_classColumn = new Column<String>("单据编号", "MBR_MAKECODE");
         va_DELETEColumn = new Column<String>("操作", "MBR_DELETE");
         va_DELETEColumn.setOnColumnItemClickListener(this);
         mScanImageView.setOnClickListener(this);
@@ -288,6 +292,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             public void onClick(View v) {
                 et_linecode_smts.setText("");
                 et_linecode_smts.requestFocus();
+
             }
         });
         iv_popuwindow.setOnClickListener(new View.OnClickListener() {
@@ -298,49 +303,49 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         });
 
         /**----------------------------------岗位资源------------------------------**/
-        ce_resources.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String va_code = ce_resources.getText().toString().trim();
-                    getfuzzySearchSourceData(va_code,"");
-                    return true;
-                }
-                return false;
-            }
-        });
-        ce_resources.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (s.length() >=2) {
-                    getfuzzySearchSourceData(ce_resources.getText().toString().trim(),"");
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                if (s == null || s.length() == 0) {
-                    iv_resources_delete.setVisibility(View.GONE);
-                } else {
-                    iv_resources_delete.setVisibility(View.VISIBLE);
-                }
-            }
-        });
-        iv_resources_delete.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ce_resources.setText("");
-                ce_resources.requestFocus();
-
-            }
-        });
+//        ce_resources.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+//            @Override
+//            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                    String va_code = ce_resources.getText().toString().trim();
+//                    getfuzzySearchSourceData(va_code,"");
+//                    return true;
+//                }
+//                return false;
+//            }
+//        });
+//        ce_resources.addTextChangedListener(new TextWatcher() {
+//            @Override
+//            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+//
+//            }
+//
+//            @Override
+//            public void onTextChanged(CharSequence s, int start, int before, int count) {
+//                if (s.length() >=2) {
+//                    getfuzzySearchSourceData(ce_resources.getText().toString().trim(),"");
+//                }
+//            }
+//
+//            @Override
+//            public void afterTextChanged(Editable s) {
+//                if (s == null || s.length() == 0) {
+//                    iv_resources_delete.setVisibility(View.GONE);
+//                } else {
+//                    iv_resources_delete.setVisibility(View.VISIBLE);
+//                }
+//            }
+//        });
+//        iv_resources_delete.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                ce_resources.setText("");
+//                ce_resources.requestFocus();
+//
+//            }
+//        });
         iv_resources.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -353,6 +358,10 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             @Override
             public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
                 switch (checkid){
+                    case R.id.rb_pepole:
+                        rb_changetext = "人员岗位";
+                        getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
+                        break;
                     case R.id.rb_equipment:
                         rb_changetext = "设备";
                         getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
@@ -381,8 +390,8 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
 
             }
         });
-        stringList = new ArrayList<>();
-        setstring = new HashSet<>();
+        list = new ArrayList<>();
+        user = new User();
         //人员编号
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -397,7 +406,16 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 return false;
             }
         });
+        tv_changeresources.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getsaVeData();
+                ce_resources.setText("");
+                tv_dc_emname.setText("");
+                list.clear();
 
+            }
+        });
         tv_dc_emcode.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -424,7 +442,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             public void onClick(View v) {
                 tv_dc_emcode.setText("");
                 tv_dc_emcode.requestFocus();
-
+                list.clear();
             }
         });
 
@@ -453,74 +471,93 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
 //        ceshiData();
     }
 
-    String inputString ="" ;
+    String inputString ="";
     public void getNewdc_emcodeData(String input){
 
         if (input.isEmpty()){
-            CommonUtil.toastNoRepeat(mActivity, "请输入人员编号");
+            CommonUtil.toastNoRepeat(mActivity, "请输入人员编号/岗位");
             return;
         }
-        list = new ArrayList<>();
-        list.clear();
-        String[] split = input.split(",");
-
-        for (String value : split) {
-            User user=new User();
-            if (!value.isEmpty()) {
-                user.setName(value + ",");
-                list.add(user);
-            }
-
-        }
-
-        for (int i = 0; i < list.size(); i++)  //外循环是循环的次数
-        {
-            for (int j = list.size() - 1; j > i; j--)  //内循环是 外循环一次比较的次数
-            {
-                if (list.get(i).getName().equals(list.get(j).getName()))
-                {
-                    list.remove(j);
-                }
 
-            }
-        }
 
-        for (int s = 0; s < list.size(); s++) {
-            inputString+= list.get(s).getName();
-        }
+//        String[] split = input.split(",");
+//
+//        for (String value : split) {
+//            User user=new User();
+//            if (!value.isEmpty()) {
+//                user.setName(value + ",");
+//                list.add(user);
+//            }
+//
+//        }
+//
+//        for (int i = 0; i < list.size(); i++)  //外循环是循环的次数
+//        {
+//            for (int j = list.size() - 1; j > i; j--)  //内循环是 外循环一次比较的次数
+//            {
+//                if (list.get(i).getName().equals(list.get(j).getName()))
+//                {
+//                    list.remove(j);
+//                }
+//
+//            }
+//        }
+//
+//        for (int s = 0; s < list.size(); s++) {
+//            inputString+= list.get(s).getName();
+//        }
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ASTATIONTHE_SELECT_GETEMNAME)
+                .url(GloableParams.ASTATIONTHE_SELECT_MAKEMANSOURCEINF)
                 .method(Request.Method.GET)
-                .addParam("em_code",inputString)
+                .addParam("data",input)
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {//DeviceChange!Use
                 progressDialog.dismiss();
                 String result = o.toString();
                 JSONObject resultObject = JSON.parseObject(result);
-                JSONObject dataObject = resultObject.getJSONObject("items");
-                String de_name = FastjsonUtil.getText(dataObject, "em_name");
-                tv_dc_emname.setText(de_name);
-                tv_dc_emcode.setText(inputString+"");
-                tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
+                JSONObject dataObject = resultObject.getJSONObject("InfoPush");
+                String de_name = FastjsonUtil.getText(dataObject, "name");
+                String type = FastjsonUtil.getText(dataObject, "type");
+                if (type.equals("Employee")){
+                    if (ce_resources.getText().toString().trim().isEmpty()){
+                        CommonUtil.toastNoRepeat(mActivity, "请先扫描岗位条码");
+                    }else {
+                        user=new User();
+                        user.setName(de_name+",");
+                        list.add(user);
+                        for (int i = 0; i < list.size(); i++)  //外循环是循环的次数
+                        {
+                            for (int j = list.size() - 1; j > i; j--)  //内循环是 外循环一次比较的次数
+                            {
+                                if (list.get(i).getName().equals(list.get(j).getName()))
+                                {
+                                    list.remove(j);
+                                }
+
+                            }
+                        }
+
+                        for (int s = 0; s < list.size(); s++) {
+                            inputString+= list.get(s).getName();
+                        }
+                        tv_dc_emname.setText(inputString);
+                    }
+                }else if (type.equals("Source")){
+                    ce_resources.setText(de_name);
+                }
+                tv_dc_emcode.setText("");
+                tv_dc_emcode.requestFocus();
                 inputString="";
             }
 
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
-                inputString="";
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-                for (int s = 0; s < list.size(); s++) {
-                    if (failStr.contains(list.get(s).getName().replace(",",""))){
-                        list.remove(s);
-                    }
-                }
-                for (int s = 0; s < list.size(); s++) {
-                    inputString+= list.get(s).getName();
-                }
-                tv_dc_emcode.setText(inputString+"");
+                tv_dc_emcode.setText("");
+                tv_dc_emcode.requestFocus();
                 tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
                 inputString="";
             }
@@ -596,11 +633,10 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                     }
                     ipAndlinecodePortAdapter.setmList(linecodeBeanList);
                     ipAndlinecodePortAdapter.notifyDataSetChanged();
-
-                    getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
+                getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
             }
 
             @Override
@@ -679,7 +715,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                     resourcesBeanList.clear();
                     MyArrayAdapter<String> mAutoStringAdapte = new MyArrayAdapter<String>(mActivity, android.R.layout.simple_dropdown_item_1line, mAutoStrings);
                     if (ce_resources != null) {
-                        ce_resources.setAdapter(mAutoStringAdapte);
+//                        ce_resources.setAdapter(mAutoStringAdapte);
                     }
                     org.json.JSONObject resultObject = new org.json.JSONObject(s);
                     org.json.JSONArray dataArray = resultObject.optJSONArray("data");
@@ -729,11 +765,12 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     }
 
     private void getDatalistCodes(String sourcecode,String macode){
-        if (macode.isEmpty()||sourcecode.isEmpty()){
+        if (macode.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "工单号为空");
             return;
         }
-        if (rb_equipment.isChecked()){
-            rb_changetext="设备";
+        if (rb_pepole.isChecked()){
+            rb_changetext="人员岗位";
         }
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
@@ -742,7 +779,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 .tag(TAG + "getindatalist")
                 .flag(0)
                 .addParam("macode", macode)
-                .addParam("sourcecode", sourcecode)
+//                .addParam("sourcecode", sourcecode)
                 .addParam("type", rb_changetext)
                 .build(), new HttpCallback() {
             @Override
@@ -821,7 +858,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                CommonUtil.toastNoRepeat(mActivity, "删除成功");
+                CommonUtil.toastYESRepeat(mActivity, "删除成功");
                 getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
             }
 
@@ -835,8 +872,8 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     }
 
     public void getsaVeData(){
-        if (rb_equipment.isChecked()){
-            rb_changetext="设备";
+        if (rb_pepole.isChecked()){
+            rb_changetext="人员岗位";
         }
 
         String ce_work_codetrim = work_code_code.getText().toString().trim();
@@ -853,7 +890,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         JSONObject object_1 = new JSONObject();
         object_1.put("MBR_MAKECODE", ce_work_codetrim);//工单号
         object_1.put("MBR_SOURCECODE", at_stationtrim);//资源
-        object_1.put("MBR_TYPE", rb_changetext);//设备\夹具\辅料
+//        object_1.put("MBR_TYPE", rb_changetext);//设备\夹具\辅料
         object_1.put("MBR_PRODCODE", tv_pr_code.getText());//产品编号
         object_1.put("MBR_INMAN", tv_dc_emname.getText());//人员名称
         object_1.put("MBR_BARCODE", storage_recharge_collect_et.getText().toString().trim());
@@ -874,7 +911,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
-                CommonUtil.toastNoRepeat(mActivity, "保存成功");
+                CommonUtil.toastYESRepeat(mActivity, "保存成功");
                 storage_recharge_collect_et.setText("");
             }
 
@@ -889,7 +926,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     }
     private void setFilterTableData(List<MakerecordBean> filterTableData) {
         mTableData = new TableData<MakerecordBean>("收料单列表", filterTableData,
-                va_vendnameColumn,va_vendcodeColumn,va_codeColumn,va_inmancolumn,va_classColumn,va_DELETEColumn);
+                va_sourcecode,va_inmancolumn,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_DELETEColumn);
         mSmartTable.setTableData(mTableData);
 //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {

app/src/main/java/com/uas/rd_equipment/fragment/RemouIdRepairFragment.java

@@ -348,7 +348,7 @@ public class RemouIdRepairFragment extends BaseFragment{
                             mActivity.runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    CommonUtil.toastNoRepeat(mActivity, "附件上传成功");
+                                    CommonUtil.toastYESRepeat(mActivity, "附件上传成功");
                                 }
                             });
                         } else {

app/src/main/java/com/uas/rd_equipment/fragment/StorageInFragment.java

@@ -90,6 +90,10 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
     private RecyclerView ra_data;
     private List<UrlDataBean.DeviceBean.UrlBean> urlBeanList;
     private UrlDataAdapter pdfOrImageAdapter;
+    private TextView tv_de_currentlinecode;
+    private TextView tv_de_lefttime;
+    private TextView tv_de_manageman;
+    private TextView de_managemantel;
 
     @Override
     protected int getLayout() {
@@ -116,6 +120,11 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
         tv_de_currentcentername = root.findViewById(R.id.tv_de_currentcentername);
         tv_de_contact = root.findViewById(R.id.tv_de_contact);
         tv_de_telvendor = root.findViewById(R.id.tv_de_telvendor);
+
+        tv_de_currentlinecode = root.findViewById(R.id.tv_de_currentlinecode);
+        tv_de_lefttime = root.findViewById(R.id.tv_de_lefttime);
+        tv_de_manageman = root.findViewById(R.id.tv_de_manageman);
+        de_managemantel = root.findViewById(R.id.de_managemantel);
         mMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
 
         mSmartTable = root.findViewById(R.id.pda_wms_in_filter_list_st);
@@ -384,18 +393,21 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                         ra_data.setVisibility(View.GONE);
                     }
 
-
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONObject dataObject = resultObject.getJSONObject("device");
-                    de_code1 = FastjsonUtil.getText(dataObject, "DE_CODE");
+                    de_code1 = FastjsonUtil.getText(dataObject, "DE_CODE");//编号
                     tv_de_code.setText(FastjsonUtil.getText(dataObject, "DE_CODE"));
                     tv_de_vendor.setText(FastjsonUtil.getText(dataObject, "DE_VENDOR"));
                     de_name1 = FastjsonUtil.getText(dataObject, "DE_NAME");
                     tv_de_name.setText(FastjsonUtil.getText(dataObject, "DE_NAME"));
                     tv_de_spec.setText(FastjsonUtil.getText(dataObject, "DE_SPEC"));
-                    tv_de_currentcentername.setText(FastjsonUtil.getText(dataObject, "DE_CURRENTCENTERNAME"));
+                    tv_de_currentcentername.setText(FastjsonUtil.getText(dataObject, "DE_CURRENTCENTERCODE"));
                     tv_de_contact.setText(FastjsonUtil.getText(dataObject, "DE_CONTACT"));
                     tv_de_telvendor.setText(FastjsonUtil.getText(dataObject, "DE_TELVENDOR"));
+                    tv_de_currentlinecode.setText(FastjsonUtil.getText(dataObject, "DE_CURRENTLINECODE"));
+                    tv_de_lefttime.setText(FastjsonUtil.getText(dataObject, "DE_LEFTTIME"));
+                    tv_de_manageman.setText(FastjsonUtil.getText(dataObject, "DE_MANAGEMAN"));
+                    de_managemantel.setText(FastjsonUtil.getText(dataObject, "DE_MANAGEMANTEL"));
 
 
 

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

@@ -339,6 +339,7 @@ public class GloableParams {
     public static String ASTATIONTHE_SELECT_GETWORKCENTER;
     public static String ASTATIONTHE_SELECT_GRANt;
     public static String ASTATIONTHE_SELECT_CONFIRMUSE;
+    public static String ASTATIONTHE_SELECT_MAKEMANSOURCEINF;
 
     /**
      * 新版设备管理
@@ -375,6 +376,7 @@ public class GloableParams {
     public static String ADDRESSTAIL_GET_GETWORKCENTER="/oa/device/getWorkCenter.action";
     public static String ADDRESSTAIL_GET_GRANt="/oa/device/getMakerecordByDC.action";
     public static String ADDRESSTAIL_GET_CONFIRMUSE="/oa/device/confirmUse.action";
+    public static String ADDRESSTAIL_GET_MAKEMANSOURCEINF="/oa/device/makeManSourceInf.action";
 
     /**
      * 高登
@@ -1523,5 +1525,6 @@ public class GloableParams {
         GloableParams.ASTATIONTHE_SELECT_GETWORKCENTER = uriHead + GloableParams.ADDRESSTAIL_GET_GETWORKCENTER;
         GloableParams.ASTATIONTHE_SELECT_GRANt = uriHead + GloableParams.ADDRESSTAIL_GET_GRANt;
         GloableParams.ASTATIONTHE_SELECT_CONFIRMUSE = uriHead + GloableParams.ADDRESSTAIL_GET_CONFIRMUSE;
+        GloableParams.ASTATIONTHE_SELECT_MAKEMANSOURCEINF = uriHead + GloableParams.ADDRESSTAIL_GET_MAKEMANSOURCEINF;
     }
 }

app/src/main/java/com/uas/rd_equipment/util/CommonUtil.java

@@ -512,6 +512,54 @@ public class CommonUtil {
         }
     }
 
+    /**
+     * 防止重复弹出Toast
+     *
+     * @param context
+     * @param content
+     */
+    public static void toastYESRepeat(Context context, String content) {
+        if (content != null) {
+            if (!content.equals(oldMsg)) {
+                textYESToast(context, content, 3000);
+//                Toast.makeText(context, content, Toast.LENGTH_LONG).show();
+                time = System.currentTimeMillis();
+            } else {
+                if ((System.currentTimeMillis() - time) > 3000) {
+                    textYESToast(context, content, 3000);
+//                    Toast.makeText(context, content, Toast.LENGTH_LONG).show();
+                    time = System.currentTimeMillis();
+                }
+            }
+            oldMsg = content;
+        }
+    }
+    public static void textYESToast(Context context, String content, int duration) {
+        Toast toast = new Toast(context);
+        //显示的时间
+        toast.setDuration(duration);
+        //显示的位置
+//        toast.setGravity(Gravity.CENTER, 0, 0);
+
+        //自定义toast布局
+        LinearLayout toastLayout = new LinearLayout(context);
+        toastLayout.setGravity(Gravity.CENTER_VERTICAL);
+        toastLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+        //添加TextView
+        TextView toastText = new TextView(context);
+//        toastText.setBackgroundColor(context.getResources().getColor(R.color.toast_bg));
+        toastText.setText(content);
+        toastText.setPadding(18, 10, 18, 10);
+        toastText.setBackgroundResource(R.drawable.shape_customer_toast);
+        toastText.setTextColor(context.getResources().getColor(R.color.green));
+        toastText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        toastLayout.addView(toastText);
+
+//        toastLayout.setBackgroundColor(context.getResources().getColor(R.color.toast_bg));
+        toast.setView(toastLayout);
+        toast.show();
+    }
     /**
      * 访问出错的提示
      *

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

@@ -0,0 +1,11 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/fl_zxing_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</RelativeLayout>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:innerrect="http://schemas.android.com/apk/res-auto"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+    >
+
+    <FrameLayout
+        android:id="@+id/scan_fl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true">
+        <SurfaceView
+            android:id="@+id/preview_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"/>
+        <RelativeLayout android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+            <com.uas.rd_equipment.camera.ViewfinderView
+                android:id="@+id/viewfinder_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                innerrect:inner_height="260dp"
+                innerrect:inner_margintop="120dp"
+                innerrect:inner_scan_speed="60"
+                innerrect:inner_width="260dp"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="400dp"
+                android:text="请将二维码/条形码置于扫描框内"
+                android:textColor="#FF8200"
+                android:textSize="20sp"
+                android:visibility="gone"
+                />
+            <ImageView
+                android:id="@+id/flashlight_iv"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="400dp"
+                android:src="@drawable/ic_flashlight_off"/>
+        </RelativeLayout>
+
+    </FrameLayout>
+    <!--
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/scan_fl"
+            android:text="将二维码/条码置于扫描框内,即可自动扫描"
+            android:textSize="18sp"
+            android:layout_centerHorizontal="true"
+            android:textColor="#ffffff"/>-->
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="@color/transparent"
+        android:padding="10dp">
+        <TextView
+            android:id="@+id/back_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_marginLeft="5dp"
+            android:gravity="center"
+            android:text="取消"
+            android:textColor="#FF8200"
+            android:textSize="20sp"/>
+        <!--<ImageView
+            android:id="@+id/qrcode_iv"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignParentRight="true"
+            android:src="@drawable/scan_light"
+            android:layout_marginRight="5dp"/>-->
+
+        <TextView android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_centerInParent="true"
+                  android:text="二维码/条形码"
+                  android:textColor="#FF8200"
+                  android:textSize="20sp"/>
+
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -27,7 +27,7 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:orientation="horizontal">
                 <TextView
-                    android:text="设备号："
+                    android:text="编号："
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
@@ -36,6 +36,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
             </LinearLayout>
+
             <LinearLayout
                 android:background="@color/white"
                 android:layout_width="match_parent"
@@ -43,15 +44,35 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:orientation="horizontal">
                 <TextView
-                    android:text="品牌："
+                    android:text="名称："
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
-                    android:id="@+id/tv_de_vendor"
+                    android:id="@+id/tv_de_name"
                     android:text=""
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
             </LinearLayout>
+            <LinearLayout
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="horizontal">
+                <TextView
+                    android:text="规格："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/tv_de_spec"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+
+
+
+
 
             <LinearLayout
                 android:background="@color/white"
@@ -60,11 +81,11 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:orientation="horizontal">
                 <TextView
-                    android:text="名称："
+                    android:text="使用部门："
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
-                    android:id="@+id/tv_de_name"
+                    android:id="@+id/tv_de_currentcentername"
                     android:text=""
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
@@ -76,16 +97,15 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:orientation="horizontal">
                 <TextView
-                    android:text="规格："
+                    android:text="使用线体："
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
-                    android:id="@+id/tv_de_spec"
+                    android:id="@+id/tv_de_currentlinecode"
                     android:text=""
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
             </LinearLayout>
-
             <LinearLayout
                 android:background="@color/white"
                 android:layout_width="match_parent"
@@ -93,15 +113,68 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:orientation="horizontal">
                 <TextView
-                    android:text="当前部门名称："
+                    android:text="寿命剩余(天)："
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
-                    android:id="@+id/tv_de_currentcentername"
+                    android:id="@+id/tv_de_lefttime"
                     android:text=""
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
             </LinearLayout>
+            <LinearLayout
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="horizontal">
+                <TextView
+                    android:text="管理人员："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/tv_de_manageman"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+            <LinearLayout
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="horizontal">
+                <TextView
+                    android:text="管理人员电话："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/de_managemantel"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+            <LinearLayout
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:orientation="horizontal">
+                <TextView
+                    android:text="设备厂商："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/tv_de_vendor"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+
+
+
+
+
 
             <LinearLayout
                 android:background="@color/white"
@@ -110,7 +183,7 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:orientation="horizontal">
                 <TextView
-                    android:text="厂商联系人："
+                    android:text="厂商人员："
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
@@ -135,6 +208,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
             </LinearLayout>
+
+
+
+
             <LinearLayout
                 android:layout_marginTop="@dimen/dp_10"
                 android:orientation="vertical"

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

@@ -247,7 +247,7 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="人员编号"
+                android:text="岗位/人员"
                 android:layout_gravity="center"
                 android:textColor="@color/black">
             </TextView>
@@ -265,7 +265,7 @@
                         android:id="@+id/tv_dc_emcode"
                         style="@style/EditTextLineStyle"
                         android:layout_height="30dp"
-                        android:hint="请输入人员编号" />
+                        android:hint="请输入人员编号/岗位" />
 
                     <ImageView
                         android:id="@+id/tv_dc_emcode_delete"
@@ -289,30 +289,6 @@
 
 
         </TableRow>
-        <TableRow
-            android:layout_marginTop="5dp">
-            <TextView
-                android:text="人员名称"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_gravity="center"
-                android:textColor="@color/black">
-            </TextView>
-            <TextView
-                android:id="@+id/tv_dc_emname"
-                android:text=""
-                android:layout_width="wrap_content"
-                android:layout_gravity="center|left"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/textsize_20"
-                android:textColor="@color/black">
-            </TextView>
-        </TableRow>
-
-
-
-
         <TableRow
             android:layout_marginTop="5dp">
             <TextView
@@ -332,13 +308,32 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
-
-                    <AutoCompleteTextView
+                    <TextView
                         android:id="@+id/ce_resources"
-                        style="@style/EditTextLineStyle"
-                        android:layout_height="30dp"
-                        android:hint="请输入岗位资源" />
-
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=""
+                        android:layout_gravity="left"
+                        android:textColor="@color/black">
+                    </TextView>
+                    <!--                    <AutoCompleteTextView-->
+                    <!--                        android:id="@+id/ce_resources"-->
+                    <!--                        style="@style/EditTextLineStyle"-->
+                    <!--                        android:layout_height="30dp"-->
+                    <!--                        android:hint="请输入岗位资源" />-->
+
+                    <TextView
+                        android:id="@+id/tv_changeresources"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="切换岗位"
+                        android:padding="@dimen/space_left_5"
+                        android:layout_gravity="right"
+                        android:background="@drawable/bg_button"
+                        android:textColor="@color/black">
+                    </TextView>
                     <ImageView
                         android:id="@+id/iv_resources_delete"
                         android:layout_width="wrap_content"
@@ -357,13 +352,35 @@
                     android:layout_marginRight="10dp"
                     android:layout_marginLeft="5dp"
                     android:background="@drawable/bg_button"
-                    android:src="@drawable/search_48" />
+                    android:src="@drawable/search_48"
+                    android:visibility="gone"/>
             </LinearLayout>
 
 
 
 
         </TableRow>
+        <TableRow
+            android:layout_marginTop="5dp">
+            <TextView
+                android:text="人员名称"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_dc_emname"
+                android:text=""
+                android:layout_width="wrap_content"
+                android:layout_gravity="center|left"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/textsize_20"
+                android:textColor="@color/black">
+            </TextView>
+        </TableRow>
+
 
     </TableLayout>
     <RadioGroup
@@ -373,11 +390,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
         <RadioButton
-            android:id="@+id/rb_equipment"
+            android:id="@+id/rb_pepole"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
             android:checked="true"
+            android:text="人员岗位">
+        </RadioButton>
+        <RadioButton
+            android:id="@+id/rb_equipment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/dp_10"
             android:text="设备">
         </RadioButton>
         <RadioButton

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

@@ -1,4 +1,4 @@
-#Wed Jul 05 17:25:51 CST 2023
+#Fri Jul 07 10:18:13 CST 2023
 D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
 D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
 D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png