1.初步完成化学品开门UI

2.更新柜子获取列表和数据结构

HttpCoreLibrary/src/main/java/com/rc/httpcore/bean/HxpControlConfig.java

@@ -1,8 +1,5 @@
 package com.rc.httpcore.bean;
 
-import java.time.LocalDateTime;
-
-
 /**
  * <p>
  * 化学品管控配置

HttpCoreLibrary/src/main/java/com/rc/httpcore/client/HttpTool.java

@@ -30,7 +30,7 @@ public final class HttpTool {
      * 获取柜子信息
      */
     public static Response getCabinetList(String labId) throws IOException {
-        return OkHttpUtils.getSync(HttpConfig.Companion.getAPI_BASE_URL() + "chemical/aio/getCabinetList?subId=" + labId);
+        return OkHttpUtils.getSync(HttpConfig.Companion.getAPI_BASE_URL() + "chemical/aio/getCabinetListBySub?subId=" + labId);
     }
 
     /**

app/src/main/AndroidManifest.xml

@@ -74,6 +74,9 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
         <activity
+            android:name=".ui.plan.unlock.UnlockActivity"
+            android:exported="false" />
+        <activity
             android:name=".ui.plan.change.ChangeCabinetActivity"
             android:exported="false" />
         <activity

app/src/main/java/com/example/chemical/ui/login/FacialCardActivity.kt

@@ -59,7 +59,7 @@ class FacialCardActivity : BaseCountDownActivity<ActivityFacialCardBinding>() {
     private var mUserName: String = ""
     private val handlerBack = Handler(Looper.getMainLooper())
     private val totalTimeInMillis: Long = 40 * 1000 // 总时常
-    private var timeLeftInSeconds = 5
+    private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
     private var mDialogsAut: AuthenticationDialog? = null
     private val countHandler = Handler(Looper.getMainLooper()) //整个页面 60秒后 直接关闭

app/src/main/java/com/example/chemical/ui/login/ScanLoginActivity.kt

@@ -296,7 +296,7 @@ class ScanLoginActivity : BaseCountDownActivity<ActivityScanLoginBinding>() {
     }
 
     private val handlerBack = Handler(Looper.getMainLooper())
-    private var timeLeftInSeconds = 5
+    private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
     private var mDialogsAut: AuthenticationDialog? = null
 

app/src/main/java/com/example/chemical/ui/login/SwipeActivity.kt

@@ -262,7 +262,7 @@ class SwipeActivity : BaseCountDownActivity<ActivitySwipeBinding>() {
     }
 
     private val handlerBack = Handler(Looper.getMainLooper())
-    private var timeLeftInSeconds = 5
+    private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
     private var mDialogsAut: AuthenticationDialog? = null
 

app/src/main/java/com/example/chemical/ui/plan/PlanAdapter.java

@@ -9,7 +9,10 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
 import com.blankj.utilcode.util.LogUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.example.chemical.databinding.ItemInStorageBinding;
+import com.example.chemical.ui.plan.room.RoomTool;
+import com.example.chemical.ui.plan.room.dao.HxpInventoryDAO;
 import com.rc.httpcore.bean.HxpChemicalVo;
 import com.example.chemical.ui.plan.room.bean.input_add.InventoryItemBean;
 
@@ -19,10 +22,12 @@ public class PlanAdapter extends BaseAdapter {
 
     private List<InventoryItemBean> inventoryItemBeanList;
     private final Context context;
+    private HxpInventoryDAO hxpInventoryDAO;
 
     public PlanAdapter(Context context, List<InventoryItemBean> inventoryItemBeanList) {
         this.inventoryItemBeanList = inventoryItemBeanList;
         this.context = context;
+        hxpInventoryDAO = RoomTool.getInstance().hxpInventoryDAO();
     }
 
     @Override
@@ -48,6 +53,21 @@ public class PlanAdapter extends BaseAdapter {
             convertView = binding.getRoot();
             viewHolder = new ViewHolder(binding);
             convertView.setTag(viewHolder);
+            binding.itemDelIV.setOnClickListener(v -> {
+                InventoryItemBean inventoryItemBean = inventoryItemBeanList.get(position);
+                LogUtils.json(inventoryItemBean);
+                LogUtils.json(inventoryItemBeanList);
+                LogUtils.json(hxpInventoryDAO.getAll());
+                for (int i = 0; i < inventoryItemBeanList.size(); i++) {
+                    InventoryItemBean inventoryItem = inventoryItemBeanList.get(i);
+                    if (inventoryItem.getId() == inventoryItemBean.getId()) {
+                        inventoryItemBeanList.remove(i);
+                        hxpInventoryDAO.delete(inventoryItemBean.getId());
+                        notifyDataSetChanged();
+                        return;
+                    }
+                }
+            });
         } else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
@@ -66,16 +86,17 @@ public class PlanAdapter extends BaseAdapter {
             String chemicalCategoryName = hxpChemicalVo.getChemicalCategoryName();
             binding.itemTypeTV.setText(TextUtils.isEmpty(chemicalCategoryName) ? "" : chemicalCategoryName);
             // 管控非管控
-            String chemicalLevelName = hxpChemicalVo.getChemicalLevelName();
-            binding.itemLevelTV.setText(TextUtils.isEmpty(chemicalLevelName) ? "" : chemicalLevelName);
-            // 纯度
-            String purity = hxpChemicalVo.getChemicalPurity();
-            binding.itemNormsTV.setText(TextUtils.isEmpty(purity) ? "" : purity);
+            int chemicalLevel = hxpChemicalVo.getChemicalLevel();
+            binding.itemLevelTV.setText(chemicalLevel == 1 ? "管控" : "非管控");
+            // 规格
+            double specNum = hxpChemicalVo.getSpecNum();
+            String specUnit = hxpChemicalVo.getSpecUnit();
+            binding.itemNormsTV.setText(specNum + (TextUtils.isEmpty(specUnit) ? "" : specUnit));
             // 净含量
-            double specNum = 0;
-            binding.itemNetWtTV.setText(TextUtils.isEmpty(String.valueOf(specNum)) ? "" : String.valueOf(specNum));
+            double netWt = hxpChemicalVo.getNetWt();
+            binding.itemNetWtTV.setText(netWt + (TextUtils.isEmpty(specUnit) ? "" : specUnit));
             // 数量
-            double packNum = 0;
+            int packNum = inventoryItemBean.getSize();
             binding.itemNumTV.setText(TextUtils.isEmpty(String.valueOf(packNum)) ? "" : String.valueOf(packNum));
         } catch (Exception e) {
             LogUtils.e(Log.getStackTraceString(e));

app/src/main/java/com/example/chemical/ui/plan/PlanAddActivity.java

@@ -1,6 +1,7 @@
 package com.example.chemical.ui.plan;
 
 import android.content.Intent;
+import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -14,30 +15,31 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
 import androidx.viewpager2.widget.ViewPager2;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.bumptech.glide.Glide;
 import com.example.chemical.ChemicalApp;
 import com.example.chemical.databinding.ActivityPlanAddBinding;
-import com.example.chemical.receiver.ScanKeyEventHelper;
 import com.example.chemical.ui.SplashActivity;
 import com.example.chemical.ui.common.BaseCountDownActivity;
 import com.example.chemical.ui.plan.add.AddActivity;
 import com.example.chemical.ui.plan.locker.LockerAdapter;
 import com.example.chemical.ui.plan.room.RoomTool;
+import com.example.chemical.ui.plan.room.bean.input_add.InventoryItemBean;
+import com.example.chemical.ui.plan.room.bean.locker.CabinetLayerSelect;
+import com.example.chemical.ui.plan.room.bean.locker.HxpCabinetVo;
 import com.example.chemical.ui.plan.room.dao.HxpCabinetDAO;
 import com.example.chemical.ui.plan.room.dao.HxpDoorDAO;
 import com.example.chemical.ui.plan.room.dao.HxpInventoryDAO;
 import com.example.chemical.ui.plan.room.dao.HxpLayerDAO;
+import com.example.chemical.ui.plan.unlock.UnlockActivity;
 import com.example.chemical.utils.UiManager;
 import com.rc.httpcore.HttpConfig;
 import com.rc.httpcore.bean.ChemicalInfoBean;
-import com.example.chemical.ui.plan.room.bean.input_add.InventoryItemBean;
-import com.example.chemical.ui.plan.room.bean.locker.HxpCabinetVo;
-import com.example.chemical.ui.plan.room.bean.locker.CabinetLayerSelect;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -45,9 +47,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-
 /**
  * 待录入页面
  */
@@ -56,8 +55,6 @@ public class PlanAddActivity extends BaseCountDownActivity<ActivityPlanAddBindin
     protected ActivityPlanAddBinding binding;
     // 柜子fragmentAdapter
     protected LockerAdapter lockerAdapter;
-    // 二维码/条形码扫描工具
-    private ScanKeyEventHelper scanKeyEventHelper;
     // 实验室基本信息
     protected ChemicalInfoBean chemicalInfo;
     // 服务端实验室所有柜子信息
@@ -105,18 +102,6 @@ public class PlanAddActivity extends BaseCountDownActivity<ActivityPlanAddBindin
         binding.nextBT.setOnClickListener(view -> binding.lockerVP2.setCurrentItem(binding.lockerVP2.getCurrentItem() + 1, true));
         binding.lastBT.setOnClickListener(view -> binding.lockerVP2.setCurrentItem(binding.lockerVP2.getCurrentItem() - 1, true));
 
-        scanKeyEventHelper = new ScanKeyEventHelper(new Function1<String, Unit>() {
-            @Override
-            public Unit invoke(String s) {
-                if (binding.inputRL.getVisibility() == View.GONE) {
-                    showToast("请先选择化学品柜层!");
-                    return null;
-                }
-                Log.d("结果", s);
-                return null;
-            }
-        });
-
         // 待存储
         intentActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
             @Override
@@ -125,7 +110,6 @@ public class PlanAddActivity extends BaseCountDownActivity<ActivityPlanAddBindin
                     planAddActivityHelp.updateInventoryUi();
                 }
             }
-
         });
 
         // 手动录入化学品
@@ -133,8 +117,20 @@ public class PlanAddActivity extends BaseCountDownActivity<ActivityPlanAddBindin
 
         planAdapter = new PlanAdapter(this, inventoryItemBeanList);
         binding.planLV.setAdapter(planAdapter);
+        planAdapter.registerDataSetObserver(dataSetObserver);
 
-        LogUtils.json(hxpInventoryDAO.getAll());
+        // 确认入库
+        binding.subAdd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                List<InventoryItemBean> inventoryItemBeans = hxpInventoryDAO.getAll();
+                if (null == inventoryItemBeans || inventoryItemBeans.isEmpty()) {
+                    ToastUtils.showLong("请录入化学品!");
+                    return;
+                }
+                ActivityUtils.startActivity(UnlockActivity.class);
+            }
+        });
     }
 
     @Override
@@ -181,7 +177,7 @@ public class PlanAddActivity extends BaseCountDownActivity<ActivityPlanAddBindin
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        scanKeyEventHelper.analysisKeyEvent(event);
+        // https://labcontrol.nwafu.edu.cn/api/?code=5020641&type=9
         return super.dispatchKeyEvent(event);
     }
 
@@ -197,8 +193,24 @@ public class PlanAddActivity extends BaseCountDownActivity<ActivityPlanAddBindin
     protected void onDestroy() {
         fragmentCallBack = null;
         super.onDestroy();
+        planAdapter.unregisterDataSetObserver(dataSetObserver);
         intentActivityResultLauncher.unregister();
     }
 
+    DataSetObserver dataSetObserver = new DataSetObserver() {
+        @Override
+        public void onChanged() {
+            super.onChanged();
+            if (null == inventoryItemBeanList || inventoryItemBeanList.isEmpty()) {
+                planAddActivityHelp.updateInventoryUi();
+            }
+            int size = 0;
+            for (int i = 0; i < inventoryItemBeanList.size(); i++) {
+                InventoryItemBean inventoryItemBean = inventoryItemBeanList.get(i);
+                size = size + inventoryItemBean.getSize();
+            }
+            binding.sizeTV.setText("总数:" + size);
+        }
+    };
 
 }

app/src/main/java/com/example/chemical/ui/plan/PlanAddActivityHelp.java

@@ -1,12 +1,8 @@
 package com.example.chemical.ui.plan;
 
-import android.annotation.SuppressLint;
 import android.util.Log;
 import android.view.View;
 
-import androidx.fragment.app.FragmentManager;
-
-import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ThreadUtils;
@@ -14,11 +10,15 @@ import com.blankj.utilcode.util.ToastUtils;
 import com.example.chemical.ChemicalApp;
 import com.example.chemical.ui.plan.locker.LockerAdapter;
 import com.example.chemical.ui.plan.locker.LockerFragment;
+import com.example.chemical.ui.plan.room.RoomTool;
 import com.example.chemical.ui.plan.room.bean.input_add.InventoryItemBean;
 import com.example.chemical.ui.plan.room.bean.locker.CabinetLayerSelect;
 import com.example.chemical.ui.plan.room.bean.locker.HxpCabinetDoorVo;
-import com.example.chemical.ui.plan.room.bean.locker.HxpCabinetListVo;
 import com.example.chemical.ui.plan.room.bean.locker.HxpCabinetVo;
+import com.example.chemical.ui.plan.room.bean.locker.HxpLabCabinetListVo;
+import com.example.chemical.ui.plan.room.bean.locker.HxpLabCabinetVo;
+import com.example.chemical.ui.plan.room.bean.locker.HxpLabDirector;
+import com.example.chemical.ui.plan.room.bean.locker.HxpLabSafe;
 import com.rc.httpcore.bean.ChemicalInfoBean;
 import com.rc.httpcore.client.ApiRepository;
 import com.rc.httpcore.client.HttpTool;
@@ -62,9 +62,16 @@ public class PlanAddActivityHelp {
                 Response response = HttpTool.getCabinetList(chemicalInfoBean.getSubId());
                 if (response.isSuccessful()) {
                     String json = response.body().string();
-                    HxpCabinetListVo hxpCabinetListVo = GsonUtils.fromJson(json, HxpCabinetListVo.class);
+                    HxpLabCabinetListVo hxpCabinetListVo = GsonUtils.fromJson(json, HxpLabCabinetListVo.class);
                     if (hxpCabinetListVo.getCode() == 200) {
-                        return hxpCabinetListVo.getData();
+                        HxpLabCabinetVo hxpLabCabinetVo = hxpCabinetListVo.getData();
+                        try {
+                            RoomTool.getInstance().hxpLabDirectorDAO().insertAll(hxpLabCabinetVo.getAdminList());
+                            RoomTool.getInstance().hxpLabSafeDAO().insertAll(hxpLabCabinetVo.getSafeList());
+                        } catch (Exception e) {
+                            LogUtils.e(Log.getStackTraceString(e));
+                        }
+                        return hxpLabCabinetVo.getCabinetList();
                     } else {
                         throw new NetException("" + hxpCabinetListVo.getCode(), hxpCabinetListVo.getMessage());
                     }

app/src/main/java/com/example/chemical/ui/plan/locker/LockerAdapter.java

@@ -15,15 +15,15 @@ public class LockerAdapter extends FragmentStateAdapter {
         fragments = cabinetFragmentList;
     }
 
-//    @Override
-//    public long getItemId(int position) {
-//        return null == fragments ? super.getItemId(position) : fragments.get(position).hashCode();
-//    }
-
-//    @Override
-//    public boolean containsItem(long itemId) {
-//        return false;
-//    }
+    @Override
+    public long getItemId(int position) {
+        return null == fragments ? super.getItemId(position) : fragments.get(position).hashCode();
+    }
+
+    @Override
+    public boolean containsItem(long itemId) {
+        return false;
+    }
 
     @NonNull
     @Override

app/src/main/java/com/example/chemical/ui/plan/room/RoomTool.java

@@ -10,14 +10,20 @@ import com.example.chemical.ui.plan.room.bean.input_add.InventoryItemBean;
 import com.example.chemical.ui.plan.room.bean.locker.CabinetLayerSelect;
 import com.example.chemical.ui.plan.room.bean.locker.HxpCabinetDoorVo;
 import com.example.chemical.ui.plan.room.bean.locker.HxpCabinetVo;
+import com.example.chemical.ui.plan.room.bean.locker.HxpLabDirector;
+import com.example.chemical.ui.plan.room.bean.locker.HxpLabSafe;
 import com.example.chemical.ui.plan.room.dao.HxpCabinetDAO;
 import com.example.chemical.ui.plan.room.dao.HxpDoorDAO;
 import com.example.chemical.ui.plan.room.dao.HxpInventoryDAO;
+import com.example.chemical.ui.plan.room.dao.HxpLabDirectorDAO;
+import com.example.chemical.ui.plan.room.dao.HxpLabSafeDAO;
 import com.example.chemical.ui.plan.room.dao.HxpLayerDAO;
 
 @Database(entities = {HxpCabinetVo.class,
         HxpCabinetDoorVo.class,
         CabinetLayerSelect.class,
+        HxpLabDirector.class,
+        HxpLabSafe.class,
         InventoryItemBean.class},
         version = BuildConfig.VERSION_CODE, exportSchema = false)
 public abstract class RoomTool extends RoomDatabase {
@@ -42,4 +48,10 @@ public abstract class RoomTool extends RoomDatabase {
 
     // 待入库清单item
     public abstract HxpInventoryDAO hxpInventoryDAO();
+
+    // 实验室责任人
+    public abstract HxpLabDirectorDAO hxpLabDirectorDAO();
+
+    // 实验室安全员
+    public abstract HxpLabSafeDAO hxpLabSafeDAO();
 }

app/src/main/java/com/example/chemical/ui/plan/room/bean/locker/HxpCabinetListVo.java

@@ -1,43 +0,0 @@
-package com.example.chemical.ui.plan.room.bean.locker;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class HxpCabinetListVo {
-    private int code;
-    private String message;
-    private List<HxpCabinetVo> data = new ArrayList<>();
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public List<HxpCabinetVo> getData() {
-        return data;
-    }
-
-    public void setData(List<HxpCabinetVo> data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return "HxpCabinetListVo{" +
-                "code=" + code +
-                ", message='" + message + '\'' +
-                ", data=" + data +
-                '}';
-    }
-}

app/src/main/java/com/example/chemical/ui/plan/room/bean/locker/HxpLabCabinetVo.java

@@ -0,0 +1,45 @@
+package com.example.chemical.ui.plan.room.bean.locker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HxpLabCabinetVo {
+
+    /**
+     * 实验室负责人
+     */
+    private List<HxpLabDirector> adminList = new ArrayList<>();
+    /**
+     * 柜子列表
+     */
+    private List<HxpCabinetVo> cabinetList = new ArrayList<>();
+    /**
+     * 实验室安全责任人
+     */
+    private List<HxpLabSafe> safeList = new ArrayList<>();
+
+
+    public List<HxpLabDirector> getAdminList() {
+        return adminList;
+    }
+
+    public void setAdminList(List<HxpLabDirector> adminList) {
+        this.adminList = adminList;
+    }
+
+    public List<HxpCabinetVo> getCabinetList() {
+        return cabinetList;
+    }
+
+    public void setCabinetList(List<HxpCabinetVo> cabinetList) {
+        this.cabinetList = cabinetList;
+    }
+
+    public List<HxpLabSafe> getSafeList() {
+        return safeList;
+    }
+
+    public void setSafeList(List<HxpLabSafe> safeList) {
+        this.safeList = safeList;
+    }
+}

app/src/main/java/com/example/chemical/ui/plan/room/dao/HxpInventoryDAO.java

@@ -33,6 +33,12 @@ public interface HxpInventoryDAO {
     @Delete
     void delete(InventoryItemBean inventoryitembean);
 
+    @Query("DELETE FROM inventoryitembean WHERE layer = :layer AND cabinetId =:cabinetId AND doorId =:doorId")
+    void delete(long cabinetId, long doorId, long layer);
+
+    @Query("DELETE FROM inventoryitembean WHERE id = :id")
+    void delete(int id);
+
     @Query("DELETE FROM inventoryitembean")
     void deleteAll();
 

app/src/main/java/com/example/chemical/ui/verify/ScanCodeTwoActivity.kt

@@ -589,7 +589,7 @@ class ScanCodeTwoActivity : BaseCountDownActivity<ActivityScanCodeTwoBinding>()
     }
 
     private lateinit var dialogsAut: DoublePeopleDialog
-    private var timeLeftInSeconds = 5
+    private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
     private val handlerBack = Handler(Looper.getMainLooper())
 

app/src/main/java/com/example/chemical/ui/verify/SwipeCodeTwoActivity.kt

@@ -569,7 +569,7 @@ class SwipeCodeTwoActivity : BaseCountDownActivity<ActivitySwipeCodeTwoBinding>(
     }
 
     private lateinit var dialogsAut: DoublePeopleDialog
-    private var timeLeftInSeconds = 5
+    private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
     private val handlerBack = Handler(Looper.getMainLooper())
 

app/src/main/java/com/example/chemical/ui/verify/TwoPersonActivity.kt

@@ -649,7 +649,7 @@ class TwoPersonActivity : BaseCountDownActivity<ActivityTwoPersonBinding>() {
     }
 
     private lateinit var dialogsAut: DoublePeopleDialog
-    private var timeLeftInSeconds = 5
+    private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
 
     //验证通过

app/src/main/java/com/example/chemical/ui/verify/TwoVerificationActivity.kt

@@ -91,7 +91,7 @@ class TwoVerificationActivity : BaseCountDownActivity<ActivityTwoVerificationBin
     private var mVerTwo = 1  //第二位    1：人脸  2：刷卡 3：扫码
     private var isLogin = false  //是否是登陆人
     private lateinit var dialogsAut: DoublePeopleDialog
-    private var timeLeftInSeconds = 5
+    private var timeLeftInSeconds = 2
     private var mTvView: TextView? = null
     private val handlerBack = Handler(Looper.getMainLooper())
     private var mVoiceCount = 1  //认证次数

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-
-
-</LinearLayout>

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

@@ -217,6 +217,7 @@
                         android:textStyle="bold" />
 
                     <TextView
+                        android:id="@+id/size_TV"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -345,7 +346,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="20dp"
         android:background="@drawable/bg_retrun_two"
-        android:text="确认入库"
+        android:text="开门入库"
         android:textColor="@color/white"
         android:textSize="10sp" />
 </RelativeLayout>

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

@@ -69,7 +69,7 @@
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
         android:singleLine="true"
-        android:text="AR(分析纯)"
+        android:text="500ml"
         android:textSize="20px" />
 
     <TextView
@@ -89,12 +89,12 @@
         android:text="100"
         android:textSize="20px" />
 
-    <TextView
-        android:id="@+id/item_del_TV"
+    <ImageView
+        android:id="@+id/item_del_IV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1.1"
         android:gravity="center"
-        android:text="删除"
+        android:src="@mipmap/icon_yrk_sc"
         android:textSize="20px" />
 </LinearLayout>