扫一扫界面UI优化；

优化送修界面逻辑；
更改养护管理保养类型选择和显示逻辑；
增加问题缉查列表界面和文集缉查界面保存逻辑；

app/src/main/java/com/uas/rd_equipment/activity/FunctionActivity.java

@@ -19,6 +19,7 @@ import com.uas.rd_equipment.fragment.DeliveryForRepairFragment;
 import com.uas.rd_equipment.fragment.DeviceProvisioningListFragment;
 import com.uas.rd_equipment.fragment.IndexSettingFragment;
 import com.uas.rd_equipment.fragment.MaintenanceManagementListFragment;
+import com.uas.rd_equipment.fragment.ProblemDetectionListFragment;
 import com.uas.rd_equipment.fragment.ProduceMassageBindingFragment;
 import com.uas.rd_equipment.fragment.RemouIdRepairFragment;
 import com.uas.rd_equipment.fragment.StorageInFragment;
@@ -103,6 +104,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.PRODUCTION_REMOULD_GRAN://物料发放
                     mFragment = new DeviceProvisioningListFragment();
                     break;
+                case GloableParams.PRODUCTION_REMOULD_PROGRAMSELECT://问题缉查列表
+                    mFragment = new ProblemDetectionListFragment();
+                    break;
                 case GloableParams.GRIDNAME_SETTING://设置
                     mFragment = new IndexSettingFragment();
 //                    mFragment = new CwShiFragment();

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

@@ -338,6 +338,10 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;
+            case GloableParams.PRODUCTION_REMOULD_PROGRAMSELECT://问题缉查
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
+                startActivity(intent);
+                break;
             case GloableParams.GRIDNAME_SETTING://设置
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);

app/src/main/java/com/uas/rd_equipment/bean/ProblemListBean.java

@@ -0,0 +1,43 @@
+package com.uas.rd_equipment.bean;
+
+/**
+ * Created by cjh-sail on 2023-07-12
+ */
+public class ProblemListBean {
+    private String IC_CODE;
+    private String IC_FIRSTMAN;
+    private String IC_SECONDMAN;
+    private String IC_INDATE;
+
+    public String getIC_CODE() {
+        return IC_CODE;
+    }
+
+    public void setIC_CODE(String IC_CODE) {
+        this.IC_CODE = IC_CODE;
+    }
+
+    public String getIC_FIRSTMAN() {
+        return IC_FIRSTMAN;
+    }
+
+    public void setIC_FIRSTMAN(String IC_FIRSTMAN) {
+        this.IC_FIRSTMAN = IC_FIRSTMAN;
+    }
+
+    public String getIC_SECONDMAN() {
+        return IC_SECONDMAN;
+    }
+
+    public void setIC_SECONDMAN(String IC_SECONDMAN) {
+        this.IC_SECONDMAN = IC_SECONDMAN;
+    }
+
+    public String getIC_INDATE() {
+        return IC_INDATE;
+    }
+
+    public void setIC_INDATE(String IC_INDATE) {
+        this.IC_INDATE = IC_INDATE;
+    }
+}

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

@@ -120,6 +120,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         de_name = arguments.getString("de_name");
         if (!StringUtil.isEmpty(de_code)){
             tv_de_code.setText("编号："+de_code);
+            getNewNameData();
         }else if (!StringUtil.isEmpty(de_name)){
             tv_de_name.setText("名称:"+de_name);
         }
@@ -244,6 +245,9 @@ public class BreakdownRepairFragment extends BaseFragment{
                 de_name=de_name1;
                 tv_de_code.setText("编号："+de_code1);
                 tv_de_name.setText("名称:"+de_name1);
+                getNewNameData();
+
+
             }
 
             @Override
@@ -254,7 +258,33 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
     }
+    public void getNewNameData(){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_COMMIT_DELIVERYFORREPAIR)
+                .method(Request.Method.GET)
+                .addParam("caller", "DeviceChange!Inspect")
+                .addParam("de_code", de_code)//设备编号
+                .build(), new HttpCallback() {
+
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                String result = o.toString();
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject dataObject = resultObject.getJSONObject("items");
+                String dc_code = FastjsonUtil.getText(dataObject, "dc_reason");
+                index_fault_phenomenon.setText(dc_code);
+
+            }
 
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

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

@@ -142,13 +142,13 @@ public class ConnectServerFragment extends BaseFragment implements View.OnClickL
         submitButton = (Button) root.findViewById(R.id.btn_submit_conncetserver_fragment);
         ipEditText = (EditText) root.findViewById(R.id.et_ip_connectserver_fragment);
 //        ipEditText.setText("10.1.80.50");
-        ipEditText.setText("10.1.81.2");
+        ipEditText.setText("192.168.6.253");
         portEditText = (EditText) root.findViewById(R.id.et_port_connectserver_fragment);
-        portEditText.setText("9443");
+        portEditText.setText("8099");
 //        portEditText.setText("8083");
         siteEditText = (EditText) root.findViewById(R.id.et_site_connectserver_fragment);
 //        siteEditText.setText("ERP");
-        siteEditText.setText("uas_dev");
+        siteEditText.setText("mes");
         noticeTextView = (TextView) root.findViewById(R.id.textview_notice);
         mSystemSpinner = (Spinner) root.findViewById(R.id.connect_system_sp);
         mHttpSpinner = (Spinner) root.findViewById(R.id.connect_http_sp);

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

@@ -163,7 +163,7 @@ public class DeliveryForRepairFragment extends BaseFragment{
         Bundle arguments = getArguments();
         if (arguments != null) {
             de_code = arguments.getString("de_code");
-            String de_name = arguments.getString("de_name");
+//            String de_name = arguments.getString("de_name");
         }
 
         if (!StringUtil.isEmpty(de_code)){

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

@@ -0,0 +1,496 @@
+package com.uas.rd_equipment.fragment;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.MediaStore;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityCompat;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.uas.rd_equipment.R;
+import com.uas.rd_equipment.activity.FunctionActivity;
+import com.uas.rd_equipment.global.GloableParams;
+import com.uas.rd_equipment.interfaces.ProgressListener;
+import com.uas.rd_equipment.util.CommonUtil;
+import com.uas.rd_equipment.util.FastjsonUtil;
+import com.uas.rd_equipment.util.HttpCallback;
+import com.uas.rd_equipment.util.HttpParams;
+import com.uas.rd_equipment.util.UploadUtils;
+import com.uas.rd_equipment.util.VollyRequest;
+import com.uas.rd_equipment.view.ClearableEditText;
+import com.uas.rd_equipment.view.business.ProgressPopup;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+/**
+ * Created by cjh-sail on 2023-07-11
+ */
+public class ProblemDetectionFragment extends BaseFragment{
+
+
+    private ImageView up_imageone;
+    private static final int REQUEST_CODE = 1;
+    private static final int REQUEST_CODETWO = 2;
+    private  final int REQUEST_EXTERNAL_STORAGE = 1;
+    private  String[] PERMISSIONS_STORAGE = {
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE };
+    private ImageView up_imagetwo;
+    private TextView tv_ic_code;
+    private ClearableEditText ce_ic_badname;
+    private ClearableEditText ce_ic_licode;
+    private ClearableEditText ce_ic_firstman;
+    private ClearableEditText ce_ic_secondman;
+    private ClearableEditText ce_ic_reason;
+    private TextView tv_prompt;
+    private TextView btn_commit;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.problemdetection_fragment;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.title_problem_detection));
+    }
+
+    @Override
+    protected void initEvents() {
+        up_imageone = root.findViewById(R.id.up_imageone);
+        up_imagetwo = root.findViewById(R.id.up_imagetwo);
+        tv_ic_code = root.findViewById(R.id.tv_ic_code);
+        ce_ic_badname = root.findViewById(R.id.ce_ic_badname);
+        ce_ic_licode = root.findViewById(R.id.ce_ic_licode);
+        ce_ic_firstman = root.findViewById(R.id.ce_ic_firstman);
+        ce_ic_secondman = root.findViewById(R.id.ce_ic_secondman);
+        ce_ic_reason = root.findViewById(R.id.ce_ic_reason);
+        tv_prompt = root.findViewById(R.id.tv_prompt);
+        btn_commit = root.findViewById(R.id.btn_commit);
+    }
+
+    @Override
+    protected void initDatas() {
+        verifyStoragePermissions(mActivity);
+        up_imageone.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+            @Override
+            public void onClick(View v) {
+                int permission = ActivityCompat.checkSelfPermission(mActivity,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                if (permission != PackageManager.PERMISSION_GRANTED) {
+                    // We don't have permission so prompt the user
+                    ActivityCompat.requestPermissions(mActivity, PERMISSIONS_STORAGE,
+                            REQUEST_EXTERNAL_STORAGE);
+                }else {
+                    // 启动文件选择器
+                    Intent intent = new Intent(Intent.ACTION_PICK);
+                    intent.setType("image/*");
+                    intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+                    startActivityForResult(Intent.createChooser(intent, "Select Images"), REQUEST_CODE);
+                }
+
+            }
+        });
+        up_imagetwo.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+            @Override
+            public void onClick(View v) {
+                int permission = ActivityCompat.checkSelfPermission(mActivity,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                if (permission != PackageManager.PERMISSION_GRANTED) {
+                    // We don't have permission so prompt the user
+                    ActivityCompat.requestPermissions(mActivity, PERMISSIONS_STORAGE,
+                            REQUEST_EXTERNAL_STORAGE);
+                }else {
+                    // 启动文件选择器
+                    Intent intent = new Intent(Intent.ACTION_PICK);
+                    intent.setType("image/*");
+                    intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+                    startActivityForResult(Intent.createChooser(intent, "Select Images"), REQUEST_CODETWO);
+                }
+
+            }
+        });
+        btn_commit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+
+    }
+    public void getNewCommitData(){
+        String string_id = "";
+        String string_idtwo = "";
+        if (stringArrayList.size()==0){
+            string_id="";
+        }else {
+            for (int i=0;i<stringArrayList.size();i++){
+                String s = stringArrayList.get(i);
+                string_id+= s;
+            }
+        }
+        if (stringArrayListtwo.size()==0){
+            string_idtwo="";
+        }else {
+            for (int i=0;i<stringArrayListtwo.size();i++){
+                String s = stringArrayListtwo.get(i);
+                string_idtwo+= s;
+            }
+        }
+
+        progressDialog.show();
+        JSONArray jsonArray = new JSONArray();
+        JSONObject object_1 = new JSONObject();
+        object_1.put("ic_code", tv_ic_code.getText().toString().trim());//单据编号
+        object_1.put("ic_badname", ce_ic_badname.getText().toString().trim());//稽查内容
+        object_1.put("ic_licode", ce_ic_licode.getText().toString().trim());//地点
+        object_1.put("ic_firstman", ce_ic_firstman.getText().toString().trim());//指定处理人
+        object_1.put("ic_badnameattach", string_id);//上传附件
+        object_1.put("ic_secondman", ce_ic_secondman.getText().toString().trim());//变更处理人
+        object_1.put("ic_reason", ce_ic_reason.getText().toString().trim());//改善措施
+        object_1.put("ic_reasonattach", string_idtwo);//上传附件
+        jsonArray.add(object_1);
+//        jsonObject.put("data", jsonArray);
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_COMMIT_MAINITEM)
+                .method(Request.Method.GET)
+                .addParam("data",jsonArray.toString())
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.GREEN);
+                tv_prompt.setText("提交成功");
+                stringArrayList.clear();
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.RED);
+                tv_prompt.setText(failStr);
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+            }
+        });
+    }
+
+
+
+
+
+
+
+    public  void verifyStoragePermissions(Activity activity) {
+        // Check if we have write permission
+        int permission = ActivityCompat.checkSelfPermission(activity,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        if (permission != PackageManager.PERMISSION_GRANTED) {
+            // We don't have permission so prompt the user
+            ActivityCompat.requestPermissions(activity, PERMISSIONS_STORAGE,
+                    REQUEST_EXTERNAL_STORAGE);
+        }
+    }
+    private List<String> selectedImagePaths = new ArrayList<>();
+    private List<String> selectedImagePathstwo = new ArrayList<>();
+    private ProgressPopup mProgressPopup;
+    private String mEnclusureId = "";
+    private String mEnclusureIdtwo = "";
+    private List<String> stringArrayListtwo=new ArrayList<>();
+    private List<String> stringArrayList=new ArrayList<>();
+    private void uploadImages(List<String> imagePaths) {
+        for (String imagePath : imagePaths) {
+            try {
+                File mFile = new File(imagePath);
+                // 获得文件名
+                String fileName = mFile.getName();
+
+                MultipartBody.Builder builder = new MultipartBody.Builder();
+                builder.setType(MultipartBody.FORM);
+                //第一个参数要与Servlet中的一致
+                builder.addFormDataPart("file", fileName,
+                        RequestBody.create(MediaType.parse("application/octet-stream"), mFile))
+                        .addFormDataPart("type", "common")
+                        .addFormDataPart("master", CommonUtil.getMaster(mActivity));
+                RequestBody multipartBody = builder.build();
+
+                if (mProgressPopup == null) {
+                    mProgressPopup = new ProgressPopup(mActivity);
+                    mProgressPopup.setTitle("附件上传中...");
+                }
+                mProgressPopup.setProgress(0);
+                mProgressPopup.showPopupWindow();
+
+
+                UploadUtils.getInstance().postFile(GloableParams.ADDRESS_MOBILE_UPLOADATTACHS, multipartBody, new ProgressListener() {
+                    @Override
+                    public void onProgress(long currentBytes, long contentLength, boolean isDone) {
+                        int progress = (int) ((double) currentBytes * 100 / (double) contentLength);
+                        mProgressPopup.setProgress(progress);
+                        if (isDone || progress == 100) {
+                            mProgressPopup.dismiss();
+                        }
+                    }
+                }, new Callback() {
+                    @Override
+                    public void onFailure(Call call, IOException e) {
+                        mProgressPopup.dismiss();
+                        Log.d("raomeng_uploadf", e.getMessage());
+                        mActivity.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onResponse(Call call, Response response) throws IOException {
+                        mProgressPopup.dismiss();
+                        if (response.code() == 200) {
+
+                            try {
+                                String result = response.body().string();
+                                JSONObject resultObject = JSON.parseObject(result);
+                                mEnclusureId = FastjsonUtil.getText(resultObject, "id");
+                                String s = removeSpace(mEnclusureId);
+                                String s1 = removeSpace2(s);
+                                stringArrayList.add(s1+";");
+                                Log.d("mEnclusureId", s1+"");
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                            mActivity.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    CommonUtil.toastYESRepeat(mActivity, "附件上传成功");
+                                }
+                            });
+                        } else {
+                            mActivity.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+                                }
+                            });
+                        }
+                    }
+                }, new File[]{mFile});
+            } catch (Exception e) {
+                if (mProgressPopup != null) {
+                    mProgressPopup.dismiss();
+                }
+                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+            }
+        }
+    }
+    private void uploadImagesTwo(List<String> imagePaths) {
+        for (String imagePath : imagePaths) {
+            try {
+                File mFile = new File(imagePath);
+                // 获得文件名
+                String fileName = mFile.getName();
+
+                MultipartBody.Builder builder = new MultipartBody.Builder();
+                builder.setType(MultipartBody.FORM);
+                //第一个参数要与Servlet中的一致
+                builder.addFormDataPart("file", fileName,
+                        RequestBody.create(MediaType.parse("application/octet-stream"), mFile))
+                        .addFormDataPart("type", "common")
+                        .addFormDataPart("master", CommonUtil.getMaster(mActivity));
+                RequestBody multipartBody = builder.build();
+
+                if (mProgressPopup == null) {
+                    mProgressPopup = new ProgressPopup(mActivity);
+                    mProgressPopup.setTitle("附件上传中...");
+                }
+                mProgressPopup.setProgress(0);
+                mProgressPopup.showPopupWindow();
+
+
+                UploadUtils.getInstance().postFile(GloableParams.ADDRESS_MOBILE_UPLOADATTACHS, multipartBody, new ProgressListener() {
+                    @Override
+                    public void onProgress(long currentBytes, long contentLength, boolean isDone) {
+                        int progress = (int) ((double) currentBytes * 100 / (double) contentLength);
+                        mProgressPopup.setProgress(progress);
+                        if (isDone || progress == 100) {
+                            mProgressPopup.dismiss();
+                        }
+                    }
+                }, new Callback() {
+                    @Override
+                    public void onFailure(Call call, IOException e) {
+                        mProgressPopup.dismiss();
+                        Log.d("raomeng_uploadf", e.getMessage());
+                        mActivity.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onResponse(Call call, Response response) throws IOException {
+                        mProgressPopup.dismiss();
+                        if (response.code() == 200) {
+
+                            try {
+                                String result = response.body().string();
+                                JSONObject resultObject = JSON.parseObject(result);
+                                mEnclusureIdtwo = FastjsonUtil.getText(resultObject, "id");
+                                String s = removeSpace(mEnclusureIdtwo);
+                                String s1 = removeSpace2(s);
+                                stringArrayListtwo.add(s1+";");
+                                Log.d("mEnclusureIdtwo", s1+"");
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                            mActivity.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    CommonUtil.toastYESRepeat(mActivity, "附件上传成功");
+                                }
+                            });
+                        } else {
+                            mActivity.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+                                }
+                            });
+                        }
+                    }
+                }, new File[]{mFile});
+            } catch (Exception e) {
+                if (mProgressPopup != null) {
+                    mProgressPopup.dismiss();
+                }
+                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+            }
+        }
+    }
+
+    public String removeSpace(String s) {
+        String regex = "\\[";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(s);
+        return matcher.replaceAll("");
+    }
+    public String removeSpace2(String s) {
+        String regex = "]";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(s);
+        return matcher.replaceAll("");
+    }
+
+    private String getRealPathFromUri(Uri uri) {
+        // 获取真实的文件路径
+        String filePath;
+        String[] projection = {MediaStore.Images.Media.DATA};
+        Cursor cursor = mActivity.getContentResolver().query(uri, projection, null, null, null);
+        if (cursor == null) {
+            filePath = uri.getPath();
+        } else {
+            cursor.moveToFirst();
+            int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+            filePath = cursor.getString(columnIndex);
+            cursor.close();
+        }
+        return filePath;
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+        if (requestCode == REQUEST_CODE && data!=null){
+            selectedImagePaths.clear();
+            if (data.getClipData() != null) {
+                // 用户选择了多个图片
+                int count = data.getClipData().getItemCount();
+                for (int i = 0; i < count; i++) {
+                    Uri imageUri = data.getClipData().getItemAt(i).getUri();
+                    selectedImagePaths.add(getRealPathFromUri(imageUri));
+                }
+            } else if (data.getData() != null) {
+                // 用户选择了单个图片
+                Uri imageUri = data.getData();
+                selectedImagePaths.add(getRealPathFromUri(imageUri));
+            }
+
+            // 批量上传图片
+            uploadImages(selectedImagePaths);
+        }
+        if (requestCode == REQUEST_CODETWO && data!=null){
+            selectedImagePathstwo.clear();
+            if (data.getClipData() != null) {
+                // 用户选择了多个图片
+                int count = data.getClipData().getItemCount();
+                for (int i = 0; i < count; i++) {
+                    Uri imageUri = data.getClipData().getItemAt(i).getUri();
+                    selectedImagePathstwo.add(getRealPathFromUri(imageUri));
+                }
+            } else if (data.getData() != null) {
+                // 用户选择了单个图片
+                Uri imageUri = data.getData();
+                selectedImagePathstwo.add(getRealPathFromUri(imageUri));
+            }
+
+            // 批量上传图片
+            uploadImagesTwo(selectedImagePathstwo);
+        }
+
+
+
+    }
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (hidden) {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.title_problem_detection));
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        }
+    }
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

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

@@ -0,0 +1,390 @@
+package com.uas.rd_equipment.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
+import com.bin.david.form.data.table.TableData;
+import com.bin.david.form.listener.OnColumnItemClickListener;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.uas.rd_equipment.R;
+import com.uas.rd_equipment.activity.FunctionActivity;
+import com.uas.rd_equipment.bean.MessageOutboundEvents;
+import com.uas.rd_equipment.bean.ProblemListBean;
+import com.uas.rd_equipment.camera.CaptureActivity;
+import com.uas.rd_equipment.global.GloableParams;
+import com.uas.rd_equipment.util.CameraUtil;
+import com.uas.rd_equipment.util.CommonUtil;
+import com.uas.rd_equipment.util.FastjsonUtil;
+import com.uas.rd_equipment.util.FragmentUtils;
+import com.uas.rd_equipment.util.HttpCallback;
+import com.uas.rd_equipment.util.HttpParams;
+import com.uas.rd_equipment.util.VolleyRequest;
+import com.uas.rd_equipment.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by cjh on 2022-10-15
+ */
+public class ProblemDetectionListFragment extends BaseFragment implements OnColumnItemClickListener<String>, View.OnClickListener {
+
+    private ClearableEditText storage_recharge_collect_et;
+    private PopupWindow mMenuPopupWindow;
+    private Fragment mFragment;
+    private RefreshLayout mRefreshLayout;
+    private SmartTable mSmartTable;
+    private Column<String> va_classColumn,va_codeColumn,va_statusColumn,va_vendnameColumn;
+    private TableData<ProblemListBean> mTableData;
+    private int mPageIndex = 1, mPageSize = 20;
+    private List<ProblemListBean> mFilterStorageInBeans;
+    private ImageView mScanImageView;
+    private Button mMenuButton;
+    private static final int SCAN_BARCODE_CODE = 111;
+    private int mFocusId;
+    private Button bt_add;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.maintenance_managementlsit_fragment;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.problem_list));
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        storage_recharge_collect_et = mActivity.findViewById(R.id.storage_recharge_collect_et);
+        mRefreshLayout = mActivity.findViewById(R.id.pda_wms_in_filter_list_srl);
+        mSmartTable = mActivity.findViewById(R.id.jlt_storage_in_filter_list_st);
+        mScanImageView = (ImageView) mActivity.findViewById(R.id.storage_recharge_scan_iv);
+        mMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
+
+    }
+
+    @Override
+    protected void initEvents() {
+
+        storage_recharge_collect_et.requestFocus();
+        storage_recharge_collect_et.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 = storage_recharge_collect_et.getText().toString().trim();
+                    getDatalistCodes(va_code);
+                    return true;
+                }
+                return false;
+            }
+        });
+        mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
+
+        initPopupWindow();
+        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+    }
+
+    @Override
+    protected void initDatas() {
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().register(this);
+        }
+        WindowManager wm = mActivity.getWindowManager();
+        int screenWith = wm.getDefaultDisplay().getWidth();
+        mSmartTable.getConfig().setMinTableWidth(screenWith)
+                .setShowXSequence(false)
+                .setShowYSequence(false)
+                .setShowTableTitle(false)
+                .setFixedTitle(true)
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity, 15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
+
+
+
+        va_classColumn = new Column<String>("单据编号", "IC_CODE");
+        va_codeColumn = new Column<String>("责任人", "IC_FIRSTMAN");
+        va_statusColumn = new Column<String>("处理人", "IC_SECONDMAN");
+        va_vendnameColumn = new Column<String>("录入日期", "IC_INDATE");
+
+        va_classColumn.setOnColumnItemClickListener(this);
+        va_codeColumn.setOnColumnItemClickListener(this);
+        va_statusColumn.setOnColumnItemClickListener(this);
+        mScanImageView.setOnClickListener(this);
+        mMenuButton.setOnClickListener(this);
+
+        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+                mPageIndex = 1;
+                getDatalistCodes("");
+            }
+        });
+
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(RefreshLayout refreshLayout) {
+                mPageIndex++;
+                getDatalistCodes("");
+            }
+        });
+
+//        ceshiData();
+    }
+    private void getDatalistCodes(String pi_inoutno){
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_SELECT_INSPECTCHECKLIST)
+                .method(Request.Method.GET)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("page",mPageIndex+"")
+                .addParam("pageSize",mPageSize+"")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    mFilterStorageInBeans.clear();
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("items");
+                    List<ProblemListBean> list=new ArrayList<>();
+                    list.clear();
+                    if (dataArray != null && dataArray.size() > 0) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                ProblemListBean jltStorageInBean = new ProblemListBean();
+                                jltStorageInBean.setIC_CODE(FastjsonUtil.getText(dataObject, "IC_CODE"));
+                                jltStorageInBean.setIC_FIRSTMAN(FastjsonUtil.getText(dataObject, "IC_FIRSTMAN"));
+                                jltStorageInBean.setIC_SECONDMAN(FastjsonUtil.getText(dataObject, "IC_SECONDMAN"));
+                                jltStorageInBean.setIC_INDATE(FastjsonUtil.getText(dataObject, "IC_INDATE"));
+                                list.add(jltStorageInBean);
+                            }
+                        }
+                    }
+                    mFilterStorageInBeans = list;//PI_INOUTNO
+                    setFilterTableData(mFilterStorageInBeans);
+                    progressDialog.dismiss();
+                    mRefreshLayout.finishRefresh(0);
+                    mRefreshLayout.finishLoadMore(0);
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    progressDialog.dismiss();
+                    mRefreshLayout.finishRefresh(0);
+                    mRefreshLayout.finishLoadMore(0);
+                }
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                mRefreshLayout.finishRefresh(0);
+                mRefreshLayout.finishLoadMore(0);
+                if (mPageIndex > 1) {
+                    mPageIndex--;
+                } else {
+                    setFilterTableData(new ArrayList<>());
+                }
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+                setFilterTableData(mFilterStorageInBeans);
+                progressDialog.dismiss();
+            }
+        });
+    }
+
+
+    private void setFilterTableData(List<ProblemListBean> filterTableData) {
+        mTableData = new TableData<ProblemListBean>("收料单列表", filterTableData,
+                va_classColumn,va_codeColumn,va_statusColumn,va_vendnameColumn);
+        mSmartTable.setTableData(mTableData);
+//        mSmartTable.requestLayout();
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
+
+    }
+    private void initPopupWindow() {
+        View view = View.inflate(getActivity(), R.layout.pop_outboundlist_out_menu, null);
+        bt_add = (Button) view.findViewById(R.id.bt_add);
+        mFragment = new ProblemDetectionFragment();
+
+        bt_add.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                FragmentUtils.switchFragment(ProblemDetectionListFragment.this, mFragment);
+            }
+        });
+
+
+
+        mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeMenuPopupWindow();
+            }
+        });
+    }
+    private void closeMenuPopupWindow() {
+        if (mMenuPopupWindow != null) {
+            mMenuPopupWindow.dismiss();
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+//    @Subscribe
+//    public void onMessageEvent(MessageOutboundEvents event) {
+//        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+//    }
+
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (hidden) {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.problem_list));
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        }
+    }
+
+    @Override
+    public void onClick(Column<String> column, String value, String s, int position) {
+        String dc_code = mFilterStorageInBeans.get(position).getIC_CODE();
+
+        ProblemDetectionFragment outboundListAdd_fragment = new ProblemDetectionFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("dc_code", dc_code);
+        outboundListAdd_fragment.setArguments(bundle);
+        FragmentUtils.switchFragment(ProblemDetectionListFragment.this, outboundListAdd_fragment);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        CommonUtil.closeKeybord(storage_recharge_collect_et, mActivity);
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.problem_list));
+    }
+
+    @Subscribe
+    public void onMessageEvent(MessageOutboundEvents event) {
+        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+    }
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.storage_recharge_scan_iv:
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+                break;
+            case R.id.btn_actionbar_more:
+                CommonUtil.setBackgroundAlpha(getActivity(), 0.5f);
+                mMenuPopupWindow.showAsDropDown(mMenuButton);
+                break;
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.storage_recharge_collect_et) {
+                    storage_recharge_collect_et.setText(result);
+                    storage_recharge_collect_et.setSelection(result.length());
+
+                    getDatalistCodes(result);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        // 注销
+        EventBus.getDefault().unregister(this);
+    }
+}

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

@@ -3,7 +3,6 @@ package com.uas.rd_equipment.fragment;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
-import android.graphics.Paint;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -33,8 +32,6 @@ import com.bin.david.form.data.style.FontStyle;
 import com.bin.david.form.data.table.TableData;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.google.gson.Gson;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.rd_equipment.R;
 import com.uas.rd_equipment.UrlDataAdapter;
 import com.uas.rd_equipment.activity.FunctionActivity;
@@ -86,7 +83,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
     private String de_name1;
     private SmartTable mSmartTable2;
     private List<Items1Bean> beanitemsList2;
-    private RefreshLayout mRefreshLayout;
+//    private RefreshLayout mRefreshLayout;
     private RecyclerView ra_data;
     private List<UrlDataBean.DeviceBean.UrlBean> urlBeanList;
     private UrlDataAdapter pdfOrImageAdapter;
@@ -112,7 +109,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
 
     @Override
     protected void initEvents() {
-        mRefreshLayout = mActivity.findViewById(R.id.pda_wms_in_filter_list_srl);
+//        mRefreshLayout = mActivity.findViewById(R.id.pda_wms_in_filter_list_srl);
         tv_de_code = root.findViewById(R.id.tv_de_code);
         tv_de_vendor = root.findViewById(R.id.tv_de_vendor);
         tv_de_name = root.findViewById(R.id.tv_de_name);
@@ -199,7 +196,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
         beanitemsList = new ArrayList<>();
         beanitemsList2 = new ArrayList<>();
         mNumColumn = new Column<String>("保养类型", "DC_KIND");
-        mNumColumn.setFixed(true);
+//        mNumColumn.setFixed(true);
         mClassColumn = new Column<String>("保养日期", "DC_ACTIONDATE");
         mPdaStatusColumn = new Column<String>("保养人", "DC_INMAN");
 //        mSupplierColumn = new Column<String>("周保养", "MI_ISWEEK");
@@ -208,22 +205,24 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
 //        mMi_yeaRColumn = new Column<String>("年保养", "MI_YEAR");
 //        mMi_tallyColumn = new Column<String>("点检", "MI_TALLY");
 //        mMi_calibrationColumn = new Column<String>("校准", "MI_CALIBRATION");
-        mClassColumn.setTextAlign(Paint.Align.CENTER);
-        mClassColumn.setWidth(500);
-
+//        mClassColumn.setTextAlign(Paint.Align.CENTER);
+//        mClassColumn.setWidth(500);
         mDE_DCKIND = new Column<String>("保养类型", "DE_DCKIND");
         mDE_NEXTDATEBYWEEK = new Column<String>("下次保养日期", "DE_NEXTDATEBYWEEK");
+
+        mDE_DCKIND.setWidth(screenWith/2);
+        mDE_NEXTDATEBYWEEK.setWidth(screenWith/2);
         initPopupWindow();
 
 
 
-        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(RefreshLayout refreshLayout) {
-                String scanResult = SharedPreUtil.getString(getActivity().getApplicationContext(), Constants.FLAG.SWEEP, null);
-                getNewData(scanResult);
-            }
-        });
+//        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+//            @Override
+//            public void onRefresh(RefreshLayout refreshLayout) {
+//                String scanResult = SharedPreUtil.getString(getActivity().getApplicationContext(), Constants.FLAG.SWEEP, null);
+//                getNewData(scanResult);
+//            }
+//        });
 
 
         urlBeanList = new ArrayList<>();
@@ -272,6 +271,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
         Button todoButton2 = (Button) view.findViewById(R.id.pop_storage_recharge_menu_2);
         Button todoButton3 = (Button) view.findViewById(R.id.pop_storage_recharge_menu_3);
         Button todoButton4 = (Button) view.findViewById(R.id.pop_storage_recharge_menu_4);
+        Button todoButton5 = (Button) view.findViewById(R.id.pop_storage_recharge_menu_5);
         mFragment = new StorageRechargeListFragment();
         doneButton1.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -323,7 +323,14 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                 FragmentUtils.switchFragment(StorageInFragment.this, mFragment4);
             }
         });
-
+        todoButton5.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String scanResult = SharedPreUtil.getString(getActivity().getApplicationContext(), Constants.FLAG.SWEEP, null);
+                getNewData(scanResult);
+                closeMenuPopupWindow();
+            }
+        });
 
         mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
@@ -407,7 +414,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                     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"));
+                    de_managemantel.setText(FastjsonUtil.getText(dataObject, "DE_MANAGEPHONE"));
 
 
 
@@ -434,11 +441,11 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                         beanitemsList2.add(items1Bean);
                     }
                     setFilterTableData2(beanitemsList2);
-                    mRefreshLayout.finishRefresh(0);
+//                    mRefreshLayout.finishRefresh(0);
                 } catch (Exception e) {
                         e.printStackTrace();
                         progressDialog.dismiss();
-                        mRefreshLayout.finishRefresh(0);
+//                        mRefreshLayout.finishRefresh(0);
                     }
 
             }
@@ -446,7 +453,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
-                mRefreshLayout.finishRefresh(0);
+//                mRefreshLayout.finishRefresh(0);
                 CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }

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

@@ -83,11 +83,11 @@ import razerdp.basepopup.BasePopupWindow;
  * @describe
  * @date 2023/1/15 17:34
  */
-public class StorageRechargeListFragment extends BaseFragment implements OnColumnItemClickListener<String> {
+public class StorageRechargeListFragment extends BaseFragment implements OnColumnItemClickListener<String> ,AdapterView.OnItemSelectedListener{
 
     private Spinner spinner;
-    private ArrayAdapter<String> adapter;
-    private String[] m;
+    private ArrayAdapter adapter;
+//    private String[] m;
     private String de_code;
 //    private MaintainitemAdapter myAdapter;
     private RecyclerView mRecyclerView;
@@ -113,6 +113,7 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
     private TableData<PrintListBean> mTableData;
     private List<PrintListBean> mFilterStorageInBeans;
     private TextView tv_add;
+    private List<String> linecodeBeanList;
 
     @Override
     protected int getLayout() {
@@ -190,12 +191,12 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 addData();
             }
         });
-
+        spinner.setOnItemSelectedListener(this);
     }
 
     @Override
     protected void initDatas() {
-        getNewData();
+//        getNewData();
         mFeededList = new ArrayList<>();
 //        myAdapter = new MaintainitemAdapter(mFeededList);
         myAdapter = new SelectAdapter(mFeededList);
@@ -296,11 +297,12 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
 
 
     //返回保养类型(下拉框的值)
-    public void getNewData(){
+    public void getNewDataChange(String code){
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ASTATIONTHE_MAINTAIN_DATA)
                 .method(Request.Method.GET)
+                .addParam("de_code",code)
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -316,27 +318,56 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 String mi_isseason = FastjsonUtil.getText(dataObject, "MI_ISSEASON");
                 String mi_calibration = FastjsonUtil.getText(dataObject, "MI_CALIBRATION");
                 String mi_ishalfmonth_user = FastjsonUtil.getText(dataObject, "MI_ISHALFMONTH_USER");
-//                HashMap<String,String> map=new HashMap<>();
-//                map.put("MI_YEAR",mi_year);
-//                map.put("MI_TALLY",mi_tally);
-//                map.put("MI_ISWEEK",mi_isweek);
-//                map.put("MI_ISMONTH",mi_ismonth);
-//
-//                map.put("MI_ISSEASON",mi_isseason);
-//                map.put("MI_CALIBRATION",mi_calibration);
-//                map.put("MI_ISHALFMONTH_USER",mi_ishalfmonth_user);
-                m = new String[]{mi_tally,mi_year,mi_isday,mi_isweek,mi_ismonth,mi_isseason,mi_calibration,mi_ishalfmonth_user};
+//MI_TALLY,MI_ISDAY,MI_ISWEEK,MI_ISMONTH,MI_ISSEASON,MI_YEAR
+
+                linecodeBeanList = new ArrayList<>();
+                linecodeBeanList.clear();
+
+                if (!mi_tally.isEmpty()){
+                    linecodeBeanList.add(mi_tally);
+                }
+                if (!mi_isday.isEmpty()){
+                    linecodeBeanList.add(mi_isday);
+                }
+                if (!mi_isweek.isEmpty()){
+                    linecodeBeanList.add(mi_isweek);
+                }
+                if (!mi_ismonth.isEmpty()){
+                    linecodeBeanList.add(mi_ismonth);
+                }
+                if (!mi_isseason.isEmpty()){
+                    linecodeBeanList.add(mi_isseason);
+                }
+                if (!mi_year.isEmpty()){
+                    linecodeBeanList.add(mi_year);
+                }
+
+
+
+
+
+                if (!mi_calibration.isEmpty()){
+                    linecodeBeanList.add(mi_calibration);
+                }
+                if (!mi_ishalfmonth_user.isEmpty()){
+                    linecodeBeanList.add(mi_ishalfmonth_user);
+                }
+                for (int i=0;i<linecodeBeanList.size();i++){
+                    Log.e("linecodeBeanList==",linecodeBeanList.get(i)+"");
+                }
+
+//                m = new String[]{mi_tally,mi_isday,mi_isweek,mi_ismonth,mi_year,mi_isseason,mi_calibration,mi_ishalfmonth_user};
 
                 //将可选内容与ArrayAdapter连接起来
-                adapter = new ArrayAdapter<String>(mActivity,android.R.layout.simple_spinner_item,m);
+                adapter = new ArrayAdapter(mActivity,R.layout.item_spinner, R.id.text_spinner, linecodeBeanList);
 
                 //设置下拉列表的风格
-                adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);//风格一
+//                adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);//风格一
                 //adapter.setDropDownViewResource(android.R.layout.simple_dropdown_item_1line); 风格二
                 //将adapter 添加到spinner中
                 spinner.setAdapter(adapter);
                 //添加事件Spinner事件监听
-                spinner.setOnItemSelectedListener(new SpinnerSelectedListener());
+//                spinner.setOnItemSelectedListener(new SpinnerSelectedListener());
                 //设置默认值
                 spinner.setVisibility(View.VISIBLE);
 
@@ -353,6 +384,9 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
 
     //选择下拉框获取项目名称
     public void getNewNameData(String mi_kind){
+        if (mi_kind.isEmpty()){
+            return;
+        }
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ASTATIONTHE_NAME_DATA)
@@ -376,6 +410,7 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 }
                 handleFeededData(dataArray);
                 ck_all.setChecked(false);
+                tv_prompt.setText("");
             }
 
             @Override
@@ -516,44 +551,40 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
         }
     }
 
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        maintenanceType=linecodeBeanList.get(position);
+        commit_maintenanceType=maintenanceType;
+        if (maintenanceType.equals("年保养")){
+            maintenanceType="MI_YEAR";
+        }else if (maintenanceType.equals("点检")){
+            maintenanceType="MI_TALLY";
+        }else if (maintenanceType.equals("日保养")){
+            maintenanceType="MI_ISDAY";
+        }else if (maintenanceType.equals("周保养")){
+            maintenanceType="MI_ISWEEK";
+        }else if (maintenanceType.equals("月保养")){
+            maintenanceType="MI_ISMONTH";
+        }else if (maintenanceType.equals("季度保养")){
+            maintenanceType="MI_ISSEASON";
+        }else if (maintenanceType.equals("校准")){
+            maintenanceType="MI_CALIBRATION";
+        }else if (maintenanceType.equals("半月校准")){
+            maintenanceType="MI_ISHALFMONTH_USER";
+        }else {
+            maintenanceType="";
+        }
 
+        getNewNameData(maintenanceType +"");
+    }
 
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
 
-    //使用数组形式操作
-    class SpinnerSelectedListener implements AdapterView.OnItemSelectedListener {
-
-        public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2,
-                                   long arg3) {
-            commit_maintenanceType = m[arg2];
-            maintenanceType = m[arg2];
-            if (maintenanceType.equals("年保养")){
-                maintenanceType="MI_YEAR";
-            }else if (maintenanceType.equals("点检")){
-                maintenanceType="MI_TALLY";
-            }else if (maintenanceType.equals("日保养")){
-                maintenanceType="MI_ISDAY";
-            }else if (maintenanceType.equals("周保养")){
-                maintenanceType="MI_ISWEEK";
-            }else if (maintenanceType.equals("月保养")){
-                maintenanceType="MI_ISMONTH";
-            }else if (maintenanceType.equals("季度保养")){
-                maintenanceType="MI_ISSEASON";
-            }else if (maintenanceType.equals("校准")){
-                maintenanceType="MI_CALIBRATION";
-            }else if (maintenanceType.equals("半月校准")){
-                maintenanceType="MI_ISHALFMONTH_USER";
-            }else {
-                maintenanceType="";
-            }
-
+    }
 
 
-            getNewNameData(maintenanceType +"");
-        }
 
-        public void onNothingSelected(AdapterView<?> arg0) {
-        }
-    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
@@ -663,22 +694,33 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
             //设置条目状态
             ((ListItemViewHolder) holder).mainTitle.setText("项目:"+mList.get(i).getMi_item());
             ((ListItemViewHolder) holder).tv_mi_desc.setText("标准:"+mList.get(i).getMI_DESC());
-            if (StringUtil.isEmpty(mList.get(i).getDI_REMARK())){
-                ((ListItemViewHolder) holder).tv_remark.setText("");
-            }else {
-//                double vDI_REMARK = Double.parseDouble(mList.get(i).getDI_REMARK());
+            if (!StringUtil.isEmpty(mList.get(i).getDI_REMARK())){
+//                ((ListItemViewHolder) holder).tv_remark.setText("");
                 ((ListItemViewHolder) holder).tv_remark.setVisibility(View.VISIBLE);
                 ((ListItemViewHolder) holder).tv_remark.setText("点检值："+mList.get(i).getDI_REMARK());
+            }else {
+                ((ListItemViewHolder) holder).tv_remark.setText("");
+                ((ListItemViewHolder) holder).tv_remark.setVisibility(View.GONE);
             }
             if (!StringUtil.isEmpty(mList.get(i).getMI_MAXVALUE())){
-                ((ListItemViewHolder) holder).tv_max.setVisibility(View.VISIBLE);
+//                ((ListItemViewHolder) holder).tv_remark.setText("");
                 ((ListItemViewHolder) holder).tv_max.setText("最大值："+mList.get(i).getMI_MAXVALUE());
+                ((ListItemViewHolder) holder).tv_max.setVisibility(View.VISIBLE);
+            }else {
+                ((ListItemViewHolder) holder).tv_max.setText("");
+                ((ListItemViewHolder) holder).tv_max.setVisibility(View.GONE);
+
             }
             if (!StringUtil.isEmpty(mList.get(i).getMI_MINVALUE())){
+//                ((ListItemViewHolder) holder).tv_remark.setText("");
                 ((ListItemViewHolder) holder).tv_min.setVisibility(View.VISIBLE);
                 ((ListItemViewHolder) holder).tv_min.setText("最小值："+mList.get(i).getMI_MINVALUE());
+            }else {
+                ((ListItemViewHolder) holder).tv_min.setText("");
+                ((ListItemViewHolder) holder).tv_min.setVisibility(View.GONE);
             }
 
+
             ((ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
 
             //checkBox的监听
@@ -897,6 +939,7 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
 
 
     public void getNewData(String de_codes){
+        tv_prompt.setText("");
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ASTATIONTHE_SWEEP_DATA)
@@ -915,7 +958,7 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 de_name=de_name1;
                 tv_de_code.setText("编号："+de_code1);
                 tv_de_name.setText("名称:"+de_name1);
-                getNewData();
+                getNewDataChange(de_code1);
                 ce_de_code.clearFocus();
                 index_position_resource.clearFocus();
             }

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

@@ -340,6 +340,7 @@ public class GloableParams {
     public static String ASTATIONTHE_SELECT_GRANt;
     public static String ASTATIONTHE_SELECT_CONFIRMUSE;
     public static String ASTATIONTHE_SELECT_MAKEMANSOURCEINF;
+    public static String ASTATIONTHE_SELECT_INSPECTCHECKLIST;
 
     /**
      * 新版设备管理
@@ -365,6 +366,7 @@ public class GloableParams {
 
 
     public static String ADDRESSTAIL_GET_CONFIRM_REPAIR="/oa/device/confirmStatus.action";
+    public static String ADDRESSTAIL_GET_INSPECTCHECKLIST="/oa/device/getInspectCheckList.action";
 
     //扫描人员编号
     public static String ADDRESSTAIL_GET_GETEMNAME="/oa/device/getEmname.action";
@@ -988,6 +990,7 @@ public class GloableParams {
     public static final String PRODUCTION_INFORMATION_UNIT = "生产信息绑定";
     public static final String PRODUCTION_REMOULD_UNIT = "设备改造";
     public static final String PRODUCTION_REMOULD_GRAN = "物料发放";
+    public static final String PRODUCTION_REMOULD_PROGRAMSELECT = "问题缉查";
     public static final String GRIDNAME_SETTING = "设置";
 //    public static final String QUERYSTATIONINFORMATION = "过站信息";
     public static String[] homeMenuNames = {
@@ -998,7 +1001,8 @@ public class GloableParams {
             TEXT_REQUISITION_TRANSFER,
             PRODUCTION_INFORMATION_UNIT,
             PRODUCTION_REMOULD_UNIT,
-//            PRODUCTION_REMOULD_GRAN,
+            PRODUCTION_REMOULD_GRAN,
+//        PRODUCTION_REMOULD_PROGRAMSELECT,
             GRIDNAME_SETTING
     };
     public static int[] homeMenuIcons = {
@@ -1009,7 +1013,8 @@ public class GloableParams {
             R.drawable.pause,
             R.drawable.information,
             R.drawable.remould,
-//            R.drawable.iv_grant,
+            R.drawable.iv_grant,
+//            R.drawable.iv_problem,
             R.drawable.mainmenu_usersetting
     };
 
@@ -1526,5 +1531,6 @@ public class GloableParams {
         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;
+        GloableParams.ASTATIONTHE_SELECT_INSPECTCHECKLIST = uriHead + GloableParams.ADDRESSTAIL_GET_INSPECTCHECKLIST;
     }
 }

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

@@ -6,248 +6,227 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:orientation="vertical">
-    <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/pda_wms_in_filter_list_srl"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <com.scwang.smartrefresh.layout.header.ClassicsHeader
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-        <LinearLayout
-            android:background="@color/white"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <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_code"
-                    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_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"
-                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_currentcentername"
-                    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_currentlinecode"
-                    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_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>
-
-
 
+<!--    <com.scwang.smartrefresh.layout.SmartRefreshLayout-->
+<!--        android:id="@+id/pda_wms_in_filter_list_srl"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        android:background="@color/white">-->
 
+<!--        <com.scwang.smartrefresh.layout.header.ClassicsHeader-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:background="@color/white"/>-->
 
 
-            <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_contact"
-                    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_telvendor"
-                    android:text=""
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-            </LinearLayout>
-
-
+<!--    </com.scwang.smartrefresh.layout.SmartRefreshLayout>-->
 
+    <android.support.design.widget.AppBarLayout
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-            <LinearLayout
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="vertical"
+        <android.support.design.widget.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:contentScrim="@color/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed">
+            <android.support.v4.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/ra_Data"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1">
-                </android.support.v7.widget.RecyclerView>
-                <com.bin.david.form.core.SmartTable
-                    android:id="@+id/smar_item1"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:layout_marginBottom="5dp"/>
-
-                <com.bin.david.form.core.SmartTable
-                    android:layout_marginTop="5dp"
-                    android:id="@+id/pda_wms_in_filter_list_st"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1.7" />
 
-            </LinearLayout>
+                    <LinearLayout
+                        android:background="@color/white"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+                        <TableLayout
+                            android:background="@color/white"
+                            android:orientation="vertical"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10"
+                                android:layout_marginTop="7dp">
+                                <TextView
+                                    android:text="编号："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_code"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="名称："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_name"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="规格："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_spec"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="使用部门："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_currentcentername"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="使用线体："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_currentlinecode"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="寿命剩余(天)："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_lefttime"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="管理人员："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"
+                                    />
+                                <TextView
+                                    android:id="@+id/tv_de_manageman"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="管理人员电话："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/de_managemantel"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="设备厂商："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_vendor"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="厂商人员："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_contact"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+                            <TableRow
+                                android:layout_marginLeft="@dimen/dp_10">
+                                <TextView
+                                    android:text="厂商电话："
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:textColor="@color/black"/>
+                                <TextView
+                                    android:id="@+id/tv_de_telvendor"
+                                    android:text=""
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </TableRow>
+
+                        </TableLayout>
+                        <android.support.v7.widget.RecyclerView
+                            android:id="@+id/ra_Data"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                        </android.support.v7.widget.RecyclerView>
+                        <com.bin.david.form.core.SmartTable
+                            android:id="@+id/smar_item1"
+                            android:layout_width="match_parent"
+                            android:layout_height="110dp"
+                            />
+                        <com.bin.david.form.core.SmartTable
+                            android:background="@color/white"
+                            android:layout_marginTop="5dp"
+                            android:id="@+id/pda_wms_in_filter_list_st"
+                            android:layout_width="match_parent"
+                            android:layout_height="400dp"
+                            />
+                    </LinearLayout>
+            </android.support.v4.widget.NestedScrollView>
+
+        </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
 
 
 
-        </LinearLayout>
-
-        <com.scwang.smartrefresh.layout.footer.ClassicsFooter
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:srlAccentColor="@android:color/darker_gray" />
-    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
-
 </LinearLayout>

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

@@ -55,7 +55,7 @@
                         android:layout_height="wrap_content">
                         <TextView
                             android:id="@+id/tv_de_code"
-                            android:text="名称："
+                            android:text="编号："
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="@color/blueq">
@@ -63,7 +63,7 @@
                         <TextView
                             android:layout_marginTop="5dp"
                             android:id="@+id/tv_de_name"
-                            android:text="编号："
+                            android:text="名称："
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="@color/blueq">

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

@@ -2,7 +2,7 @@
 <!--主菜单griditem布局-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="100dp"
-    android:layout_height="100dp"
+    android:layout_height="80dp"
     android:gravity="center"
     android:focusable="false"
     android:layout_centerInParent="true"

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="5dp">
+    android:layout_height="wrap_content">
     <TextView
         android:layout_marginLeft="@dimen/dp_10"
         android:id="@+id/tv_pathname"

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

@@ -45,4 +45,13 @@
         android:background="@color/transparent"
         android:text="领用转移"
         android:textSize="@dimen/app_text_size_body_2" />
+    <Button
+        android:id="@+id/pop_storage_recharge_menu_5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="刷新"
+        android:textSize="@dimen/app_text_size_body_2" />
 </LinearLayout>

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

@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1"
+        android:layout_weight="1">
+        <TableRow>
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="单据编号"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="5dp">
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+                    <TextView
+                        android:id="@+id/tv_ic_code"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="left"
+                        android:gravity="center"
+                        android:textColor="@color/black"
+                        android:text="">
+                    </TextView>
+
+                </FrameLayout>
+
+                <ImageView
+                    android:layout_width="@dimen/dp_10"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:clickable="false" />
+            </LinearLayout>
+
+
+
+
+        </TableRow>
+        <TableRow>
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="稽查内容"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="5dp">
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_line_edittext"
+                    android:layout_weight="1">
+                    <com.uas.rd_equipment.view.ClearableEditText
+                        android:id="@+id/ce_ic_badname"
+                        style="@style/EditTextStyle"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:layout_height="30dp"
+                        android:focusableInTouchMode="true"
+                        android:hint="请输入缉查内容"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+                </FrameLayout>
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:clickable="false" />
+            </LinearLayout>
+
+
+
+
+        </TableRow>
+        <TableRow
+            android:layout_marginTop="5dp">
+
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="地点"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/textsize_16"
+                android:layout_marginRight="@dimen/textsize_16">
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_line_edittext">
+                    <com.uas.rd_equipment.view.ClearableEditText
+                        android:id="@+id/ce_ic_licode"
+                        style="@style/EditTextStyle"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:layout_height="30dp"
+                        android:focusableInTouchMode="true"
+                        android:hint="请输入地点"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+                </FrameLayout>
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:clickable="false" />
+            </LinearLayout>
+
+        </TableRow>
+        <TableRow
+            android:layout_marginTop="5dp">
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="指定处理人"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp">
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_line_edittext">
+
+                    <com.uas.rd_equipment.view.ClearableEditText
+                        android:id="@+id/ce_ic_firstman"
+                        style="@style/EditTextStyle"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:layout_height="30dp"
+                        android:focusableInTouchMode="true"
+                        android:hint="请输入指定处理人"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+                </FrameLayout>
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:clickable="false" />
+            </LinearLayout>
+
+
+        </TableRow>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="50dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="上传附件"
+                android:textColor="@color/black">
+            </TextView>
+            <ImageView
+                android:id="@+id/up_imageone"
+                android:layout_marginLeft="15dp"
+                android:layout_width="@dimen/dp_40"
+                android:layout_height="@dimen/dp_40"
+                android:src="@drawable/uploading_image"
+                android:layout_marginStart="15dp">
+            </ImageView>
+        </LinearLayout>
+
+        <TableRow
+            android:layout_marginTop="5dp">
+
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="变更处理人"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/textsize_16"
+                android:layout_marginRight="@dimen/textsize_16">
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_line_edittext">
+                    <com.uas.rd_equipment.view.ClearableEditText
+                        android:id="@+id/ce_ic_secondman"
+                        style="@style/EditTextStyle"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:layout_height="30dp"
+                        android:focusableInTouchMode="true"
+                        android:hint="请输入变更处理人"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+                </FrameLayout>
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:clickable="false" />
+            </LinearLayout>
+
+        </TableRow>
+        <TableRow
+            android:layout_marginTop="5dp">
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="改善措施"
+                android:layout_gravity="center"
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp">
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_line_edittext">
+
+                    <com.uas.rd_equipment.view.ClearableEditText
+                        android:id="@+id/ce_ic_reason"
+                        style="@style/EditTextStyle"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:layout_height="30dp"
+                        android:focusableInTouchMode="true"
+                        android:hint="请输入改善措施"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+                </FrameLayout>
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:clickable="false" />
+            </LinearLayout>
+
+
+        </TableRow>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="50dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="上传附件"
+                android:textColor="@color/black">
+            </TextView>
+            <ImageView
+                android:id="@+id/up_imagetwo"
+                android:layout_marginLeft="15dp"
+                android:layout_width="@dimen/dp_40"
+                android:layout_height="@dimen/dp_40"
+                android:src="@drawable/uploading_image"
+                android:layout_marginStart="15dp">
+            </ImageView>
+        </LinearLayout>
+
+    </TableLayout>
+    <TextView
+        android:id="@+id/tv_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_10">
+    </TextView>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/btn_commit"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_button"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:layout_gravity="center"
+            android:text="保存"
+            android:textColor="@color/white">
+        </Button>
+        <Button
+            android:id="@+id/btn_confirm_the_fault"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_button"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:text="确认处理"
+            android:textColor="@color/white">
+        </Button>
+
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -384,6 +384,7 @@
 
     </TableLayout>
     <RadioGroup
+        android:layout_marginTop="5dp"
         android:id="@+id/rg_change"
         android:layout_gravity="center"
         android:orientation="horizontal"
@@ -393,7 +394,6 @@
             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>
@@ -401,14 +401,12 @@
             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
             android:id="@+id/rb_fixture"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/dp_10"
             android:layout_weight="1"
             android:text="夹具">
         </RadioButton>
@@ -416,7 +414,6 @@
             android:id="@+id/rb_ingredients"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/dp_10"
             android:text="辅料">
         </RadioButton>
     </RadioGroup>

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

@@ -316,6 +316,7 @@
     <string name="title_storage_in">扫一扫</string>
     <string name="title_storage_maintain">养护管理</string>
     <string name="title_storage_breakdown">故障送检</string>
+    <string name="title_problem_detection">问题缉查</string>
     <string name="title_requisition_transfer">领用转移</string>
     <string name="title_storage_deliveryforrepair">设备维修</string>
     <string name="title_storage_remould">设备改造</string>
@@ -381,6 +382,7 @@
     <string name="box_num_total">箱内总数：</string>
     <string name="whcode_flag">仓库：</string>
     <string name="main_list">领用转移列表</string>
+    <string name="problem_list">问题缉查列表</string>
     <string name="grant_list">物料发放列表</string>
     <string name="producemassagebinding">生产信息绑定</string>
     <string name="addequipmentgrant">物料发放</string>

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

@@ -1,4 +1,4 @@
-#Fri Jul 07 10:18:13 CST 2023
+#Wed Jul 12 21:08:29 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