调整存储流程为单个存储且均需绑定rfid，调整全局uhf外置hib消费，调整业务白名单，修复存储入库后化学品列表页显示柜门名称问题

app/src/main/java/xn/hxp/ui/adapter/PrintLabelAdapter.kt

@@ -0,0 +1,30 @@
+package xn.hxp.ui.adapter
+
+import android.widget.TextView
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.rc.httpcore.bean.StockDetailsModel
+import xn.hxp.R
+
+class PrintLabelAdapter :
+    BaseQuickAdapter<StockDetailsModel, BaseViewHolder>(R.layout.item_print_label_rv) {
+
+    companion object {
+        const val DEFAULT_RFID_HINT = "请用读卡器扫描RFID标签"
+    }
+
+    init {
+        addChildClickViewIds(R.id.imgDelete, R.id.rescanBtn)
+    }
+
+    override fun convert(holder: BaseViewHolder, item: StockDetailsModel) {
+        holder.setText(R.id.tagCode, item.tagCode ?: "")
+        val rfidView = holder.getView<TextView>(R.id.rfidCode)
+        val rfid = item.rfidCode?.trim().orEmpty()
+        if (rfid.isEmpty()) {
+            rfidView.text = DEFAULT_RFID_HINT
+        } else {
+            rfidView.text = rfid
+        }
+    }
+}

app/src/main/java/xn/hxp/ui/plan/add/AddActivity.java

@@ -131,6 +131,8 @@ public class AddActivity extends BaseActivity {
         int layer = cabinetLayerSelect.getLayer();
         binding.cabinetLayerSelectTV.setText(cabinetName + "-" + doorName + "-" + layer + "层");
         binding.cabinetLayerSelectTV.setSelected(true);
+        binding.sizeET.setText("1");
+        binding.sizeET.setEnabled(false);
     }
 
     @Override
@@ -413,4 +415,4 @@ public class AddActivity extends BaseActivity {
         super.onDestroy();
         intentActivityResultLauncher.unregister();
     }
-}
+}

app/src/main/java/xn/hxp/ui/plan/add/AddActivityHelp.java

@@ -305,26 +305,7 @@ public class AddActivityHelp {
         activity.hxpChemicalVo.setNetContent(netWt);
 
         // 数量
-        Editable sizeETText = activity.binding.sizeET.getText();
-        if (null == sizeETText || TextUtils.isEmpty(sizeETText)) {
-            activity.binding.sizeET.setError("请输入数量");
-            activity.binding.sizeET.requestFocus();
-            return;
-        }
-        int size = -1;
-        try {
-            size = Integer.parseInt(sizeETText.toString());
-        } catch (Exception e) {
-            activity.binding.sizeET.setError("请检查数量内容正确");
-            activity.binding.sizeET.requestFocus();
-            return;
-        }
-        if (size <= 0) {
-            activity.binding.sizeET.setError("请检查数量内容正确");
-            activity.binding.sizeET.requestFocus();
-            return;
-        }
-        activity.inventoryItemBean.setSize(size);
+        activity.inventoryItemBean.setSize(1);
 
         /*-- 非必填 --*/
         // 纯度
@@ -472,7 +453,7 @@ public class AddActivityHelp {
         activity.binding.chemicalDensityET.setTag(null);
         activity.binding.netWtET.setText("");
         activity.binding.netWtET.setTag(null);
-        activity.binding.sizeET.setText("");
+        activity.binding.sizeET.setText("1");
         activity.binding.sizeET.setTag(null);
         activity.binding.purityET.setText("");
         activity.binding.purityET.setTag(null);

app/src/main/java/xn/hxp/ui/plan/save_list/SaveListAdapter.java

@@ -137,7 +137,7 @@ public class SaveListAdapter extends BaseAdapter {
                     if (null != chemicalVo) {
                         // 化学品名称
                         String chemicalName = chemicalVo.getChemicalName();
-                        viewHolder.binding.name.setText(TextUtils.isEmpty(chemicalName) ? "" : cabinetName);
+                        viewHolder.binding.name.setText(TextUtils.isEmpty(chemicalName) ? "" : chemicalName);
                         viewHolder.binding.name.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                             @Override
                             public void onDebouncingClick(View v) {

app/src/main/java/xn/hxp/weidith/LabelDialog.kt

@@ -284,7 +284,9 @@ class LabelDialog(
         }
         // 外置超高频RFID读卡器输入
         if (UhfRfidManager.isEnabled(ac) && UhfRfidManager.isUhfRfidEvent(ac, event)) {
-            mUhfRfidHelper.analysisKeyEvent(event)
+            if (UhfRfidManager.isPageWhitelisted(ac, UhfRfidManager.PAGE_STORAGE_RFID)) {
+                mUhfRfidHelper.analysisKeyEvent(event)
+            }
             return true
         }
         mPortScanHelper.dispatchKeyEvent(event)
@@ -345,13 +347,18 @@ class LabelDialog(
 
     //更新Rfid
     fun upViewRfid(rfid: String) {
+        val cleanRfid = rfid.replace("\r", "").replace("\n", "").trim()
+        if (cleanRfid.isEmpty()) {
+            mHandleScanEvent = false
+            return
+        }
         var tagCode: String = ""
         var wxCode: String = ""
         var rfidCode: String = ""
         var position = -1
         for (index in mAdapter.data.indices) {
             if (mAdapter.data[index].rfidCode == null) {
-                mAdapter.data[index].rfidCode = rfid
+                mAdapter.data[index].rfidCode = cleanRfid
                 tagCode = mAdapter.data[index].tagCode!!
                 wxCode = mAdapter.data[index].wxCode!!
                 rfidCode = mAdapter.data[index].rfidCode!!
@@ -427,4 +434,4 @@ class LabelDialog(
         LogUtils.i("=========弹框触发了")
         mCounter = 0
     }
-}
+}

app/src/main/java/xn/hxp/weidith/prin_label_dialog/PrintLabelDialog.java

@@ -6,10 +6,12 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDialog;
@@ -24,14 +26,19 @@ import com.rc.httpcore.bean.BelongingPersonBean;
 import com.rc.httpcore.bean.HxpChemicalVo;
 import com.rc.httpcore.bean.StockDetailsModel;
 import com.rc.httpcore.bean.TopicDataBean;
+import com.rc.httpcore.client.ApiRepository;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import xn.hxp.R;
 import xn.hxp.databinding.DialogPrintLabelBinding;
 import xn.hxp.ui.PrintBean;
-import xn.hxp.ui.adapter.LabelDialogAdapter;
+import xn.hxp.receiver.UhfRfidKeyEventHelper;
+import xn.hxp.receiver.UhfRfidManager;
+import xn.hxp.ui.adapter.PrintLabelAdapter;
 import xn.hxp.ui.plan.room.bean.input_add.InventoryItemBean;
 import xn.hxp.utils.PrintTool;
 
@@ -46,9 +53,16 @@ public class PrintLabelDialog extends AppCompatDialog {
     private String planPath;
 
     private List<StockDetailsModel> labelList = new ArrayList<>();
-    private LabelDialogAdapter labelDialogAdapter;
+    private PrintLabelAdapter labelDialogAdapter;
+    private int selectedIndex = 0;
 
     private boolean isPrint;
+    private Runnable hideTipRunnable;
+
+    private final UhfRfidKeyEventHelper uhfRfidKeyEventHelper = new UhfRfidKeyEventHelper(content -> {
+        updateRfid(selectedIndex, content);
+        return null;
+    });
 
     /**
      * @param inventoryItemBean 清单item
@@ -108,26 +122,17 @@ public class PrintLabelDialog extends AppCompatDialog {
             @Override
             public void onSuccess(Object result) {
                 binding.rvView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false));
-                labelDialogAdapter = new LabelDialogAdapter();
+                labelDialogAdapter = new PrintLabelAdapter();
                 binding.rvView.setAdapter(labelDialogAdapter);
                 labelDialogAdapter.setList(labelList);
-                // 删除条目
+                // 删除/重新扫描
                 labelDialogAdapter.setOnItemChildClickListener((adapter, view, position) -> {
-                    if (view.getId() == R.id.imgDelete) {
-                        try {
-                            if (labelList.size() == 1) {
-                                throw new Exception();
-                            }
-                            labelList.remove(position);
-                            for (int i = 0; i < labelList.size(); i++) {
-                                labelList.get(i).setNo(++i);
-                            }
-                            labelDialogAdapter.setList(labelList);
-                            binding.sumTV.setText("共  " + labelList.size() + "  张");
-                        } catch (Exception e) {
-                            LogUtils.e(Log.getStackTraceString(e));
-                            PopTip.show("删除失败!");
-                        }
+                    if (position < 0 || position >= labelList.size()) {
+                        return;
+                    }
+                    selectedIndex = position;
+                    if (view.getId() == R.id.rescanBtn || view.getId() == R.id.imgDelete) {
+                        clearRfid(position);
                     }
                 });
             }
@@ -146,72 +151,111 @@ public class PrintLabelDialog extends AppCompatDialog {
         binding.determine.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
             public void onDebouncingClick(View v) {
+                validateBeforeSubmit(chemicalName, hxpChemicalVo);
+            }
+        });
+    }
 
-                printState(true);
-
-                ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<Object>() {
-                    @Override
-                    public Object doInBackground() throws Throwable {
-                        for (int i = 0; i < labelList.size(); i++) {
-                            StockDetailsModel stockDetailsModel = labelList.get(i);
-                            PrintBean printBean = new PrintBean();
-                            // 化学品编码
-                            String tagCode = stockDetailsModel.getTagCode();
-                            printBean.setTag(TextUtils.isEmpty(tagCode) ? "" : tagCode);
-                            // 二维码
-                            String wxCode = stockDetailsModel.getWxCode();
-                            printBean.setWxCode(TextUtils.isEmpty(wxCode) ? "" : wxCode);
-                            // 化学品名
-                            printBean.setName(TextUtils.isEmpty(chemicalName) ? "" : chemicalName);
-                            // CAS
-                            String casNum = hxpChemicalVo.getCasNum();
-                            printBean.setCasNo(TextUtils.isEmpty(casNum) ? "" : casNum);
-                            int belongType = hxpChemicalVo.getBelongType();
-                            String name = "";
-                            // 归属人
-                            if (belongType == 2) {
-                                BelongingPersonBean belongingPersonBean = inventoryItemBean.getBelongingPersonBean();
-                                name = belongingPersonBean.getUserName();
-                            }
-                            // 课题组
-                            else if (belongType == 1) {
-                                TopicDataBean topicDataBean = inventoryItemBean.getTopicDataBean();
-                                name = topicDataBean.getTopicName();
-                            }
-                            printBean.setPerson(TextUtils.isEmpty(name) ? "" : name);
-                            // 管控非管控
-//                        int chemicalLevel = hxpChemicalVo.getChemicalLevel();
-//                        printBean.setLevel(1 == chemicalLevel ? "管控" : "非管控");
-                            // 化学品类型
-                            CharSequence chemicalCategory = hxpChemicalVo.getChemicalCategoryName();
-                            printBean.setTypes(TextUtils.isEmpty(chemicalCategory) ? "" : chemicalCategory.toString());
-                            // 打印
-                            if (isPrint) {
-                                LogUtils.json("打印机前", labelList);
-                                PrintTool.INSTANCE.print(hxpChemicalVo.isGr(), belongType == 2, printBean);
-                            }
-                            Thread.sleep(200);
-                        }
-                        return null;
-                    }
+    private void validateBeforeSubmit(String chemicalName, HxpChemicalVo hxpChemicalVo) {
+        Set<String> localRfidSet = new HashSet<>();
+        for (int i = 0; i < labelList.size(); i++) {
+            StockDetailsModel stockDetailsModel = labelList.get(i);
+            String rfid = stockDetailsModel.getRfidCode() == null ? "" : stockDetailsModel.getRfidCode().trim();
+            if (rfid.isEmpty()) {
+                showDialogTip("请先扫描RFID标签");
+                return;
+            }
+            if (!localRfidSet.add(rfid)) {
+                selectedIndex = i;
+                clearRfid(i);
+                showDialogTip("rfid标签不能重复,请重新扫描");
+                return;
+            }
+        }
+        printState(true);
+        checkRemoteRfid(0, chemicalName, hxpChemicalVo);
+    }
 
-                    @Override
-                    public void onSuccess(Object result) {
-                        printState(false);
-                        hxpChemicalVo.setStockDetailsModelList(labelList);
-                        printLabelCallBack.confirm();
-                        dismiss();
-                    }
+    private void checkRemoteRfid(int index, String chemicalName, HxpChemicalVo hxpChemicalVo) {
+        if (index >= labelList.size()) {
+            submitWithRfids(chemicalName, hxpChemicalVo);
+            return;
+        }
+        String rfid = labelList.get(index).getRfidCode();
+        ApiRepository.INSTANCE.checkRfids(rfid).subscribe(data -> {
+            if (Boolean.TRUE.equals(data)) {
+                printState(false);
+                selectedIndex = index;
+                clearRfid(index);
+                showDialogTip("rfid标签已存在,请重新扫描");
+                return;
+            }
+            checkRemoteRfid(index + 1, chemicalName, hxpChemicalVo);
+        }, throwable -> {
+            printState(false);
+            showDialogTip(TextUtils.isEmpty(throwable.getMessage()) ? "RFID校验失败,请重试" : throwable.getMessage());
+            LogUtils.e(Log.getStackTraceString(throwable));
+        });
+    }
 
-                    @Override
-                    public void onFail(Throwable t) {
-                        super.onFail(t);
-                        PopTip.show("打印失败,已打印标签无效,请重试!");
-                        printLabelCallBack.close();
-                        dismiss();
-                        LogUtils.e(Log.getStackTraceString(t));
+    private void submitWithRfids(String chemicalName, HxpChemicalVo hxpChemicalVo) {
+        ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<Object>() {
+            @Override
+            public Object doInBackground() throws Throwable {
+                for (int i = 0; i < labelList.size(); i++) {
+                    StockDetailsModel stockDetailsModel = labelList.get(i);
+                    PrintBean printBean = new PrintBean();
+                    // 化学品编码
+                    String tagCode = stockDetailsModel.getTagCode();
+                    printBean.setTag(TextUtils.isEmpty(tagCode) ? "" : tagCode);
+                    // 二维码
+                    String wxCode = stockDetailsModel.getWxCode();
+                    printBean.setWxCode(TextUtils.isEmpty(wxCode) ? "" : wxCode);
+                    // 化学品名
+                    printBean.setName(TextUtils.isEmpty(chemicalName) ? "" : chemicalName);
+                    // CAS
+                    String casNum = hxpChemicalVo.getCasNum();
+                    printBean.setCasNo(TextUtils.isEmpty(casNum) ? "" : casNum);
+                    int belongType = hxpChemicalVo.getBelongType();
+                    String name = "";
+                    // 归属人
+                    if (belongType == 2) {
+                        BelongingPersonBean belongingPersonBean = inventoryItemBean.getBelongingPersonBean();
+                        name = belongingPersonBean.getUserName();
                     }
-                });
+                    // 课题组
+                    else if (belongType == 1) {
+                        TopicDataBean topicDataBean = inventoryItemBean.getTopicDataBean();
+                        name = topicDataBean.getTopicName();
+                    }
+                    printBean.setPerson(TextUtils.isEmpty(name) ? "" : name);
+                    CharSequence chemicalCategory = hxpChemicalVo.getChemicalCategoryName();
+                    printBean.setTypes(TextUtils.isEmpty(chemicalCategory) ? "" : chemicalCategory.toString());
+                    if (isPrint) {
+                        LogUtils.json("打印机前", labelList);
+                        PrintTool.INSTANCE.print(hxpChemicalVo.isGr(), belongType == 2, printBean);
+                    }
+                    Thread.sleep(200);
+                }
+                return null;
+            }
+
+            @Override
+            public void onSuccess(Object result) {
+                printState(false);
+                hxpChemicalVo.setStockDetailsModelList(labelList);
+                printLabelCallBack.confirm();
+                dismiss();
+            }
+
+            @Override
+            public void onFail(Throwable t) {
+                super.onFail(t);
+                printState(false);
+                PopTip.show("打印失败,已打印标签无效,请重试!");
+                printLabelCallBack.close();
+                dismiss();
+                LogUtils.e(Log.getStackTraceString(t));
             }
         });
     }
@@ -232,6 +276,54 @@ public class PrintLabelDialog extends AppCompatDialog {
         }
     }
 
+    private void clearRfid(int position) {
+        if (position < 0 || position >= labelList.size()) {
+            return;
+        }
+        labelList.get(position).setRfidCode(null);
+        if (labelDialogAdapter != null) {
+            labelDialogAdapter.notifyItemChanged(position);
+        }
+    }
+
+    private void updateRfid(int position, String rfid) {
+        if (position < 0 || position >= labelList.size()) {
+            return;
+        }
+        String cleanRfid = rfid == null ? "" : rfid.replace("\r", "").replace("\n", "").trim();
+        if (cleanRfid.isEmpty()) {
+            return;
+        }
+        labelList.get(position).setRfidCode(cleanRfid);
+        if (labelDialogAdapter != null) {
+            labelDialogAdapter.notifyItemChanged(position);
+        }
+    }
+
+    private void showDialogTip(String message) {
+        TextView tipView = binding.tipTV;
+        tipView.setText(message);
+        tipView.setVisibility(View.VISIBLE);
+        tipView.bringToFront();
+        if (hideTipRunnable != null) {
+            tipView.removeCallbacks(hideTipRunnable);
+        }
+        hideTipRunnable = () -> tipView.setVisibility(View.GONE);
+        tipView.postDelayed(hideTipRunnable, 2500);
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (UhfRfidManager.INSTANCE.isEnabled(getContext())
+                && UhfRfidManager.INSTANCE.isUhfRfidEvent(getContext(), event)) {
+            if (UhfRfidManager.INSTANCE.isPageWhitelisted(getContext(), UhfRfidManager.PAGE_STORAGE_RFID)) {
+                uhfRfidKeyEventHelper.analysisKeyEvent(event);
+            }
+            return true;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
     public interface PrintLabelCallBack {
         void confirm();
 

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

@@ -582,9 +582,12 @@
                         android:layout_height="50px"
                         android:layout_marginStart="20px"
                         android:background="@drawable/shape_input_box"
+                        android:enabled="false"
                         android:digits="1234567890"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
                         android:gravity="center_vertical"
-                        android:hint="输入化学品数量"
+                        android:text="1"
                         android:imeOptions="actionDone"
                         android:inputType="number"
                         android:paddingHorizontal="10px"
@@ -845,4 +848,4 @@
         android:text="返回"
         android:textColor="@color/white"
         android:textSize="10sp" />
-</RelativeLayout>
+</RelativeLayout>

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

@@ -12,8 +12,25 @@
         android:gravity="center"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tip_TV"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:background="@drawable/shape_unlock_failed"
+            android:gravity="center"
+            android:paddingStart="16dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="8dp"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            android:textSize="14sp"
+            android:visibility="gone"
+            tools:text="rfid标签已存在,请重新扫描" />
+
         <LinearLayout
-            android:layout_width="420dp"
+            android:layout_width="620dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/bg_shu_ru_kuang"
@@ -96,7 +113,7 @@
                 android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="1.15"
                     android:text="编号"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -106,9 +123,17 @@
                 android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="RFID编号"
-                    android:visibility="gone"
+                    android:layout_weight="1.8"
+                    android:text="RFID"
+                    android:textColor="@color/black"
+                    android:textSize="12sp" />
+
+                <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
+                    android:layout_width="84dp"
+                    android:layout_height="wrap_content"
+                    android:text="操作"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
@@ -131,7 +156,7 @@
                     android:id="@+id/rvView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    tools:listitem="@layout/label_dialog_rv" />
+                    tools:listitem="@layout/item_print_label_rv" />
 
                 <LinearLayout
                     android:id="@+id/loading_LL"
@@ -190,4 +215,4 @@
                 android:textColor="@color/white" />
         </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
+</RelativeLayout>

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="45dp"
+    android:background="@color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/tagCode"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.15"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:textColor="@color/black"
+            android:textSize="10sp" />
+
+        <TextView
+            android:id="@+id/rfidCode"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.8"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:textColor="@color/black"
+            android:textColorHint="@color/purple_ff0072dd"
+            android:textSize="10sp" />
+
+        <TextView
+            android:id="@+id/rescanBtn"
+            android:layout_width="84dp"
+            android:layout_height="28dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/bg_quan_xin_twoe"
+            android:gravity="center"
+            android:text="重新扫描"
+            android:textColor="@color/white"
+            android:textSize="10sp" />
+
+        <ImageView
+            android:id="@+id/imgDelete"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginEnd="10dp"
+            android:background="@mipmap/icon_yrk_sc" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/purple_FFE0E0E0" />
+</RelativeLayout>

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

@@ -42,7 +42,7 @@
             android:textColor="@color/black"
             android:textColorHint="@color/purple_ff0072dd"
             android:textSize="10sp"
-            android:visibility="gone" />
+            android:visibility="visible" />
 
         <ImageView
             android:id="@+id/imgDelete"
@@ -63,4 +63,4 @@
         android:layout_height="0.5dp"
         android:layout_alignParentBottom="true"
         android:background="@color/purple_FFE0E0E0" />
-</RelativeLayout>
+</RelativeLayout>