Kaynağa Gözat

1.所有点击替换为防抖

JaycePC 4 gün önce
ebeveyn
işleme
2766adf7bd
100 değiştirilmiş dosya ile 2318 ekleme ve 406 silme
  1. 34 20
      app/src/main/java/xn/hxp/ui/MainActivity.java
  2. 5 4
      app/src/main/java/xn/hxp/ui/adapter/CabinetBannerAdapter.java
  3. 0 1
      app/src/main/java/xn/hxp/ui/adapter/UsageLabelDialogAdapter.kt
  4. 29 16
      app/src/main/java/xn/hxp/ui/inquiry/InquiryActivity.java
  5. 19 7
      app/src/main/java/xn/hxp/ui/login/FaceLoginActivity.java
  6. 16 10
      app/src/main/java/xn/hxp/ui/plan/PlanAdapter.java
  7. 26 6
      app/src/main/java/xn/hxp/ui/plan/PlanAddActivity.java
  8. 118 64
      app/src/main/java/xn/hxp/ui/plan/add/AddActivity.java
  9. 71 52
      app/src/main/java/xn/hxp/ui/plan/already/AlreadyActivity.java
  10. 2 2
      app/src/main/java/xn/hxp/ui/plan/already/AlreadyAdapter.java
  11. 37 18
      app/src/main/java/xn/hxp/ui/plan/change/ChangeCabinetActivity.java
  12. 9 4
      app/src/main/java/xn/hxp/ui/plan/save_list/SaveListActivity.java
  13. 2 2
      app/src/main/java/xn/hxp/ui/plan/save_list/SaveListAdapter.java
  14. 19 8
      app/src/main/java/xn/hxp/ui/plan/unlock/UnlockActivity.java
  15. 5 4
      app/src/main/java/xn/hxp/ui/plan/unlock/UnlockAdapter.java
  16. 19 13
      app/src/main/java/xn/hxp/ui/verify/DoubleVerifyActivity.java
  17. 0 12
      app/src/main/java/xn/hxp/ui/warehousing/ChemicalLabelingActivity.kt
  18. 9 1
      app/src/main/java/xn/hxp/weidith/SelectChemicalDialog.java
  19. 3 2
      app/src/main/java/xn/hxp/weidith/ble/BleSelectorDialog.java
  20. 59 55
      app/src/main/java/xn/hxp/weidith/ble/BluetoothWeighDialog.java
  21. 71 63
      app/src/main/java/xn/hxp/weidith/prin_label_dialog/PrintLabelDialog.java
  22. 52 0
      app/src/main/res/layout/activity_add.xml
  23. 68 0
      app/src/main/res/layout/activity_added_chemicals.xml
  24. 46 0
      app/src/main/res/layout/activity_already.xml
  25. 12 0
      app/src/main/res/layout/activity_change_cabinet.xml
  26. 40 0
      app/src/main/res/layout/activity_checklists.xml
  27. 74 0
      app/src/main/res/layout/activity_chemical_labeling.xml
  28. 78 0
      app/src/main/res/layout/activity_chemicals_also.xml
  29. 10 0
      app/src/main/res/layout/activity_demonstrate.xml
  30. 20 0
      app/src/main/res/layout/activity_double_verify.xml
  31. 22 0
      app/src/main/res/layout/activity_electronic_ledger.xml
  32. 20 0
      app/src/main/res/layout/activity_facial_card.xml
  33. 20 0
      app/src/main/res/layout/activity_facial_login.xml
  34. 22 0
      app/src/main/res/layout/activity_inquiry.xml
  35. 10 0
      app/src/main/res/layout/activity_ledger.xml
  36. 52 0
      app/src/main/res/layout/activity_main.xml
  37. 18 0
      app/src/main/res/layout/activity_msds.xml
  38. 6 0
      app/src/main/res/layout/activity_msds_screen.xml
  39. 38 0
      app/src/main/res/layout/activity_plan_add.xml
  40. 96 0
      app/src/main/res/layout/activity_processed.xml
  41. 50 0
      app/src/main/res/layout/activity_query_details.xml
  42. 12 0
      app/src/main/res/layout/activity_save_list.xml
  43. 36 0
      app/src/main/res/layout/activity_scan_code_two.xml
  44. 18 0
      app/src/main/res/layout/activity_scan_login.xml
  45. 10 0
      app/src/main/res/layout/activity_setting.xml
  46. 6 0
      app/src/main/res/layout/activity_splash.xml
  47. 8 0
      app/src/main/res/layout/activity_start.xml
  48. 16 0
      app/src/main/res/layout/activity_swipe.xml
  49. 28 0
      app/src/main/res/layout/activity_swipe_code_two.xml
  50. 32 0
      app/src/main/res/layout/activity_two_person.xml
  51. 42 0
      app/src/main/res/layout/activity_two_verification.xml
  52. 42 0
      app/src/main/res/layout/activity_unlock.xml
  53. 42 0
      app/src/main/res/layout/activity_use.xml
  54. 54 0
      app/src/main/res/layout/activity_warehousing.xml
  55. 32 0
      app/src/main/res/layout/activity_warning_events.xml
  56. 90 0
      app/src/main/res/layout/activity_waste_chemicals.xml
  57. 5 1
      app/src/main/res/layout/air_bottle_dialog.xml
  58. 9 1
      app/src/main/res/layout/air_bottle_new_dialog.xml
  59. 2 0
      app/src/main/res/layout/already_dialog.xml
  60. 12 0
      app/src/main/res/layout/authentication_dialog.xml
  61. 12 1
      app/src/main/res/layout/belonging_person_dialog.xml
  62. 7 1
      app/src/main/res/layout/cabinet_opened_dialog.xml
  63. 8 0
      app/src/main/res/layout/chemical_search_rv.xml
  64. 9 6
      app/src/main/res/layout/chemical_type_dialog.xml
  65. 2 0
      app/src/main/res/layout/chemical_type_dialog_rv.xml
  66. 2 0
      app/src/main/res/layout/custom_bubble_attach_popup.xml
  67. 2 0
      app/src/main/res/layout/custom_dialog_layout.xml
  68. 2 0
      app/src/main/res/layout/custom_spinner_item.xml
  69. 3 1
      app/src/main/res/layout/custom_spinner_tow_item.xml
  70. 10 0
      app/src/main/res/layout/dcae_dialog.xml
  71. 2 0
      app/src/main/res/layout/dialog_ble_selector.xml
  72. 14 0
      app/src/main/res/layout/dialog_bluetooth_weigh.xml
  73. 2 0
      app/src/main/res/layout/dialog_loading.xml
  74. 4 0
      app/src/main/res/layout/dialog_plan.xml
  75. 21 1
      app/src/main/res/layout/dialog_print_label.xml
  76. 5 1
      app/src/main/res/layout/discard_dialog.xml
  77. 8 0
      app/src/main/res/layout/double_people_dialog.xml
  78. 2 0
      app/src/main/res/layout/dropdown_item.xml
  79. 10 5
      app/src/main/res/layout/empties_dialog.xml
  80. 2 0
      app/src/main/res/layout/fragment_face_detect.xml
  81. 38 0
      app/src/main/res/layout/fragment_inventory_iedger.xml
  82. 28 0
      app/src/main/res/layout/fragment_locker.xml
  83. 30 0
      app/src/main/res/layout/fragment_query_one.xml
  84. 34 0
      app/src/main/res/layout/fragment_query_two.xml
  85. 60 24
      app/src/main/res/layout/fragment_use_ledger.xml
  86. 28 0
      app/src/main/res/layout/include_cabinet.xml
  87. 22 0
      app/src/main/res/layout/item_already.xml
  88. 8 0
      app/src/main/res/layout/item_belonging_person.xml
  89. 4 0
      app/src/main/res/layout/item_ble.xml
  90. 2 0
      app/src/main/res/layout/item_cabinet_door.xml
  91. 2 0
      app/src/main/res/layout/item_cabinet_info.xml
  92. 50 0
      app/src/main/res/layout/item_cabinet_view.xml
  93. 18 0
      app/src/main/res/layout/item_checklists.xml
  94. 10 0
      app/src/main/res/layout/item_chemical_labeling.xml
  95. 10 0
      app/src/main/res/layout/item_chemical_timeout.xml
  96. 10 0
      app/src/main/res/layout/item_chemicals_view.xml
  97. 6 0
      app/src/main/res/layout/item_door_unlock.xml
  98. 14 0
      app/src/main/res/layout/item_in_storage.xml
  99. 14 0
      app/src/main/res/layout/item_inquiry.xml
  100. 0 0
      app/src/main/res/layout/item_inventory.xml

+ 34 - 20
app/src/main/java/xn/hxp/ui/MainActivity.java

@@ -108,7 +108,6 @@ public class MainActivity extends BaseActivity {
             viewBinding.inc.userLogin.setVisibility(View.GONE);
             viewBinding.inc.loggedIn.setVisibility(View.VISIBLE);
             viewBinding.inc.tvName.setText(ChemicalApp.userData.userName);
-
             Glide.with(this)
                     .load(HttpConfig.Companion.getAPI_BASE_IMG_URL() + ChemicalApp.userData.avatar)
                     .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.AUTOMATIC))
@@ -143,9 +142,10 @@ public class MainActivity extends BaseActivity {
                 basicConfLog();
             }
         })).create(ruleBeanList);
-        viewBinding.test.setOnClickListener(new View.OnClickListener() {
+        viewBinding.test.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
+
                 if (!AppUtils.isAppDebug()) {
                     showTextInputDialog("请输入内容", new TextInputCallback() {
                         @Override
@@ -192,24 +192,28 @@ public class MainActivity extends BaseActivity {
         }
 
         // 心跳上报
-        heartbeatCdTimer = new CountDownTimer(20000, 1000) {
-            @Override
-            public void onTick(long millisUntilFinished) {
+        heartbeatCdTimer = new
 
-            }
+                CountDownTimer(20000, 1000) {
+                    @Override
+                    public void onTick(long millisUntilFinished) {
 
-            @Override
-            public void onFinish() {
-                AsyncTask.execute(() -> {
-                    try {
-                        HttpTool.heartbeat();
-                    } catch (Exception e) {
-                        LogUtils.e(Log.getStackTraceString(e));
                     }
-                });
-                heartbeatCdTimer.start();
-            }
-        };
+
+                    @Override
+                    public void onFinish() {
+                        AsyncTask.execute(() -> {
+                            try {
+                                HttpTool.heartbeat();
+                            } catch (Exception e) {
+                                LogUtils.e(Log.getStackTraceString(e));
+                            }
+                        });
+                        heartbeatCdTimer.start();
+                    }
+                }
+
+        ;
         heartbeatCdTimer.start();
     }
 
@@ -440,8 +444,18 @@ public class MainActivity extends BaseActivity {
         });
         timeUpdater.startUpdating();
 
-        viewBinding.last.setOnClickListener(v -> viewBinding.cabinetVP.previousPage());
-        viewBinding.next.setOnClickListener(v -> viewBinding.cabinetVP.nextPage());
+        viewBinding.last.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                viewBinding.cabinetVP.previousPage();
+            }
+        });
+        viewBinding.next.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                viewBinding.cabinetVP.nextPage();
+            }
+        });
 
 
         RelativeLayoutDebouncer.Companion.setDebouncedOnClickListener(viewBinding.inc.userLogin, 1000L, v -> {

+ 5 - 4
app/src/main/java/xn/hxp/ui/adapter/CabinetBannerAdapter.java

@@ -6,6 +6,7 @@ import android.widget.RelativeLayout;
 
 import androidx.appcompat.widget.AppCompatTextView;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.rc.httpcore.bean.AdminVoListBean;
 import com.rc.httpcore.bean.CabinetDoorVo;
 import com.rc.httpcore.bean.RuleBean;
@@ -45,9 +46,9 @@ public class CabinetBannerAdapter extends BaseBannerAdapter<RuleBean> {
         cabinetNameTV.setText(data.getCabinetName());
         // 左柜门布局
         RelativeLayout doorRLL = holder.findViewById(R.id.doorRLL);
-        doorRLL.setOnClickListener(new View.OnClickListener() {
+        doorRLL.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 if (ChemicalApp.userData != null) {
                     CabinetDoorVo cabinetDoor = cabinetDoorList.get(0);
                     Map<String, Object> map = new HashMap<>();
@@ -62,9 +63,9 @@ public class CabinetBannerAdapter extends BaseBannerAdapter<RuleBean> {
         });
         // 右柜门布局
         RelativeLayout doorRLR = holder.findViewById(R.id.doorRLR);
-        doorRLR.setOnClickListener(new View.OnClickListener() {
+        doorRLR.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 if (ChemicalApp.userData != null) {
                     CabinetDoorVo cabinetDoor = cabinetDoorList.get(1);
                     Map<String, Object> map = new HashMap<>();

+ 0 - 1
app/src/main/java/xn/hxp/ui/adapter/UsageLabelDialogAdapter.kt

@@ -23,7 +23,6 @@ class UsageLabelDialogAdapter(private val ct: Context) :
     override fun convert(holder: BaseViewHolder, item: ChemistryBean) {
         holder.setText(R.id.chemicalName, "${item.chemicalName}")
         val chemicalName = holder.getView<TextView>(R.id.chemicalName)
-        chemicalName.isSelected = true
         holder.setText(R.id.code, "${item.code}")
         if (item.weigh != null) {
             when {

+ 29 - 16
app/src/main/java/xn/hxp/ui/inquiry/InquiryActivity.java

@@ -171,29 +171,42 @@ public class InquiryActivity extends BaseActivity {
             viewBinding.tvName.setVisibility(View.GONE);
         }
 
-        viewBinding.logIn.setOnClickListener(v -> getUserIds());
+        viewBinding.logIn.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                getUserIds();
+            }
+        });
         initTitle();
-        viewBinding.tvReturn.setOnClickListener(v -> finish());
-
-        viewBinding.butOpen.setOnClickListener(v -> {
-            if (ChemicalApp.administrators || ChemicalApp.responsibles) {
-                if (mCabinetLockVoList != null && !mCabinetLockVoList.isEmpty()) {
-                    mLockStr.clear();
-                    for (LockVoListBean it : mCabinetLockVoList) {
-                        if (it.getUnlockingMethod() == 2) {
-                            mLockStr.add(it.getLockNum());
+        viewBinding.tvReturn.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                finish();
+            }
+        });
+
+        viewBinding.butOpen.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                if (ChemicalApp.administrators || ChemicalApp.responsibles) {
+                    if (mCabinetLockVoList != null && !mCabinetLockVoList.isEmpty()) {
+                        mLockStr.clear();
+                        for (LockVoListBean it : mCabinetLockVoList) {
+                            if (it.getUnlockingMethod() == 2) {
+                                mLockStr.add(it.getLockNum());
+                            }
+                        }
+                        if (!mLockStr.isEmpty()) {
+                            openLock(mLockStr);
+                        } else {
+                            customDialogView(1, "柜门已开");
                         }
-                    }
-                    if (!mLockStr.isEmpty()) {
-                        openLock(mLockStr);
                     } else {
                         customDialogView(1, "柜门已开");
                     }
                 } else {
-                    customDialogView(1, "柜门已开");
+                    showToast("无权限信息");
                 }
-            } else {
-                showToast("无权限信息");
             }
         });
 

+ 19 - 7
app/src/main/java/xn/hxp/ui/login/FaceLoginActivity.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -128,18 +129,29 @@ public class FaceLoginActivity extends BaseActivity {
     }
 
     private void setupButtonListeners(Map<String, String> map) {
-        viewBinding.tvSwipe.setOnClickListener(v -> {
-            UiManager.INSTANCE.switcher(this, map, SwipeActivity.class);
-            finish();
+        viewBinding.tvSwipe.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                UiManager.INSTANCE.switcher(FaceLoginActivity.this, map, SwipeActivity.class);
+                finish();
+            }
         });
 
-        viewBinding.tvScan.setOnClickListener(v -> {
-            UiManager.INSTANCE.switcher(this, map, ScanLoginActivity.class);
-            finish();
+        viewBinding.tvScan.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                UiManager.INSTANCE.switcher(FaceLoginActivity.this, map, ScanLoginActivity.class);
+                finish();
+            }
         });
 
         viewBinding.tvReturn.setText("返回" + ChemicalApp.confs.getBackTime() + "s");
-        viewBinding.tvReturn.setOnClickListener(v -> finish());
+        viewBinding.tvReturn.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                finish();
+            }
+        });
     }
 
     private void initCamera() {

+ 16 - 10
app/src/main/java/xn/hxp/ui/plan/PlanAdapter.java

@@ -10,10 +10,13 @@ import android.widget.BaseAdapter;
 
 import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.LogUtils;
+
 import xn.hxp.databinding.ItemInStorageBinding;
 import xn.hxp.ui.plan.room.RoomTool;
 import xn.hxp.ui.plan.room.dao.HxpInventoryDAO;
+
 import com.rc.httpcore.bean.HxpChemicalVo;
+
 import xn.hxp.ui.plan.room.bean.input_add.InventoryItemBean;
 import xn.hxp.weidith.TextTool;
 
@@ -54,15 +57,18 @@ public class PlanAdapter extends BaseAdapter {
             convertView = binding.getRoot();
             viewHolder = new ViewHolder(binding);
             convertView.setTag(viewHolder);
-            binding.itemDelIV.setOnClickListener(v -> {
-                InventoryItemBean inventoryItemBean = inventoryItemBeanList.get(position);
-                for (int i = 0; i < inventoryItemBeanList.size(); i++) {
-                    InventoryItemBean inventoryItem = inventoryItemBeanList.get(i);
-                    if (inventoryItem.getId() == inventoryItemBean.getId()) {
-                        inventoryItemBeanList.remove(i);
-                        hxpInventoryDAO.delete(inventoryItemBean.getId());
-                        notifyDataSetChanged();
-                        return;
+            binding.itemDelIV.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+                @Override
+                public void onDebouncingClick(View v) {
+                    InventoryItemBean inventoryItemBean = inventoryItemBeanList.get(position);
+                    for (int i = 0; i < inventoryItemBeanList.size(); i++) {
+                        InventoryItemBean inventoryItem = inventoryItemBeanList.get(i);
+                        if (inventoryItem.getId() == inventoryItemBean.getId()) {
+                            inventoryItemBeanList.remove(i);
+                            hxpInventoryDAO.delete(inventoryItemBean.getId());
+                            notifyDataSetChanged();
+                            return;
+                        }
                     }
                 }
             });
@@ -80,7 +86,7 @@ public class PlanAdapter extends BaseAdapter {
             binding.itemNameTV.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                 @Override
                 public void onDebouncingClick(View v) {
-                    TextTool.showPop(context,binding.itemNameTV);
+                    TextTool.showPop(context, binding.itemNameTV);
                 }
             });
             // cas

+ 26 - 6
app/src/main/java/xn/hxp/ui/plan/PlanAddActivity.java

@@ -119,8 +119,18 @@ public class PlanAddActivity extends BaseActivity {
                 binding.countTV.setText((position + 1) + "/" + lockerAdapter.getItemCount());
             }
         });
-        binding.nextBT.setOnClickListener(view -> binding.lockerVP2.setCurrentItem(binding.lockerVP2.getCurrentItem() + 1, true));
-        binding.lastBT.setOnClickListener(view -> binding.lockerVP2.setCurrentItem(binding.lockerVP2.getCurrentItem() - 1, true));
+        binding.nextBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                binding.lockerVP2.setCurrentItem(binding.lockerVP2.getCurrentItem() + 1, true);
+            }
+        });
+        binding.lastBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                binding.lockerVP2.setCurrentItem(binding.lockerVP2.getCurrentItem() - 1, true);
+            }
+        });
 
         // 待存储
         intentActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
@@ -133,7 +143,12 @@ public class PlanAddActivity extends BaseActivity {
         });
 
         // 手动录入化学品
-        binding.inputBT.setOnClickListener(v -> intentActivityResultLauncher.launch(new Intent(PlanAddActivity.this, AddActivity.class)));
+        binding.inputBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                intentActivityResultLauncher.launch(new Intent(PlanAddActivity.this, AddActivity.class));
+            }
+        });
 
         planAdapter = new PlanAdapter(this, inventoryItemBeanList);
         binding.planLV.setAdapter(planAdapter);
@@ -263,9 +278,9 @@ public class PlanAddActivity extends BaseActivity {
             LogUtils.e(Log.getStackTraceString(e));
         }
         // 退出
-        binding.tvOutLogin.setOnClickListener(new View.OnClickListener() {
+        binding.tvOutLogin.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 try {
                     HttpTool.logout();
                 } catch (IOException e) {
@@ -273,7 +288,12 @@ public class PlanAddActivity extends BaseActivity {
                 }
             }
         });
-        binding.tvReturn.setOnClickListener(v -> finish());
+        binding.tvReturn.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                finish();
+            }
+        });
     }
 
 

+ 118 - 64
app/src/main/java/xn/hxp/ui/plan/add/AddActivity.java

@@ -14,6 +14,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.viewbinding.ViewBinding;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
@@ -102,9 +103,9 @@ public class AddActivity extends BaseActivity {
         }
 
         // 退出
-        binding.tvOutLogin.setOnClickListener(new View.OnClickListener() {
+        binding.tvOutLogin.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 try {
                     HttpTool.logout();
                 } catch (IOException e) {
@@ -150,117 +151,165 @@ public class AddActivity extends BaseActivity {
     @Override
     protected void onInit() {
         // 化学品搜索
-        binding.chemicalSearchBT.setOnClickListener(v -> {
-            Editable chemicalSearchETText = binding.chemicalSearchET.getText();
-            if (null == chemicalSearchETText || TextUtils.isEmpty(chemicalSearchETText)) {
-                binding.chemicalSearchET.setError("请输入化学品名称");
-                return;
+        binding.chemicalSearchBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                Editable chemicalSearchETText = binding.chemicalSearchET.getText();
+                if (null == chemicalSearchETText || TextUtils.isEmpty(chemicalSearchETText)) {
+                    binding.chemicalSearchET.setError("请输入化学品名称");
+                    return;
+                }
+                addActivityHelp.hxpSearch(chemicalSearchETText);
             }
-            addActivityHelp.hxpSearch(chemicalSearchETText);
         });
         binding.chemicalSearchET.setOnEditorActionListener((v, actionId, event) -> {
             binding.chemicalSearchBT.performClick();
             return true;
         });
         //CAS搜索
-        binding.casBT.setOnClickListener(v -> {
-            Editable casETText = binding.casET.getText();
-            if (null == casETText || TextUtils.isEmpty(casETText)) {
-                binding.casET.setError("请输入CAS码");
-                return;
+        binding.casBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                Editable casETText = binding.casET.getText();
+                if (null == casETText || TextUtils.isEmpty(casETText)) {
+                    binding.casET.setError("请输入CAS码");
+                    return;
+                }
+                addActivityHelp.hxpSearch(casETText);
             }
-            addActivityHelp.hxpSearch(casETText);
         });
         binding.casET.setOnEditorActionListener((v, actionId, event) -> {
             binding.casBT.performClick();
             return true;
         });
         // 类别选择
-        binding.chemicalCategoryTV.setOnClickListener(v -> {
-            new ChemicalTypeDialog(AddActivity.this, chemicalTypeList, data -> {
-                binding.chemicalCategoryTV.setText(data.getLabel());
-                binding.chemicalCategoryTV.setTag(data.getValue());
-            }).show();
+        binding.chemicalCategoryTV.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                new ChemicalTypeDialog(AddActivity.this, chemicalTypeList, data -> {
+                    binding.chemicalCategoryTV.setText(data.getLabel());
+                    binding.chemicalCategoryTV.setTag(data.getValue());
+                }).show();
+            }
         });
         // 归属人搜索
-        binding.belongBT.setOnClickListener(v -> {
-            Editable belongETText = binding.belongET.getText();
-            if (null == belongETText || TextUtils.isEmpty(belongETText)) {
-                binding.belongET.setError("请输入姓名或工号");
-                return;
+        binding.belongBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                Editable belongETText = binding.belongET.getText();
+                if (null == belongETText || TextUtils.isEmpty(belongETText)) {
+                    binding.belongET.setError("请输入姓名或工号");
+                    return;
+                }
+                addActivityHelp.belongSearch(belongETText);
             }
-            addActivityHelp.belongSearch(belongETText);
         });
         binding.belongET.setOnEditorActionListener((v, actionId, event) -> {
             binding.belongBT.performClick();
             return true;
         });
         // 课题组搜索
-        binding.topicBT.setOnClickListener(v -> {
-            if (null == belongingPerson) {
-                binding.topicET.setText("请先选择归属人");
-                return;
+        binding.topicBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                if (null == belongingPerson) {
+                    binding.topicET.setText("请先选择归属人");
+                    return;
+                }
+                addActivityHelp.topicSearch(belongingPerson.getUserId());
             }
-            addActivityHelp.topicSearch(belongingPerson.getUserId());
         });
-
         binding.topicET.setOnEditorActionListener((v, actionId, event) -> {
             binding.topicBT.performClick();
             return true;
         });
         //  存储
-        binding.saveBT.setOnClickListener(v -> addActivityHelp.save(false));
+        binding.saveBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                addActivityHelp.save(false);
+            }
+        });
         //  称重存储
-        binding.weighSaveBT.setOnClickListener(v -> addActivityHelp.save(true));
+        binding.weighSaveBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                addActivityHelp.save(true);
+            }
+        });
         // ml选择
-        binding.chemicalSpecMlRB.setOnClickListener(v -> {
-            String ml = binding.chemicalSpecMlRB.getText().toString();
-            hxpChemicalVo.setSpecUnit(ml);
-            binding.netWtTV.setText(ml);
+        binding.chemicalSpecMlRB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                String ml = binding.chemicalSpecMlRB.getText().toString();
+                hxpChemicalVo.setSpecUnit(ml);
+                binding.netWtTV.setText(ml);
+            }
         });
         // 选择
-        binding.chemicalSpecGRB.setOnClickListener(v -> {
-            String g = binding.chemicalSpecGRB.getText().toString();
-            hxpChemicalVo.setSpecUnit(g);
-            binding.netWtTV.setText(g);
+        binding.chemicalSpecGRB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                String g = binding.chemicalSpecGRB.getText().toString();
+                hxpChemicalVo.setSpecUnit(g);
+                binding.netWtTV.setText(g);
+            }
         });
         // 管控级别
-        binding.uncontrolledRB.setOnClickListener(v -> hxpChemicalVo.setChemicalLevel(2));
-        binding.controlledRB.setOnClickListener(v -> hxpChemicalVo.setChemicalLevel(1));
+        binding.uncontrolledRB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                hxpChemicalVo.setChemicalLevel(2);
+            }
+        });
+        binding.controlledRB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                hxpChemicalVo.setChemicalLevel(1);
+            }
+        });
         // 重置
-        binding.resetBT.setOnClickListener(v -> addActivityHelp.reset());
+        binding.resetBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                addActivityHelp.reset();
+            }
+        });
         // 归属人选择
-        binding.belongRB.setOnClickListener(new View.OnClickListener() {
+        binding.belongRB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 binding.belongLL.setVisibility(View.VISIBLE);
                 binding.topicLL.setVisibility(View.GONE);
                 hxpChemicalVo.setBelongType(2);
             }
         });
         // 课题组选择
-        binding.topicRB.setOnClickListener(new View.OnClickListener() {
+        binding.topicRB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 binding.topicLL.setVisibility(View.VISIBLE);
                 binding.belongLL.setVisibility(View.GONE);
                 hxpChemicalVo.setBelongType(1);
             }
         });
         // 过期日期
-        binding.chemicalExpiresTV.setOnClickListener(v -> {
-            DatePickerDialog datePickerDialog = new DatePickerDialog(AddActivity.this);
-            datePickerDialog.getDatePicker().setMinDate(System.currentTimeMillis());
-            datePickerDialog.setOnDateSetListener((view, year, month, dayOfMonth) -> {
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(year, month, dayOfMonth, 23, 59, 59);
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-                String date = simpleDateFormat.format(calendar.getTime());
-                hxpChemicalVo.setExpireTime(date);
-                binding.chemicalExpiresTV.setText(date);
-                datePickerDialog.dismiss();
-            });
-            datePickerDialog.show();
+        binding.chemicalExpiresTV.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                DatePickerDialog datePickerDialog = new DatePickerDialog(AddActivity.this);
+                datePickerDialog.getDatePicker().setMinDate(System.currentTimeMillis());
+                datePickerDialog.setOnDateSetListener((view, year, month, dayOfMonth) -> {
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.set(year, month, dayOfMonth, 23, 59, 59);
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+                    String date = simpleDateFormat.format(calendar.getTime());
+                    hxpChemicalVo.setExpireTime(date);
+                    binding.chemicalExpiresTV.setText(date);
+                    datePickerDialog.dismiss();
+                });
+                datePickerDialog.show();
+            }
         });
 
         // 位置选择
@@ -295,15 +344,20 @@ public class AddActivity extends BaseActivity {
                 }
             }
         });
-        binding.changeCabinetBT.setOnClickListener(new View.OnClickListener() {
+        binding.changeCabinetBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 intentActivityResultLauncher.launch(new Intent(AddActivity.this, ChangeCabinetActivity.class));
             }
         });
 
         // 返回
-        binding.tvReturn.setOnClickListener(v -> finish());
+        binding.tvReturn.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                finish();
+            }
+        });
 
         showLoading("请稍等...");
         // 化学品类别列表获取

+ 71 - 52
app/src/main/java/xn/hxp/ui/plan/already/AlreadyActivity.java

@@ -137,9 +137,9 @@ public class AlreadyActivity extends BaseActivity {
         });
 
         // 全选/全返选
-        binding.selectAllCB.setOnClickListener(new View.OnClickListener() {
+        binding.selectAllCB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 if (null != hxpChemicalVoList && !hxpChemicalVoList.isEmpty()) {
                     List<String> waitArray = new ArrayList<>();
                     for (int i = 0; i < hxpChemicalVoList.size(); i++) {
@@ -178,39 +178,43 @@ public class AlreadyActivity extends BaseActivity {
             getHxpStockWait(true);
         });
         // 根据申领单号查询
-        binding.applicantCodeSearchRL.setOnClickListener(v -> {
-            List<String> applyOrderNumberList;
-            if (type == 0) {
-                applyOrderNumberList = applyOrderBean.getTypeOwner().getApplyOrderNumbers();
-            } else {
-                applyOrderNumberList = applyOrderBean.getTypeOther().getApplyOrderNumbers();
-            }
-            if (null != applyOrderNumberList && !applyOrderNumberList.isEmpty()) {
-                new SelectAlreadyDialog(AlreadyActivity.this, "选择申领单号", applyOrderNumberList, new SelectAlreadyDialog.SelectedListener() {
-                    @Override
-                    public void selected(String string) {
-                        applyOrder = string;
-                        binding.applicantCodeSearchTV.setText(applyOrder);
-                        binding.applicantCodeSearchTV.setSelected(true);
-                        getHxpStockWait(true);
-                    }
+        binding.applicantCodeSearchRL.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
 
-                    @Override
-                    public void clear() {
-                        applyOrder = "";
-                        binding.applicantCodeSearchTV.setText("申领单号");
-                        getHxpStockWait(true);
-                    }
-                }).show();
-            } else {
-                showToast("暂无数据");
-            }
+                List<String> applyOrderNumberList;
+                if (type == 0) {
+                    applyOrderNumberList = applyOrderBean.getTypeOwner().getApplyOrderNumbers();
+                } else {
+                    applyOrderNumberList = applyOrderBean.getTypeOther().getApplyOrderNumbers();
+                }
+                if (null != applyOrderNumberList && !applyOrderNumberList.isEmpty()) {
+                    new SelectAlreadyDialog(AlreadyActivity.this, "选择申领单号", applyOrderNumberList, new SelectAlreadyDialog.SelectedListener() {
+                        @Override
+                        public void selected(String string) {
+                            applyOrder = string;
+                            binding.applicantCodeSearchTV.setText(applyOrder);
+                            binding.applicantCodeSearchTV.setSelected(true);
+                            getHxpStockWait(true);
+                        }
 
+                        @Override
+                        public void clear() {
+                            applyOrder = "";
+                            binding.applicantCodeSearchTV.setText("申领单号");
+                            getHxpStockWait(true);
+                        }
+                    }).show();
+                } else {
+                    showToast("暂无数据");
+                }
+            }
         });
         // 根据申领人查询
-        binding.applicantSearchRL.setOnClickListener(new View.OnClickListener() {
+        binding.applicantSearchRL.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
+
                 List<String> applicantList;
                 if (type == 0) {
                     applicantList = applyOrderBean.getTypeOwner().getApplicants();
@@ -240,9 +244,10 @@ public class AlreadyActivity extends BaseActivity {
             }
         });
         // 根据归属人查询
-        binding.belongSearchRL.setOnClickListener(new View.OnClickListener() {
+        binding.belongSearchRL.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
+
                 List<String> ownerList;
                 if (type == 0) {
                     ownerList = applyOrderBean.getTypeOwner().getOwners();
@@ -370,24 +375,30 @@ public class AlreadyActivity extends BaseActivity {
         });
 
         // 上一页
-        binding.lastPage.setOnClickListener(v -> {
-            int last = page - 1;
-            if (last < 1) {
-                showToast("没有更多数据!");
-                return;
+        binding.lastPage.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                int last = page - 1;
+                if (last < 1) {
+                    showToast("没有更多数据!");
+                    return;
+                }
+                page = last;
+                getHxpStockWait(false);
             }
-            page = last;
-            getHxpStockWait(false);
         });
         // 下一页
-        binding.nextPage.setOnClickListener(v -> {
-            int next = page + 1;
-            if (next > pages) {
-                showToast("没有更多数据!");
-                return;
+        binding.nextPage.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                int next = page + 1;
+                if (next > pages) {
+                    showToast("没有更多数据!");
+                    return;
+                }
+                page = next;
+                getHxpStockWait(false);
             }
-            page = next;
-            getHxpStockWait(false);
         });
 
         try {
@@ -413,14 +424,22 @@ public class AlreadyActivity extends BaseActivity {
             LogUtils.e(Log.getStackTraceString(e));
         }
         // 退出
-        binding.tvOutLogin.setOnClickListener(v -> {
-            try {
-                HttpTool.logout();
-            } catch (IOException e) {
-                LogUtils.e(Log.getStackTraceString(e));
+        binding.tvOutLogin.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                try {
+                    HttpTool.logout();
+                } catch (IOException e) {
+                    LogUtils.e(Log.getStackTraceString(e));
+                }
+            }
+        });
+        binding.tvReturn.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                finish();
             }
         });
-        binding.tvReturn.setOnClickListener(v -> finish());
     }
 
     private void autoSave(PlanAddData planAddData) {

+ 2 - 2
app/src/main/java/xn/hxp/ui/plan/already/AlreadyAdapter.java

@@ -129,9 +129,9 @@ public class AlreadyAdapter extends BaseAdapter {
                 binding.operate.setTextColor(Color.parseColor("#ff0183FA"));
                 binding.selectCB.setEnabled(true);
                 binding.selectCB.setOnCheckedChangeListener(null);
-                binding.selectCB.setOnClickListener(new View.OnClickListener() {
+                binding.selectCB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                     @Override
-                    public void onClick(View v) {
+                    public void onDebouncingClick(View v) {
                         HxpChemicalVo recordsBean = getItem(position);
                         recordsBean.setSelect(binding.selectCB.isChecked());
                     }

+ 37 - 18
app/src/main/java/xn/hxp/ui/plan/change/ChangeCabinetActivity.java

@@ -9,6 +9,7 @@ import android.view.View;
 import androidx.viewbinding.ViewBinding;
 import androidx.viewpager2.widget.ViewPager2;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.bumptech.glide.Glide;
@@ -48,25 +49,43 @@ public class ChangeCabinetActivity extends BaseActivity {
                 binding.countTV.setText((position + 1) + "/" + changeCabinetAdapter.getItemCount());
             }
         });
-        binding.nextBT.setOnClickListener(view -> binding.cabinetVP.setCurrentItem(binding.cabinetVP.getCurrentItem() + 1, true));
-        binding.lastBT.setOnClickListener(view -> binding.cabinetVP.setCurrentItem(binding.cabinetVP.getCurrentItem() - 1, true));
+        binding.nextBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                binding.cabinetVP.setCurrentItem(binding.cabinetVP.getCurrentItem() + 1, true);
+            }
+        });
+        binding.lastBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                binding.cabinetVP.setCurrentItem(binding.cabinetVP.getCurrentItem() - 1, true);
+            }
+        });
         binding.cabinetVP.setAdapter(changeCabinetAdapter);
 
-        binding.cancelBT.setOnClickListener(v -> finish());
-
-        binding.confirmBT.setOnClickListener(v -> {
-            if (cabinetLayerSelect != null) {
-                HxpLayerDAO hxpLayerDAO = RoomTool.getInstance().hxpLayerDAO();
-                hxpLayerDAO.insert(cabinetLayerSelect);
-                hxpLayerDAO.change(cabinetLayerSelect.getCabinetId(), cabinetLayerSelect.getDoorId(), cabinetLayerSelect.getLayer());
-                Intent intent = new Intent();
-                Bundle bundle = new Bundle();
-                bundle.putSerializable("Change", cabinetLayerSelect);
-                intent.putExtra("data", bundle);
-                setResult(RESULT_OK, intent);
+        binding.cancelBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
                 finish();
-            } else {
-                showToast("请选择要更换的柜层!");
+            }
+        });
+
+        binding.confirmBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                if (cabinetLayerSelect != null) {
+                    HxpLayerDAO hxpLayerDAO = RoomTool.getInstance().hxpLayerDAO();
+                    hxpLayerDAO.insert(cabinetLayerSelect);
+                    hxpLayerDAO.change(cabinetLayerSelect.getCabinetId(), cabinetLayerSelect.getDoorId(), cabinetLayerSelect.getLayer());
+                    Intent intent = new Intent();
+                    Bundle bundle = new Bundle();
+                    bundle.putSerializable("Change", cabinetLayerSelect);
+                    intent.putExtra("data", bundle);
+                    setResult(RESULT_OK, intent);
+                    finish();
+                } else {
+                    showToast("请选择要更换的柜层!");
+                }
             }
         });
 
@@ -90,9 +109,9 @@ public class ChangeCabinetActivity extends BaseActivity {
             LogUtils.e(Log.getStackTraceString(e));
         }
         // 退出
-        binding.tvOutLogin.setOnClickListener(new View.OnClickListener() {
+        binding.tvOutLogin.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 try {
                     HttpTool.logout();
                 } catch (IOException e) {

+ 9 - 4
app/src/main/java/xn/hxp/ui/plan/save_list/SaveListActivity.java

@@ -8,6 +8,7 @@ import android.view.View;
 
 import androidx.viewbinding.ViewBinding;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
@@ -86,9 +87,9 @@ public class SaveListActivity extends BaseActivity {
         }
 
         // 退出
-        binding.tvOutLogin.setOnClickListener(new View.OnClickListener() {
+        binding.tvOutLogin.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 try {
                     HttpTool.logout();
                 } catch (IOException e) {
@@ -147,8 +148,12 @@ public class SaveListActivity extends BaseActivity {
             userValidation2 = GsonUtils.fromJson(getIntent.getStringExtra("userValidation2"), UserValidationBean.class);
         }
 
-        binding.exit.setOnClickListener(v -> UiManager.INSTANCE.switcher(SaveListActivity.this, MainActivity.class));
-
+        binding.exit.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                UiManager.INSTANCE.switcher(SaveListActivity.this, MainActivity.class);
+            }
+        });
     }
 
     public List<String> splitStringIntoChunks(String inputString, int chunkSize) {

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

@@ -78,9 +78,9 @@ public class SaveListAdapter extends BaseAdapter {
             viewHolder = new ViewHolder(binding);
             convertView.setTag(viewHolder);
             //  开门
-            binding.unlockBT.setOnClickListener(new View.OnClickListener() {
+            binding.unlockBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                 @Override
-                public void onClick(View v) {
+                public void onDebouncingClick(View v) {
                     HxpCabinetDoorVo doorVo = doorDAO.getById(saveListBean.getDoorId());
                     List<HxpCabinetLockVo> lockVoList = doorVo.getCabinetLockVoList();
                     if (null != lockVoList && !lockVoList.isEmpty()) {

+ 19 - 8
app/src/main/java/xn/hxp/ui/plan/unlock/UnlockActivity.java

@@ -9,6 +9,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.viewbinding.ViewBinding;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
@@ -69,9 +70,9 @@ public class UnlockActivity extends BaseActivity {
                         activityHelp.unlock(userValidation1, userValidation2);
                     }
                 });
-                binding.validateBT.setOnClickListener(new View.OnClickListener() {
+                binding.validateBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                     @Override
-                    public void onClick(View v) {
+                    public void onDebouncingClick(View v) {
                         Intent intent = new Intent(UnlockActivity.this, DoubleVerifyActivity.class);
                         String json = GsonUtils.toJson(planAddData);
                         intent.putExtra("data", json);
@@ -79,10 +80,15 @@ public class UnlockActivity extends BaseActivity {
                     }
                 });
 
-                binding.retryBT.setOnClickListener(v -> activityHelp.reTryUnlock());
-                binding.saveBT.setOnClickListener(new View.OnClickListener() {
+                binding.retryBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                     @Override
-                    public void onClick(View v) {
+                    public void onDebouncingClick(View v) {
+                        activityHelp.reTryUnlock();
+                    }
+                });
+                binding.saveBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+                    @Override
+                    public void onDebouncingClick(View v) {
                         activityHelp.save(isAuto);
                     }
                 });
@@ -109,9 +115,9 @@ public class UnlockActivity extends BaseActivity {
             LogUtils.e(Log.getStackTraceString(e));
         }
         // 退出
-        binding.tvOutLogin.setOnClickListener(new View.OnClickListener() {
+        binding.tvOutLogin.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 try {
                     HttpTool.logout();
                 } catch (IOException e) {
@@ -119,7 +125,12 @@ public class UnlockActivity extends BaseActivity {
                 }
             }
         });
-        binding.exit.setOnClickListener(v -> finish());
+        binding.exit.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                finish();
+            }
+        });
     }
 
     @Override

+ 5 - 4
app/src/main/java/xn/hxp/ui/plan/unlock/UnlockAdapter.java

@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.LogUtils;
 
 import xn.hxp.R;
@@ -156,9 +157,9 @@ public class UnlockAdapter extends BaseAdapter {
                 }
 
                 // 上门
-                viewHolder.binding.upDoorUnlockBT.setOnClickListener(new View.OnClickListener() {
+                viewHolder.binding.upDoorUnlockBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                     @Override
-                    public void onClick(View v) {
+                    public void onDebouncingClick(View v) {
                         if (null != cabinet) {
                             List<HxpCabinetDoorVo> hxpCabinetDoorVoList = findDoorByCabinetId(cabinet.getCabinetId());
                             if (!hxpCabinetDoorVoList.isEmpty()) {
@@ -174,9 +175,9 @@ public class UnlockAdapter extends BaseAdapter {
                     }
                 });
                 // 下门
-                viewHolder.binding.downDoorUnlockBT.setOnClickListener(new View.OnClickListener() {
+                viewHolder.binding.downDoorUnlockBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
                     @Override
-                    public void onClick(View v) {
+                    public void onDebouncingClick(View v) {
                         if (null != cabinet) {
                             List<HxpCabinetDoorVo> hxpCabinetDoorVoList = findDoorByCabinetId(cabinet.getCabinetId());
                             if (!hxpCabinetDoorVoList.isEmpty()) {

+ 19 - 13
app/src/main/java/xn/hxp/ui/verify/DoubleVerifyActivity.java

@@ -6,6 +6,7 @@ import android.view.View;
 
 import androidx.viewbinding.ViewBinding;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.GsonUtils;
 import com.rc.core.ui.activity.BaseActivity;
 import com.rc.httpcore.bean.UserValidationBean;
@@ -52,46 +53,51 @@ public class DoubleVerifyActivity extends BaseActivity {
 
         planAddData = GsonUtils.fromJson(getIntent().getStringExtra("data"), PlanAddData.class);
 
-        binding.card1IB.setOnClickListener(new View.OnClickListener() {
+        binding.card1IB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 activityHelp.switchShowDetect(detectType = DetectType.CARD_DETECT, true, true);
             }
         });
-        binding.face1IB.setOnClickListener(new View.OnClickListener() {
+        binding.face1IB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 activityHelp.switchShowDetect(detectType = DetectType.FACE_DETECT, true, true);
             }
         });
-        binding.scan1IB.setOnClickListener(new View.OnClickListener() {
+        binding.scan1IB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 activityHelp.switchShowDetect(detectType = DetectType.SCAN_DETECT, true, true);
             }
         });
-        binding.card2IB.setOnClickListener(new View.OnClickListener() {
+        binding.card2IB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 activityHelp.switchShowDetect(detectType = DetectType.CARD_DETECT, false, true);
             }
         });
-        binding.face2IB.setOnClickListener(new View.OnClickListener() {
+        binding.face2IB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 activityHelp.switchShowDetect(detectType = DetectType.FACE_DETECT, false, true);
             }
         });
 
-        binding.scan2IB.setOnClickListener(new View.OnClickListener() {
+        binding.scan2IB.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 activityHelp.switchShowDetect(detectType = DetectType.SCAN_DETECT, false, true);
             }
         });
         activityHelp.switchShowDetect(detectType = DetectType.FACE_DETECT, true, true);
 
-        binding.tvReturn.setOnClickListener(v -> finish());
+        binding.tvReturn.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                finish();
+            }
+        });
     }
 
     @Override

+ 0 - 12
app/src/main/java/xn/hxp/ui/warehousing/ChemicalLabelingActivity.kt

@@ -265,18 +265,6 @@ class ChemicalLabelingActivity : BaseActivity() {
         sPrinDate.add("级别")
         sPrinDate.add("管控")
         sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
-        sPrinDate.add("非管控")
         LogUtils.i("=======当前级别条数${sPrinDate.size}")
 
         val customAdapter = CustomSpinnerTwoAdapter(this, sPrinDate!!)

+ 9 - 1
app/src/main/java/xn/hxp/weidith/SelectChemicalDialog.java

@@ -6,6 +6,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Gravity;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -15,6 +16,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import xn.hxp.R;
 import xn.hxp.databinding.DcaeDialogBinding;
 import xn.hxp.ui.adapter.SelectChemicalDialogAdapter;
+
+import com.blankj.utilcode.util.ClickUtils;
 import com.rc.httpcore.bean.HxpChemicalVo;
 
 import java.util.List;
@@ -58,6 +61,11 @@ public class SelectChemicalDialog extends Dialog {
             dismiss();
         });
 
-        binding.butClos.setOnClickListener(v -> dismiss());
+        binding.butClos.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                dismiss();
+            }
+        });
     }
 }

+ 3 - 2
app/src/main/java/xn/hxp/weidith/ble/BleSelectorDialog.java

@@ -11,6 +11,7 @@ import android.widget.AdapterView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDialog;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.SPUtils;
 import com.clj.fastble.BleManager;
 import com.clj.fastble.data.BleScanState;
@@ -58,9 +59,9 @@ public class BleSelectorDialog extends AppCompatDialog {
                 dismiss();
             }
         });
-        binding.ok.setOnClickListener(new View.OnClickListener() {
+        binding.ok.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onDebouncingClick(View v) {
                 binding.ok.setVisibility(View.GONE);
                 binding.cancel.setVisibility(View.VISIBLE);
                 binding.bleLV.setVisibility(View.VISIBLE);

+ 59 - 55
app/src/main/java/xn/hxp/weidith/ble/BluetoothWeighDialog.java

@@ -129,66 +129,70 @@ public class BluetoothWeighDialog extends AppCompatDialog {
             }
         });
         // 确认
-        binding.confirmBT.setOnClickListener(v -> {
-            Editable netWtETText = binding.netWtET.getText();
-            if (null == netWtETText || TextUtils.isEmpty(netWtETText)) {
-                binding.netWtET.setError("请输入净含量");
-                return;
-            }
-            double netWt = -1.0;
-            try {
-                netWt = Double.parseDouble(netWtETText.toString());
-            } catch (Exception e) {
-                binding.netWtET.setError("请检查净含量内容正确");
-                return;
-            }
-            if (netWt <= 0) {
-                binding.netWtET.setError("请检查净含量内容正确");
-                return;
-            }
-            // 净含量不可大于规格
-            if (netWt > hxpChemicalVo.getSpecNum()) {
-                binding.netWtET.setError("净含量不能大于规格");
-                return;
-            }
-            // 净含量不可大于称重
-            if (netWt > hxpChemicalVo.getWeigh()) {
-                binding.netWtET.setError("净含量不能大于称重");
-                return;
-            }
-            hxpChemicalVo.setNetContent(netWt);
-            WaitDialog.show("校验中...");
-            ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<String>() {
-                @Override
-                public String doInBackground() throws Throwable {
-                    Response response = HttpTool.addStockCheck(hxpChemicalVo);
-                    if (response.isSuccessful()) {
-                        String json = response.body().string();
-                        JSONObject jsonObject = new JSONObject(json);
-                        int code = jsonObject.getInt("code");
-                        if (code == 200) {
-                            return "ok";
+        binding.confirmBT.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+
+                Editable netWtETText = binding.netWtET.getText();
+                if (null == netWtETText || TextUtils.isEmpty(netWtETText)) {
+                    binding.netWtET.setError("请输入净含量");
+                    return;
+                }
+                double netWt = -1.0;
+                try {
+                    netWt = Double.parseDouble(netWtETText.toString());
+                } catch (Exception e) {
+                    binding.netWtET.setError("请检查净含量内容正确");
+                    return;
+                }
+                if (netWt <= 0) {
+                    binding.netWtET.setError("请检查净含量内容正确");
+                    return;
+                }
+                // 净含量不可大于规格
+                if (netWt > hxpChemicalVo.getSpecNum()) {
+                    binding.netWtET.setError("净含量不能大于规格");
+                    return;
+                }
+                // 净含量不可大于称重
+                if (netWt > hxpChemicalVo.getWeigh()) {
+                    binding.netWtET.setError("净含量不能大于称重");
+                    return;
+                }
+                hxpChemicalVo.setNetContent(netWt);
+                WaitDialog.show("校验中...");
+                ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<String>() {
+                    @Override
+                    public String doInBackground() throws Throwable {
+                        Response response = HttpTool.addStockCheck(hxpChemicalVo);
+                        if (response.isSuccessful()) {
+                            String json = response.body().string();
+                            JSONObject jsonObject = new JSONObject(json);
+                            int code = jsonObject.getInt("code");
+                            if (code == 200) {
+                                return "ok";
+                            } else {
+                                return jsonObject.getString("message");
+                            }
                         } else {
-                            return jsonObject.getString("message");
+                            return response.message();
                         }
-                    } else {
-                        return response.message();
                     }
-                }
 
-                @Override
-                public void onSuccess(String result) {
-                    WaitDialog.dismiss();
-                    if ("ok".equals(result)) {
-                        hxpChemicalVo.setJoinType(1);
-                        dialogCallBack.confirm(BluetoothWeighDialog.this);
-                    } else if (null == result || result.isEmpty()) {
-                        dialogCallBack.cancel(BluetoothWeighDialog.this, "称重失败,系统异常!");
-                    } else {
-                        PopTip.show(result);
+                    @Override
+                    public void onSuccess(String result) {
+                        WaitDialog.dismiss();
+                        if ("ok".equals(result)) {
+                            hxpChemicalVo.setJoinType(1);
+                            dialogCallBack.confirm(BluetoothWeighDialog.this);
+                        } else if (null == result || result.isEmpty()) {
+                            dialogCallBack.cancel(BluetoothWeighDialog.this, "称重失败,系统异常!");
+                        } else {
+                            PopTip.show(result);
+                        }
                     }
-                }
-            });
+                });
+            }
         });
         setCancelable(false);
         setCanceledOnTouchOutside(false);

+ 71 - 63
app/src/main/java/xn/hxp/weidith/prin_label_dialog/PrintLabelDialog.java

@@ -15,6 +15,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ThreadUtils;
 import com.kongzue.dialogx.dialogs.PopTip;
@@ -133,78 +134,85 @@ public class PrintLabelDialog extends AppCompatDialog {
         });
 
         // 关闭
-        binding.butClos.setOnClickListener(v -> {
-            dismiss();
-            printLabelCallBack.close();
+        binding.butClos.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+                dismiss();
+                printLabelCallBack.close();
+            }
         });
 
         // 确定
-        binding.determine.setOnClickListener(v -> {
-            printState(true);
-
-            ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<Object>() {
-                @Override
-                public Object doInBackground() throws Throwable {
-                    for (int i = 0; i < labelList.size(); i++) {
-                        StockDetailsModel stockDetailsModel = labelList.get(i);
-                        PrintBean printBean = new PrintBean();
-                        // 化学品编码
-                        String tagCode = stockDetailsModel.getTagCode();
-                        printBean.setTag(TextUtils.isEmpty(tagCode) ? "" : tagCode);
-                        // 二维码
-                        String wxCode = stockDetailsModel.getWxCode();
-                        printBean.setWxCode(TextUtils.isEmpty(wxCode) ? "" : wxCode);
-                        // 化学品名
-                        printBean.setName(TextUtils.isEmpty(chemicalName) ? "" : chemicalName);
-                        // CAS
-                        String casNum = hxpChemicalVo.getCasNum();
-                        printBean.setCasNo(TextUtils.isEmpty(casNum) ? "" : casNum);
-                        int belongType = hxpChemicalVo.getBelongType();
-                        String name = "";
-                        // 归属人
-                        if (belongType == 2) {
-                            BelongingPersonBean belongingPersonBean = inventoryItemBean.getBelongingPersonBean();
-                            name = belongingPersonBean.getUserName();
-                        }
-                        // 课题组
-                        else if (belongType == 1) {
-                            TopicDataBean topicDataBean = inventoryItemBean.getTopicDataBean();
-                            name = topicDataBean.getTopicName();
-                        }
-                        printBean.setPerson(TextUtils.isEmpty(name) ? "" : name);
-                        // 管控非管控
+        binding.determine.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+
+                printState(true);
+
+                ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<Object>() {
+                    @Override
+                    public Object doInBackground() throws Throwable {
+                        for (int i = 0; i < labelList.size(); i++) {
+                            StockDetailsModel stockDetailsModel = labelList.get(i);
+                            PrintBean printBean = new PrintBean();
+                            // 化学品编码
+                            String tagCode = stockDetailsModel.getTagCode();
+                            printBean.setTag(TextUtils.isEmpty(tagCode) ? "" : tagCode);
+                            // 二维码
+                            String wxCode = stockDetailsModel.getWxCode();
+                            printBean.setWxCode(TextUtils.isEmpty(wxCode) ? "" : wxCode);
+                            // 化学品名
+                            printBean.setName(TextUtils.isEmpty(chemicalName) ? "" : chemicalName);
+                            // CAS
+                            String casNum = hxpChemicalVo.getCasNum();
+                            printBean.setCasNo(TextUtils.isEmpty(casNum) ? "" : casNum);
+                            int belongType = hxpChemicalVo.getBelongType();
+                            String name = "";
+                            // 归属人
+                            if (belongType == 2) {
+                                BelongingPersonBean belongingPersonBean = inventoryItemBean.getBelongingPersonBean();
+                                name = belongingPersonBean.getUserName();
+                            }
+                            // 课题组
+                            else if (belongType == 1) {
+                                TopicDataBean topicDataBean = inventoryItemBean.getTopicDataBean();
+                                name = topicDataBean.getTopicName();
+                            }
+                            printBean.setPerson(TextUtils.isEmpty(name) ? "" : name);
+                            // 管控非管控
 //                        int chemicalLevel = hxpChemicalVo.getChemicalLevel();
 //                        printBean.setLevel(1 == chemicalLevel ? "管控" : "非管控");
-                        // 化学品类型
-                        CharSequence chemicalCategory = hxpChemicalVo.getChemicalCategoryName();
-                        printBean.setTypes(TextUtils.isEmpty(chemicalCategory) ? "" : chemicalCategory.toString());
-                        // 打印
-                        if (isPrint) {
-                            LogUtils.json("打印机前", labelList);
-                            PrintTool.INSTANCE.print(hxpChemicalVo.isGr(), belongType == 2, printBean);
+                            // 化学品类型
+                            CharSequence chemicalCategory = hxpChemicalVo.getChemicalCategoryName();
+                            printBean.setTypes(TextUtils.isEmpty(chemicalCategory) ? "" : chemicalCategory.toString());
+                            // 打印
+                            if (isPrint) {
+                                LogUtils.json("打印机前", labelList);
+                                PrintTool.INSTANCE.print(hxpChemicalVo.isGr(), belongType == 2, printBean);
+                            }
+                            Thread.sleep(200);
                         }
-                        Thread.sleep(200);
+                        return null;
                     }
-                    return null;
-                }
 
-                @Override
-                public void onSuccess(Object result) {
-                    printState(false);
-                    hxpChemicalVo.setStockDetailsModelList(labelList);
-                    printLabelCallBack.confirm();
-                    dismiss();
-                }
+                    @Override
+                    public void onSuccess(Object result) {
+                        printState(false);
+                        hxpChemicalVo.setStockDetailsModelList(labelList);
+                        printLabelCallBack.confirm();
+                        dismiss();
+                    }
 
-                @Override
-                public void onFail(Throwable t) {
-                    super.onFail(t);
-                    PopTip.show("打印失败,已打印标签无效,请重试!");
-                    printLabelCallBack.close();
-                    dismiss();
-                    LogUtils.e(Log.getStackTraceString(t));
-                }
-            });
+                    @Override
+                    public void onFail(Throwable t) {
+                        super.onFail(t);
+                        PopTip.show("打印失败,已打印标签无效,请重试!");
+                        printLabelCallBack.close();
+                        dismiss();
+                        LogUtils.e(Log.getStackTraceString(t));
+                    }
+                });
+            }
         });
     }
 

+ 52 - 0
app/src/main/res/layout/activity_add.xml

@@ -23,6 +23,8 @@
             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"
@@ -41,6 +43,8 @@
             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"
@@ -52,6 +56,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -79,6 +85,8 @@
                 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"
@@ -100,6 +108,8 @@
                 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"
@@ -123,6 +133,8 @@
         android:background="@drawable/bg_add_chemicals_one">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/title_TV"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -192,6 +204,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -228,6 +242,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -236,6 +252,8 @@
 
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/chemical_category_TV"
                         android:layout_width="250px"
                         android:layout_height="50px"
@@ -256,6 +274,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -268,6 +288,8 @@
                         android:layout_height="match_parent">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/net_wt_TV"
                             android:layout_width="50px"
                             android:layout_height="wrap_content"
@@ -303,6 +325,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -355,6 +379,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -393,6 +419,8 @@
                     android:visibility="gone">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -437,6 +465,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -476,6 +506,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -536,6 +568,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -566,6 +600,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -594,6 +630,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -602,6 +640,8 @@
 
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/chemical_expires_TV"
                         android:layout_width="250px"
                         android:layout_height="50px"
@@ -630,6 +670,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -682,6 +724,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -712,6 +756,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -740,6 +786,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="120px"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -747,6 +795,8 @@
                         android:textColor="#333" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/cabinet_Layer_select_TV"
                         android:layout_width="260px"
                         android:layout_height="50px"
@@ -783,6 +833,8 @@
     </RelativeLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 68 - 0
app/src/main/res/layout/activity_added_chemicals.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -130,6 +140,8 @@
             android:paddingTop="16dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="新增入库"
@@ -144,6 +156,8 @@
                 android:paddingLeft="10dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvOne"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -192,6 +206,8 @@
                 android:paddingLeft="10dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvProductName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -236,6 +252,8 @@
                 android:paddingLeft="10dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvCAS"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -281,6 +299,8 @@
                 android:paddingLeft="10dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvCategory"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -296,6 +316,8 @@
                     android:layout_toRightOf="@+id/tvCategory">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/chemType"
                         android:layout_width="match_parent"
                         android:layout_height="25dp"
@@ -328,6 +350,8 @@
                 android:paddingLeft="10dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvJi"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -374,6 +398,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvgui"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -417,6 +443,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/keti"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -426,6 +454,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/topicName"
                     android:layout_width="135dp"
                     android:layout_height="25dp"
@@ -470,6 +500,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvManufacturer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -503,6 +535,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvPurity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -535,6 +569,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvDensity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -568,6 +604,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvSpecifications"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -626,6 +664,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvPackage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -656,6 +696,8 @@
                         android:textSize="10sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
@@ -675,6 +717,8 @@
                     android:background="@drawable/bg_quan_xin_twoe">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/packUnit"
                         android:layout_width="36dp"
                         android:layout_height="30dp"
@@ -702,6 +746,8 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvNum"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -778,6 +824,8 @@
                 android:orientation="vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingTop="16dp"
@@ -795,6 +843,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -804,6 +854,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -813,6 +865,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -822,6 +876,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -831,6 +887,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/storey"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -841,6 +899,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="30dp"
                         android:layout_height="30dp"
                         android:gravity="center"
@@ -870,6 +930,8 @@
                     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="11dp"
@@ -878,6 +940,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
@@ -901,6 +965,8 @@
                     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"
@@ -937,6 +1003,8 @@
     </LinearLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 46 - 0
app/src/main/res/layout/activity_already.xml

@@ -23,6 +23,8 @@
             android:layout_marginStart="20dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,6 +43,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -76,6 +82,8 @@
                 android:layout_marginEnd="6dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -97,6 +105,8 @@
                 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"
@@ -127,6 +137,8 @@
             android:layout_marginTop="50px">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/alreadyName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -186,6 +198,8 @@
                     android:textSize="20px" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/belongSearchTV"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -214,6 +228,8 @@
                     android:textSize="20px" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/applicantSearchTV"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -242,6 +258,8 @@
                     android:textSize="20px" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/applicantCodeSearchTV"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -261,6 +279,8 @@
         </RelativeLayout>
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
@@ -286,6 +306,8 @@
                 android:button="@null" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/alreadyCodeTV"
                 android:layout_width="175px"
                 android:layout_height="wrap_content"
@@ -297,6 +319,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/name"
                 android:layout_width="200px"
                 android:layout_height="wrap_content"
@@ -308,6 +332,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/type"
                 android:layout_width="120px"
                 android:layout_height="wrap_content"
@@ -319,6 +345,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/cas"
                 android:layout_width="120px"
                 android:layout_height="wrap_content"
@@ -330,6 +358,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/purity"
                 android:layout_width="110px"
                 android:layout_height="wrap_content"
@@ -341,6 +371,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/specs"
                 android:layout_width="126px"
                 android:layout_height="wrap_content"
@@ -352,6 +384,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/belongTV"
                 android:layout_width="126px"
                 android:layout_height="wrap_content"
@@ -363,6 +397,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/applicantTV"
                 android:layout_width="108px"
                 android:layout_height="wrap_content"
@@ -374,6 +410,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/code"
                 android:layout_width="218px"
                 android:layout_height="wrap_content"
@@ -385,6 +423,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/save"
                 android:layout_width="227px"
                 android:layout_height="wrap_content"
@@ -396,6 +436,8 @@
                 android:textSize="26px" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/operate"
                 android:layout_width="100px"
                 android:layout_height="wrap_content"
@@ -424,6 +466,8 @@
                 android:layout_marginBottom="19dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/pageItem"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -469,6 +513,8 @@
     </LinearLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 12 - 0
app/src/main/res/layout/activity_change_cabinet.xml

@@ -24,6 +24,8 @@
             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"
@@ -42,6 +44,8 @@
             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"
@@ -53,6 +57,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -80,6 +86,8 @@
                 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"
@@ -101,6 +109,8 @@
                 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"
@@ -124,6 +134,8 @@
         android:background="@drawable/bg_add_chemicals_one">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/count_TV"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

+ 40 - 0
app/src/main/res/layout/activity_checklists.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -121,6 +131,8 @@
         android:orientation="vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tvCount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -141,6 +153,8 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -148,6 +162,8 @@
                 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"
@@ -155,6 +171,8 @@
                 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"
@@ -162,6 +180,8 @@
                 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"
@@ -169,6 +189,8 @@
                 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"
@@ -176,6 +198,8 @@
                 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"
@@ -183,6 +207,8 @@
                 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"
@@ -190,6 +216,8 @@
                 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"
@@ -197,6 +225,8 @@
                 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"
@@ -225,6 +255,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/one"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -235,6 +267,8 @@
                     android:textColor="@color/white" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/two"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -247,6 +281,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/three"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -259,6 +295,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/drop"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -271,6 +309,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/many"
                     android:layout_width="30dp"
                     android:layout_height="25dp"

+ 74 - 0
app/src/main/res/layout/activity_chemical_labeling.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -143,6 +153,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -188,6 +200,8 @@
                             android:visibility="visible">
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/cabinetName"
                                 android:layout_width="match_parent"
                                 android:layout_height="30dp"
@@ -221,6 +235,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/reSou"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
@@ -234,6 +250,8 @@
 
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/resetting"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
@@ -253,6 +271,8 @@
                     android:gravity="center">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -262,6 +282,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -271,6 +293,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -281,6 +305,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -290,6 +316,8 @@
                         android:textSize="12sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -321,6 +349,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/one"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -331,6 +361,8 @@
                         android:textSize="10sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/two"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -343,6 +375,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/three"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -355,6 +389,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/drop"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -367,6 +403,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/many"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -433,6 +471,8 @@
                     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"
@@ -441,6 +481,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
@@ -467,6 +509,8 @@
                 android:layout_height="34dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/chemicalName"
                     android:layout_width="300px"
                     android:layout_height="wrap_content"
@@ -485,6 +529,8 @@
                     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"
@@ -501,6 +547,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/chemicalLevelName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -522,6 +570,8 @@
                 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"
@@ -530,6 +580,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/replaceLabel"
                     android:layout_width="60dp"
                     android:layout_height="20dp"
@@ -543,6 +595,8 @@
                     android:visibility="invisible" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/reLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -570,6 +624,8 @@
                 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"
@@ -578,6 +634,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/spec"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -591,6 +649,8 @@
                 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"
@@ -599,6 +659,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/belongName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -612,6 +674,8 @@
                 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"
@@ -620,6 +684,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/surplus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -633,6 +699,8 @@
                 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"
@@ -642,6 +710,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/expireTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -658,6 +728,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -666,6 +738,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/cabinet"
                     android:layout_width="match_parent"
                     android:layout_height="30dp"

+ 78 - 0
app/src/main/res/layout/activity_chemicals_also.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -140,6 +150,8 @@
                     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"
@@ -163,6 +175,8 @@
                             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"
@@ -195,6 +209,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/reQuy"
                             android:layout_width="35dp"
                             android:layout_height="30dp"
@@ -207,6 +223,8 @@
 
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/resetting"
                             android:layout_width="35dp"
                             android:layout_height="30dp"
@@ -227,6 +245,8 @@
                     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"
@@ -235,6 +255,8 @@
                         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"
@@ -243,6 +265,8 @@
                         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"
@@ -251,6 +275,8 @@
                         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"
@@ -259,6 +285,8 @@
                         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"
@@ -287,6 +315,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/one"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -297,6 +327,8 @@
                         android:textSize="10sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/two"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -309,6 +341,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/three"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -321,6 +355,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/drop"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -333,6 +369,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/many"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -401,6 +439,8 @@
                     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"
@@ -427,6 +467,8 @@
                 android:layout_height="34dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/chemicalName"
                     android:layout_width="180px"
                     android:layout_height="wrap_content"
@@ -445,6 +487,8 @@
                     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"
@@ -460,6 +504,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/chemicalLevelName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -480,6 +526,8 @@
                 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"
@@ -489,6 +537,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/replaceLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -505,6 +555,8 @@
                     android:visibility="invisible" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/reLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -532,6 +584,8 @@
                 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"
@@ -540,6 +594,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/spec"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -554,6 +610,8 @@
                 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"
@@ -562,6 +620,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/belongName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -576,6 +636,8 @@
                 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"
@@ -584,6 +646,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/collectStockNum"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -597,6 +661,8 @@
                 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"
@@ -605,6 +671,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/createByName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -618,6 +686,8 @@
                 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"
@@ -627,6 +697,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/collectTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -637,6 +709,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/surplusTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -653,6 +727,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -670,6 +746,8 @@
                     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"

+ 10 - 0
app/src/main/res/layout/activity_demonstrate.xml

@@ -20,6 +20,8 @@
             android:background="@mipmap/ic_launcher" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -37,6 +39,8 @@
             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"
@@ -47,6 +51,8 @@
                 android:textSize="24sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -76,6 +82,8 @@
                 android:background="@mipmap/ic_launcher" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -97,6 +105,8 @@
                 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"

+ 20 - 0
app/src/main/res/layout/activity_double_verify.xml

@@ -22,6 +22,8 @@
             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"
@@ -40,6 +42,8 @@
             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"
@@ -51,6 +55,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -79,6 +85,8 @@
                 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"
@@ -100,6 +108,8 @@
                 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"
@@ -123,6 +133,8 @@
         android:orientation="vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -145,6 +157,8 @@
                 android:layout_weight="1">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/hint_1_IV"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
@@ -167,6 +181,8 @@
                     android:background="@mipmap/icon_rlrz_xx">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/hint_bottom_1_IV"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -240,6 +256,8 @@
                 android:layout_weight="1">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/hint_2_IV"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
@@ -262,6 +280,8 @@
                     android:background="@mipmap/icon_rlrz_xx">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/hint_bottom_2_IV"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

+ 22 - 0
app/src/main/res/layout/activity_electronic_ledger.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textSize="24sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,6 +84,8 @@
                 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"
@@ -99,6 +107,8 @@
                 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"
@@ -125,6 +135,8 @@
         android:paddingLeft="15dp">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="30dp"
@@ -133,6 +145,8 @@
             android:textSize="16sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -155,6 +169,8 @@
                 android:orientation="vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/chemicalLabeling"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -166,6 +182,8 @@
                     android:textSize="18sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -183,6 +201,8 @@
                 android:visibility="gone">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/cylinderLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -194,6 +214,8 @@
                     android:textSize="18sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"

+ 20 - 0
app/src/main/res/layout/activity_facial_card.xml

@@ -21,6 +21,8 @@
             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"
@@ -38,6 +40,8 @@
             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"
@@ -49,6 +53,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -74,6 +80,8 @@
         android:orientation="vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tvOen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -119,6 +127,8 @@
                             android:background="@mipmap/icon_smrz_sfrz" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
@@ -169,6 +179,8 @@
                             android:orientation="vertical">
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="请在刷卡区域进行刷卡验证"
@@ -195,6 +207,8 @@
                             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"
@@ -231,6 +245,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -295,6 +311,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请正对屏幕并使脸位于取景框内"
@@ -302,6 +320,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请保持光线充足,避免光照过强或过弱"

+ 20 - 0
app/src/main/res/layout/activity_facial_login.xml

@@ -20,6 +20,8 @@
             android:layout_centerVertical="true"
             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"
@@ -30,6 +32,8 @@
             android:textColor="@color/white"
             android:textSize="22sp" />
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/dept"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,6 +45,8 @@
             android:textSize="24sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/nowTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -71,6 +77,8 @@
                 android:layout_marginLeft="10dp"
                 android:background="@mipmap/icon_smrz_sfrz" />
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -129,12 +137,16 @@
                 android:orientation="vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="请正对屏幕并使脸位于取景框内"
                     android:textColor="@color/white" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="请保持光线充足,避免光照过强或过弱"
@@ -151,6 +163,8 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvFace"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -159,6 +173,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvSwipe"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -166,6 +182,8 @@
                 android:background="@mipmap/icon_sfsb_xyk" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvScan"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -180,6 +198,8 @@
 
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 22 - 0
app/src/main/res/layout/activity_inquiry.xml

@@ -22,6 +22,8 @@
             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"
@@ -40,6 +42,8 @@
             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"
@@ -51,6 +55,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,6 +84,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -127,6 +137,8 @@
                 android:background="@mipmap/icon_login_img" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvLogin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -169,6 +181,8 @@
                     android:background="@mipmap/cshrk_img_zwsj" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="扫描标签可查看化学品详情"
@@ -176,6 +190,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="如需查询更多化学品点击右上角登录"
@@ -205,6 +221,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="130dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -213,6 +231,8 @@
                     android:textColor="@color/black" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="170dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
@@ -272,6 +292,8 @@
         android:textSize="12sp" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

+ 10 - 0
app/src/main/res/layout/activity_ledger.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textSize="24sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,6 +84,8 @@
                 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"
@@ -99,6 +107,8 @@
                 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"

+ 52 - 0
app/src/main/res/layout/activity_main.xml

@@ -50,7 +50,9 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:textColor="@color/white"
                             android:textSize="9sp" />
 
@@ -58,7 +60,9 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
+                            android:ellipsize="end"
                             android:gravity="center"
+                            android:maxLines="1"
                             android:text="级"
                             android:textColor="@color/white"
                             android:textSize="9sp" />
@@ -69,7 +73,9 @@
                         android:layout_width="248dp"
                         android:layout_height="30dp"
                         android:background="@drawable/bg_hua_bei"
+                        android:ellipsize="end"
                         android:gravity="center_vertical"
+                        android:maxLines="1"
                         android:padding="6dp"
                         android:textColor="@color/white" />
 
@@ -89,6 +95,8 @@
                         android:id="@+id/test"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="技术支持:江苏忠江智能科技有限公司"
                         android:textColor="@color/white"
                         android:textSize="12sp" />
@@ -98,6 +106,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:textColor="@color/white"
                         android:textSize="12sp"
                         android:visibility="gone"
@@ -180,6 +190,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="存储"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -188,6 +200,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Storage"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -222,6 +236,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="废弃"
                                 android:textColor="@color/white"
                                 android:textSize="16sp"
@@ -230,6 +246,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Discard"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -265,6 +283,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="待入库"
                                 android:textColor="@color/white"
                                 android:textSize="16sp"
@@ -273,6 +293,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Stock pending"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -313,6 +335,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="查询"
                                 android:textColor="@color/white"
                                 android:textSize="16sp"
@@ -321,6 +345,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Inquire"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -354,6 +380,8 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="标签管理"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -362,6 +390,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Label"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -401,6 +431,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="领用"
                                 android:textColor="@color/white"
                                 android:textSize="16sp"
@@ -409,6 +441,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Claim"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -443,6 +477,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="归还"
                                 android:textColor="@color/white"
                                 android:textSize="16sp"
@@ -451,6 +487,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Return"
                                 android:textColor="@color/white"
                                 android:textSize="14sp"
@@ -486,6 +524,8 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="电子台账"
                                 android:textColor="@color/white"
                                 android:textSize="12sp"
@@ -494,6 +534,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Use ledgers"
                                 android:textColor="@color/white"
                                 android:textSize="8sp"
@@ -520,7 +562,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:ellipsize="end"
                                 android:gravity="center_vertical"
+                                android:maxLines="1"
                                 android:text="报警事件"
                                 android:textColor="@color/white"
                                 android:textSize="12sp"
@@ -529,6 +573,8 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Alarm events"
                                 android:textColor="@color/white"
                                 android:textSize="8sp" />
@@ -554,6 +600,8 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="MSDS"
                                 android:textColor="@color/white"
                                 android:textSize="12sp"
@@ -563,6 +611,8 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="Material Safety Data Sheet"
                                 android:textColor="@color/white"
                                 android:textSize="8sp" />
@@ -630,6 +680,8 @@
                 android:layout_below="@id/caozuo_qr"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="3px"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:text="操作教程"
                 android:textColor="@color/white"
                 android:textSize="18px" />

+ 18 - 0
app/src/main/res/layout/activity_msds.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -91,6 +97,8 @@
                     android:background="@mipmap/icon_sysmc_whp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
@@ -128,6 +136,8 @@
                 android:background="@drawable/bg_add_chemicals_one">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -223,6 +233,8 @@
                     android:background="@drawable/bgm_quan_ping">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -257,6 +269,8 @@
                         android:layout_height="50dp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -265,6 +279,8 @@
                         android:textSize="9sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -280,6 +296,8 @@
     </LinearLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 6 - 0
app/src/main/res/layout/activity_msds_screen.xml

@@ -14,6 +14,8 @@
         android:background="@color/purple_ff54a2ea">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -85,6 +87,8 @@
             android:layout_height="70dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -92,6 +96,8 @@
             android:textColor="@color/black" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"

+ 38 - 0
app/src/main/res/layout/activity_plan_add.xml

@@ -24,6 +24,8 @@
             android:layout_marginStart="20dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -42,6 +44,8 @@
             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"
@@ -51,6 +55,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 android:layout_marginEnd="6dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -98,6 +106,8 @@
                 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"
@@ -142,6 +152,8 @@
                     android:background="@mipmap/icon_dcc_z" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/countTV"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -160,6 +172,8 @@
             </LinearLayout>
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/add_index_TV"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -210,6 +224,8 @@
                     android:layout_marginVertical="10dp">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="待存储列表"
@@ -217,6 +233,8 @@
                         android:textStyle="bold" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/size_TV"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -233,6 +251,8 @@
                     android:gravity="center_vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="10dp"
@@ -241,6 +261,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -248,6 +270,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -255,6 +279,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -262,6 +288,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -269,6 +297,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -276,6 +306,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -284,6 +316,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1.1"
@@ -311,6 +345,8 @@
                         android:src="@mipmap/img_gh_smsb" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
@@ -326,6 +362,8 @@
     </LinearLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 96 - 0
app/src/main/res/layout/activity_processed.xml

@@ -21,6 +21,8 @@
             android:layout_marginLeft="20dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/titleDeptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textSize="24sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -135,6 +145,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/dStatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -145,6 +157,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/yStatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -155,6 +169,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/warnContent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -173,12 +189,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="时    间:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/warnTime"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -196,12 +216,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="学         院:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/deptName"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -220,12 +244,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="实  验  室:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/subName"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -251,12 +279,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="归属人:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/belongName"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -277,12 +309,16 @@
                     android:visibility="gone">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="领用时间:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/collectTime"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -303,12 +339,16 @@
                     android:visibility="gone">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="领用时效:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/collectTimeAging"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -335,12 +375,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="操作人:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/operationPerson"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -358,12 +402,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="业务类型:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/alarmType"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -383,12 +431,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="化学品柜:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/cabinetName"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -416,6 +468,8 @@
                     android:orientation="horizontal"
                     android:layout_height="wrap_content">
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/chemicalName"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -423,6 +477,8 @@
                         android:text="化学品名称"
                         android:textColor="@color/black" />
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/chemicalCode"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -439,6 +495,8 @@
                     android:layout_height="wrap_content">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/position"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -461,12 +519,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/collectUserName"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="@color/black" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/normsNum"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -474,6 +536,8 @@
                             android:textColor="@color/black" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/surplus"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -499,6 +563,8 @@
             </LinearLayout>
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -514,6 +580,8 @@
                 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"
@@ -523,6 +591,8 @@
                     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"
@@ -532,6 +602,8 @@
                     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"
@@ -541,6 +613,8 @@
                     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"
@@ -557,6 +631,8 @@
                 android:layout_height="110dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvProc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -575,6 +651,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/processing"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -604,12 +682,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="处理方式:"
                             android:textColor="@color/black" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/typeMsg"
                             android:layout_width="150dp"
                             android:layout_height="match_parent"
@@ -627,12 +709,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="处 理 人:"
                             android:textColor="@color/black" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/handlePerson"
                             android:layout_width="150dp"
                             android:layout_height="match_parent"
@@ -650,12 +736,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="处理时间:"
                             android:textColor="@color/black" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/handleTime"
                             android:layout_width="150dp"
                             android:layout_height="match_parent"
@@ -677,12 +767,16 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="处理备注:"
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/handleNotes"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
@@ -717,6 +811,8 @@
             android:textColor="@color/white" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

+ 50 - 0
app/src/main/res/layout/activity_query_details.xml

@@ -21,6 +21,8 @@
             android:layout_marginLeft="20dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -38,6 +40,8 @@
             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"
@@ -49,6 +53,8 @@
                 android:textSize="24sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,6 +84,8 @@
                 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"
@@ -99,6 +107,8 @@
                 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"
@@ -141,6 +151,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -149,6 +161,8 @@
                     android:textColor="@color/black" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -196,6 +210,8 @@
                 android:layout_height="34dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -203,6 +219,8 @@
                     android:textColor="@color/black" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/produce"
                     android:layout_width="60dp"
                     android:layout_height="30dp"
@@ -215,6 +233,8 @@
                     android:textColor="@color/purple_0072dd" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/category"
                     android:layout_width="60dp"
                     android:layout_height="30dp"
@@ -232,6 +252,8 @@
                 android:layout_height="34dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -250,6 +272,8 @@
                         android:background="@mipmap/icon_cx_zl" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
@@ -263,6 +287,8 @@
                         android:background="@mipmap/icon_cz_jhl" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
@@ -286,6 +312,8 @@
                 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"
@@ -295,6 +323,8 @@
                     android:textSize="16sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -304,6 +334,8 @@
                     android:textSize="16sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -313,6 +345,8 @@
                     android:textSize="16sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -322,6 +356,8 @@
                     android:textSize="16sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -331,6 +367,8 @@
                     android:textSize="16sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -359,6 +397,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/one"
                         android:layout_width="50dp"
                         android:layout_height="40dp"
@@ -369,6 +409,8 @@
                         android:textColor="@color/white" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/two"
                         android:layout_width="50dp"
                         android:layout_height="40dp"
@@ -378,6 +420,8 @@
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/three"
                         android:layout_width="50dp"
                         android:layout_height="40dp"
@@ -387,6 +431,8 @@
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/drop"
                         android:layout_width="50dp"
                         android:layout_height="40dp"
@@ -396,6 +442,8 @@
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/many"
                         android:layout_width="50dp"
                         android:layout_height="40dp"
@@ -444,6 +492,8 @@
 
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

+ 12 - 0
app/src/main/res/layout/activity_save_list.xml

@@ -23,6 +23,8 @@
             android:layout_marginStart="20dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,6 +43,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -76,6 +82,8 @@
                 android:layout_marginEnd="6dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -97,6 +105,8 @@
                 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"
@@ -121,6 +131,8 @@
         android:orientation="vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="50px"

+ 36 - 0
app/src/main/res/layout/activity_scan_code_two.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -75,6 +81,8 @@
 
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tvOen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -117,6 +125,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -146,6 +156,8 @@
                             android:layout_height="100dp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="20dp"
@@ -177,6 +189,8 @@
                                 android:src="@mipmap/icon_zhan_wei" />
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/userName"
                                 android:layout_width="112.5dp"
                                 android:layout_height="20dp"
@@ -207,6 +221,8 @@
                                 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"
@@ -244,6 +260,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请打开微信扫描屏幕二维码"
@@ -251,6 +269,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="进行扫码验证"
@@ -267,12 +287,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/face"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_rlsb" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/card"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
@@ -307,6 +331,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -332,6 +358,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
@@ -364,6 +392,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请打开微信扫描屏幕二维码"
@@ -371,6 +401,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="进行扫码验证"
@@ -387,12 +419,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/faceTow"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_rlsb" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/cardTow"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"

+ 18 - 0
app/src/main/res/layout/activity_scan_login.xml

@@ -21,6 +21,8 @@
             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"
@@ -32,6 +34,8 @@
             android:textSize="22sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/dep"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -43,6 +47,8 @@
             android:textSize="24sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/nowTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -74,6 +80,8 @@
                 android:background="@mipmap/icon_smrz_sfrz" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -97,6 +105,8 @@
                 android:layout_height="130dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/img"
@@ -129,6 +139,8 @@
                 android:orientation="vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="请打开微信扫描屏幕二维码进行扫码验证"
@@ -146,12 +158,16 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvFace"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@mipmap/icon_sfsb_rlsb" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvCrad"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -162,6 +178,8 @@
     </LinearLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 10 - 0
app/src/main/res/layout/activity_setting.xml

@@ -13,6 +13,8 @@
         android:background="#20ffffff">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
@@ -230,6 +232,8 @@
                     android:paddingVertical="5dp">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Http服务配置"
@@ -270,6 +274,8 @@
 
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
@@ -305,6 +311,8 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="蓝牙称配置"
@@ -312,6 +320,8 @@
                             android:textStyle="bold" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/ble_name_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"

+ 6 - 0
app/src/main/res/layout/activity_splash.xml

@@ -7,6 +7,8 @@
     android:background="@mipmap/img_hxpglpt_bg">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/versionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -21,6 +23,8 @@
         tools:text="版本号:xxxxxxxxxx" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/copyRight"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -53,6 +57,8 @@
             android:src="@mipmap/img_qdy_zjzn" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="30dp"

+ 8 - 0
app/src/main/res/layout/activity_start.xml

@@ -9,6 +9,8 @@
     tools:context=".ui.StartActivity">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/logo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,6 +31,8 @@
         android:orientation="horizontal">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/hint_TV"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -43,12 +47,16 @@
     </LinearLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

+ 16 - 0
app/src/main/res/layout/activity_swipe.xml

@@ -21,6 +21,8 @@
             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"
@@ -32,6 +34,8 @@
             android:textSize="22sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/dept"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -43,6 +47,8 @@
             android:textSize="24sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/nowTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -74,6 +80,8 @@
                 android:background="@mipmap/icon_smrz_sfrz" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -122,6 +130,8 @@
                 android:orientation="vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="请在刷卡区域进行刷卡验证"
@@ -139,12 +149,16 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvFace"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@mipmap/icon_sfsb_rlsb" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvWx"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -155,6 +169,8 @@
     </LinearLayout>
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 28 - 0
app/src/main/res/layout/activity_swipe_code_two.xml

@@ -21,6 +21,8 @@
             android:layout_marginLeft="10dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -40,6 +42,8 @@
             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"
@@ -51,6 +55,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -75,6 +81,8 @@
         android:background="@drawable/bg_bei_jing">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tvOen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -117,6 +125,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -168,6 +178,8 @@
                                 android:src="@mipmap/icon_zhan_wei" />
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/userName"
                                 android:layout_width="112dp"
                                 android:layout_height="wrap_content"
@@ -198,6 +210,8 @@
                                 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"
@@ -234,6 +248,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请在刷卡区域进行刷卡验证"
@@ -251,12 +267,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/face"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_rlsb" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/wxScan"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
@@ -291,6 +311,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -340,6 +362,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请在刷卡区域进行刷卡验证"
@@ -356,12 +380,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/faceTwo"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_rlsb" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/wxScanTwo"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"

+ 32 - 0
app/src/main/res/layout/activity_two_person.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -74,6 +80,8 @@
         android:background="@drawable/bg_bei_jing">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tvOen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -116,6 +124,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -172,6 +182,8 @@
                                 android:src="@mipmap/icon_zhan_wei" />
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/userName"
                                 android:layout_width="112dp"
                                 android:layout_height="wrap_content"
@@ -202,6 +214,8 @@
                                 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"
@@ -238,6 +252,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请正对屏幕并使脸位于取景框内"
@@ -245,6 +261,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请保持光线充足,避免光照过强或过弱"
@@ -261,12 +279,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/scan"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_wxsm" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/campus"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
@@ -301,6 +323,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -361,6 +385,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请正对屏幕并使脸位于取景框内"
@@ -368,6 +394,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="请保持光线充足,避免光照过强或过弱"
@@ -384,12 +412,16 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/scanTwo"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_wxsm" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/campusTwo"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"

+ 42 - 0
app/src/main/res/layout/activity_two_verification.xml

@@ -22,6 +22,8 @@
             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"
@@ -40,6 +42,8 @@
             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"
@@ -51,6 +55,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -79,6 +85,8 @@
                 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"
@@ -100,6 +108,8 @@
                 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"
@@ -123,6 +133,8 @@
         android:background="@drawable/bg_bei_jing">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tvOen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -165,6 +177,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/tvMsg"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -233,6 +247,8 @@
                         android:layout_height="100dp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
@@ -266,6 +282,8 @@
                             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"
@@ -298,6 +316,8 @@
                             android:orientation="vertical">
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/tvMsgRoa"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -306,6 +326,8 @@
                                 android:textSize="12sp" />
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/tvMsgRob"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -323,18 +345,24 @@
                             android:orientation="horizontal">
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/scan"
                                 android:layout_width="98dp"
                                 android:layout_height="wrap_content"
                                 android:background="@mipmap/icon_sfsb_wxsm" />
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/campus"
                                 android:layout_width="98dp"
                                 android:layout_height="wrap_content"
                                 android:background="@mipmap/icon_sfsb_xyk" />
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/face"
                                 android:layout_width="98dp"
                                 android:layout_height="wrap_content"
@@ -369,6 +397,8 @@
                         android:background="@mipmap/icon_smrz_sfrz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/tvMsgRoe"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -446,6 +476,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
@@ -479,6 +511,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/tvMsgRoc"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -487,6 +521,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/tvMsgRod"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -504,18 +540,24 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/scanTwo"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_wxsm" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/campusTwo"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"
                             android:background="@mipmap/icon_sfsb_xyk" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/faceRoa"
                             android:layout_width="98dp"
                             android:layout_height="wrap_content"

+ 42 - 0
app/src/main/res/layout/activity_unlock.xml

@@ -23,6 +23,8 @@
             android:layout_marginStart="20dp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,6 +43,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -76,6 +82,8 @@
                 android:layout_marginEnd="6dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -97,6 +105,8 @@
                 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"
@@ -161,6 +171,8 @@
                     android:layout_height="wrap_content" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -199,6 +211,8 @@
                     android:orientation="vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="80px"
                         android:background="@drawable/shape_unlock_t"
@@ -214,6 +228,8 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="120px"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -227,6 +243,8 @@
                             android:background="#d5d5d5" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/admin_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -241,6 +259,8 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="120px"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -254,6 +274,8 @@
                             android:background="#d5d5d5" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/safety_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -268,6 +290,8 @@
                         android:orientation="horizontal">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="120px"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -281,6 +305,8 @@
                             android:background="#d5d5d5" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/director_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -302,6 +328,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_gravity="end"
@@ -310,6 +338,8 @@
                             android:text="柜子" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_gravity="end"
@@ -318,6 +348,8 @@
                             android:text="柜门" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_gravity="end"
@@ -328,6 +360,8 @@
                             android:text="成功" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_gravity="end"
@@ -345,6 +379,8 @@
                         android:orientation="vertical">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/cabinet_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -353,6 +389,8 @@
                             android:gravity="center" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/door_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -361,6 +399,8 @@
                             android:gravity="center" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/unlocked_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -370,6 +410,8 @@
                             android:textColor="#0FB525" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/unlock_failed_TV"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"

+ 42 - 0
app/src/main/res/layout/activity_use.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,6 +84,8 @@
                 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"
@@ -99,6 +107,8 @@
                 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"
@@ -142,6 +152,8 @@
                     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"
@@ -192,6 +204,8 @@
                         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"
@@ -219,6 +233,8 @@
                     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"
@@ -228,6 +244,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -237,6 +255,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -246,6 +266,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -255,6 +277,8 @@
                         android:textSize="16sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -284,6 +308,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/one"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -294,6 +320,8 @@
                         android:textSize="10sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/two"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -306,6 +334,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/three"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -318,6 +348,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/drop"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -330,6 +362,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/many"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -384,6 +418,8 @@
             android:paddingRight="20dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="选择要打开的柜门"
@@ -399,6 +435,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="157dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -408,6 +446,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="147dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -452,6 +492,8 @@
 
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tvReturn"
         android:layout_width="85dp"
         android:layout_height="30dp"

+ 54 - 0
app/src/main/res/layout/activity_warehousing.xml

@@ -20,6 +20,8 @@
             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"
@@ -38,6 +40,8 @@
             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"
@@ -49,6 +53,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -140,6 +150,8 @@
                     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"
@@ -198,6 +210,8 @@
                         android:background="@drawable/bg_shu_ru_kuang_twoe">
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/value"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -226,6 +240,8 @@
                     android:gravity="center">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -235,6 +251,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -244,6 +262,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -253,6 +273,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -262,6 +284,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -271,6 +295,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -302,6 +328,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/one"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -312,6 +340,8 @@
                         android:textSize="10sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/two"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -324,6 +354,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/three"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -336,6 +368,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/drop"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -348,6 +382,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/many"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -407,6 +443,8 @@
                 android:paddingLeft="6dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="入库清单"
@@ -423,6 +461,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -431,6 +471,8 @@
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -439,6 +481,8 @@
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -447,6 +491,8 @@
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -455,6 +501,8 @@
                         android:textColor="@color/black" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -487,6 +535,8 @@
                     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="10dp"
@@ -495,6 +545,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="或直接扫描化学品标签"
@@ -517,6 +569,8 @@
                     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"

+ 32 - 0
app/src/main/res/layout/activity_warning_events.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,6 +84,8 @@
                 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"
@@ -99,6 +107,8 @@
                 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"
@@ -158,6 +168,8 @@
                 </RelativeLayout>
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/countSi"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -177,6 +189,8 @@
                     android:layout_marginLeft="4dp">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/dateTime"
                         android:layout_width="match_parent"
                         android:layout_height="30dp"
@@ -253,6 +267,8 @@
                 android:paddingLeft="13dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.6"
@@ -261,6 +277,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.4"
@@ -269,6 +287,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
@@ -278,6 +298,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.77"
@@ -309,6 +331,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/one"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -319,6 +343,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/two"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -331,6 +357,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/three"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -343,6 +371,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/drop"
                     android:layout_width="30dp"
                     android:layout_height="25dp"
@@ -355,6 +385,8 @@
                     android:visibility="gone" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/many"
                     android:layout_width="30dp"
                     android:layout_height="25dp"

+ 90 - 0
app/src/main/res/layout/activity_waste_chemicals.xml

@@ -21,6 +21,8 @@
             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"
@@ -39,6 +41,8 @@
             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"
@@ -50,6 +54,8 @@
                 android:textStyle="bold" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nowTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
                 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"
@@ -98,6 +106,8 @@
                 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"
@@ -140,6 +150,8 @@
                     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"
@@ -161,6 +173,8 @@
                             android:layout_marginRight="6dp">
 
                             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                                 android:id="@+id/cabinetName"
                                 android:layout_width="match_parent"
                                 android:layout_height="30dp"
@@ -193,6 +207,8 @@
                             android:textSize="12sp" />
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/reQuy"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
@@ -206,6 +222,8 @@
 
 
                         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                             android:id="@+id/resetting"
                             android:layout_width="45dp"
                             android:layout_height="30dp"
@@ -225,6 +243,8 @@
                     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"
@@ -234,6 +254,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -243,6 +265,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -252,6 +276,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -261,6 +287,8 @@
                         android:textSize="13sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -290,6 +318,8 @@
                     android:orientation="horizontal">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/one"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -299,6 +329,8 @@
                         android:textColor="@color/white" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/two"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -310,6 +342,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/three"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -321,6 +355,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/drop"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -333,6 +369,8 @@
                         android:visibility="gone" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/many"
                         android:layout_width="30dp"
                         android:layout_height="25dp"
@@ -399,6 +437,8 @@
                     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"
@@ -407,6 +447,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="11dp"
@@ -434,6 +476,8 @@
                 android:layout_height="34dp">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/chemicalName"
                     android:layout_width="300px"
                     android:layout_height="wrap_content"
@@ -452,6 +496,8 @@
                     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"
@@ -468,6 +514,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/chemicalLevelName"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
@@ -489,6 +537,8 @@
                 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"
@@ -510,6 +560,8 @@
                 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"
@@ -518,6 +570,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/spec"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -531,6 +585,8 @@
                 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"
@@ -539,6 +595,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/surplus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -553,6 +611,8 @@
                 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"
@@ -561,6 +621,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/belongName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -575,6 +637,8 @@
                 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"
@@ -584,6 +648,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/expireTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -593,6 +659,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvNoName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -611,6 +679,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -619,6 +689,8 @@
                     android:textSize="10sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/storage"
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
@@ -653,6 +725,8 @@
                 android:orientation="vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="已废弃出库"
@@ -660,6 +734,8 @@
                     android:textSize="20sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/surplusTow"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -680,6 +756,8 @@
                         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"
@@ -705,6 +783,8 @@
                         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"
@@ -718,6 +798,8 @@
             </LinearLayout>
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
@@ -746,6 +828,8 @@
                 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"
@@ -767,6 +851,8 @@
                     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"
@@ -792,6 +878,8 @@
                     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"
@@ -803,6 +891,8 @@
                         android:textSize="10sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"

+ 5 - 1
app/src/main/res/layout/air_bottle_dialog.xml

@@ -26,6 +26,8 @@
                 android:background="@mipmap/icon_bqgl_sys" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
@@ -44,6 +46,8 @@
             android:layout_marginRight="30dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvEte"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -84,7 +88,7 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="70px"
         android:layout_marginTop="15dp"
         android:gravity="center"
         android:orientation="horizontal">

+ 9 - 1
app/src/main/res/layout/air_bottle_new_dialog.xml

@@ -26,6 +26,8 @@
                 android:background="@mipmap/icon_bqgl_sys" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
@@ -44,6 +46,8 @@
             android:layout_marginRight="30dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvRfid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -53,6 +57,8 @@
                 android:textSize="16sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/rfids"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +83,8 @@
             android:layout_marginRight="30dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvEte"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -117,7 +125,7 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="70px"
         android:layout_marginTop="15dp"
         android:gravity="center"
         android:orientation="horizontal">

+ 2 - 0
app/src/main/res/layout/already_dialog.xml

@@ -12,6 +12,8 @@
         android:orientation="vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/dialogName"
             android:layout_width="wrap_content"
             android:layout_height="40dp"

+ 12 - 0
app/src/main/res/layout/authentication_dialog.xml

@@ -26,6 +26,8 @@
                 android:src="@mipmap/icon_zhan_wei" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/userName"
                 android:layout_width="match_parent"
                 android:layout_height="20dp"
@@ -55,6 +57,8 @@
                     android:src="@mipmap/icon_sy_sysmc" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/subName"
                     android:layout_width="156dp"
                     android:layout_height="wrap_content"
@@ -78,6 +82,8 @@
                     android:src="@mipmap/icon_sy_xymc" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/deptName"
                     android:layout_width="156dp"
                     android:layout_height="wrap_content"
@@ -100,6 +106,8 @@
                     android:src="@mipmap/icon_sy_ldlcmc" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/buildName"
                     android:layout_width="156dp"
                     android:layout_height="wrap_content"
@@ -139,6 +147,8 @@
                     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"
@@ -150,6 +160,8 @@
             </RelativeLayout>
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

+ 12 - 1
app/src/main/res/layout/belonging_person_dialog.xml

@@ -8,7 +8,7 @@
     <LinearLayout
         android:id="@+id/lin1"
         android:layout_width="470dp"
-        android:layout_height="300dp"
+        android:layout_height="wrap_content"
         android:background="@drawable/bg_shu_ru_kuang"
         android:orientation="vertical">
 
@@ -17,6 +17,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="12dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="选择归属人"
             android:textColor="@color/black"
             android:textSize="18sp" />
@@ -31,7 +33,9 @@
                 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" />
 
@@ -39,7 +43,9 @@
                 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" />
 
@@ -47,7 +53,9 @@
                 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" />
 
@@ -55,7 +63,9 @@
                 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>
@@ -72,6 +82,7 @@
         android:layout_width="110dp"
         android:layout_height="32dp"
         android:layout_marginTop="15dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/bg_quan_xin_twoe"
         android:text="关闭"
         android:textColor="@color/white" />

+ 7 - 1
app/src/main/res/layout/cabinet_opened_dialog.xml

@@ -27,6 +27,8 @@
                 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_marginLeft="8dp"
@@ -45,6 +47,8 @@
             android:layout_marginTop="40dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/useAmount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -54,6 +58,8 @@
                 android:textSize="12sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/remark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -68,7 +74,7 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="70px"
         android:layout_below="@+id/lin1"
         android:layout_centerInParent="true"
         android:layout_gravity="center"

+ 8 - 0
app/src/main/res/layout/chemical_search_rv.xml

@@ -10,6 +10,8 @@
         android:gravity="center_vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -19,6 +21,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/casNum"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -28,6 +32,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalPurity"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -37,6 +43,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"

+ 9 - 6
app/src/main/res/layout/chemical_type_dialog.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:orientation="vertical"
+    android:layout_height="match_parent"
     android:gravity="center"
-    android:layout_height="match_parent">
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/lin1"
         android:layout_width="418dp"
-        android:layout_height="282dp"
+        android:layout_height="wrap_content"
         android:background="@drawable/bg_shu_ru_kuang"
         android:orientation="vertical">
 
@@ -17,17 +17,19 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="12dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="选择化学品类别"
             android:textColor="@color/black"
             android:textSize="16sp" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvView"
-            android:layout_marginRight="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="200dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginTop="22dp"
+            android:layout_marginRight="20dp"
             android:layout_marginBottom="10dp" />
 
     </LinearLayout>
@@ -37,6 +39,7 @@
         android:layout_width="110dp"
         android:layout_height="32dp"
         android:layout_marginTop="20dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/bg_quan_xin_twoe"
         android:text="关闭"
         android:textColor="@color/white" />

+ 2 - 0
app/src/main/res/layout/chemical_type_dialog_rv.xml

@@ -4,6 +4,8 @@
     android:layout_height="wrap_content">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="25dp"

+ 2 - 0
app/src/main/res/layout/custom_bubble_attach_popup.xml

@@ -8,6 +8,8 @@
     android:paddingHorizontal="120px">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

+ 2 - 0
app/src/main/res/layout/custom_dialog_layout.xml

@@ -28,6 +28,8 @@
             android:visibility="gone" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

+ 2 - 0
app/src/main/res/layout/custom_spinner_item.xml

@@ -13,6 +13,8 @@
         android:paddingHorizontal="20px">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/spinnerItemText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

+ 3 - 1
app/src/main/res/layout/custom_spinner_tow_item.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+                android:ellipsize="end"
+                android:maxLines="1" xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/spinnerItemText"
     android:layout_width="match_parent"
     android:layout_height="24dp"

+ 10 - 0
app/src/main/res/layout/dcae_dialog.xml

@@ -13,6 +13,8 @@
         android:orientation="vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
             android:layout_gravity="center"
@@ -30,6 +32,8 @@
             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"
@@ -39,6 +43,8 @@
                  />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -48,6 +54,8 @@
                  />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -57,6 +65,8 @@
                  />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"

+ 2 - 0
app/src/main/res/layout/dialog_ble_selector.xml

@@ -16,6 +16,8 @@
         android:padding="10dp">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="请核对好蓝牙称上的MAC地址,并选择扫描出的蓝牙设备"

+ 14 - 0
app/src/main/res/layout/dialog_bluetooth_weigh.xml

@@ -15,6 +15,8 @@
         android:background="@drawable/bg_shu_ru_kuang">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/hint_TV"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -62,6 +64,8 @@
                     android:background="@drawable/shape_input_box">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -74,6 +78,8 @@
                         app:drawableStartCompat="@mipmap/icon_cz_cz" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -83,6 +89,8 @@
                         android:textSize="18px" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/weigh_TV"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -102,6 +110,8 @@
                     android:background="@drawable/shape_input_box">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -115,6 +125,8 @@
 
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/specs_TV"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -134,6 +146,8 @@
                     android:background="@drawable/shape_input_box">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="30px"

+ 2 - 0
app/src/main/res/layout/dialog_loading.xml

@@ -16,6 +16,8 @@
         android:layout_margin="7dp" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 4 - 0
app/src/main/res/layout/dialog_plan.xml

@@ -19,6 +19,8 @@
             android:background="@mipmap/img_bg_whpcc">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
@@ -37,6 +39,8 @@
             android:background="@mipmap/img_bg_qthxpcc">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"

+ 21 - 1
app/src/main/res/layout/dialog_print_label.xml

@@ -21,6 +21,8 @@
             android:padding="20dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_width="380dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -31,6 +33,8 @@
                 android:textSize="12sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/chemicalName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -43,6 +47,8 @@
                 android:layout_height="wrap_content">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/net_Wt_TV"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -52,6 +58,8 @@
 
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/layer_TV"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -76,12 +84,16 @@
                 android:gravity="center_vertical">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="40dp"
                     android:layout_height="wrap_content"
                     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"
@@ -90,6 +102,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -99,6 +113,8 @@
                     android:textSize="12sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="40dp"
                     android:layout_height="wrap_content"
                     android:text="删除"
@@ -130,6 +146,8 @@
                         android:layout_height="wrap_content" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="打印中..." />
@@ -137,6 +155,8 @@
             </RelativeLayout>
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/sum_TV"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -147,7 +167,7 @@
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="40dp"
+            android:layout_height="70px"
             android:layout_gravity="center"
             android:layout_marginTop="18dp"
             android:orientation="horizontal">

+ 5 - 1
app/src/main/res/layout/discard_dialog.xml

@@ -20,6 +20,8 @@
             android:layout_marginTop="16dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/wasteVolume"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -92,6 +94,8 @@
                 android:gravity="center">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/tvOtn"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -119,7 +123,7 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="70px"
         android:layout_marginTop="26dp"
         android:orientation="horizontal">
 

+ 8 - 0
app/src/main/res/layout/double_people_dialog.xml

@@ -24,6 +24,8 @@
                 android:layout_height="90dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nameA"
                 android:layout_width="110dp"
                 android:layout_height="wrap_content"
@@ -47,6 +49,8 @@
                 android:layout_height="90dp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/nameB"
                 android:layout_width="112dp"
                 android:layout_height="wrap_content"
@@ -82,6 +86,8 @@
                     android:background="@mipmap/icon_sy_zq" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/person"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -94,6 +100,8 @@
             </RelativeLayout>
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

+ 2 - 0
app/src/main/res/layout/dropdown_item.xml

@@ -6,6 +6,8 @@
     android:padding="6dp">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

+ 10 - 5
app/src/main/res/layout/empties_dialog.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:orientation="vertical"
+    android:layout_height="match_parent"
     android:gravity="center"
-    android:layout_height="match_parent">
+    android:orientation="vertical">
+
     <LinearLayout
         android:id="@+id/lin1"
         android:layout_width="700dp"
@@ -19,6 +20,8 @@
             android:layout_marginTop="20dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/chemicalName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -35,20 +38,22 @@
             android:layout_marginTop="40dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/tvOne"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="16dp"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:textColor="@color/black"
+                android:textSize="20sp" />
         </RelativeLayout>
 
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="70px"
         android:layout_below="@+id/lin1"
         android:layout_marginTop="15dp"
         android:orientation="horizontal">

+ 2 - 0
app/src/main/res/layout/fragment_face_detect.xml

@@ -11,6 +11,8 @@
         android:layout_height="match_parent" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/hint_TV"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

+ 38 - 0
app/src/main/res/layout/fragment_inventory_iedger.xml

@@ -57,6 +57,8 @@
             android:layout_toRightOf="@+id/tvCategory">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/chemType"
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
@@ -113,6 +115,8 @@
             android:layout_toRightOf="@+id/tvCategory">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/cabinetName"
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
@@ -196,6 +200,8 @@
             android:layout_height="45dp">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/total"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -218,6 +224,8 @@
         android:orientation="horizontal">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -226,6 +234,8 @@
             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"
@@ -234,6 +244,8 @@
             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"
@@ -242,6 +254,8 @@
             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"
@@ -250,6 +264,8 @@
             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"
@@ -258,6 +274,8 @@
             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"
@@ -266,6 +284,8 @@
             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"
@@ -274,6 +294,8 @@
             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"
@@ -282,6 +304,8 @@
             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"
@@ -290,6 +314,8 @@
             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"
@@ -298,6 +324,8 @@
             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"
@@ -330,6 +358,8 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/one"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -340,6 +370,8 @@
                 android:textColor="@color/white" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/two"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -352,6 +384,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/three"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -364,6 +398,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/drop"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -376,6 +412,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/many"
                 android:layout_width="30dp"
                 android:layout_height="25dp"

+ 28 - 0
app/src/main/res/layout/fragment_locker.xml

@@ -174,7 +174,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="①  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -186,7 +188,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="②  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -198,7 +202,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="③  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -210,7 +216,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="④  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -222,7 +230,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑤  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -234,7 +244,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑥  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -246,7 +258,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑦  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -258,7 +272,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑧  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -279,7 +295,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="①  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -291,7 +309,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="②  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -303,7 +323,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="③  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -315,7 +337,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="④  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -329,6 +353,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="33px"
             android:layout_marginTop="168px"
+            android:ellipsize="end"
             android:maxLines="4"
             android:textColor="@color/white" />
 
@@ -338,6 +363,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="33px"
             android:layout_marginTop="410px"
+            android:ellipsize="end"
             android:maxLines="4"
             android:textColor="@color/white" />
 
@@ -349,7 +375,9 @@
             android:layout_marginTop="30px"
             android:drawableStart="@drawable/locker_name_round"
             android:drawablePadding="15px"
+            android:ellipsize="end"
             android:gravity="center_vertical"
+            android:maxLines="1"
             android:textColor="@color/white"
             android:textSize="16sp" />
 

+ 30 - 0
app/src/main/res/layout/fragment_query_one.xml

@@ -28,6 +28,8 @@
                 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"
@@ -89,6 +91,8 @@
                 android:textSize="12sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/reQuy"
                 android:layout_width="45dp"
                 android:layout_height="30dp"
@@ -102,6 +106,8 @@
 
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/resetting"
                 android:layout_width="45dp"
                 android:layout_height="30dp"
@@ -142,6 +148,8 @@
             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"
@@ -150,6 +158,8 @@
                 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"
@@ -158,6 +168,8 @@
                 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"
@@ -166,6 +178,8 @@
                 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"
@@ -174,6 +188,8 @@
                 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"
@@ -182,6 +198,8 @@
                 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"
@@ -190,6 +208,8 @@
                 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"
@@ -220,6 +240,8 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/one"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -230,6 +252,8 @@
                 android:textSize="10sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/two"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -242,6 +266,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/three"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -254,6 +280,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/drop"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -266,6 +294,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/many"
                 android:layout_width="30dp"
                 android:layout_height="25dp"

+ 34 - 0
app/src/main/res/layout/fragment_query_two.xml

@@ -21,6 +21,8 @@
             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"
@@ -29,6 +31,8 @@
                 android:textSize="15sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/chemicalLevelName"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
@@ -45,6 +49,8 @@
                 android:textSize="10sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/chemicalCategoryName"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
@@ -65,6 +71,8 @@
             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"
@@ -84,6 +92,8 @@
                     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"
@@ -98,6 +108,8 @@
                     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"
@@ -124,6 +136,8 @@
             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"
@@ -132,6 +146,8 @@
                 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"
@@ -140,6 +156,8 @@
                 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"
@@ -148,6 +166,8 @@
                 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"
@@ -156,6 +176,8 @@
                 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"
@@ -164,6 +186,8 @@
                 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"
@@ -195,6 +219,8 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/one"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -205,6 +231,8 @@
                 android:textSize="10sp" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/two"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -217,6 +245,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/three"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -229,6 +259,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/drop"
                 android:layout_width="30dp"
                 android:layout_height="25dp"
@@ -241,6 +273,8 @@
                 android:visibility="gone" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/many"
                 android:layout_width="30dp"
                 android:layout_height="25dp"

+ 60 - 24
app/src/main/res/layout/fragment_use_ledger.xml

@@ -21,9 +21,9 @@
             android:button="@null"
             android:checked="true"
             android:gravity="center"
-            android:textSize="12sp"
             android:text="全部"
-            android:textColor="@drawable/text_color_selector" />
+            android:textColor="@drawable/text_color_selector"
+            android:textSize="12sp" />
 
         <RadioButton
             android:id="@+id/radioTwo"
@@ -32,9 +32,9 @@
             android:background="@drawable/bg_one"
             android:button="@null"
             android:gravity="center"
-            android:textSize="12sp"
             android:text="近一个月"
-            android:textColor="@drawable/text_color_selector" />
+            android:textColor="@drawable/text_color_selector"
+            android:textSize="12sp" />
 
         <RadioButton
             android:id="@+id/radioThree"
@@ -43,9 +43,9 @@
             android:background="@drawable/bg_sele_you"
             android:button="@null"
             android:gravity="center"
-            android:textSize="12sp"
             android:text="近三个月"
-            android:textColor="@drawable/text_color_selector" />
+            android:textColor="@drawable/text_color_selector"
+            android:textSize="12sp" />
 
         <RelativeLayout
             android:layout_width="75dp"
@@ -59,7 +59,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
                 android:background="@drawable/bg_shu_ru_kuang_twoe"
+                android:ellipsize="end"
                 android:gravity="center_vertical"
+                android:maxLines="1"
                 android:paddingLeft="6dp"
                 android:text="类别"
                 android:textColor="@color/black"
@@ -86,8 +88,8 @@
                 android:layout_height="30dp"
                 android:layout_centerVertical="true"
                 android:background="@null"
-                android:gravity="center"
                 android:entries="@array/spinner_spLev"
+                android:gravity="center"
                 android:padding="2dp"
                 android:text="级别"
                 android:textColor="@color/black" />
@@ -114,7 +116,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
                 android:background="@drawable/bg_shu_ru_kuang_twoe"
+                android:ellipsize="end"
                 android:gravity="center_vertical"
+                android:maxLines="1"
                 android:paddingLeft="6dp"
                 android:text="化学品柜"
                 android:textColor="@color/black"
@@ -137,8 +141,8 @@
             android:layout_toLeftOf="@+id/reQuy"
             android:background="@drawable/bg_sou_no_1"
             android:hint="化学品名/拼音首字母/CAS码/编码/姓名"
-            android:padding="4dp"
             android:imeOptions="actionDone"
+            android:padding="4dp"
             android:singleLine="true"
             android:textSize="12sp" />
 
@@ -173,6 +177,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="10dp"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:textColor="@color/black" />
         </RelativeLayout>
     </LinearLayout>
@@ -181,15 +187,17 @@
         android:layout_width="match_parent"
         android:layout_height="35dp"
         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: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" />
 
@@ -197,6 +205,8 @@
             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" />
 
@@ -204,6 +214,8 @@
             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" />
 
@@ -211,6 +223,8 @@
             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" />
 
@@ -218,6 +232,8 @@
             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" />
 
@@ -225,6 +241,8 @@
             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" />
 
@@ -232,6 +250,8 @@
             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" />
 
@@ -239,6 +259,8 @@
             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" />
 
@@ -246,6 +268,8 @@
             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" />
 
@@ -253,6 +277,8 @@
             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>
@@ -265,8 +291,8 @@
             android:id="@+id/rvView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="13dp"
             android:layout_marginBottom="65dp"
+            android:paddingLeft="13dp"
             tools:listitem="@layout/item_use_ledger" />
 
         <RelativeLayout
@@ -289,10 +315,12 @@
                     android:layout_height="25dp"
                     android:layout_marginLeft="10dp"
                     android:background="@drawable/bg_sou_suo_page"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:text="1"
-                    android:textSize="10sp"
-                    android:textColor="@color/white" />
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
 
                 <TextView
                     android:id="@+id/two"
@@ -300,10 +328,12 @@
                     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:textSize="10sp"
                     android:textColor="@color/black"
+                    android:textSize="10sp"
                     android:visibility="gone" />
 
                 <TextView
@@ -312,10 +342,12 @@
                     android:layout_height="25dp"
                     android:layout_marginLeft="10dp"
                     android:background="@drawable/bg_sou_suo_two_page"
+                    android:ellipsize="end"
                     android:gravity="center"
-                    android:textSize="10sp"
+                    android:maxLines="1"
                     android:text="3"
                     android:textColor="@color/black"
+                    android:textSize="10sp"
                     android:visibility="gone" />
 
                 <TextView
@@ -324,10 +356,12 @@
                     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="..."
-                    android:textSize="10sp"
                     android:textColor="@color/black"
+                    android:textSize="10sp"
                     android:visibility="gone" />
 
                 <TextView
@@ -336,11 +370,13 @@
                     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="4"
-                    android:textSize="10sp"
                     android:textColor="@color/black"
+                    android:textSize="10sp"
                     android:visibility="gone" />
             </LinearLayout>
 
@@ -348,26 +384,26 @@
                 android:id="@+id/butUpper"
                 android:layout_width="65dp"
                 android:layout_height="25dp"
+                android:layout_centerVertical="true"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="-2dp"
-                android:layout_centerVertical="true"
-                android:textSize="10sp"
                 android:layout_toLeftOf="@+id/rvPage"
                 android:background="@drawable/bg_up_page"
                 android:text="上一页"
-                android:textColor="@color/black" />
+                android:textColor="@color/black"
+                android:textSize="10sp" />
 
             <Button
                 android:id="@+id/butNext"
                 android:layout_width="65dp"
                 android:layout_height="25dp"
-                android:textSize="10sp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="8dp"
                 android:layout_toRightOf="@+id/rvPage"
                 android:background="@drawable/bg_sou_suo_page"
                 android:text="下一页"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"
+                android:textSize="10sp" />
 
             <Button
                 android:id="@+id/butReturned"
@@ -375,10 +411,10 @@
                 android:layout_height="25dp"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="10dp"
-                android:textSize="12sp"
                 android:background="@drawable/bg_sou_suo_page"
                 android:text="待归还清单"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"
+                android:textSize="12sp" />
         </RelativeLayout>
     </RelativeLayout>
 

+ 28 - 0
app/src/main/res/layout/include_cabinet.xml

@@ -177,7 +177,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="①  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -189,7 +191,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="②  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -201,7 +205,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="③  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -213,7 +219,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="④  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -225,7 +233,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑤  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -237,7 +247,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑥  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -249,7 +261,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑦  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -261,7 +275,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="⑧  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -282,7 +298,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="①  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -294,7 +312,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="②  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -306,7 +326,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="③  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -318,7 +340,9 @@
                         android:layout_marginStart="20px"
                         android:layout_marginBottom="10px"
                         android:layout_weight="1"
+                        android:ellipsize="end"
                         android:gravity="bottom"
+                        android:maxLines="1"
                         android:text="④  层"
                         android:textColor="@color/white"
                         android:visibility="gone" />
@@ -332,6 +356,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="33px"
             android:layout_marginTop="168px"
+            android:ellipsize="end"
             android:maxLines="4"
             android:textColor="@color/white" />
 
@@ -341,6 +366,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="33px"
             android:layout_marginTop="410px"
+            android:ellipsize="end"
             android:maxLines="4"
             android:textColor="@color/white" />
 
@@ -352,7 +378,9 @@
             android:layout_marginTop="30px"
             android:drawableStart="@drawable/locker_name_round"
             android:drawablePadding="15px"
+            android:ellipsize="end"
             android:gravity="center_vertical"
+            android:maxLines="1"
             android:textColor="@color/white"
             android:textSize="16sp" />
 

+ 22 - 0
app/src/main/res/layout/item_already.xml

@@ -17,6 +17,8 @@
         android:focusableInTouchMode="false" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/alreadyCodeTV"
         android:layout_width="175px"
         android:layout_height="wrap_content"
@@ -30,6 +32,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/name"
         android:layout_width="200px"
         android:layout_height="match_parent"
@@ -43,6 +47,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/type"
         android:layout_width="120px"
         android:layout_height="wrap_content"
@@ -56,6 +62,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/cas"
         android:layout_width="120px"
         android:layout_height="wrap_content"
@@ -69,6 +77,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/purity"
         android:layout_width="110px"
         android:layout_height="wrap_content"
@@ -82,6 +92,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/specs"
         android:layout_width="120px"
         android:layout_height="wrap_content"
@@ -95,6 +107,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/belongTV"
         android:layout_width="120px"
         android:layout_height="match_parent"
@@ -109,6 +123,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/applicantTV"
         android:layout_width="108px"
         android:layout_height="wrap_content"
@@ -122,6 +138,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/code"
         android:layout_width="218px"
         android:layout_height="wrap_content"
@@ -135,6 +153,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/save"
         android:layout_width="227px"
         android:layout_height="wrap_content"
@@ -148,6 +168,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/operate"
         android:layout_width="100px"
         android:layout_height="wrap_content"

+ 8 - 0
app/src/main/res/layout/item_belonging_person.xml

@@ -11,6 +11,8 @@
         android:gravity="center_vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/userName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -20,6 +22,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/account"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -29,6 +33,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/mobile"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -38,6 +44,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/deptName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

+ 4 - 0
app/src/main/res/layout/item_ble.xml

@@ -13,6 +13,8 @@
         android:orientation="vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/ble_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,6 +24,8 @@
             android:textSize="16sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/ble_mac"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

+ 2 - 0
app/src/main/res/layout/item_cabinet_door.xml

@@ -6,6 +6,8 @@
     android:orientation="vertical">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/cont"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

+ 2 - 0
app/src/main/res/layout/item_cabinet_info.xml

@@ -5,6 +5,8 @@
     android:gravity="center">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/cabinetName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

+ 50 - 0
app/src/main/res/layout/item_cabinet_view.xml

@@ -25,6 +25,8 @@
             android:background="@drawable/bg_yuan_jiao" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/cabinetName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,6 +49,8 @@
             android:visibility="gone">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/doorNameOne"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -72,6 +76,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="数    量:"
@@ -79,6 +85,8 @@
                     android:textSize="9sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/num"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -95,6 +103,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="管理员:"
@@ -107,6 +117,8 @@
                     android:orientation="vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -115,6 +127,8 @@
                         android:textSize="9sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -141,6 +155,8 @@
             android:visibility="gone">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/doorNameTwo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -166,6 +182,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="数    量:"
@@ -173,6 +191,8 @@
                     android:textSize="9sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/numTow"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -189,6 +209,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="管理员:"
@@ -201,6 +223,8 @@
                     android:orientation="vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -209,6 +233,8 @@
                         android:textSize="9sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -234,6 +260,8 @@
             android:visibility="gone">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/doorNameThree"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -259,6 +287,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="数    量:"
@@ -266,6 +296,8 @@
                     android:textSize="9sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/numThree"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -282,6 +314,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="管理员:"
@@ -294,6 +328,8 @@
                     android:orientation="vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -302,6 +338,8 @@
                         android:textSize="9sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher6"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -328,6 +366,8 @@
             android:visibility="gone">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/four"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -353,6 +393,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="数    量:"
@@ -360,6 +402,8 @@
                     android:textSize="9sp" />
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:id="@+id/numFour"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -376,6 +420,8 @@
                 android:orientation="horizontal">
 
                 <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="管理员:"
@@ -388,6 +434,8 @@
                     android:orientation="vertical">
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher7"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -396,6 +444,8 @@
                         android:textSize="9sp" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/teacher8"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

+ 18 - 0
app/src/main/res/layout/item_checklists.xml

@@ -14,6 +14,8 @@
         android:orientation="horizontal">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -22,6 +24,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tagCode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,6 +34,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/cabinetName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -38,6 +44,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/collectTime"
             android:layout_width="match_parent"
             android:layout_weight="1"
@@ -47,6 +55,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/createByName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,6 +65,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/collectStockNum"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -63,6 +75,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/outOneName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -71,6 +85,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/duration"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -79,6 +95,8 @@
             android:textSize="12sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/status"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

+ 10 - 0
app/src/main/res/layout/item_chemical_labeling.xml

@@ -14,6 +14,8 @@
 
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -23,6 +25,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/tagCode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,6 +36,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/rfidCode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -42,6 +48,8 @@
             android:visibility="gone" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/specNum"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -51,6 +59,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/belongName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

+ 10 - 0
app/src/main/res/layout/item_chemical_timeout.xml

@@ -11,6 +11,8 @@
         android:layout_height="wrap_content">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,6 +22,8 @@
             android:textColor="@color/black" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/position"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,6 +51,8 @@
             android:orientation="horizontal">
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/normsNum"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -54,6 +60,8 @@
                 android:textColor="@color/black" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/surplus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -62,6 +70,8 @@
                 android:textColor="@color/black" />
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/belong"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

+ 10 - 0
app/src/main/res/layout/item_chemicals_view.xml

@@ -6,6 +6,8 @@
     android:orientation="horizontal">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/chemicalName"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -15,6 +17,8 @@
         android:textSize="10sp" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/specifications"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -24,6 +28,8 @@
         android:textSize="10sp" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/net_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -33,6 +39,8 @@
         android:textSize="10sp" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/number"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -51,6 +59,8 @@
         android:background="@null"
         android:textColor="@color/black"/>
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/layers"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

+ 6 - 0
app/src/main/res/layout/item_door_unlock.xml

@@ -26,6 +26,8 @@
 
 
             <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:id="@+id/cabinet_name_TV"
                 android:layout_width="match_parent"
                 android:layout_height="50px"
@@ -55,6 +57,8 @@
                         android:background="@mipmap/icon_gzxx_zh" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/up_door_name_TV"
                         android:layout_width="150px"
                         android:layout_height="match_parent"
@@ -94,6 +98,8 @@
                         android:background="@mipmap/icon_gzxx_zh" />
 
                     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
                         android:id="@+id/down_door_name_TV"
                         android:layout_width="150px"
                         android:layout_height="match_parent"

+ 14 - 0
app/src/main/res/layout/item_in_storage.xml

@@ -8,6 +8,8 @@
     android:orientation="horizontal">
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/item_name_TV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -23,6 +25,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/cas_TV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -36,6 +40,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/item_type_TV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -49,6 +55,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/item_level_TV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -57,6 +65,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/item_norms_TV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -71,6 +81,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/item_net_Wt_TV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -79,6 +91,8 @@
         android:textSize="20px" />
 
     <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
         android:id="@+id/item_num_TV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 14 - 0
app/src/main/res/layout/item_inquiry.xml

@@ -11,6 +11,8 @@
         android:gravity="center_vertical">
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -25,6 +27,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/casNum"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -34,6 +38,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalCategoryName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -43,6 +49,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalLevelName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -52,6 +60,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalPurity"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -61,6 +71,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/surplus"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -70,6 +82,8 @@
             android:textSize="10sp" />
 
         <TextView
+                android:ellipsize="end"
+                android:maxLines="1"
             android:id="@+id/chemicalNumber"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

+ 0 - 0
app/src/main/res/layout/item_inventory.xml


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor