1.修复诸多显示问题

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

@@ -25,8 +25,6 @@ class UsageLabelDialogAdapter(private val ct: Context) :
         val chemicalName = holder.getView<TextView>(R.id.chemicalName)
         chemicalName.isSelected = true
         holder.setText(R.id.code, "${item.code}")
-        val code = holder.getView<TextView>(R.id.code)
-        code.isSelected = true
         if (item.weigh != null) {
             when {
                 item.specUnit.equals("g") -> {

app/src/main/java/xn/hxp/ui/discard/WasteChemicalsActivity.kt

@@ -350,7 +350,8 @@ class WasteChemicalsActivity : BaseActivity() {
             .subscribe({ data ->
                 dismissLoading()
                 val storageDialog =
-                    StorageDialog(ct = this,
+                    StorageDialog(
+                        ct = this,
                         listData = data!!,
                         lint = object : StorageDialog.IonClickListener {
                             override fun onClick(
@@ -927,6 +928,7 @@ class WasteChemicalsActivity : BaseActivity() {
         viewBinding.linTow.visibility = View.VISIBLE
         viewBinding.lintComplete.visibility = View.GONE
         viewBinding.chemicalName.text = "${mDataBean.chemicalName}"
+        viewBinding.chemicalName.isSelected = true
         viewBinding.chemicalLevelName.text = "${mDataBean.chemicalLevelName}"
         viewBinding.chemicalCategoryName.text = "${mDataBean.chemicalCategoryName}"
         viewBinding.tagCode.text = "编码${mDataBean.tagCode}"

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

@@ -126,7 +126,7 @@ public class SaveListActivity extends BaseActivity {
             saveListBeanList.add(saveListBean);
             saveListBeanMap.put(doorVo.getDoorId(), saveListBeanList);
         }
-
+        LogUtils.json("清单", saveListBeanMap);
         saveListAdapter = new SaveListAdapter(this, saveListBeanMap);
         binding.saveLV.setAdapter(saveListAdapter);
         List<String> logs = splitStringIntoChunks(GsonUtils.toJson(saveListBeanMap), 500);

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

@@ -105,24 +105,23 @@ public class SaveListAdapter extends BaseAdapter {
                 }
 
                 // 需要展示数量时
-                if (viewHolder.binding.unlockBT.getVisibility() == View.VISIBLE) {
+                if (position == 0) {
+                    viewHolder.binding.sumTV.setVisibility(View.VISIBLE);
                     if (null != saveListBeanMap) {
-                        List<SaveListBean> saveListBeans = saveListBeanMap.get(saveListBean.getDoorId());
                         int countSize = 0;
-                        if (saveListBeans != null && !saveListBeans.isEmpty()) {
-                            for (int i = 0; i < saveListBeans.size(); i++) {
-                                SaveListBean saveBean = saveListBeans.get(i);
-                                InventoryItemBean inventoryItemBean = saveBean.getInventoryItemBean();
-                                if (null != inventoryItemBean) {
-                                    countSize = countSize + inventoryItemBean.getSize();
-                                }
+                        for (int i = 0; i < saveListBeanList.size(); i++) {
+                            SaveListBean saveBean = saveListBeanList.get(i);
+                            InventoryItemBean inventoryItemBean = saveBean.getInventoryItemBean();
+                            if (null != inventoryItemBean) {
+                                countSize = countSize + inventoryItemBean.getSize();
                             }
                         }
                         if (countSize > 0) {
-                            viewHolder.binding.sumTV.setVisibility(View.VISIBLE);
                             viewHolder.binding.sumTV.setText("数量:" + countSize);
                         }
                     }
+                } else {
+                    viewHolder.binding.sumTV.setVisibility(View.GONE);
                 }
                 String cabinetName = saveListBean.getCabinetName();
                 cabinetName = TextUtils.isEmpty(cabinetName) ? "" : cabinetName;

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

@@ -505,7 +505,8 @@
                     android:paddingRight="8dp"
                     android:text="更换RFID"
                     android:textColor="@color/purple_0072dd"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    android:visibility="invisible" />
 
                 <TextView
                     android:id="@+id/reLabel"

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

@@ -166,8 +166,8 @@
                                 android:layout_height="30dp"
                                 android:background="@drawable/bg_shu_ru_kuang"
                                 android:gravity="center"
-                                android:text="化学品柜"
                                 android:paddingRight="12dp"
+                                android:text="化学品柜"
                                 android:textColor="@color/black" />
 
                             <ImageView
@@ -183,13 +183,13 @@
                             android:id="@+id/edCont"
                             android:layout_width="214dp"
                             android:layout_height="30dp"
+                            android:layout_gravity="center_vertical"
                             android:layout_marginLeft="4dp"
                             android:layout_marginRight="4dp"
                             android:background="@drawable/bg_shu_ru_kuang_twoe"
-                            android:layout_gravity="center_vertical"
                             android:gravity="center_vertical"
-                            android:paddingLeft="10dp"
                             android:hint="化学品名/编码/归属人/领用人"
+                            android:paddingLeft="10dp"
                             android:textSize="12sp" />
 
                         <TextView
@@ -405,6 +405,7 @@
                     android:text="请将化学品标签对准扫描区域识别"
                     android:textColor="@color/black"
                     android:textSize="10sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -434,9 +435,15 @@
 
                 <TextView
                     android:id="@+id/chemicalName"
-                    android:layout_width="wrap_content"
+                    android:layout_width="300px"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:gravity="center"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:singleLine="true"
                     android:textColor="@color/black"
                     android:textSize="15sp" />
 
@@ -821,9 +828,9 @@
                     android:layout_marginLeft="4dp"
                     android:background="@drawable/bg_sou_suo"
                     android:text="再次开门"
-                    android:visibility="gone"
                     android:textColor="@color/white"
-                    android:textSize="10sp" />
+                    android:textSize="10sp"
+                    android:visibility="gone" />
 
             </RelativeLayout>
         </LinearLayout>

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

@@ -48,9 +48,9 @@
                 android:layout_centerVertical="true"
                 android:layout_gravity="end"
                 android:layout_marginEnd="40px"
-                android:text="数量:3"
-                android:textColor="#333"
-                android:visibility="gone" />
+                android:text="数量:"
+                android:visibility="gone"
+                android:textColor="#333" />
         </RelativeLayout>
 
         <LinearLayout

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

@@ -29,12 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="25dp"
             android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
             android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:singleLine="true"
             android:textColor="@color/black"
             android:textSize="12sp" />