1.细化更换位置功能

2.新增重置手动输入功能
3.调整数据库关系

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

@@ -0,0 +1,153 @@
+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;
+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.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.rc.httpcore.bean.ChemicalInfoBean;
+import com.rc.httpcore.client.ApiRepository;
+import com.rc.httpcore.client.HttpTool;
+import com.rc.httpcore.exception.NetException;
+
+import java.util.List;
+
+import io.reactivex.functions.Consumer;
+import okhttp3.Response;
+
+public class PlanAddActivityHelp {
+
+    private PlanAddActivity activity;
+
+    public PlanAddActivityHelp(PlanAddActivity planAddActivity) {
+        activity = planAddActivity;
+    }
+
+    public void getLabInfo() {
+        activity.showLoading("加载中...", false);
+        // 实验室基本信息
+        activity.addDisposable(ApiRepository.INSTANCE.getRelList(ChemicalApp.subjectId).subscribe(new Consumer<ChemicalInfoBean>() {
+            @Override
+            public void accept(ChemicalInfoBean chemicalInfoBean) throws Exception {
+                activity.chemicalInfo = chemicalInfoBean;
+                getCabinetList(chemicalInfoBean);
+            }
+        }, throwable -> {
+            LogUtils.e(Log.getStackTraceString(throwable));
+            activity.dismissLoading();
+            ToastUtils.showLong("实验室基本信息获取失败,请重试!");
+            activity.finish();
+        }));
+    }
+
+    private void getCabinetList(ChemicalInfoBean chemicalInfoBean) {
+        // 获取实验室柜子信息
+        ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<List<HxpCabinetVo>>() {
+            @Override
+            public List<HxpCabinetVo> doInBackground() throws Throwable {
+                Response response = HttpTool.getCabinetList(chemicalInfoBean.getSubId());
+                if (response.isSuccessful()) {
+                    String json = response.body().string();
+                    HxpCabinetListVo hxpCabinetListVo = GsonUtils.fromJson(json, HxpCabinetListVo.class);
+                    if (hxpCabinetListVo.getCode() == 200) {
+                        return hxpCabinetListVo.getData();
+                    } else {
+                        throw new NetException("" + hxpCabinetListVo.getCode(), hxpCabinetListVo.getMessage());
+                    }
+                } else {
+                    throw new NetException("" + response.code(), response.message());
+                }
+            }
+
+            @Override
+            public void onSuccess(List<HxpCabinetVo> hxpCabinetVoList) {
+                activity.dismissLoading();
+                if (null != hxpCabinetVoList && !hxpCabinetVoList.isEmpty()) {
+                    activity.cabinetVoList = hxpCabinetVoList;
+                    activity.hxpCabinetDAO.insertAll(activity.cabinetVoList);
+                    // 录入柜子
+                    for (int i = 0; i < activity.cabinetVoList.size(); i++) {
+                        HxpCabinetVo hxpCabinetVo = activity.cabinetVoList.get(i);
+                        List<HxpCabinetDoorVo> hxpCabinetDoorVoList = hxpCabinetVo.getCabinetDoorVoList();
+                        if (null != hxpCabinetDoorVoList && !hxpCabinetDoorVoList.isEmpty()) {
+                            // 录入柜门
+                            activity.hxpDoorDAO.insertAll(hxpCabinetDoorVoList);
+                        }
+                    }
+
+                    // 柜子初始化
+                    for (int i = 0; i < activity.cabinetVoList.size(); i++) {
+                        HxpCabinetVo hxpCabinetVo = activity.cabinetVoList.get(i);
+                        activity.cabinetFragmentList.add(new LockerFragment(hxpCabinetVo.getCabinetId(), activity.fragmentCallBack));
+                    }
+
+                    activity.lockerAdapter = new LockerAdapter(activity, activity.cabinetFragmentList);
+                    activity.binding.lockerVP2.setAdapter(activity.lockerAdapter);
+                    activity.binding.lockerVP2.setOffscreenPageLimit(1);
+
+                    updateInventoryUi();
+                } else {
+                    activity.showToast("未找到化学品柜!");
+                }
+            }
+
+            @Override
+            public void onFail(Throwable t) {
+                super.onFail(t);
+                ToastUtils.showLong("化学品柜获取失败,请重试!");
+                activity.dismissLoading();
+                activity.finish();
+            }
+        });
+    }
+
+    /**
+     * 选择柜层
+     */
+    public void selectCabinetLayer(CabinetLayerSelect lastSelectInfo) {
+        // 选择柜层数据库更新
+        activity.hxpLayerDAO.insert(lastSelectInfo);
+        activity.hxpLayerDAO.change(lastSelectInfo.getCabinetId(), lastSelectInfo.getDoorId(), lastSelectInfo.getLayer());
+        // 更新待存储列表
+        updateInventoryUi();
+    }
+
+
+    /**
+     * 更新待存储列表
+     */
+    public void updateInventoryUi() {
+        // 待存储列表更新
+        CabinetLayerSelect cabinetLayerSelect = activity.hxpLayerDAO.getChanged();
+        if (null != cabinetLayerSelect) {
+            activity.inventoryItemBeanList.clear();
+            List<InventoryItemBean> inventoryItemBeanList = activity.hxpInventoryDAO.getById(cabinetLayerSelect.getCabinetId(), cabinetLayerSelect.getDoorId(), cabinetLayerSelect.getLayer());
+            // 展示待存储UI
+            activity.binding.inputRL.setVisibility(View.VISIBLE);
+            if (null != inventoryItemBeanList && !inventoryItemBeanList.isEmpty()) {
+                activity.binding.addIndexTV.setVisibility(View.GONE);
+                activity.binding.scanLL.setVisibility(View.GONE);
+                activity.binding.planLV.setVisibility(View.VISIBLE);
+                activity.inventoryItemBeanList.addAll(inventoryItemBeanList);
+                activity.planAdapter.notifyDataSetChanged();
+            } else {
+                activity.binding.scanLL.setVisibility(View.VISIBLE);
+                activity.binding.planLV.setVisibility(View.GONE);
+            }
+        }
+    }
+}

app/src/main/java/com/example/chemical/ui/plan/add/AddActivity.java

@@ -68,13 +68,6 @@ public class AddActivity extends BaseCountDownActivity<ActivityAddBinding> {
     private HxpDoorDAO hxpDoorDAO;
     private HxpLayerDAO hxpLayerDAO;
 
-    // 当前选中信息
-    protected CabinetLayerSelect cabinetLayerSelect;
-    // 当前选中的柜子
-    protected HxpCabinetVo sqlHxpCabinetVo;
-    // 当前选中的柜门
-    protected HxpCabinetDoorVo sqlHxpCabinetDoorVo;
-
     private ActivityResultLauncher<Intent> intentActivityResultLauncher;
 
     protected HxpInventoryDAO hxpInventoryDAO;
@@ -195,7 +188,8 @@ public class AddActivity extends BaseCountDownActivity<ActivityAddBinding> {
         // 管控级别
         binding.uncontrolledRB.setOnClickListener(v -> hxpChemicalVo.setChemicalLevel(2));
         binding.controlledRB.setOnClickListener(v -> hxpChemicalVo.setChemicalLevel(1));
-
+        // 重置
+        binding.resetBT.setOnClickListener(v -> addActivityHelp.reset());
 
         // 位置选择
         intentActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
@@ -206,7 +200,19 @@ public class AddActivity extends BaseCountDownActivity<ActivityAddBinding> {
                     if (null != resultData && resultData.hasExtra("data")) {
                         Bundle bundle = resultData.getBundleExtra("data");
                         if (null != bundle) {
-                            cabinetLayerSelect = (CabinetLayerSelect) bundle.getSerializable("Change");
+                            CabinetLayerSelect cabinetLayerSelect = (CabinetLayerSelect) bundle.getSerializable("Change");
+                            if (null != cabinetLayerSelect) {
+                                hxpLayerDAO.change(cabinetLayerSelect.getCabinetId(), cabinetLayerSelect.getDoorId(), cabinetLayerSelect.getLayer());
+                                HxpCabinetVo hxpCabinetVo = hxpCabinetDAO.getById(cabinetLayerSelect.getCabinetId());
+                                String cabinetName = hxpCabinetVo.getCabinetName();
+                                cabinetName = TextUtils.isEmpty(cabinetName) ? "" : cabinetName;
+                                HxpCabinetDoorVo hxpCabinetDoorVo = hxpDoorDAO.getById(cabinetLayerSelect.getDoorId());
+                                String doorName = hxpCabinetDoorVo.getDoorName();
+                                doorName = TextUtils.isEmpty(doorName) ? "" : doorName;
+                                int layer = cabinetLayerSelect.getLayer();
+                                binding.cabinetLayerSelectTV.setText(cabinetName + "-" + doorName + "-" + layer + "层");
+                                binding.cabinetLayerSelectTV.setSelected(true);
+                            }
                         }
                     }
                 }
@@ -224,14 +230,15 @@ public class AddActivity extends BaseCountDownActivity<ActivityAddBinding> {
         hxpInventoryDAO = RoomTool.getInstance().hxpInventoryDAO();
         CabinetLayerSelect cabinetLayerSelect = hxpLayerDAO.getChanged();
         inventoryItemBean = new InventoryItemBean(cabinetLayerSelect.getCabinetId(), cabinetLayerSelect.getDoorId(), cabinetLayerSelect.getLayer());
-        this.cabinetLayerSelect = hxpLayerDAO.getById(cabinetLayerSelect.getCabinetId(), cabinetLayerSelect.getDoorId(), cabinetLayerSelect.getLayer());
-        int layer = this.cabinetLayerSelect.getLayer();
-        sqlHxpCabinetVo = hxpCabinetDAO.getById(cabinetLayerSelect.getCabinetId());
-        String cabinetName = sqlHxpCabinetVo.getCabinetName();
+
+        HxpCabinetVo hxpCabinetVo = hxpCabinetDAO.getById(cabinetLayerSelect.getCabinetId());
+        String cabinetName = hxpCabinetVo.getCabinetName();
         cabinetName = TextUtils.isEmpty(cabinetName) ? "" : cabinetName;
-        sqlHxpCabinetDoorVo = hxpDoorDAO.getById(cabinetLayerSelect.getDoorId());
-        String doorName = sqlHxpCabinetDoorVo.getDoorName();
+
+        HxpCabinetDoorVo hxpCabinetDoorVo = hxpDoorDAO.getById(cabinetLayerSelect.getDoorId());
+        String doorName = hxpCabinetDoorVo.getDoorName();
         doorName = TextUtils.isEmpty(doorName) ? "" : doorName;
+        int layer = cabinetLayerSelect.getLayer();
         binding.cabinetLayerSelectTV.setText(cabinetName + "-" + doorName + "-" + layer + "层");
         binding.cabinetLayerSelectTV.setSelected(true);
         // 化学品类别列表获取

app/src/main/java/com/example/chemical/ui/plan/add/AddActivityHelp.java

@@ -187,6 +187,7 @@ public class AddActivityHelp {
         Editable chemicalSearchETText = addActivity.binding.chemicalSearchET.getText();
         if (null == chemicalSearchETText || TextUtils.isEmpty(chemicalSearchETText)) {
             addActivity.binding.chemicalSearchET.setError("请输入化学品名称");
+            addActivity.binding.chemicalSearchET.requestFocus();
             return;
         }
         addActivity.hxpChemicalVo.setChemicalName(chemicalSearchETText.toString());
@@ -195,6 +196,7 @@ public class AddActivityHelp {
         Editable casETText = addActivity.binding.casET.getText();
         if (null == casETText || TextUtils.isEmpty(casETText)) {
             addActivity.binding.casET.setError("请输入CAS码");
+            addActivity.binding.casET.requestFocus();
             return;
         }
         addActivity.hxpChemicalVo.setCasNum(casETText.toString());
@@ -203,6 +205,7 @@ public class AddActivityHelp {
         String categoryTVTag = (String) addActivity.binding.chemicalCategoryTV.getTag();
         if (null == categoryTVTag || TextUtils.isEmpty(categoryTVTag)) {
             addActivity.binding.chemicalCategoryTV.setError("请选择化学品类别");
+            addActivity.binding.chemicalCategoryTV.requestFocus();
             return;
         }
         addActivity.hxpChemicalVo.setChemicalCategory(categoryTVTag);
@@ -210,6 +213,7 @@ public class AddActivityHelp {
         CharSequence chemicalCategoryTVText = addActivity.binding.chemicalCategoryTV.getText();
         if (null == chemicalCategoryTVText || TextUtils.isEmpty(chemicalCategoryTVText)) {
             addActivity.binding.chemicalCategoryTV.setError("请选择化学品类别");
+            addActivity.binding.chemicalCategoryTV.requestFocus();
             return;
         }
         addActivity.hxpChemicalVo.setChemicalCategoryName(chemicalCategoryTVText.toString());
@@ -218,6 +222,7 @@ public class AddActivityHelp {
         Editable chemicalSpecETText = addActivity.binding.chemicalSpecET.getText();
         if (null == chemicalSpecETText || TextUtils.isEmpty(chemicalSpecETText)) {
             addActivity.binding.chemicalSpecET.setError("请输入规格");
+            addActivity.binding.chemicalSpecET.requestFocus();
             return;
         }
         double specNum = -1.0;
@@ -225,10 +230,12 @@ public class AddActivityHelp {
             specNum = Double.parseDouble(chemicalSpecETText.toString());
         } catch (Exception e) {
             addActivity.binding.chemicalSpecET.setError("请检查规格内容正确");
+            addActivity.binding.chemicalSpecET.requestFocus();
             return;
         }
         if (specNum < 0) {
             addActivity.binding.chemicalSpecET.setError("请检查规格内容正确");
+            addActivity.binding.chemicalSpecET.requestFocus();
             return;
         }
         addActivity.hxpChemicalVo.setSpecNum(specNum);
@@ -244,6 +251,7 @@ public class AddActivityHelp {
         Editable chemicalDensityETText = addActivity.binding.chemicalDensityET.getText();
         if (null == chemicalDensityETText || TextUtils.isEmpty(chemicalDensityETText)) {
             addActivity.binding.chemicalDensityET.setError("请输入密度");
+            addActivity.binding.chemicalDensityET.requestFocus();
             return;
         }
         double density = -1.0;
@@ -251,10 +259,12 @@ public class AddActivityHelp {
             density = Double.parseDouble(chemicalDensityETText.toString());
         } catch (Exception e) {
             addActivity.binding.chemicalDensityET.setError("请检查密度内容正确");
+            addActivity.binding.chemicalDensityET.requestFocus();
             return;
         }
         if (density <= 0) {
             addActivity.binding.chemicalDensityET.setError("请检查密度内容正确");
+            addActivity.binding.chemicalDensityET.requestFocus();
             return;
         }
         addActivity.hxpChemicalVo.setChemicalDensity(density);
@@ -263,6 +273,7 @@ public class AddActivityHelp {
         Editable netWtETText = addActivity.binding.netWtET.getText();
         if (null == netWtETText || TextUtils.isEmpty(netWtETText)) {
             addActivity.binding.netWtET.setError("请输入净含量");
+            addActivity.binding.netWtET.requestFocus();
             return;
         }
         double netWt = -1.0;
@@ -270,10 +281,12 @@ public class AddActivityHelp {
             netWt = Double.parseDouble(netWtETText.toString());
         } catch (Exception e) {
             addActivity.binding.netWtET.setError("请检查净含量内容正确");
+            addActivity.binding.netWtET.requestFocus();
             return;
         }
         if (netWt <= 0) {
             addActivity.binding.netWtET.setError("请检查净含量内容正确");
+            addActivity.binding.netWtET.requestFocus();
             return;
         }
         addActivity.hxpChemicalVo.setNetWt(netWt);
@@ -282,6 +295,7 @@ public class AddActivityHelp {
         Editable sizeETText = addActivity.binding.sizeET.getText();
         if (null == sizeETText || TextUtils.isEmpty(sizeETText)) {
             addActivity.binding.sizeET.setError("请输入数量");
+            addActivity.binding.sizeET.requestFocus();
             return;
         }
         int size = -1;
@@ -289,10 +303,12 @@ public class AddActivityHelp {
             size = Integer.parseInt(sizeETText.toString());
         } catch (Exception e) {
             addActivity.binding.sizeET.setError("请检查数量内容正确");
+            addActivity.binding.sizeET.requestFocus();
             return;
         }
         if (size <= 0) {
             addActivity.binding.sizeET.setError("请检查数量内容正确");
+            addActivity.binding.sizeET.requestFocus();
             return;
         }
         addActivity.inventoryItemBean.setSize(size);
@@ -301,6 +317,7 @@ public class AddActivityHelp {
         String userId = (String) addActivity.binding.belongET.getTag();
         if (addActivity.belongingPerson == null || addActivity.belongingPerson.getUserId().isEmpty() || null == userId || TextUtils.isEmpty(userId) || !addActivity.belongingPerson.getUserId().equals(userId)) {
             addActivity.binding.belongET.setError("请先搜索并选择归属人");
+            addActivity.binding.belongET.requestFocus();
             return;
         }
 
@@ -364,4 +381,31 @@ public class AddActivityHelp {
             addActivity.showNetError(throwable);
         }));
     }
+
+    public void reset() {
+        addActivity.hxpChemicalVo = null;
+        addActivity.hxpChemicalVo = new HxpChemicalVo();
+        addActivity.binding.chemicalSearchET.setText("");
+        addActivity.binding.chemicalSearchET.setTag(null);
+        addActivity.binding.chemicalSpecET.setText("");
+        addActivity.binding.chemicalSpecET.setTag(null);
+        addActivity.binding.casET.setText("");
+        addActivity.binding.casET.setTag(null);
+        addActivity.binding.chemicalSpecET.setText("");
+        addActivity.binding.chemicalSpecET.setTag(null);
+        addActivity.binding.chemicalDensityET.setText("");
+        addActivity.binding.chemicalDensityET.setTag(null);
+        addActivity.binding.netWtET.setText("");
+        addActivity.binding.netWtET.setTag(null);
+        addActivity.binding.sizeET.setText("");
+        addActivity.binding.sizeET.setTag(null);
+        addActivity.binding.purityET.setText("");
+        addActivity.binding.purityET.setTag(null);
+        addActivity.binding.belongET.setText("");
+        addActivity.binding.belongET.setTag(null);
+        addActivity.binding.topicET.setText("");
+        addActivity.binding.topicET.setTag(null);
+        addActivity.binding.factoryET.setText("");
+        addActivity.binding.factoryET.setTag(null);
+    }
 }

app/src/main/java/com/example/chemical/ui/plan/change/ChangeCabinetActivity.java

@@ -38,7 +38,6 @@ public class ChangeCabinetActivity extends BaseCountDownActivity<ActivityChangeC
         for (int i = 0; i < hxpCabinetVoList.size(); i++) {
             HxpCabinetVo s = hxpCabinetVoList.get(i);
         }
-        List<HxpCabinetDoorVo> hxpCabinetDoorVoList = RoomTool.getInstance().hxpDoorDAO().getAll();
         changeCabinetAdapter = new ChangeCabinetAdapter(this, hxpCabinetVoList, fragmentCallBack);
         binding.cabinetVP.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override

app/src/main/java/com/example/chemical/ui/plan/change/ChangeCabinetFragment.java

@@ -22,6 +22,7 @@ public class ChangeCabinetFragment extends Fragment {
     private FragmentCallBack fragmentCallBack;
     private FragmentChangeCabinetBinding binding;
     private List<ChangeCabinetHelp> changeCabinetHelpList = new ArrayList<>();
+    private List<IncludeCabinetBinding> includeCabinetBindingList = new ArrayList<>();
 
     public ChangeCabinetFragment(List<HxpCabinetVo> hxpCabinetVos, FragmentCallBack fragmentCallBack) {
         this.hxpCabinetVoList = hxpCabinetVos;
@@ -38,17 +39,30 @@ public class ChangeCabinetFragment extends Fragment {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-//        if (null != savedInstanceState) {
-//            for (int i = 0; i < changeCabinetHelpList.size(); i++) {
-//                changeCabinetHelpList.get(i).recycle();
-//            }
-//            binding.main.removeAllViewsInLayout();
-//        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateUi();
+    }
+
+    private void updateUi() {
+        changeCabinetHelpList.clear();
+        includeCabinetBindingList.clear();
+        binding.main.removeAllViewsInLayout();
         for (int i = 0; i < hxpCabinetVoList.size(); i++) {
             HxpCabinetVo hxpCabinetVo = hxpCabinetVoList.get(i);
             IncludeCabinetBinding includeCabinetBinding = IncludeCabinetBinding.inflate(getLayoutInflater());
+            includeCabinetBindingList.add(includeCabinetBinding);
             changeCabinetHelpList.add(new ChangeCabinetHelp(includeCabinetBinding, hxpCabinetVo, fragmentCallBack));
             binding.main.addView(includeCabinetBinding.getRoot());
         }
     }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        updateUi();
+    }
 }

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

@@ -0,0 +1,39 @@
+package com.example.chemical.ui.plan.room.dao;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+import androidx.room.Update;
+
+import com.example.chemical.ui.plan.room.bean.input_add.InventoryItemBean;
+import com.example.chemical.ui.plan.room.bean.locker.CabinetLayerSelect;
+
+import java.util.List;
+
+@Dao
+public interface HxpInventoryDAO {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insert(InventoryItemBean inventoryItemBean);
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insertAll(List<InventoryItemBean> inventoryItemBeans);
+
+    @Query("SELECT * FROM inventoryitembean")
+    List<InventoryItemBean> getAll();
+
+    @Query("SELECT * FROM inventoryitembean WHERE layer = :layer AND cabinetId =:cabinetId AND doorId =:doorId")
+    List<InventoryItemBean> getById(long cabinetId, long doorId, long layer);
+
+    @Update
+    void update(InventoryItemBean inventoryitembean);
+
+    @Delete
+    void delete(InventoryItemBean inventoryitembean);
+
+    @Query("DELETE FROM inventoryitembean")
+    void deleteAll();
+
+}

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

@@ -141,6 +141,7 @@
             android:gravity="center">
 
             <Button
+                android:id="@+id/reset_BT"
                 android:layout_width="150px"
                 android:layout_height="50px"
                 android:layout_marginHorizontal="15px"

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

@@ -141,15 +141,20 @@
 
             <Button
                 android:id="@+id/cancel_BT"
-                android:layout_width="wrap_content"
-                android:layout_height="70px"
+                android:layout_width="150px"
+                android:layout_height="50px"
+                android:layout_marginHorizontal="35px"
+                android:background="@drawable/bg_closes"
                 android:text="取消" />
 
             <Button
                 android:id="@+id/confirm_BT"
-                android:layout_width="wrap_content"
-                android:layout_height="70px"
-                android:text="确定" />
+                android:layout_width="150px"
+                android:layout_height="50px"
+                android:layout_marginHorizontal="35px"
+                android:background="@drawable/selector_input_select_bt"
+                android:text="确定"
+                android:textColor="@color/white" />
         </LinearLayout>
 
         <RelativeLayout
@@ -173,11 +178,12 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/cabinet_VP">
 
-                <Button
+                <ImageButton
                     android:id="@+id/last_BT"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
+                    android:background="@mipmap/icon_dcc_z"
                     android:text="上一页" />
             </RelativeLayout>
 
@@ -187,11 +193,13 @@
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/cabinet_VP">
 
-                <Button
+                <ImageButton
                     android:id="@+id/next_BT"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
+                    android:background="@mipmap/icon_dcc_z"
+                    android:rotation="180"
                     android:text="下一页" />
             </RelativeLayout>
 

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

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    android:background="#50000000"
     android:gravity="center"
     android:orientation="horizontal"
     tools:ignore="PxUsage">

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

@@ -8,6 +8,11 @@
     android:paddingHorizontal="20px"
     tools:ignore="PxUsage">
 
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true" />
+
     <RelativeLayout
         android:id="@+id/cabinet_RL"
         android:layout_width="610px"
@@ -337,8 +342,7 @@
             android:layout_marginStart="33px"
             android:layout_marginTop="410px"
             android:maxLines="4"
-            android:textColor="@color/white"
-            android:visibility="gone" />
+            android:textColor="@color/white" />
 
         <TextView
             android:id="@+id/locker_name_TV"