1.各个列表高度控制

app/build.gradle

@@ -13,7 +13,7 @@ android {
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdk 28
         versionCode 1
-        versionName "2.4"
+        versionName "2.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true

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

@@ -1,19 +1,33 @@
 package xn.hxp.ui.adapter
 
 import android.content.Context
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import xn.hxp.R
 import com.blankj.utilcode.util.LogUtils
 import com.rc.httpcore.bean.UseLedgerListBean
+import xn.hxp.weidith.TextTool
 
 class ChecklistsAdapter(private val ct: Context) :
     BaseQuickAdapter<UseLedgerListBean, BaseViewHolder>(R.layout.item_checklists) {
     override fun convert(holder: BaseViewHolder, item: UseLedgerListBean) {
         holder.setText(R.id.chemicalName, "${item.chemicalName}")
+        val chemicalNameTV = holder.getView<TextView>(R.id.chemicalName);
+        chemicalNameTV.setOnClickListener {
+            TextTool.showPop(context, chemicalNameTV)
+        }
         holder.setText(R.id.tagCode, "${item.tagCode}")
+        val tagCodeTV = holder.getView<TextView>(R.id.tagCode);
+        tagCodeTV.setOnClickListener {
+            TextTool.showPop(context, tagCodeTV)
+        }
         holder.setText(R.id.cabinetName, "${item.cabinetName}-${item.doorName}-${item.layers}层")
+        val cabinetNameTV = holder.getView<TextView>(R.id.cabinetName);
+        cabinetNameTV.setOnClickListener {
+            TextTool.showPop(context, cabinetNameTV)
+        }
 //        // 截取后5位
 //        if (item.collectTime!=null){
 //            val splitDateTime = item.collectTime.split(" ")
@@ -26,9 +40,9 @@ class ChecklistsAdapter(private val ct: Context) :
 //            holder.setText(R.id.times, "")
 //        }
         // 截取后5位
-        if (item.collectTime!=null){
+        if (item.collectTime != null) {
             holder.setText(R.id.collectTime, "${item.collectTime}")
-        }else{
+        } else {
             holder.setText(R.id.collectTime, "")
         }
 
@@ -45,13 +59,18 @@ class ChecklistsAdapter(private val ct: Context) :
 //        when (item.status) {
         when (item.useStatus) {
             2 -> {
-                holder.setTextColor(R.id.status, ContextCompat.getColor(ct, R.color.purple_FFFF8C11))
+                holder.setTextColor(
+                    R.id.status,
+                    ContextCompat.getColor(ct, R.color.purple_FFFF8C11)
+                )
                 holder.setText(R.id.status, "超时未归还")
             }
+
             1 -> {
                 holder.setTextColor(R.id.status, ContextCompat.getColor(ct, R.color.black))
                 holder.setText(R.id.status, "待归还")
             }
+
             else -> {
                 holder.setTextColor(R.id.status, ContextCompat.getColor(ct, R.color.black))
                 holder.setText(R.id.status, " ")

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

@@ -17,8 +17,12 @@ class InventoryAdapter(private val ct: Context) :
         val chemicalNameView = holder.getView<TextView>(R.id.chemicalName)
         chemicalNameView.setOnClickListener { TextTool.showPop(context, chemicalNameView) }
         holder.setText(R.id.tagCode, item.tagCode)
+        val tagCodeView = holder.getView<TextView>(R.id.tagCode)
+        tagCodeView.setOnClickListener { TextTool.showPop(context, tagCodeView) }
         holder.setText(R.id.specNum, "${item.specNum}${item.specUnit}/${item.packUnit}")
         holder.setText(R.id.cabinetName, "${item.cabinetName}-${item.doorName}-${item.layers}层")
+        val cabinetNameView = holder.getView<TextView>(R.id.cabinetName)
+        cabinetNameView.setOnClickListener { TextTool.showPop(context, cabinetNameView) }
         if (item.expireTime != null) {
             if (item.expireStatus == 1) {
                 holder.setTextColor(

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

@@ -1,20 +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 xn.hxp.R
 import com.rc.httpcore.bean.QueryTwoListBean
+import xn.hxp.weidith.TextTool
 
 class UesItemDetail :
     BaseQuickAdapter<QueryTwoListBean, BaseViewHolder>(R.layout.item_ues_details) {
 
     override fun convert(holder: BaseViewHolder, item: QueryTwoListBean) {
         holder.setText(R.id.tagCode, "${item.tagCode}")
+        val tagCodeTV = holder.getView<TextView>(R.id.tagCode)
+        tagCodeTV.setOnClickListener {
+            TextTool.showPop(context, tagCodeTV)
+        }
         holder.setText(R.id.specNum, "${item.specNum}${item.specUnit}/${item.packUnit}")
         holder.setText(R.id.surplus, "${item.surplus}${item.specUnit}")
         holder.setText(R.id.belongName, "${item.belongName}")
         holder.setText(R.id.storage, "${item.cabinetName}-${item.doorName}-${item.layers}层")
-        if (item.statusStr!=null){
+        val storageTV = holder.getView<TextView>(R.id.storage)
+        storageTV.setOnClickListener {
+            TextTool.showPop(context, storageTV)
+        }
+        if (item.statusStr != null) {
             holder.setText(R.id.statusStr, "${item.statusStr}")
         }
 

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

@@ -0,0 +1,89 @@
+package xn.hxp.ui.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.blankj.utilcode.util.ClickUtils;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+
+import xn.hxp.R;
+import xn.hxp.utils.ConversionUtils;
+import xn.hxp.weidith.TextTool;
+
+import com.rc.httpcore.bean.ChemistryBean;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class UsageLabelDialogAdapter extends BaseQuickAdapter<ChemistryBean, BaseViewHolder> {
+    private final Context ct;
+    private final List<String> spinnerArray = new ArrayList<>();
+
+    public UsageLabelDialogAdapter(Context context) {
+        super(R.layout.item_usage_label_dialog);
+        this.ct = context;
+        addChildClickViewIds(R.id.imgDelete);
+        spinnerArray.add("否");
+        spinnerArray.add("是");
+    }
+
+    @Override
+    protected void convert(@NonNull BaseViewHolder holder, ChemistryBean item) {
+        holder.setText(R.id.chemicalName, item.getChemicalName() != null ? item.getChemicalName() : "");
+        TextView chemicalName = holder.getView(R.id.chemicalName);
+        chemicalName.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                TextTool.showPop(ct, chemicalName);
+            }
+        });
+        holder.setText(R.id.code, item.getCode() != null ? item.getCode() : "");
+        TextView codeTV = holder.getView(R.id.code);
+        codeTV.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                TextTool.showPop(ct, codeTV);
+            }
+        });
+
+        if (item.getWeigh() != null) {
+            if ("g".equals(item.getSpecUnit())) {
+                holder.setText(R.id.surplus, item.getWeigh().subtract(item.getPackNum()) + item.getSpecUnit());
+            } else if ("ml".equals(item.getSpecUnit())) {
+                String gramsToMilliliters = String.valueOf(ConversionUtils.INSTANCE.gramsToMilliliters(item.getWeigh().subtract(item.getPackNum()), item.getChemicalDensity()));
+                holder.setText(R.id.surplus, gramsToMilliliters + item.getSpecUnit());
+            } else {
+                holder.setText(R.id.surplus, (item.getSurplus() != null ? item.getSurplus() : "") + item.getSpecUnit());
+            }
+        } else {
+            holder.setText(R.id.surplus, (item.getSurplus() != null ? item.getSurplus() : "") + item.getSpecUnit());
+        }
+
+        holder.setText(R.id.spec, item.getSpec() != null ? item.getSpec() : "");
+        holder.setText(R.id.duration, item.getDuration() != null ? item.getDuration() : "");
+
+        Spinner sPinner = holder.getView(R.id.sPinner);
+        CustomSpinnerFoutAdapter adapter = new CustomSpinnerFoutAdapter(ct, spinnerArray);
+        sPinner.setAdapter(adapter);
+        sPinner.setSelection(0);
+        sPinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                String selectedItem = parent.getItemAtPosition(position).toString();
+                item.setAllBottle(!"否".equals(selectedItem));
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                // 处理未选择任何选项情况
+            }
+        });
+    }
+}

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

@@ -1,76 +0,0 @@
-package xn.hxp.ui.adapter
-
-import android.content.Context
-import android.view.View
-import android.widget.AdapterView
-import android.widget.Spinner
-import android.widget.TextView
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import xn.hxp.R
-import xn.hxp.utils.ConversionUtils
-import com.rc.httpcore.bean.ChemistryBean
-
-//领用列表
-class UsageLabelDialogAdapter(private val ct: Context) :
-    BaseQuickAdapter<ChemistryBean, BaseViewHolder>(R.layout.item_usage_label_dialog) {
-
-    init {
-        addChildClickViewIds(R.id.imgDelete)
-    }
-
-    private val spinnerArray = listOf("否", "是")
-    override fun convert(holder: BaseViewHolder, item: ChemistryBean) {
-        holder.setText(R.id.chemicalName, "${item.chemicalName}")
-        val chemicalName = holder.getView<TextView>(R.id.chemicalName)
-        holder.setText(R.id.code, "${item.code}")
-        if (item.weigh != null) {
-            when {
-                item.specUnit.equals("g") -> {
-                    holder.setText(
-                        R.id.surplus,
-                        "${item.weigh!!.subtract(item.packNum)}${item.specUnit}"
-                    )
-                }
-
-                item.specUnit.equals("ml") -> {
-                    val subtract = item.weigh!!.subtract(item.packNum)
-                    val gramsToMilliliters =
-                        ConversionUtils.gramsToMilliliters(subtract, item.chemicalDensity)
-                    holder.setText(R.id.surplus, "$gramsToMilliliters${item.specUnit}")
-                }
-
-                else -> {
-                    holder.setText(R.id.surplus, "${item.surplus}${item.specUnit}")
-                }
-            }
-        } else {
-            holder.setText(R.id.surplus, "${item.surplus}${item.specUnit}")
-        }
-
-        holder.setText(R.id.spec, "${item.spec}")
-//        holder.setText(R.id.surplus, "${item.weigh}${item.specUnit}")
-        holder.setText(R.id.duration, "${item.duration}")
-        val sPinner = holder.getView<Spinner>(R.id.sPinner)
-        val adapter = CustomSpinnerFoutAdapter(ct, spinnerArray)
-        sPinner.adapter = adapter
-        sPinner.setSelection(0)
-        sPinner.onItemSelectedListener =
-            object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>?,
-                    view: View?,
-                    position: Int,
-                    id: Long
-                ) {
-                    // 处理选项选择事件
-                    val selectedItem = parent?.getItemAtPosition(position).toString()
-                    item.allBottle = selectedItem != "否"
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {
-                    // 处理未选择任何选项情况
-                }
-            }
-    }
-}

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

@@ -20,6 +20,8 @@ class UseLedgerAdapter :
         val chemicalNameView = holder.getView<TextView>(R.id.chemicalName)
         chemicalNameView.setOnClickListener { TextTool.showPop(context, chemicalNameView) }
         holder.setText(R.id.tagCode, item.tagCode)
+        val tagCodeView = holder.getView<TextView>(R.id.tagCode)
+        tagCodeView.setOnClickListener { TextTool.showPop(context, tagCodeView) }
         // 截取后5位
         if (item.collectTime != null) {
             LogUtils.i("==带归还清单 ${item.collectTime}")
@@ -52,7 +54,7 @@ class UseLedgerAdapter :
                 holder.setText(R.id.returnTimeTwo, "$time")
             }
         } else {
-            if (item.statusStr!=null){
+            if (item.statusStr != null) {
                 holder.getView<LinearLayout>(R.id.lintc).visibility = View.GONE
                 holder.getView<TextView>(R.id.wholeBottle).visibility = View.VISIBLE
                 holder.setText(R.id.wholeBottle, "${item.statusStr}")

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

@@ -1,6 +1,7 @@
 package xn.hxp.ui.adapter
 
 import android.content.Context
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
@@ -9,6 +10,7 @@ import com.blankj.utilcode.util.LogUtils
 import com.rc.httpcore.bean.ReturnDetailsBean
 import com.rc.httpcore.bean.ReturningList
 import com.rc.httpcore.bean.WasteChemicalsListBean
+import xn.hxp.weidith.TextTool
 
 //化学品废弃列表
 class WasteChemicalsAdapter(private val ct: Context) :
@@ -22,17 +24,27 @@ class WasteChemicalsAdapter(private val ct: Context) :
             holder.setTextColor(R.id.chemicalPurity, ContextCompat.getColor(ct, R.color.white))
             holder.setTextColor(R.id.surplus, ContextCompat.getColor(ct, R.color.white))
             holder.setTextColor(R.id.chemicalNumber, ContextCompat.getColor(ct, R.color.white))
-            holder.setTextColor(R.id.cabinetName_doorName, ContextCompat.getColor(ct, R.color.white))
+            holder.setTextColor(
+                R.id.cabinetName_doorName,
+                ContextCompat.getColor(ct, R.color.white)
+            )
         } else {
             holder.setBackgroundResource(R.id.cont, R.color.white)
             holder.setTextColor(R.id.chemicalName, ContextCompat.getColor(ct, R.color.black))
             holder.setTextColor(R.id.chemicalPurity, ContextCompat.getColor(ct, R.color.black))
             holder.setTextColor(R.id.surplus, ContextCompat.getColor(ct, R.color.black))
             holder.setTextColor(R.id.chemicalNumber, ContextCompat.getColor(ct, R.color.black))
-            holder.setTextColor(R.id.cabinetName_doorName, ContextCompat.getColor(ct, R.color.black))
+            holder.setTextColor(
+                R.id.cabinetName_doorName,
+                ContextCompat.getColor(ct, R.color.black)
+            )
         }
 
         holder.setText(R.id.chemicalName, "${item.chemicalName}")
+        val chemicalNameTV = holder.getView<TextView>(R.id.chemicalName)
+        chemicalNameTV.setOnClickListener {
+            TextTool.showPop(context, chemicalNameTV)
+        }
         //编码
         holder.setText(R.id.chemicalPurity, "${item.tagCode}")
 
@@ -51,6 +63,7 @@ class WasteChemicalsAdapter(private val ct: Context) :
                         ContextCompat.getColor(ct, R.color.purple_ffff7919)
                     )
                 }
+
                 2 -> {
                     //即将过期
                     holder.setTextColor(
@@ -59,6 +72,7 @@ class WasteChemicalsAdapter(private val ct: Context) :
                     )
                     holder.setText(R.id.cabinetName_doorName, "${item.expireTime}即将过期")
                 }
+
                 else -> {
                     holder.setText(R.id.cabinetName_doorName, "${item.expireTime}")
                     holder.setTextColor(
@@ -70,7 +84,5 @@ class WasteChemicalsAdapter(private val ct: Context) :
         }
 
 
-
-
     }
 }

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

@@ -37,6 +37,7 @@ import xn.hxp.utils.*
 import xn.hxp.weidith.CustomDialog
 import xn.hxp.weidith.DiscardDialog
 import xn.hxp.weidith.StorageDialog
+import xn.hxp.weidith.TextTool
 import java.net.ConnectException
 import java.net.SocketTimeoutException
 
@@ -913,7 +914,9 @@ class WasteChemicalsActivity : BaseActivity() {
         viewBinding.linTow.visibility = View.VISIBLE
         viewBinding.lintComplete.visibility = View.GONE
         viewBinding.chemicalName.text = "${mDataBean.chemicalName}"
-        viewBinding.chemicalName.isSelected = true
+        viewBinding.chemicalName.setOnClickListener {
+            TextTool.showPop(this, viewBinding.chemicalName)
+        }
         viewBinding.chemicalLevelName.text = "${mDataBean.chemicalLevelName}"
         viewBinding.chemicalCategoryName.text = "${mDataBean.chemicalCategoryName}"
         viewBinding.tagCode.text = "编码${mDataBean.tagCode}"

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

@@ -46,19 +46,23 @@ class ScanCodeDialog(private val ct: Context, private var data: UseNoTwoBean) :
         findViewById<TextView>(R.id.chemicalName).text = "${data.chemicalName}"
         if (data.casNum != null) {
             findViewById<TextView>(R.id.casNum).text = "CAS: ${data.casNum}"
-        }else{
+        } else {
             findViewById<TextView>(R.id.casNum).text = "CAS:"
         }
 
-        findViewById<TextView>(R.id.chemicalCategoryName).text = "类别: ${data.chemicalCategoryName}"
+        findViewById<TextView>(R.id.chemicalCategoryName).text =
+            "类别: ${data.chemicalCategoryName}"
         findViewById<TextView>(R.id.specNum).text =
             "规格: ${data.specNum}${data.specUnit}/${data.packUnit}"
         if (data.expireTime != null) {
             findViewById<TextView>(R.id.expireTime).text = "${data.expireTime}"
         }
 
-        findViewById<TextView>(R.id.storageLocation).text =
-            "存储位置：${data.cabinetName}-${data.doorName}-${data.layers}层"
+        val storageLocation = findViewById<TextView>(R.id.storageLocation)
+        storageLocation.text = "存储位置：${data.cabinetName}-${data.doorName}-${data.layers}层"
+        storageLocation.setOnClickListener {
+            TextTool.showPop(context, storageLocation)
+        }
         if (data.collectTime != null) {
             findViewById<TextView>(R.id.collectTime).text = "领用时间: ${data.collectTime}"
         } else {
@@ -123,9 +127,11 @@ class ScanCodeDialog(private val ct: Context, private var data: UseNoTwoBean) :
                 // 用户按下屏幕时的处理逻辑
                 onUserInteraction()
             }
+
             MotionEvent.ACTION_MOVE -> {
                 // 用户在屏幕上移动手指时的处理逻辑
             }
+
             MotionEvent.ACTION_UP -> {
                 // 用户抬起手指时的处理逻辑
             }

app/src/main/java/xn/hxp/weidith/UsageLabelDialog.java

@@ -0,0 +1,267 @@
+package xn.hxp.weidith;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.IntentFilter;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.LogUtils;
+import com.rc.httpcore.bean.ChemistryBean;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import xn.hxp.R;
+import xn.hxp.comm.Constants;
+import xn.hxp.receiver.OnSerialScanListener;
+import xn.hxp.receiver.PortScanHelper;
+import xn.hxp.receiver.UsbReceiver;
+import xn.hxp.ui.adapter.UsageLabelDialogAdapter;
+import xn.hxp.utils.BigDecimalUtils;
+
+public class UsageLabelDialog extends Dialog {
+    private final Activity ac;
+    private final boolean isLcok;
+    private final String cabinet;
+    private final IIneSwipeLin lint;
+
+    private UsbReceiver mUsbReceiver;
+    private boolean mHandleScanEvent = false;
+    private UsageLabelDialogAdapter mAdapter;
+    private int mCounter = 0;
+    private Button butClos;
+    private PortScanHelper mPortScanHelper;
+    private Handler mCountDownHandler;
+
+    public UsageLabelDialog(Activity ac, boolean isLcok, String cabinet, IIneSwipeLin lint) {
+        super(ac);
+        this.ac = ac;
+        this.isLcok = isLcok;
+        this.cabinet = cabinet;
+        this.lint = lint;
+
+        // 初始化适配器
+        mAdapter = new UsageLabelDialogAdapter(ac);
+        initCountDownHandler();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.usage_label_dialog);
+        setCanceledOnTouchOutside(false);
+
+        if (isLcok) {
+            findViewById(R.id.butOpen).setVisibility(View.VISIBLE);
+        } else {
+            findViewById(R.id.butOpen).setVisibility(View.GONE);
+        }
+
+        ((TextView) findViewById(R.id.cabinet)).setText(cabinet);
+        butClos = findViewById(R.id.butClos);
+        butClos.setOnClickListener(v -> dismiss());
+
+        findViewById(R.id.cloe).setOnClickListener(v -> {
+            lint.onCloses();
+            dismiss();
+        });
+
+        findViewById(R.id.useEn).setOnClickListener(v -> {
+            if (mAdapter.getData() != null && mAdapter.getData().size() > 0) {
+                boolean hasDuplicateCodes = hasDuplicateCodes(mAdapter.getData());
+                LogUtils.i("========hasDuplicateCodes  " + hasDuplicateCodes);
+                if (!hasDuplicateCodes) {
+                    lint.onUseClick(mAdapter.getData());
+                    dismiss();
+                } else {
+                    LogUtils.i("===========2");
+                    Toast.makeText(ActivityUtils.getTopActivity(), "不能重复领用", Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+        findViewById(R.id.butOpen).setOnClickListener(v -> {
+            dismiss();
+            lint.openLock();
+        });
+
+        RecyclerView reView = findViewById(R.id.reView);
+        reView.setLayoutManager(new LinearLayoutManager(ac));
+        reView.setAdapter(mAdapter);
+
+        mPortScanHelper = new PortScanHelper(ac, new OnSerialScanListener() {
+            @Override
+            public void dispatchScanEvent(OnSerialScanListener.ScanType type, String content) {
+                lint.onTimerReply();
+                mCounter = 0;
+                if (!mHandleScanEvent) {
+                    if (content != null && !content.isEmpty()) {
+                        LogUtils.i("========a==当前usb返回参数" + content);
+                        mHandleScanEvent = true;
+                        if (content.startsWith("http")) {
+                            try {
+                                String currentDateTimeString = BigDecimalUtils.INSTANCE.extractParameterValue(content, "code");
+                                LogUtils.i("=======ce  " + currentDateTimeString);
+                                lint.onCardInContent(currentDateTimeString);
+                            } catch (Exception e) {
+                                mHandleScanEvent = false;
+                                LogUtils.i("刷卡异常了");
+                                showToast("未获取到二维码信息，请重新扫描", 3000);
+                            }
+                        } else {
+                            lint.onCardInContent(content);
+                        }
+                    }
+                }
+            }
+        });
+
+        mAdapter.setOnItemChildClickListener((adapter, view, position) -> {
+            if (view.getId() == R.id.imgDelete) {
+                lint.onPositions(position, mAdapter);
+            }
+        });
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+        registerUsbBroadcast();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        ac.unregisterReceiver(mUsbReceiver);
+        EventBus.getDefault().unregister(this);
+    }
+
+    private boolean hasDuplicateCodes(List<ChemistryBean> list) {
+        List<String> codes = new ArrayList<>();
+        for (ChemistryBean bean : list) {
+            codes.add(bean.getCode());
+        }
+        return codes.size() != list.size();
+    }
+
+    public interface IIneSwipeLin {
+        void onCardInContent(String cont);
+
+        void onUseClick(List<ChemistryBean> data);
+
+        void onCloses();
+
+        void openLock();
+
+        void onPositions(int position, UsageLabelDialogAdapter mData);
+
+        void onTimerReply();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(@NonNull KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+            return true;
+        }
+        mPortScanHelper.dispatchKeyEvent(event);
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onUpdateEventEvent(KeyEvent event) {
+        // 事件总线处理方法
+    }
+
+    private void showToast(String message, int duration) {
+        Toast.makeText(ac, message, duration).show();
+    }
+
+    private void registerUsbBroadcast() {
+        if (mUsbReceiver == null) {
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(UsbReceiver.ACTION_USB_PERMISSION);
+            filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+            filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
+            filter.addAction(UsbReceiver.ACTION_USB_STATE);
+            mUsbReceiver = new UsbReceiver();
+            ac.registerReceiver(mUsbReceiver, filter);
+        }
+    }
+
+    public void setMessage(String message, List<ChemistryBean> dataList) {
+        LogUtils.i("====================数据过来了");
+        mHandleScanEvent = false;
+        findViewById(R.id.img).setVisibility(View.GONE);
+        butClos.setVisibility(View.GONE);
+        findViewById(R.id.linTow).setVisibility(View.VISIBLE);
+        findViewById(R.id.reView).setVisibility(View.VISIBLE);
+        mAdapter.setNewInstance(new ArrayList<>(dataList));
+    }
+
+    public void notifyData(List<ChemistryBean> chemistryBeans) {
+        mHandleScanEvent = false;
+        mAdapter.setNewInstance(chemistryBeans);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    public void notifyData() {
+        mHandleScanEvent = false;
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(@NonNull MotionEvent ev) {
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                onUserInteraction();
+                break;
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    private void initCountDownHandler() {
+        mCountDownHandler = new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(@NonNull Message msg) {
+                if (msg.what == Constants.INSTANCE.getWHAT_COUNT_DOWN_TWO()) {
+                    // 倒计时处理逻辑
+                }
+            }
+        };
+    }
+
+    public void onUserInteraction() {
+        LogUtils.i("=========弹框触发了");
+        lint.onTimerReply();
+        mCounter = 0;
+        mCountDownHandler.removeMessages(Constants.INSTANCE.getWHAT_COUNT_DOWN_TWO());
+        mCountDownHandler.sendEmptyMessageDelayed(Constants.INSTANCE.getWHAT_COUNT_DOWN_TWO(), 5000);
+    }
+}

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

@@ -1,254 +0,0 @@
-package xn.hxp.weidith
-
-import android.app.Activity
-import android.app.Dialog
-import android.content.Context
-import android.content.IntentFilter
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.hardware.usb.UsbManager
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.os.Message
-import android.util.Log
-import android.view.*
-import android.widget.*
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.blankj.utilcode.util.ActivityUtils
-import com.blankj.utilcode.util.LogUtils
-import xn.hxp.R
-import xn.hxp.comm.Constants
-import xn.hxp.receiver.OnSerialScanListener
-import xn.hxp.receiver.PortScanHelper
-import xn.hxp.receiver.UsbReceiver
-import xn.hxp.ui.adapter.UsageLabelDialogAdapter
-import xn.hxp.utils.BigDecimalUtils
-import com.rc.httpcore.bean.ChemistryBean
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-
-
-//领用-请扫描化学品标签
-class UsageLabelDialog(
-    private val ac: Activity,
-    private var isLcok: Boolean,
-    private var cabinet: String,
-    private val lint: IIneSwipeLin
-) : Dialog(ac) {
-
-    private var mUsbReceiver: UsbReceiver? = null  // 刷卡广播注册
-    private var mHandleScanEvent = false //当前是否已经获取过 usb返回的参数
-    private val mAdapter by lazy { UsageLabelDialogAdapter(ac) }
-    private var mCounter = 0
-    private var butClos: Button? = null
-
-    lateinit var mPortScanHelper: PortScanHelper
-
-    override fun onStart() {
-        super.onStart()
-        EventBus.getDefault().register(this)
-    }
-
-
-    override fun onStop() {
-        super.onStop()
-        ac.unregisterReceiver(mUsbReceiver)
-        EventBus.getDefault().unregister(this)
-    }
-
-    init {
-        setContentView(R.layout.usage_label_dialog)
-        // 设置点击外部空白处不关闭对话框
-        setCanceledOnTouchOutside(false)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (isLcok) {
-            findViewById<Button>(R.id.butOpen).visibility = View.VISIBLE
-        } else {
-            findViewById<Button>(R.id.butOpen).visibility = View.GONE
-        }
-
-        findViewById<TextView>(R.id.cabinet).text = "$cabinet"
-        findViewById<Button>(R.id.butClos).setOnClickListener {
-            dismiss()
-        }
-
-        findViewById<Button>(R.id.cloe).setOnClickListener {
-            lint.onCloses()
-            dismiss()
-        }
-
-        //领用信息
-        findViewById<Button>(R.id.useEn).setOnClickListener {
-            if (mAdapter.data != null && mAdapter.data.size > 0) {
-                val hasDuplicateCodes = hasDuplicateCodes(mAdapter.data)
-                LogUtils.i("========hasDuplicateCodes  $hasDuplicateCodes")
-                if (!hasDuplicateCodes) {
-                    lint.onUseClick(mAdapter.data)
-                    dismiss()
-                } else {
-                    LogUtils.i("===========2")
-                    Toast.makeText(ActivityUtils.getTopActivity(), "不能重复领用", Toast.LENGTH_SHORT).show()
-                }
-
-            }
-        }
-
-        findViewById<Button>(R.id.butOpen).setOnClickListener {
-            dismiss()
-            lint.openLock()
-        }
-        val findViewById = findViewById<RecyclerView>(R.id.reView)
-        findViewById.layoutManager = LinearLayoutManager(ac)
-        findViewById.adapter = mAdapter
-        mPortScanHelper = PortScanHelper(ac, object : OnSerialScanListener {
-            override fun dispatchScanEvent(type: OnSerialScanListener.ScanType, content: String) {
-                lint.onTimerReply()
-                mCounter = 0
-                if (!mHandleScanEvent) {
-                    if (content.isNotBlank()) {
-                        LogUtils.i("========a==当前usb返回参数$content")
-                        mHandleScanEvent = true
-//                        handleScanEvent(content)
-                        //所有通过查询二维码的参数 需要先判断  http开头的  然后进行截取
-                        if (content.startsWith("http")) {
-                            try {
-                                val currentDateTimeString =
-                                    BigDecimalUtils.extractParameterValue(content, "code")
-                                LogUtils.i("=======ce  $currentDateTimeString")
-                                lint.onCardInContent(currentDateTimeString!!)
-                            } catch (e: Exception) {
-                                mHandleScanEvent = false
-                                LogUtils.i("刷卡异常了")
-                                showToast("未获取到二维码信息，请重新扫描", 3000)
-                            }
-                        } else {
-                            lint.onCardInContent(content)
-                        }
-                    }
-
-                }
-            }
-
-        })
-        registerUsbBroadcast()
-
-
-//        mCountDownHandler.removeMessages(Constants.WHAT_COUNT_DOWN_TWO)
-//        mCountDownHandler.sendEmptyMessage(Constants.WHAT_COUNT_DOWN_TWO)
-        mAdapter.setOnItemChildClickListener { adapter, view, position ->
-            // 在这里处理子View的点击事件
-            when (view.id) {
-                R.id.imgDelete -> {
-//                    mAdapter.data.removeAt(position)
-//                    mAdapter.notifyItemRemoved(position)
-                    lint.onPositions(position, mAdapter)
-                }
-            }
-        }
-    }
-
-    private fun hasDuplicateCodes(list: List<ChemistryBean>): Boolean {
-        val distinctCodes = list.map { it.code }.distinct()
-        return distinctCodes.size != list.size
-    }
-
-    interface IIneSwipeLin {
-        fun onCardInContent(cont: String)//刷卡返回
-        fun onUseClick(data: MutableList<ChemistryBean>)//点击领用
-        fun onCloses() //关闭清空数据
-        fun openLock()//再次开门
-        fun onPositions(position: Int, mData: UsageLabelDialogAdapter)//下标删除
-        fun onTimerReply()//重置最外层弹框信息
-    }
-
-
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        if (event.keyCode == KeyEvent.KEYCODE_BACK) {
-            // 在Dialog弹出时处理返回键事件
-            // 处理完事件后返回true表示事件已经被消费，不再传递
-            return true
-        }
-        mPortScanHelper.dispatchKeyEvent(event)
-        return super.dispatchKeyEvent(event)
-    }
-
-
-    //必须写这个方法  防止注册失败
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onUpdateEventEvent(event: KeyEvent) {
-
-    }
-
-
-    private fun showToast(message: String, duration: Int) {
-        Toast.makeText(ActivityUtils.getTopActivity(), message, duration).show()
-    }
-
-    //刷卡usb链接
-    private fun registerUsbBroadcast() {
-        if (null == mUsbReceiver) {
-            val filter = IntentFilter().apply {
-                addAction(UsbReceiver.ACTION_USB_PERMISSION)
-                addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
-                addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
-                addAction(UsbReceiver.ACTION_USB_STATE) // usb连接状态广播
-            }
-            mUsbReceiver = UsbReceiver()
-            ac.registerReceiver(mUsbReceiver, filter)
-        }
-    }
-
-    fun setMessage(message: String, dataList: List<ChemistryBean>) {
-        LogUtils.i("====================数据过来了")
-        mHandleScanEvent = false
-        findViewById<ImageView>(R.id.img).visibility = View.GONE
-        findViewById<Button>(R.id.butClos).visibility = View.GONE
-        findViewById<LinearLayout>(R.id.linTow).visibility = View.VISIBLE
-        findViewById<RecyclerView>(R.id.reView).visibility = View.VISIBLE     // 在这里可以设置接收到的消息参数
-        mAdapter.setNewInstance(dataList.toMutableList())
-
-    }
-
-    fun notifyData(mChemistryBean: MutableList<ChemistryBean>) {
-        mHandleScanEvent = false
-        mAdapter.data = mChemistryBean
-        mAdapter.notifyDataSetChanged()
-    }
-
-    fun notifyData() {
-        mHandleScanEvent = false
-    }
-
-    override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-        // 在触摸事件发生时被调用
-        when (ev.action) {
-            MotionEvent.ACTION_DOWN -> {
-                // 用户按下屏幕时的处理逻辑
-                onUserInteraction()
-            }
-
-            MotionEvent.ACTION_MOVE -> {
-                // 用户在屏幕上移动手指时的处理逻辑
-            }
-
-            MotionEvent.ACTION_UP -> {
-                // 用户抬起手指时的处理逻辑
-            }
-        }
-        return super.dispatchTouchEvent(ev)
-    }
-
-    fun onUserInteraction() {
-        // 在用户与对话框交互时的逻辑处理
-        LogUtils.i("=========弹框触发了")
-        lint.onTimerReply()
-        mCounter = 0
-    }
-}

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

@@ -21,14 +21,14 @@
             android:layout_marginLeft="20dp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/image"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="实验室名称-房间号"
             android:textColor="@color/white"
             android:textSize="22sp" />
@@ -41,26 +41,26 @@
             android:layout_marginTop="2dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="化学品智能管理"
                 android:textColor="@color/white"
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:textColor="@color/white" />
 
         </LinearLayout>
@@ -83,8 +83,6 @@
                 android:layout_marginRight="6dp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -92,6 +90,8 @@
                 android:layout_marginLeft="6dp"
                 android:layout_marginRight="6dp"
                 android:layout_toRightOf="@+id/imageName"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="李XX"
                 android:textColor="@color/white" />
 
@@ -106,14 +106,14 @@
                 android:background="@mipmap/cshrk_dl_tc" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvOutLogin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="10dp"
                 android:layout_toRightOf="@+id/imgOut"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="退出"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
@@ -131,13 +131,13 @@
         android:orientation="vertical">
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/tvCount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
             android:layout_marginTop="20dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="待归还清单"
             android:textColor="@color/black"
             android:textSize="16sp" />
@@ -147,205 +147,215 @@
             android:layout_height="35dp"
             android:layout_marginLeft="24dp"
             android:layout_marginTop="8dp"
-            android:paddingLeft="13dp"
             android:background="@drawable/bg_bei_ji"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingLeft="13dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="名称"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="编码"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="存储位置"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="领用时间"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="领用人"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="领用量"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="双人认证"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="领用时效"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="状态"
                 android:textColor="@color/black" />
         </LinearLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvView"
-            android:paddingLeft="13dp"
-            android:layout_width="match_parent"
-            android:layout_height="240dp"
-            android:layout_marginLeft="24dp"
-            tools:listitem="@layout/item_checklists" />
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:layout_marginTop="28dp">
+            android:layout_height="match_parent">
 
-            <LinearLayout
-                android:id="@+id/rvPage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:orientation="horizontal">
-
-                <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                    android:id="@+id/one"
-                    android:layout_width="30dp"
-                    android:layout_height="25dp"
-                    android:background="@drawable/bg_sou_suo_page"
-                    android:gravity="center"
-                    android:text="1"
-                    android:textSize="10sp"
-                    android:textColor="@color/white" />
-
-                <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                    android:id="@+id/two"
-                    android:layout_width="30dp"
-                    android:layout_height="25dp"
-                    android:layout_marginLeft="10dp"
-                    android:background="@drawable/bg_sou_suo_two_page"
-                    android:gravity="center"
-                    android:text="2"
-                    android:textSize="10sp"
-                    android:textColor="@color/black"
-                    android:visibility="gone" />
-
-                <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                    android:id="@+id/three"
-                    android:layout_width="30dp"
+            <RelativeLayout
+                android:id="@+id/kz"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginVertical="10dp"
+                android:layout_marginTop="28dp">
+
+                <LinearLayout
+                    android:id="@+id/rvPage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/one"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:background="@drawable/bg_sou_suo_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="1"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
+
+                    <TextView
+                        android:id="@+id/two"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="2"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/three"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="3"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/drop"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="..."
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/many"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="4"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/butUpper"
+                    android:layout_width="65dp"
                     android:layout_height="25dp"
-                    android:layout_marginLeft="10dp"
-                    android:background="@drawable/bg_sou_suo_two"
-                    android:gravity="center"
-                    android:text="3"
-                    android:textSize="10sp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toLeftOf="@+id/rvPage"
+                    android:background="@drawable/bg_up_page"
+                    android:text="上一页"
                     android:textColor="@color/black"
-                    android:visibility="gone" />
+                    android:textSize="10sp" />
 
-                <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                    android:id="@+id/drop"
-                    android:layout_width="30dp"
+                <Button
+                    android:id="@+id/butNext"
+                    android:layout_width="65dp"
                     android:layout_height="25dp"
-                    android:background="@drawable/bg_sou_suo_two"
-                    android:gravity="center"
+                    android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
-                    android:text="..."
-                    android:textSize="10sp"
-                    android:textColor="@color/black"
-                    android:visibility="gone" />
-
-                <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                    android:id="@+id/many"
-                    android:layout_width="30dp"
-                    android:layout_height="25dp"
-                    android:layout_marginLeft="10dp"
-                    android:background="@drawable/bg_sou_suo_two"
-                    android:gravity="center"
-                    android:text="4"
-                    android:textSize="10sp"
-                    android:textColor="@color/black"
-                    android:visibility="gone" />
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/butUpper"
-                android:layout_width="65dp"
-                android:layout_height="25dp"
-                android:textSize="10sp"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="10dp"
-                android:layout_toLeftOf="@+id/rvPage"
-                android:background="@drawable/bg_up_page"
-                android:text="上一页"
-                android:textColor="@color/black" />
+                    android:layout_toRightOf="@+id/rvPage"
+                    android:background="@drawable/bg_sou_suo_page"
+                    android:text="下一页"
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
+            </RelativeLayout>
 
-            <Button
-                android:id="@+id/butNext"
-                android:layout_width="65dp"
-                android:layout_height="25dp"
-                android:textSize="10sp"
-                android:layout_marginLeft="10dp"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/rvPage"
-                android:background="@drawable/bg_sou_suo_page"
-                android:text="下一页"
-                android:textColor="@color/white" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@id/kz"
+                android:layout_marginLeft="24dp"
+                android:paddingLeft="13dp"
+                tools:listitem="@layout/item_checklists" />
         </RelativeLayout>
 
     </LinearLayout>
@@ -358,9 +368,9 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="20dp"
         android:background="@drawable/bg_retrun"
-        android:textSize="12sp"
         android:text="返回180s"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        android:textSize="12sp" />
 
     <Button
         android:id="@+id/butReturn"
@@ -370,7 +380,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="20dp"
         android:background="@drawable/bg_retrun_two"
-        android:textSize="12sp"
         android:text="去归还"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        android:textSize="12sp" />
 </RelativeLayout>

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

@@ -21,14 +21,14 @@
             android:layout_marginLeft="20dp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/image"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="实验室名称-房间号"
             android:textColor="@color/white"
             android:textSize="22sp" />
@@ -41,26 +41,26 @@
             android:layout_marginTop="2dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="化学品智能管理"
                 android:textColor="@color/white"
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:textColor="@color/white" />
 
         </LinearLayout>
@@ -83,8 +83,6 @@
                 android:layout_marginRight="6dp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -92,6 +90,8 @@
                 android:layout_marginLeft="6dp"
                 android:layout_marginRight="6dp"
                 android:layout_toRightOf="@+id/imageName"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="李XX"
                 android:textColor="@color/white" />
 
@@ -106,14 +106,14 @@
                 android:background="@mipmap/cshrk_dl_tc" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvOutLogin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="10dp"
                 android:layout_toRightOf="@+id/imgOut"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="退出"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
@@ -136,13 +136,122 @@
             android:layout_height="match_parent"
             android:layout_weight="0.32">
 
+            <RelativeLayout
+                android:id="@+id/kz"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="19dp">
+
+                <LinearLayout
+                    android:id="@+id/rvPage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/one"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:background="@drawable/bg_sou_suo_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="1"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
+
+                    <TextView
+                        android:id="@+id/two"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="2"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/three"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="3"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/drop"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="..."
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/many"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="4"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/butUpper"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toLeftOf="@+id/rvPage"
+                    android:background="@drawable/bg_up_page"
+                    android:text="上一页"
+                    android:textColor="@color/black"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/butNext"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/rvPage"
+                    android:background="@drawable/bg_sou_suo_page"
+                    android:text="下一页"
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_above="@id/kz"
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="22dp"
                 android:layout_marginRight="16dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="0.32"
                 android:orientation="vertical">
 
@@ -153,12 +262,12 @@
                     android:orientation="horizontal">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginRight="22dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="化学品标签"
                         android:textColor="@color/black"
                         android:textSize="16sp" />
@@ -200,13 +309,13 @@
                             android:visibility="visible">
 
                             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                                 android:id="@+id/cabinetName"
                                 android:layout_width="match_parent"
                                 android:layout_height="30dp"
                                 android:background="@drawable/bg_shu_ru_kuang_twoe"
+                                android:ellipsize="end"
                                 android:gravity="center"
+                                android:maxLines="1"
                                 android:paddingRight="12dp"
                                 android:text="化学品柜"
                                 android:textColor="@color/black"
@@ -235,28 +344,28 @@
                             android:textSize="12sp" />
 
                         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                             android:id="@+id/reSou"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
                             android:layout_marginLeft="6dp"
                             android:layout_marginRight="6dp"
                             android:background="@drawable/bgm_cha_xun"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:text="查询"
                             android:textColor="@color/white"
                             android:textSize="12sp" />
 
 
                         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                             android:id="@+id/resetting"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
                             android:background="@drawable/bgm_cha_cun_two"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:text="重置"
                             android:textColor="@color/purple_FF666666"
                             android:textSize="12sp" />
@@ -271,57 +380,57 @@
                     android:gravity="center">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="名称"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="编码"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="RFID编号"
                         android:textColor="@color/black"
                         android:textSize="12sp"
                         android:visibility="gone" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="规格"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="归属人"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
@@ -331,116 +440,10 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvInventory"
                     android:layout_width="match_parent"
-                    android:layout_height="250dp"
+                    android:layout_height="match_parent"
                     tools:listitem="@layout/item_chemical_labeling" />
             </LinearLayout>
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="19dp">
-
-                <LinearLayout
-                    android:id="@+id/rvPage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/one"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:background="@drawable/bg_sou_suo_page"
-                        android:gravity="center"
-                        android:text="1"
-                        android:textColor="@color/white"
-                        android:textSize="10sp" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/two"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two_page"
-                        android:gravity="center"
-                        android:text="2"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/three"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="3"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/drop"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="..."
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/many"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="4"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/butUpper"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_toLeftOf="@+id/rvPage"
-                    android:background="@drawable/bg_up_page"
-                    android:text="上一页"
-                    android:textColor="@color/black"
-                    android:textSize="10sp" />
-
-                <Button
-                    android:id="@+id/butNext"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="10dp"
-                    android:layout_toRightOf="@+id/rvPage"
-                    android:background="@drawable/bg_sou_suo_page"
-                    android:text="下一页"
-                    android:textColor="@color/white"
-                    android:textSize="10sp" />
-            </RelativeLayout>
 
         </RelativeLayout>
 
@@ -471,21 +474,21 @@
                     android:background="@mipmap/cshrk_img_zwsj" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="暂无数据"
                     android:textColor="@color/purple_ff999999"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="请点选左侧化学品，补打或更换标签"
                     android:textColor="@color/purple_ff999999"
                     android:textSize="12sp" />
@@ -509,12 +512,12 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalName"
                     android:layout_width="300px"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="化学品名称化学品名称"
                     android:textColor="@color/black"
                     android:textSize="15sp" />
@@ -529,8 +532,6 @@
                     android:background="@mipmap/icon_sy_zq" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalCategoryName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -538,7 +539,9 @@
                     android:layout_marginRight="20dp"
                     android:layout_toLeftOf="@+id/imgA"
                     android:background="@drawable/bg_guan_zhi"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="10dp"
                     android:paddingTop="3dp"
                     android:paddingRight="10dp"
@@ -547,8 +550,6 @@
                     android:textSize="10sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalLevelName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -556,7 +557,9 @@
                     android:layout_marginRight="6dp"
                     android:layout_toLeftOf="@+id/chemicalCategoryName"
                     android:background="@drawable/bg_guan_zhi"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="10dp"
                     android:paddingTop="3dp"
                     android:paddingRight="10dp"
@@ -570,33 +573,31 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tagCode"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/replaceLabel"
                     android:layout_width="60dp"
                     android:layout_height="20dp"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/bg_bu_da_biao_qian"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:text="更换RFID"
                     android:textColor="@color/purple_0072dd"
                     android:textSize="12sp"
                     android:visibility="invisible" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/reLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -604,7 +605,9 @@
                     android:layout_marginRight="8dp"
                     android:layout_toLeftOf="@+id/replaceLabel"
                     android:background="@drawable/bg_bu_da_biao_qian"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:text="补打标签"
@@ -624,22 +627,22 @@
                 android:layout_marginTop="14dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="规格："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/spec"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -649,22 +652,22 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="归属人："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/belongName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -674,22 +677,22 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="库存量："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/surplus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -699,24 +702,24 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tv1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="过期时间："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/expireTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_toRightOf="@+id/tv1"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
@@ -728,24 +731,24 @@
                 android:orientation="horizontal">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="存储位置："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/cabinet"
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="4dp"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>

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

@@ -21,14 +21,14 @@
             android:layout_marginLeft="20dp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/image"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="实验室名称-房间号"
             android:textColor="@color/white"
             android:textSize="22sp" />
@@ -41,26 +41,26 @@
             android:layout_marginTop="2dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="化学品智能管理"
                 android:textColor="@color/white"
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:textColor="@color/white" />
 
         </LinearLayout>
@@ -83,8 +83,6 @@
                 android:layout_marginRight="6dp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -92,6 +90,8 @@
                 android:layout_marginLeft="6dp"
                 android:layout_marginRight="6dp"
                 android:layout_toRightOf="@+id/imageName"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="李XX"
                 android:textColor="@color/white" />
 
@@ -106,14 +106,14 @@
                 android:background="@mipmap/cshrk_dl_tc" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvOutLogin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="10dp"
                 android:layout_toRightOf="@+id/imgOut"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="退出"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
@@ -137,11 +137,121 @@
             android:layout_height="match_parent"
             android:layout_weight="0.32">
 
+            <RelativeLayout
+                android:id="@+id/kz"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="19dp">
+
+                <LinearLayout
+                    android:id="@+id/rvPage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/one"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:background="@drawable/bg_sou_suo_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="1"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
+
+                    <TextView
+                        android:id="@+id/two"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="2"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/three"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="3"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/drop"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="..."
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/many"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="4"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/butUpper"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toLeftOf="@+id/rvPage"
+                    android:background="@drawable/bg_up_page"
+                    android:text="上一页"
+                    android:textColor="@color/black"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/butNext"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/rvPage"
+                    android:background="@drawable/bg_sou_suo_page"
+                    android:text="下一页"
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
+            </RelativeLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_above="@id/kz"
                 android:layout_marginTop="22dp"
                 android:layout_marginRight="16dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="0.32"
                 android:orientation="vertical">
 
@@ -150,11 +260,11 @@
                     android:layout_height="wrap_content">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="待归还清单"
                         android:textColor="@color/black"
                         android:textSize="15sp" />
@@ -175,13 +285,13 @@
                             android:background="@drawable/bg_shu_ru_kuang_twoe">
 
                             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                                 android:id="@+id/cabinetName"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_centerVertical="true"
                                 android:layout_marginLeft="10dp"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="化学品柜"
                                 android:textColor="@color/black"
                                 android:textSize="12sp" />
@@ -209,27 +319,27 @@
                             android:textSize="12sp" />
 
                         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                             android:id="@+id/reQuy"
                             android:layout_width="35dp"
                             android:layout_height="30dp"
                             android:layout_marginRight="2dp"
                             android:background="@drawable/bgm_cha_xun"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:text="查询"
                             android:textColor="@color/white"
                             android:textSize="12sp" />
 
 
                         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                             android:id="@+id/resetting"
                             android:layout_width="35dp"
                             android:layout_height="30dp"
                             android:background="@drawable/bgm_cha_cun_two"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:text="重置"
                             android:textColor="@color/purple_FF666666"
                             android:textSize="12sp" />
@@ -245,52 +355,52 @@
                     android:gravity="center_vertical">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="名称"
                         android:textColor="@color/black" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="编码"
                         android:textColor="@color/black" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="规格"
                         android:textColor="@color/black" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="归属人"
                         android:textColor="@color/black" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="领用人"
                         android:textColor="@color/black" />
                 </LinearLayout>
@@ -298,116 +408,9 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvUse"
                     android:layout_width="match_parent"
-                    android:layout_height="216dp" />
+                    android:layout_height="match_parent" />
             </LinearLayout>
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="19dp">
-
-                <LinearLayout
-                    android:id="@+id/rvPage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/one"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:background="@drawable/bg_sou_suo_page"
-                        android:gravity="center"
-                        android:text="1"
-                        android:textColor="@color/white"
-                        android:textSize="10sp" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/two"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two_page"
-                        android:gravity="center"
-                        android:text="2"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/three"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="3"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/drop"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="..."
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/many"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="4"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/butUpper"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_toLeftOf="@+id/rvPage"
-                    android:background="@drawable/bg_up_page"
-                    android:text="上一页"
-                    android:textColor="@color/black"
-                    android:textSize="10sp" />
-
-                <Button
-                    android:id="@+id/butNext"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="10dp"
-                    android:layout_toRightOf="@+id/rvPage"
-                    android:background="@drawable/bg_sou_suo_page"
-                    android:text="下一页"
-                    android:textColor="@color/white"
-                    android:textSize="10sp" />
-            </RelativeLayout>
-
 
         </RelativeLayout>
 
@@ -439,11 +442,11 @@
                     android:background="@mipmap/img_gh_smsb" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="11dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="请将化学品标签对准扫描区域识别"
                     android:textColor="@color/black"
                     android:textSize="10sp" />
@@ -467,12 +470,12 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalName"
                     android:layout_width="180px"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
 
                     android:text="化学品名称化学品名称"
                     android:textColor="@color/black"
@@ -487,8 +490,6 @@
                     android:background="@mipmap/icon_sy_zq" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalCategoryName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -496,7 +497,9 @@
                     android:layout_marginRight="30dp"
                     android:layout_toLeftOf="@+id/imgA"
                     android:background="@drawable/bg_guan_zhi"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:text="易制毒"
@@ -504,8 +507,6 @@
                     android:textSize="10sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalLevelName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -513,7 +514,9 @@
                     android:layout_marginRight="6dp"
                     android:layout_toLeftOf="@+id/chemicalCategoryName"
                     android:background="@drawable/bg_guan_zhi"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:text="管制类"
@@ -526,19 +529,17 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tagCode"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="编码952795279527"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/replaceLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -546,7 +547,9 @@
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
                     android:background="@drawable/bg_bu_da_biao_qian"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
                     android:text="更换RFID"
@@ -555,8 +558,6 @@
                     android:visibility="invisible" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/reLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -564,7 +565,9 @@
                     android:layout_marginRight="8dp"
                     android:layout_toLeftOf="@+id/replaceLabel"
                     android:background="@drawable/bg_bu_da_biao_qian"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
                     android:text="补打标签"
@@ -584,22 +587,22 @@
                 android:layout_marginTop="8dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="规格："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/spec"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="500ml/瓶"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -610,22 +613,22 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="归属人："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/belongName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="李明明"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -636,22 +639,22 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="领用量："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/collectStockNum"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -661,22 +664,22 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="领用人："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/createByName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -686,37 +689,37 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tv1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="领用时间："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/collectTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_toRightOf="@+id/tv1"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="2023/11/23  11:23 |"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/surplusTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="6dp"
                     android:layout_toRightOf="@+id/collectTime"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/purple_54A2EA"
                     android:textSize="12sp" />
             </RelativeLayout>
@@ -727,11 +730,11 @@
                 android:orientation="horizontal">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="存储位置："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -746,14 +749,14 @@
                     android:background="@drawable/bg_shu_ru_kuang_twoe">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:id="@+id/cabinet"
                         android:layout_width="match_parent"
                         android:layout_height="30dp"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
+                        android:ellipsize="end"
                         android:gravity="center_vertical"
+                        android:maxLines="1"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
 

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

@@ -21,14 +21,14 @@
             android:layout_marginLeft="20dp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/image"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="实验室名称-房间号"
             android:textColor="@color/white"
             android:textSize="22sp" />
@@ -41,26 +41,26 @@
             android:layout_marginTop="2dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="化学品智能管理"
                 android:textColor="@color/white"
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
+                android:ellipsize="end"
+                android:maxLines="1"
 
                 android:textColor="@color/white" />
 
@@ -84,8 +84,6 @@
                 android:layout_marginRight="6dp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -93,6 +91,8 @@
                 android:layout_marginLeft="6dp"
                 android:layout_marginRight="6dp"
                 android:layout_toRightOf="@+id/imageName"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="李XX"
                 android:textColor="@color/white" />
 
@@ -107,14 +107,14 @@
                 android:background="@mipmap/cshrk_dl_tc" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvOutLogin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="10dp"
                 android:layout_toRightOf="@+id/imgOut"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="退出"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
@@ -137,13 +137,122 @@
             android:layout_height="match_parent"
             android:layout_weight="0.32">
 
+            <RelativeLayout
+                android:id="@+id/kz"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="19dp">
+
+                <LinearLayout
+                    android:id="@+id/rvPage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/one"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:background="@drawable/bg_sou_suo_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="1"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
+
+                    <TextView
+                        android:id="@+id/two"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="2"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/three"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="3"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/drop"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="..."
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/many"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="4"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/butUpper"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toLeftOf="@+id/rvPage"
+                    android:background="@drawable/bg_up_page"
+                    android:text="上一页"
+                    android:textColor="@color/black"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/butNext"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/rvPage"
+                    android:background="@drawable/bg_sou_suo_page"
+                    android:text="下一页"
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_above="@id/kz"
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="22dp"
                 android:layout_marginRight="16dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="0.32"
                 android:orientation="vertical">
 
@@ -152,11 +261,11 @@
                     android:layout_height="wrap_content">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="可用化学品"
                         android:textColor="@color/black"
                         android:textSize="15sp" />
@@ -204,13 +313,13 @@
                         android:background="@drawable/bg_shu_ru_kuang_twoe">
 
                         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                             android:id="@+id/cabinetName"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
                             android:layout_marginLeft="6dp"
+                            android:ellipsize="end"
+                            android:maxLines="1"
                             android:text="化学品柜"
                             android:textColor="@color/black"
                             android:textSize="12sp" />
@@ -233,56 +342,56 @@
                     android:gravity="center_vertical">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="名称"
                         android:textColor="@color/black"
                         android:textSize="16sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="纯度"
                         android:textColor="@color/black"
                         android:textSize="16sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="可用量"
                         android:textColor="@color/black"
                         android:textSize="16sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="数量"
                         android:textColor="@color/black"
                         android:textSize="16sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="储存位置"
                         android:textColor="@color/black"
                         android:textSize="16sp" />
@@ -291,116 +400,9 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvUse"
                     android:layout_width="match_parent"
-                    android:layout_height="206dp" />
+                    android:layout_height="match_parent" />
             </LinearLayout>
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="19dp">
-
-                <LinearLayout
-                    android:id="@+id/rvPage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/one"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:background="@drawable/bg_sou_suo_page"
-                        android:gravity="center"
-                        android:text="1"
-                        android:textColor="@color/white"
-                        android:textSize="10sp" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/two"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two_page"
-                        android:gravity="center"
-                        android:text="2"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/three"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="3"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/drop"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="..."
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/many"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="4"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/butUpper"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_toLeftOf="@+id/rvPage"
-                    android:background="@drawable/bg_up_page"
-                    android:text="上一页"
-                    android:textColor="@color/black"
-                    android:textSize="10sp" />
-
-                <Button
-                    android:id="@+id/butNext"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_centerVertical="true"
-                    android:layout_toRightOf="@+id/rvPage"
-                    android:background="@drawable/bg_sou_suo_page"
-                    android:text="下一页"
-                    android:textColor="@color/white"
-                    android:textSize="10sp" />
-            </RelativeLayout>
-
         </RelativeLayout>
 
         <View
@@ -418,10 +420,10 @@
             android:paddingRight="20dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="选择要打开的柜门"
                 android:textColor="@color/black"
                 android:textSize="15sp" />
@@ -435,23 +437,23 @@
                 android:orientation="horizontal">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="157dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:text="化学品柜"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="147dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:text="柜门"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -492,15 +494,15 @@
 
 
     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="20dp"
         android:background="@drawable/bg_retrun"
+        android:ellipsize="end"
         android:gravity="center"
+        android:maxLines="1"
         android:text="返回180s"
         android:textColor="@color/white"
         android:textSize="12sp" />

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

@@ -21,14 +21,14 @@
             android:layout_marginLeft="20dp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/image"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="实验室名称-房间号"
             android:textColor="@color/white"
             android:textSize="22sp" />
@@ -41,26 +41,26 @@
             android:layout_marginTop="2dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="化学品智能管理"
                 android:textColor="@color/white"
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:textColor="@color/white" />
 
         </LinearLayout>
@@ -83,8 +83,6 @@
                 android:layout_marginRight="6dp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -92,6 +90,8 @@
                 android:layout_marginLeft="6dp"
                 android:layout_marginRight="6dp"
                 android:layout_toRightOf="@+id/imageName"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="李XX"
                 android:textColor="@color/white" />
 
@@ -106,14 +106,14 @@
                 android:background="@mipmap/cshrk_dl_tc" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/tvOutLogin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="10dp"
                 android:layout_toRightOf="@+id/imgOut"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="退出"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
@@ -137,11 +137,119 @@
             android:layout_height="match_parent"
             android:layout_weight="0.32">
 
+
+            <RelativeLayout
+                android:id="@+id/kz"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="19dp">
+
+                <LinearLayout
+                    android:id="@+id/rvPage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/one"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:background="@drawable/bg_sou_suo_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="1"
+                        android:textColor="@color/white" />
+
+                    <TextView
+                        android:id="@+id/two"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two_page"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="2"
+                        android:textColor="@color/black"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/three"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="3"
+                        android:textColor="@color/black"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/drop"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="..."
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/many"
+                        android:layout_width="30dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="@drawable/bg_sou_suo_two"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:text="4"
+                        android:textColor="@color/black"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/butUpper"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toLeftOf="@+id/rvPage"
+                    android:background="@drawable/bg_up_page"
+                    android:text="上一页"
+                    android:textColor="@color/black"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/butNext"
+                    android:layout_width="65dp"
+                    android:layout_height="25dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/rvPage"
+                    android:background="@drawable/bg_sou_suo_page"
+                    android:text="下一页"
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
+            </RelativeLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_above="@id/kz"
                 android:layout_marginTop="22dp"
                 android:layout_marginRight="16dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="0.32"
                 android:orientation="vertical">
 
@@ -150,11 +258,11 @@
                     android:layout_height="40dp">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="查询化学品"
                         android:textColor="@color/black"
                         android:textSize="15sp" />
@@ -173,13 +281,13 @@
                             android:layout_marginRight="6dp">
 
                             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                                 android:id="@+id/cabinetName"
                                 android:layout_width="match_parent"
                                 android:layout_height="30dp"
                                 android:background="@drawable/bg_shu_ru_kuang"
+                                android:ellipsize="end"
                                 android:gravity="center"
+                                android:maxLines="1"
                                 android:paddingRight="12dp"
                                 android:text="化学品柜"
                                 android:textColor="@color/black" />
@@ -207,28 +315,28 @@
                             android:textSize="12sp" />
 
                         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                             android:id="@+id/reQuy"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
                             android:layout_marginLeft="6dp"
                             android:layout_marginRight="6dp"
                             android:background="@drawable/bgm_cha_xun"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:text="查询"
                             android:textColor="@color/white"
                             android:textSize="12sp" />
 
 
                         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                             android:id="@+id/resetting"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
                             android:background="@drawable/bgm_cha_cun_two"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:text="重置"
                             android:textColor="@color/purple_FF666666"
                             android:textSize="12sp" />
@@ -243,56 +351,56 @@
                     android:gravity="center_vertical">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="名称"
                         android:textColor="@color/black"
                         android:textSize="13sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="编码"
                         android:textColor="@color/black"
                         android:textSize="13sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="库存量"
                         android:textColor="@color/black"
                         android:textSize="13sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="归属人"
                         android:textColor="@color/black"
                         android:textSize="13sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="center"
+                        android:maxLines="1"
                         android:text="过期时间"
                         android:textColor="@color/black"
                         android:textSize="13sp" />
@@ -301,112 +409,9 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvView"
                     android:layout_width="match_parent"
-                    android:layout_height="230dp" />
+                    android:layout_height="match_parent" />
             </LinearLayout>
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="19dp">
-
-                <LinearLayout
-                    android:id="@+id/rvPage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:orientation="horizontal">
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/one"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:background="@drawable/bg_sou_suo_page"
-                        android:gravity="center"
-                        android:text="1"
-                        android:textColor="@color/white" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/two"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two_page"
-                        android:gravity="center"
-                        android:text="2"
-                        android:textColor="@color/black"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/three"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="3"
-                        android:textColor="@color/black"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/drop"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="..."
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                        android:id="@+id/many"
-                        android:layout_width="30dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="@drawable/bg_sou_suo_two"
-                        android:gravity="center"
-                        android:text="4"
-                        android:textColor="@color/black"
-                        android:textSize="10sp"
-                        android:visibility="gone" />
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/butUpper"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_toLeftOf="@+id/rvPage"
-                    android:background="@drawable/bg_up_page"
-                    android:text="上一页"
-                    android:textColor="@color/black"
-                    android:textSize="10sp" />
-
-                <Button
-                    android:id="@+id/butNext"
-                    android:layout_width="65dp"
-                    android:layout_height="25dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="10dp"
-                    android:layout_toRightOf="@+id/rvPage"
-                    android:background="@drawable/bg_sou_suo_page"
-                    android:text="下一页"
-                    android:textColor="@color/white"
-                    android:textSize="10sp" />
-            </RelativeLayout>
 
         </RelativeLayout>
 
@@ -437,21 +442,21 @@
                     android:background="@mipmap/img_gh_smsb" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="11dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="请将化学品标签对准扫描区域识别"
                     android:textColor="@color/black"
                     android:textSize="10sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="11dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="或点选左侧化学品"
                     android:textColor="@color/black"
                     android:textSize="10sp" />
@@ -476,13 +481,13 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalName"
                     android:layout_width="300px"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="15sp" />
 
@@ -496,8 +501,6 @@
                     android:background="@mipmap/icon_sy_zq" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalCategoryName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -505,7 +508,9 @@
                     android:layout_marginRight="20dp"
                     android:layout_toLeftOf="@+id/imgA"
                     android:background="@drawable/bg_guan_zhi"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="10dp"
                     android:paddingTop="3dp"
                     android:paddingRight="10dp"
@@ -514,8 +519,6 @@
                     android:textSize="10sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalLevelName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -523,7 +526,9 @@
                     android:layout_marginRight="6dp"
                     android:layout_toLeftOf="@+id/chemicalCategoryName"
                     android:background="@drawable/bg_guan_zhi"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:paddingLeft="10dp"
                     android:paddingTop="3dp"
                     android:paddingRight="10dp"
@@ -537,12 +542,12 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tagCode"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
@@ -560,22 +565,22 @@
                 android:layout_marginTop="8dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="规格："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/spec"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -585,22 +590,22 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="库存量："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/surplus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -611,22 +616,22 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="归属人："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/belongName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -637,36 +642,36 @@
                 android:layout_height="34dp">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tv1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="过期时间："
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/expireTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_toRightOf="@+id/tv1"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tvNoName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="6dp"
                     android:layout_toRightOf="@+id/expireTime"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="已过期"
                     android:textColor="@color/purple_FF7919"
                     android:textSize="12sp"
@@ -679,25 +684,25 @@
                 android:orientation="horizontal">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="存储位置："
                     android:textColor="@color/black"
                     android:textSize="10sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/storage"
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="4dp"
                     android:background="@drawable/bg_shu_ru_kuang_twoe"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+                    android:maxLines="1"
                     android:paddingLeft="8dp"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -725,21 +730,21 @@
                 android:orientation="vertical">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="已废弃出库"
                     android:textColor="@color/purple_16BC3D"
                     android:textSize="20sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/surplusTow"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black" />
 
                 <RelativeLayout
@@ -756,13 +761,13 @@
                         android:background="@mipmap/icon_fe_qi" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="10dp"
                         android:layout_toRightOf="@+id/img4"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="请及时进行废弃物品回收"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
@@ -783,13 +788,13 @@
                         android:background="@mipmap/icon_sy_zq" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="10dp"
                         android:layout_toRightOf="@+id/img2"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="柜门已开，请取出废弃的化学品"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
@@ -798,14 +803,14 @@
             </LinearLayout>
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_centerInParent="true"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="20dp"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="如需继续操作，请扫描标签或点选左侧化学品"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
@@ -828,11 +833,11 @@
                 android:background="@mipmap/img_gh_smsb" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="11dp"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="请将化学品标签对准扫描区域识别"
                 android:textColor="@color/black"
                 android:textSize="10sp" />
@@ -851,13 +856,13 @@
                     android:background="@mipmap/icon_sy_zq" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="8dp"
                     android:layout_toRightOf="@+id/imgView"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="柜门已开，请取出废弃的化学品"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -878,26 +883,26 @@
                     android:background="@drawable/bg_shu_ru_kuang">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:id="@+id/cabinet"
                         android:layout_width="wrap_content"
                         android:layout_height="30dp"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
+                        android:ellipsize="end"
                         android:gravity="center_vertical"
+                        android:maxLines="1"
                         android:text="存储位置:一柜子-左一门"
                         android:textColor="@color/black"
                         android:textSize="10sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="10dp"
                         android:layout_toRightOf="@+id/cabinet"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="3号格"
                         android:textColor="@color/black"
                         android:textSize="10sp"

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

@@ -6,9 +6,119 @@
     android:background="@color/white"
     tools:context=".ui.fragments.QueryOneFragment">
 
+    <RelativeLayout
+        android:id="@+id/kz"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="19dp">
+
+        <LinearLayout
+            android:id="@+id/rvPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/one"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:background="@drawable/bg_sou_suo_page"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="1"
+                android:textColor="@color/white"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/two"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two_page"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="2"
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/three"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="3"
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/drop"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="..."
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/many"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="4"
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/butUpper"
+            android:layout_width="65dp"
+            android:layout_height="25dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:layout_toLeftOf="@+id/rvPage"
+            android:background="@drawable/bg_up_page"
+            android:text="上一页"
+            android:textColor="@color/black"
+            android:textSize="10sp" />
+
+        <Button
+            android:id="@+id/butNext"
+            android:layout_width="65dp"
+            android:layout_height="25dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@+id/rvPage"
+            android:background="@drawable/bg_sou_suo_page"
+            android:text="下一页"
+            android:textColor="@color/white"
+            android:textSize="10sp" />
+    </RelativeLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_above="@id/kz"
+        android:layout_marginBottom="10dp"
         android:orientation="vertical"
         android:paddingLeft="10dp"
         android:paddingTop="20dp">
@@ -28,13 +138,13 @@
                 android:background="@drawable/bg_shu_ru_kuang_twoe">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemType"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="7.5dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="类别"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
@@ -91,28 +201,28 @@
                 android:textSize="12sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/reQuy"
                 android:layout_width="45dp"
                 android:layout_height="30dp"
                 android:layout_marginLeft="6dp"
                 android:layout_marginRight="6dp"
                 android:background="@drawable/bgm_cha_xun"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="查询"
                 android:textColor="@color/white"
                 android:textSize="12sp" />
 
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/resetting"
                 android:layout_width="45dp"
                 android:layout_height="30dp"
                 android:background="@drawable/bgm_cha_cun_two"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="重置"
                 android:textColor="@color/purple_FF666666"
                 android:textSize="12sp" />
@@ -148,72 +258,72 @@
             android:gravity="center_vertical">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="名称"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="CAS码"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="类别"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="级别"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="纯度"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="库存量"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="数量"
                 android:textColor="@color/black" />
         </LinearLayout>
@@ -221,116 +331,9 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvUse"
             android:layout_width="match_parent"
-            android:layout_height="216dp"
+            android:layout_height="match_parent"
             android:layout_marginRight="16dp"
             tools:listitem="@layout/item_inquiry" />
     </LinearLayout>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="19dp">
-
-        <LinearLayout
-            android:id="@+id/rvPage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal">
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/one"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:background="@drawable/bg_sou_suo_page"
-                android:gravity="center"
-                android:text="1"
-                android:textColor="@color/white"
-                android:textSize="10sp" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/two"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two_page"
-                android:gravity="center"
-                android:text="2"
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/three"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two"
-                android:gravity="center"
-                android:text="3"
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/drop"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two"
-                android:gravity="center"
-                android:text="..."
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/many"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two"
-                android:gravity="center"
-                android:text="4"
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/butUpper"
-            android:layout_width="65dp"
-            android:layout_height="25dp"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
-            android:layout_toLeftOf="@+id/rvPage"
-            android:background="@drawable/bg_up_page"
-            android:text="上一页"
-            android:textColor="@color/black"
-            android:textSize="10sp" />
-
-        <Button
-            android:id="@+id/butNext"
-            android:layout_width="65dp"
-            android:layout_height="25dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@+id/rvPage"
-            android:background="@drawable/bg_sou_suo_page"
-            android:text="下一页"
-            android:textColor="@color/white"
-            android:textSize="10sp" />
-    </RelativeLayout>
-
 </RelativeLayout>

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

@@ -6,33 +6,140 @@
     android:background="@color/white"
     tools:context=".ui.fragments.QueryTwoFragment">
 
+    <RelativeLayout
+        android:id="@+id/kz"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="19dp">
+
+        <LinearLayout
+            android:id="@+id/rvPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/one"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:background="@drawable/bg_sou_suo_page"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="1"
+                android:textColor="@color/white"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/two"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two_page"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="2"
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/three"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="3"
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/drop"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="..."
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/many"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_sou_suo_two"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="4"
+                android:textColor="@color/black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/butUpper"
+            android:layout_width="65dp"
+            android:layout_height="25dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:layout_toLeftOf="@+id/rvPage"
+            android:background="@drawable/bg_up_page"
+            android:text="上一页"
+            android:textColor="@color/black"
+            android:textSize="10sp" />
+
+        <Button
+            android:id="@+id/butNext"
+            android:layout_width="65dp"
+            android:layout_height="25dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@+id/rvPage"
+            android:background="@drawable/bg_sou_suo_page"
+            android:text="下一页"
+            android:textColor="@color/white"
+            android:textSize="10sp" />
+    </RelativeLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_above="@id/kz"
+        android:layout_marginBottom="10dp"
         android:layout_weight="0.32"
         android:orientation="vertical"
         android:paddingLeft="20dp"
         android:paddingTop="20dp"
         android:paddingRight="23dp">
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="34dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/chemicalName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:textColor="@color/black"
                 android:textSize="15sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/chemicalLevelName"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
@@ -40,7 +147,9 @@
                 android:layout_marginRight="6dp"
                 android:layout_toLeftOf="@+id/imgA"
                 android:background="@drawable/bg_guan_zhi"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:paddingLeft="10dp"
                 android:paddingTop="3dp"
                 android:paddingRight="10dp"
@@ -49,15 +158,15 @@
                 android:textSize="10sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/chemicalCategoryName"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/produce"
                 android:background="@drawable/bg_guan_zhi"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:paddingLeft="10dp"
                 android:paddingTop="3dp"
                 android:paddingRight="10dp"
@@ -71,12 +180,12 @@
             android:layout_height="34dp">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:id="@+id/cont"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
 
@@ -92,12 +201,12 @@
                     android:background="@mipmap/icon_cx_zl" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/surplus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
@@ -108,13 +217,13 @@
                     android:background="@mipmap/icon_cz_jhl" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalNumber"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
@@ -136,62 +245,62 @@
             android:gravity="center_vertical">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="编码"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="规格"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="库存量"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="归属人"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="存储位置"
                 android:textColor="@color/black" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="状态"
                 android:textColor="@color/black" />
 
@@ -200,115 +309,9 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvUse"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="match_parent"
             android:layout_marginTop="10dp"
             tools:listitem="@layout/item_ues_details" />
     </LinearLayout>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="19dp">
-
-        <LinearLayout
-            android:id="@+id/rvPage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal">
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/one"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:background="@drawable/bg_sou_suo_page"
-                android:gravity="center"
-                android:text="1"
-                android:textColor="@color/white"
-                android:textSize="10sp" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/two"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two_page"
-                android:gravity="center"
-                android:text="2"
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/three"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two"
-                android:gravity="center"
-                android:text="3"
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/drop"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two"
-                android:gravity="center"
-                android:text="..."
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:id="@+id/many"
-                android:layout_width="30dp"
-                android:layout_height="25dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/bg_sou_suo_two"
-                android:gravity="center"
-                android:text="4"
-                android:textColor="@color/black"
-                android:textSize="10sp"
-                android:visibility="gone" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/butUpper"
-            android:layout_width="65dp"
-            android:layout_height="25dp"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
-            android:layout_toLeftOf="@+id/rvPage"
-            android:background="@drawable/bg_up_page"
-            android:text="上一页"
-            android:textColor="@color/black"
-            android:textSize="10sp" />
-
-        <Button
-            android:id="@+id/butNext"
-            android:layout_width="65dp"
-            android:layout_height="25dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@+id/rvPage"
-            android:background="@drawable/bg_sou_suo_page"
-            android:text="下一页"
-            android:textColor="@color/white"
-            android:textSize="10sp" />
-    </RelativeLayout>
 </RelativeLayout>

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

@@ -1,80 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@color/white"
-    android:layout_height="40dp">
+    android:layout_height="40dp"
+    android:background="@color/white">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center_vertical">
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/tagCode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
             android:textColor="@color/black"
             android:textSize="12sp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/specNum"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
             android:textColor="@color/black"
             android:textSize="12sp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/surplus"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
             android:textColor="@color/black"
             android:textSize="12sp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/belongName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
             android:textColor="@color/black"
             android:textSize="12sp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/storage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
             android:textColor="@color/black"
             android:textSize="12sp" />
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/statusStr"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
             android:textColor="@color/black"
             android:textSize="12sp" />
 
     </LinearLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"

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

@@ -12,16 +12,16 @@
         android:orientation="vertical">
 
         <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
             android:id="@+id/chemicalName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="14dp"
+            android:ellipsize="end"
             android:gravity="center"
-            android:textSize="15sp"
-            android:textColor="@color/black" />
+            android:maxLines="1"
+            android:textColor="@color/black"
+            android:textSize="15sp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -32,38 +32,38 @@
             <LinearLayout
                 android:layout_width="265dp"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="20dp"
                 android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/casNum"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalCategory"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/sepl"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
@@ -72,24 +72,24 @@
                     android:layout_height="wrap_content">
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:id="@+id/expireTime"
                         android:layout_width="wrap_content"
                         android:layout_height="30dp"
+                        android:ellipsize="end"
                         android:gravity="center_vertical"
+                        android:maxLines="1"
                         android:textColor="@color/black"
                         android:textSize="12sp" />
 
                     <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                         android:id="@+id/expire"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="6dp"
                         android:layout_toRightOf="@+id/expireTime"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:textColor="@color/purple_FF7919"
                         android:textSize="12sp" />
 
@@ -101,8 +101,8 @@
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
-                android:layout_marginRight="10dp"
                 android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="@mipmap/icon_shu_xian" />
 
             <LinearLayout
@@ -114,45 +114,45 @@
                 android:orientation="vertical">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/tagCode"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/chemicalLevelName"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
-                    
+                    android:maxLines="1"
+
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/surplus"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
-                    
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/belongName"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
-                    
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
+
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
             </LinearLayout>

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

@@ -30,13 +30,13 @@
                 android:background="@mipmap/icon_sy_zq" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="8dp"
                 android:layout_toRightOf="@+id/imgA"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="柜门已开，取出要领用的化学品"
                 android:textColor="@color/black"
                 android:textSize="15sp" />
@@ -53,11 +53,11 @@
                 android:orientation="horizontal">
 
                 <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                     android:id="@+id/cabinet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textColor="@color/black"
                     android:textSize="12sp" />
 
@@ -80,12 +80,12 @@
             </LinearLayout>
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="请扫描化学品标签"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
@@ -106,78 +106,78 @@
             android:orientation="horizontal">
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="化学品名称"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="编码"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="规格"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="领用量"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="领用时效"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text="整瓶领用"
                 android:textColor="@color/black"
                 android:textSize="12sp" />
 
             <TextView
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:ellipsize="end"
                 android:gravity="center"
+                android:maxLines="1"
                 android:text=" "
                 android:textColor="@color/black"
                 android:textSize="12sp" />
@@ -219,13 +219,14 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginTop="17dp"
+        android:layout_marginBottom="10dp"
         android:orientation="horizontal"
         android:visibility="gone">
 
         <Button
             android:id="@+id/cloe"
             android:layout_width="110dp"
-            android:layout_height="30dp"
+            android:layout_height="70px"
             android:layout_marginRight="10dp"
             android:background="@drawable/bg_closes"
             android:text="关闭" />
@@ -233,7 +234,7 @@
         <Button
             android:id="@+id/useEn"
             android:layout_width="110dp"
-            android:layout_height="30dp"
+            android:layout_height="70px"
             android:layout_marginLeft="10dp"
             android:background="@drawable/bg_quan_xin_twoe"
             android:text="领用"