最新代码

app/build.gradle

@@ -45,7 +45,7 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_EQUIPMENT_STORAGE_RELEASE_${releaseInfo}.apk"
+                    fileName = "设备通用版_UAS_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     fileName = "UAS_EQUIPMENT_STORAGE_DEBUG_${debugInfo}.apk"

app/src/main/java/com/uas/equipment/bean/JsonStorateBean.java

@@ -6,10 +6,30 @@ package com.uas.equipment.bean;
 public class JsonStorateBean {
     private String DI_RESULT;
     private String DI_ITEM;
+    private String DI_DESC;
+    private String DI_REMARK;
 
-    public JsonStorateBean(String DI_RESULT, String DI_ITEM) {
+    public JsonStorateBean(String DI_RESULT, String DI_ITEM, String DI_DESC, String DI_REMARK) {
         this.DI_RESULT = DI_RESULT;
         this.DI_ITEM = DI_ITEM;
+        this.DI_DESC = DI_DESC;
+        this.DI_REMARK = DI_REMARK;
+    }
+
+    public String getDI_DESC() {
+        return DI_DESC;
+    }
+
+    public void setDI_DESC(String DI_DESC) {
+        this.DI_DESC = DI_DESC;
+    }
+
+    public String getDI_REMARK() {
+        return DI_REMARK;
+    }
+
+    public void setDI_REMARK(String DI_REMARK) {
+        this.DI_REMARK = DI_REMARK;
     }
 
     public String getDI_RESULT() {

app/src/main/java/com/uas/equipment/bean/MaintainitemBean.java

@@ -17,13 +17,25 @@ public class MaintainitemBean {
     private String mi_calibration;
     private String mi_ishalfmonth_user;
     private String mi_recentmaStringdate;
+    private String DI_REMARK;
+    private String MI_MAXVALUE;
+    private String MI_MINVALUE;
     private boolean isChecked;
 
-    public MaintainitemBean(String mi_id, String mi_item,String mi_detno,String MI_DESC) {
+//    public MaintainitemBean(String mi_id, String mi_item,String mi_detno,String MI_DESC) {
+//        this.mi_id = mi_id;
+//        this.mi_item = mi_item;
+//        this.mi_detno = mi_detno;
+//        this.MI_DESC = MI_DESC;
+//    }
+
+    public MaintainitemBean(String mi_id, String mi_item, String mi_detno, String MI_DESC, String MI_MAXVALUE, String MI_MINVALUE) {
         this.mi_id = mi_id;
         this.mi_item = mi_item;
         this.mi_detno = mi_detno;
         this.MI_DESC = MI_DESC;
+        this.MI_MAXVALUE = MI_MAXVALUE;
+        this.MI_MINVALUE = MI_MINVALUE;
     }
 
     public boolean isChecked() {
@@ -137,4 +149,28 @@ public class MaintainitemBean {
     public void setMi_recentmaStringdate(String mi_recentmaStringdate) {
         this.mi_recentmaStringdate = mi_recentmaStringdate;
     }
+
+    public String getDI_REMARK() {
+        return DI_REMARK;
+    }
+
+    public void setDI_REMARK(String DI_REMARK) {
+        this.DI_REMARK = DI_REMARK;
+    }
+
+    public String getMI_MAXVALUE() {
+        return MI_MAXVALUE;
+    }
+
+    public void setMI_MAXVALUE(String MI_MAXVALUE) {
+        this.MI_MAXVALUE = MI_MAXVALUE;
+    }
+
+    public String getMI_MINVALUE() {
+        return MI_MINVALUE;
+    }
+
+    public void setMI_MINVALUE(String MI_MINVALUE) {
+        this.MI_MINVALUE = MI_MINVALUE;
+    }
 }

app/src/main/java/com/uas/equipment/bean/PrintListBean.java

@@ -0,0 +1,32 @@
+package com.uas.equipment.bean;
+
+/**
+ * Created by cjh-sail on 2023-04-17
+ */
+public class PrintListBean {
+    private String dd_detail;
+    private String dd_qty;
+
+    public PrintListBean(){}
+
+    public PrintListBean(String dd_detail, String dd_qty) {
+        this.dd_detail = dd_detail;
+        this.dd_qty = dd_qty;
+    }
+
+    public String getDd_detail() {
+        return dd_detail;
+    }
+
+    public void setDd_detail(String dd_detail) {
+        this.dd_detail = dd_detail;
+    }
+
+    public String getDd_qty() {
+        return dd_qty;
+    }
+
+    public void setDd_qty(String dd_qty) {
+        this.dd_qty = dd_qty;
+    }
+}

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

@@ -115,7 +115,6 @@ public class BreakdownRepairFragment extends BaseFragment{
             tv_de_name.setText("名称:"+de_name);
         }
 
-
         btn_commit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -125,17 +124,15 @@ public class BreakdownRepairFragment extends BaseFragment{
 
     }
 
-
     public void getNewCommitData(){
-
         if (index_fault_phenomenon.getText().toString().trim().isEmpty()||index_position_resource.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请填写故障现象!");
             return;
         }
-        if (index_position_resource.getText().toString().trim().isEmpty()){
-            CommonUtil.toastNoRepeat(mActivity, "请填写备注！");
-            return;
-        }
+//        if (index_position_resource.getText().toString().trim().isEmpty()){
+//            CommonUtil.toastNoRepeat(mActivity, "请填写备注！");
+//            return;
+//        }
         progressDialog.show();
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();

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

@@ -2,20 +2,27 @@ package com.uas.equipment.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.InputType;
 import android.util.Log;
 import android.util.SparseBooleanArray;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -24,6 +31,7 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -37,6 +45,7 @@ import com.uas.equipment.R;
 import com.uas.equipment.activity.FunctionActivity;
 import com.uas.equipment.bean.JsonStorateBean;
 import com.uas.equipment.bean.MaintainitemBean;
+import com.uas.equipment.bean.PrintListBean;
 import com.uas.equipment.camera.CaptureActivity;
 import com.uas.equipment.camera.CodeUtils;
 import com.uas.equipment.global.GloableParams;
@@ -53,10 +62,13 @@ import com.uas.equipment.util.VollyRequest;
 import com.uas.equipment.view.ClearableEditText;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import razerdp.basepopup.BasePopupWindow;
+
 /**
  * @author cjh
  * @describe
@@ -88,6 +100,11 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
     private static final int SCAN_BARCODE_CODE = 111;
     private String commit_maintenanceType;
 
+    private List<PrintListBean> mFilterStorageInBeans;
+    private List<String> linecodeBeanList;
+    private AlertDialog downloadDialog;
+    private TextView mProgress;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_storage_recharge_list;
@@ -119,6 +136,7 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
             tv_de_name.setText("名称:"+de_name);
         }
 
+        mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
         spinner.setOnItemSelectedListener(this);
 
         ce_de_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -221,7 +239,7 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
         });
 
     }
-    private List<String> linecodeBeanList;
+
     //返回保养类型(下拉框的值)
     public void getNewData(){
         progressDialog.show();
@@ -244,8 +262,6 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
                 String mi_calibration = FastjsonUtil.getText(dataObject, "MI_CALIBRATION");
                 String mi_ishalfmonth_user = FastjsonUtil.getText(dataObject, "MI_ISHALFMONTH_USER");
 
-
-
                 linecodeBeanList = new ArrayList<>();
                 linecodeBeanList.clear();
 
@@ -346,7 +362,9 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
                     data.getString("MI_ID"),
                     data.getString("MI_ITEM"),
                     data.getString("MI_DETNO"),
-                    data.getString("MI_DESC"));
+                    data.getString("MI_DESC"),
+                    data.getString("MI_MAXVALUE"),
+                    data.getString("MI_MINVALUE"));
             mFeededList.add(bean);
         }
         setAdapter(mFeededList);
@@ -364,17 +382,18 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
     }
     //提交保存
     public void getNewCommitData(){//dc_remark dc_kind 主表formStore ----- DI_RESULT，DI_ITEM，DI_RESULT
-        progressDialog.show();
+
 //        if (mi_item.isEmpty()||mi_detno.isEmpty()){
 //            CommonUtil.toastNoRepeat(mActivity, "请勾选项目名称");
 //            return;
 //        }
 
         ArrayList<MaintainitemBean> selectedItem = myAdapter.getSelectedItem();
-        for (int i=0;i<selectedItem.size();i++){
-            MaintainitemBean maintainitemBean = selectedItem.get(i);
-            Log.e("maintainitemBean====",maintainitemBean.getMi_item());
-        }
+//        if (selectedItem.size()!=mFeededList.size()){
+//            CommonUtil.toastNoRepeat(mActivity, "必须勾选全部检验项目");
+//            return;
+//        }
+
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
@@ -389,16 +408,45 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
         object_2.put("DI_DETNO", mi_detno);//序号
         ArrayList<JsonStorateBean> list=new ArrayList<>();
         Map<String, String> map = new HashMap<String, String>();
+        list.clear();
         for (int i=0;i<selectedItem.size();i++){
             MaintainitemBean maintainitemBean = selectedItem.get(i);
-            Log.e("maintainitemBean====",maintainitemBean.getMi_item());
+            if (!StringUtil.isEmpty(maintainitemBean.getMI_MAXVALUE()) && !StringUtil.isEmpty(maintainitemBean.getMI_MINVALUE())){
+                if (StringUtil.isEmpty(maintainitemBean.getDI_REMARK())){
+                    CommonUtil.toastNoRepeat(mActivity, "请填写点检值");
+                    return;
+                }
+            }
 //            object_2.put("DI_ITEM", maintainitemBean.getMi_item());
 //            list.add(maintainitemBean.getMi_item());
-            JsonStorateBean jsonStorateBean=new JsonStorateBean("OK",maintainitemBean.getMi_item());
+
+//            JsonStorateBean jsonStorateBean=new JsonStorateBean("OK",maintainitemBean.getMi_item());
+            JsonStorateBean jsonStorateBean=new JsonStorateBean("OK",maintainitemBean.getMi_item(),maintainitemBean.getMI_DESC(),maintainitemBean.getDI_REMARK());
             list.add(jsonStorateBean);
+
 //            map.put("DI_RESULT","OK");
 //            map.put("DI_ITEM",maintainitemBean.getMi_item());
         }
+        JSONObject jsonObject3 = new JSONObject();
+        JSONArray jsonArray3 = new JSONArray();
+        ArrayList<PrintListBean> PrintListBeanlist=new ArrayList<>();
+        for (int o=0;o<mFilterStorageInBeans.size();o++){
+            PrintListBean printListBean = mFilterStorageInBeans.get(o);
+            if (StringUtil.isEmpty(printListBean.getDd_detail())){
+                printListBean.setDd_detail("");
+            }
+            if (StringUtil.isEmpty(printListBean.getDd_qty())){
+                printListBean.setDd_qty("");
+            }
+            PrintListBean printListBean1=new PrintListBean(printListBean.getDd_detail(),printListBean.getDd_qty());
+            PrintListBeanlist.add(printListBean1);
+        }
+
+        jsonArray3.add(PrintListBeanlist);
+        jsonObject3.put("param1",jsonArray3);
+        String substring3 = jsonArray3.toString().substring(0, jsonArray3.toString().length() - 1);//去除尾部
+        String substring13 = substring3.substring(1, substring3.length());//去除首部
+
 //        object_2.put("DI_ITEM", list);
 //        object_2.put("DI_ITEM", mi_item);//项目名称
 //        for (String o : map.keySet()) {
@@ -412,7 +460,7 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
         String substring = jsonArray2.toString().substring(0, jsonArray2.toString().length() - 1);//去除尾部
         String substring1 = substring.substring(1, substring.length());//去除首部
         Log.i("params===2===",substring1);
-
+        progressDialog.show();
         Log.i("TESTJSON33", jsonObject.toString());
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ASTATIONTHE_COMMIT_MAINITEM)
@@ -421,6 +469,7 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
                 .addParam("de_code",de_code)
                 .addParam("formStore",jsonArray.toString())
                 .addParam("param",substring1)
+                .addParam("param1",substring13)
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -428,6 +477,12 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("提交成功");
+
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
+                list.clear();
+                ck_all.setChecked(false);
+                showDownloadDialogture();
             }
 
             @Override
@@ -438,8 +493,76 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
                 tv_prompt.setText(failStr);
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
+                showDownloadDialog(failStr);
+
             }
         });
+        mFilterStorageInBeans.clear();
+    }
+
+    private void showDownloadDialog(String failStr){
+        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+        builder.setTitle("提示");
+        final LayoutInflater inflater = LayoutInflater.from(mActivity);
+        View v = inflater.inflate(R.layout.progress, null);
+        mProgress = (TextView) v.findViewById(R.id.progress);
+
+        builder.setView(v);
+        mProgress.setTextColor(Color.RED);
+        mProgress.setText(failStr+"");
+        builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+
+            @Override
+
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+
+            }
+
+        });
+
+        downloadDialog = builder.create();
+
+        builder.setCancelable(false);
+
+        downloadDialog.setCanceledOnTouchOutside(false);
+
+        downloadDialog.show();
+
+    }
+    Handler handler=new Handler();
+    Runnable runnable=new Runnable() {
+        @Override
+        public void run() {
+            handler.postDelayed(this, 1000);
+            downloadDialog.dismiss();
+            handler.removeCallbacks(runnable);
+        }
+
+    };
+
+    private void showDownloadDialogture(){
+        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+        builder.setTitle("提示");
+        final LayoutInflater inflater = LayoutInflater.from(mActivity);
+        View v = inflater.inflate(R.layout.progress, null);
+        mProgress = (TextView) v.findViewById(R.id.progress);
+
+        builder.setView(v);
+        mProgress.setTextColor(Color.GREEN);
+        mProgress.setText("提交成功");
+
+        downloadDialog = builder.create();
+
+        //        builder.setCancelable(false);
+
+        //        downloadDialog.setCanceledOnTouchOutside(false);
+
+        downloadDialog.show();
+        handler.postDelayed(runnable, 1000);
+
     }
 
     @Override
@@ -624,6 +747,14 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
                 }
             });
 
+            ((ListItemViewHolder) holder).iv_change.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    ce_de_code.clearFocus();
+                    index_position_resource.clearFocus();
+                    initEditPopupWindow(mList,i);
+                }
+            });
 
         }
 
@@ -637,14 +768,103 @@ public class StorageRechargeListFragment extends BaseFragment implements Adapter
             CheckBox checkBox;
             TextView mainTitle;
             TextView tv_mi_desc;
+            ImageView iv_change;
             ListItemViewHolder(View view) {
                 super(view);
                 this.mainTitle = (TextView) view.findViewById(R.id.text);
                 this.tv_mi_desc = (TextView) view.findViewById(R.id.tv_mi_desc);
                 this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
+                this.iv_change = (ImageView) view.findViewById(R.id.iv_change);
             }
         }
     }
+
+    /**
+     * *  点检值改量
+     */
+    private PopupWindow editPW;
+    private void initEditPopupWindow(ArrayList<MaintainitemBean> mList,int i) {
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_edit_pup_remark_change, null);
+        ClearableEditText edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView =mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+        edit_et.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+        edit_et.setText(mList.get(i).getDI_REMARK());
+        edit_et.requestFocus();
+        edit_et.setSelection(edit_et.getText().toString().length());
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (edit_et.getText().toString().trim().isEmpty()){
+                    edit_et.setText("0");
+                }
+                String trim = edit_et.getText().toString().trim();
+                MaintainitemBean maintainitemBean = mList.get(i);
+                if (!StringUtil.isEmpty(maintainitemBean.getMI_MAXVALUE())
+                        &&!StringUtil.isEmpty(maintainitemBean.getMI_MINVALUE())){
+                    //判断是否为整数
+                    boolean numeric_remark = CommonUtil.isNumeric(trim);
+                    boolean numeric_maxvalue = CommonUtil.isNumeric(maintainitemBean.getMI_MAXVALUE());
+                    boolean numeric_minvalue = CommonUtil.isNumeric(maintainitemBean.getMI_MINVALUE());
+                    //判断是否为小数
+                    boolean isDouble_remark = CommonUtil.isDouble(trim);
+                    boolean isDouble_maxvalue = CommonUtil.isDouble(maintainitemBean.getMI_MAXVALUE());
+                    boolean isDouble_minvalue = CommonUtil.isDouble(maintainitemBean.getMI_MINVALUE());
+                    if ((numeric_remark||isDouble_remark) && (numeric_maxvalue||isDouble_maxvalue) && (numeric_minvalue||isDouble_minvalue)){
+                        double int_remark = Double.parseDouble(trim);
+                        double int_maxvalue = Double.parseDouble(maintainitemBean.getMI_MAXVALUE());
+                        double int_minvalue = Double.parseDouble(maintainitemBean.getMI_MINVALUE());
+                        if (int_remark>=int_minvalue && int_remark<=int_maxvalue){
+                            mList.get(i).setDI_REMARK(edit_et.getText().toString().trim());
+                            myAdapter.setItemChecked(i, true);
+                            myAdapter.notifyItemChanged(i);
+                        }else {
+                            CommonUtil.toastNoRepeat(mActivity,"点检值不在范围内");
+                            return;
+                        }
+                    }else {
+                        CommonUtil.toastNoRepeat(mActivity,"值不为数字");
+                        return;
+                    }
+                }else {
+                    mList.get(i).setDI_REMARK(edit_et.getText().toString().trim());
+                    myAdapter.setItemChecked(i, true);
+                    myAdapter.notifyItemChanged(i);
+                }
+                //                myAdapter.notifyDataSetChanged();
+                closeListPopupWindow();
+            }
+        });
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+    }
+
+    private void closeListPopupWindow() {
+        if (editPW != null) {
+            editPW.dismiss();
+            editPW = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+
     public void getNewData(String de_codes){
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()

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

@@ -461,6 +461,32 @@ public class CommonUtil {
     }
 
 
+    /**
+     * 判断字符串是否是浮点数
+     */
+    public static boolean isDouble(String value) {
+        try {
+            Double.parseDouble(value);
+            if (value.contains("."))
+                return true;
+            return false;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * 帕努单字符串是否是整数
+     * @param str
+     * @return
+     */
+    public static boolean isNumeric(String str){
+        Pattern pattern = Pattern.compile("[0-9]*");
+
+        return pattern.matcher(str).matches();
+
+    }
+
     private static String oldMsg;
     private static long time;
 

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

@@ -66,6 +66,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
@@ -104,6 +105,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
@@ -132,7 +134,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="储位：" />
+                    android:text="存放地点：" />
 
                 <TextView
                     android:id="@+id/tv_de_location"
@@ -161,6 +163,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
@@ -180,6 +183,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -33,121 +32,139 @@
             android:src="@drawable/ic_edittext_scan" />
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_marginLeft="15dp"
-        android:orientation="vertical"
+    <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/tv_de_code"
-            android:text="@string/recharge_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/blueq">
-        </TextView>
-        <TextView
-            android:layout_marginTop="5dp"
-            android:id="@+id/tv_de_name"
-            android:text="编号："
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/blueq">
-        </TextView>
-    </LinearLayout>
+        android:layout_height="match_parent"
+        >
 
-    <LinearLayout
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="备注："
-            android:textColor="@color/blueq">
-        </TextView>
-        <com.uas.equipment.view.ClearableEditText
-            android:id="@+id/index_position_resource"
-            style="@style/EditTextLineStyle"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:layout_marginRight="50dp"
-            android:layout_marginLeft="30dp"
-            />
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
 
-    </LinearLayout>
-    <LinearLayout
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="保养类型："
-            android:textColor="@color/blueq">
-        </TextView>
-        <LinearLayout
-            android:background="@drawable/bg_edittext_black"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <Spinner
-                android:id="@+id/spinner02"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-            </Spinner>
-        </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:orientation="vertical">
 
+                <TextView
+                    android:id="@+id/tv_de_code"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/recharge_name"
+                    android:textColor="@color/blueq"></TextView>
 
-    </LinearLayout>
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-            <CheckBox
-                android:id="@+id/ck_all"
-                android:text="全选"
-                android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/tv_de_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="编号："
+                    android:textColor="@color/blueq"></TextView>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="15dp">
-            </CheckBox>
-            <android.support.v7.widget.RecyclerView
                 android:layout_marginLeft="15dp"
-                android:layout_marginRight="15dp"
-                android:id="@+id/feeded_rv"
+                android:layout_marginTop="15dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="备注："
+                    android:textColor="@color/blueq"></TextView>
+
+                <com.uas.equipment.view.ClearableEditText
+                    android:id="@+id/index_position_resource"
+                    style="@style/EditTextLineStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:layout_marginLeft="30dp"
+                    android:layout_marginRight="50dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/ck_all"/>
-        </RelativeLayout>
-        <TextView
-            android:id="@+id/tv_prompt"
-            android:text="提交成功"
-            android:layout_marginLeft="15dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone">
-        </TextView>
-        <Button
-            android:id="@+id/btn_commit"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_button"
-            android:layout_gravity="center"
-            android:text="提交"
-            android:textColor="@color/white"
-            android:layout_marginBottom="@dimen/textsize_20">
-        </Button>
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="15dp"
+                android:orientation="horizontal">
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="保养类型："
+                    android:textColor="@color/blueq"></TextView>
 
-    </LinearLayout>
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_edittext_black">
+
+                    <Spinner
+                        android:id="@+id/spinner02"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"></Spinner>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
+
+                    <CheckBox
+                        android:id="@+id/ck_all"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:text="全选"></CheckBox>
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/feeded_rv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/ck_all"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp" />
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/tv_prompt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:text="提交成功"
+                    android:visibility="gone"></TextView>
+
+                <Button
+                    android:id="@+id/btn_commit"
+                    android:layout_width="150dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginBottom="@dimen/textsize_20"
+                    android:background="@drawable/bg_button"
+                    android:text="提交"
+                    android:textColor="@color/white"></Button>
+
+
+            </LinearLayout>
+
+
+        </LinearLayout>
 
+    </android.support.v4.widget.NestedScrollView>
 
 
 

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

@@ -0,0 +1,75 @@
+<?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="12dp"
+    android:background="@color/background"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="14dp"
+        android:text="点检值" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="@color/white"
+        android:orientation="horizontal">
+
+        <com.uas.equipment.view.ClearableEditText
+            android:id="@+id/edit_et"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:hint="请输入点检值"
+            android:singleLine="true"
+            android:padding="5dp"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:visibility="gone"
+            android:id="@+id/search_im"
+            android:layout_width="46dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/bg_button"
+            android:src="@drawable/search_48" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp">
+
+        <Button
+            android:id="@+id/sure_tv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:background="@drawable/selector_confirm_bg"
+            android:gravity="center"
+            android:text="保存"
+            android:textColor="@color/white" />
+
+        <Button
+            android:id="@+id/cancle_tv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:background="@drawable/selector_cancel_bg"
+            android:gravity="center"
+            android:text="取消"
+            android:textColor="@color/selector_cancel_text_color" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,13 @@
+<?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">
+    <TextView
+        android:id="@+id/progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:textColor="@color/black">
+    </TextView>
+</LinearLayout>

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

@@ -16,6 +16,7 @@
             android:layout_height="wrap_content"
             android:id="@+id/select_checkbox"/>
         <LinearLayout
+            android:layout_weight="1"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -24,6 +25,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
                 android:textSize="15sp"
+                android:layout_marginStart="5dp"
                 android:text="1111111"
                 android:id="@+id/text"
                 android:gravity="left"
@@ -43,6 +45,17 @@
 
         </LinearLayout>
 
+        <ImageView
+            android:layout_gravity="center"
+            android:id="@+id/iv_change"
+            android:src="@drawable/iv_change"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginRight="5dp"
+            >
+        </ImageView>
+
+
     </LinearLayout>
 
 

build.gradle

@@ -62,8 +62,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 11,
-            versionName      : "v1.0.0"
+            versionCode      : 13,
+            versionName      : "v1.0.2"
     ]
 
     depsVersion = [