1.删除textview 样式

app/build.gradle

@@ -146,4 +146,9 @@ dependencies {
 
     implementation 'com.github.zhpanvip:bannerviewpager:3.5.12'
 
+    implementation 'com.github.getActivity:Toaster:13.0'
+
+    implementation 'com.github.li-xiaojun:XPopup:2.10.0'
+
+
 }

app/src/main/java/com/rc/core/ui/activity/BaseActivity.java

@@ -1,6 +1,7 @@
 package com.rc.core.ui.activity;
 
 import android.os.Bundle;
+import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -55,7 +56,11 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
 
         ScreenAdapter.INSTANCE.setCustomDensity(this);
-        setContentView(setViewBinding().getRoot());
+
+        ViewBinding binding = setViewBinding();
+//        ViewGroup mainVG = (ViewGroup) binding.getRoot();
+//        mainVG.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        setContentView(binding.getRoot());
         ThreadUtils.executeByCachedAtFixRate(cdTask, 1, TimeUnit.SECONDS);
         baseActivityHelp = new BaseActivityHelp(this);
         onInit();

app/src/main/java/xn/hxp/app/ChemicalApp.kt

@@ -14,6 +14,7 @@ import com.blankj.utilcode.util.SPUtils
 import com.blankj.utilcode.util.ThreadUtils
 import com.clj.fastble.BleManager
 import com.github.anrwatchdog.ANRWatchDog
+import com.hjq.toast.Toaster
 import com.kongzue.dialogx.DialogX
 import com.kongzue.dialogx.util.TextInfo
 import com.rc.core.util.ScreenAdapter
@@ -101,6 +102,7 @@ class ChemicalApp : Application() {
         initX5()
         appContext = applicationContext
         initLog()
+        Toaster.init(this)
     }
 
     private fun initLog() {

app/src/main/java/xn/hxp/ui/MainActivity.java

@@ -134,6 +134,8 @@ public class MainActivity extends BaseActivity {
         registerReceiver(timeTickReceiver, new IntentFilter(Intent.ACTION_TIME_TICK));
 
         viewBinding.versionName.setText("版本号：" + AppUtils.getAppVersionName());
+        viewBinding.cabinetVP.setIndicatorSliderColor(Color.parseColor("#80E0E0E0"), Color.WHITE);
+        viewBinding.cabinetVP.setIndicatorSliderWidth(16);
         viewBinding.cabinetVP.registerLifecycleObserver(getLifecycle()).setAdapter(new CabinetBannerAdapter(new CabinetBannerAdapter.VerifyCallBack() {
             @Override
             public void login() {

app/src/main/java/xn/hxp/ui/login/SwipeActivity.kt

@@ -171,6 +171,7 @@ class SwipeActivity : BaseActivity() {
                 val allFalse =
                     java.lang.Boolean.TRUE == data.cabinetAdmin || java.lang.Boolean.TRUE == data.belongUser || java.lang.Boolean.TRUE == data.toipcUser || java.lang.Boolean.TRUE == data.safeUser || java.lang.Boolean.TRUE == data.collegeAdmin || java.lang.Boolean.TRUE == data.schoolLevelAdmin || java.lang.Boolean.TRUE == data.adminUser || java.lang.Boolean.TRUE == data.apply || java.lang.Boolean.TRUE == data.white
                 if (!allFalse) {
+                    LogUtils.d("当前身份不符合")
                     HttpClient.token = null
                     ChemicalApp.userData = null
                     customDialogView(2, "当前身份不符合")
@@ -193,6 +194,7 @@ class SwipeActivity : BaseActivity() {
                     } else if (data.white == true || data.apply == true) {// 白名单和实验室准入
                         authenticationDialog(data.faceImg, data.userName)
                     } else {
+                        LogUtils.d("当前身份不符合")
                         HttpClient.token = null
                         ChemicalApp.userData = null
                         customDialogView(2, "当前身份不符合")
@@ -202,6 +204,7 @@ class SwipeActivity : BaseActivity() {
                 }
 
             }, { throwable ->
+                LogUtils.d("登录异常", throwable.message)
                 dismissLoading()
                 throwableView(throwable)
                 HttpClient.token = null

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

@@ -76,6 +76,12 @@ public class AlreadyAdapter extends BaseAdapter {
             // 化学品名称
             String chemicalName = recordsBean.getChemicalName();
             binding.name.setText(TextUtils.isEmpty(chemicalName) ? "" : chemicalName);
+            binding.name.setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+                @Override
+                public void onDebouncingClick(View v) {
+
+                }
+            });
             // 类别
             String chemicalCategoryName = recordsBean.getChemicalCategoryName();
             binding.type.setText(TextUtils.isEmpty(chemicalCategoryName) ? "" : chemicalCategoryName);
@@ -110,6 +116,7 @@ public class AlreadyAdapter extends BaseAdapter {
             int doorLayers = recordsBean.getDoorLayers();
             binding.save.setText(cabinetName + "-" + doorName + "-" + doorLayers + "层");
             binding.selectCB.setChecked(recordsBean.isSelect());
+
             if (0 == type) {
                 binding.save.setTextColor(Color.parseColor("#ff0183FA"));
                 binding.operate.setTextColor(Color.parseColor("#ff0183FA"));

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

@@ -0,0 +1,22 @@
+package xn.hxp.weidith;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+
+import com.blankj.utilcode.util.ClickUtils;
+
+@SuppressLint("AppCompatCustomView")
+public class MyTextView extends TextView {
+    public MyTextView(Context context) {
+        super(context);
+        setOnClickListener(new ClickUtils.OnDebouncingClickListener() {
+            @Override
+            public void onDebouncingClick(View v) {
+            }
+        });
+    }
+
+
+}

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

@@ -207,7 +207,6 @@
                         android:gravity="center_vertical"
                         android:hint="输入化学品名称搜索"
                         android:imeOptions="actionSearch"
-                        android:maxLines="1"
                         android:paddingHorizontal="10px"
                         android:textAppearance="@style/input_hint_text_size" />
 
@@ -752,7 +751,7 @@
                         android:layout_width="260px"
                         android:layout_height="50px"
                         android:layout_marginStart="10px"
-                        android:ellipsize="marquee"
+
                         android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:gravity="center"

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

@@ -247,7 +247,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="15px"
-                    android:ellipsize="marquee"
+
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:marqueeRepeatLimit="marquee_forever"

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

@@ -55,7 +55,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
                 android:textColor="@color/white" />
 
         </LinearLayout>

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

@@ -55,7 +55,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
                 android:textColor="@color/white" />
 
         </LinearLayout>
@@ -472,7 +471,7 @@
                     android:layout_width="300px"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:ellipsize="marquee"
+
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:marqueeRepeatLimit="marquee_forever"

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

@@ -431,7 +431,7 @@
                     android:layout_width="180px"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:ellipsize="marquee"
+
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:marqueeRepeatLimit="marquee_forever"

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

@@ -53,7 +53,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </RelativeLayout>

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

@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </LinearLayout>

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

@@ -55,7 +55,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </RelativeLayout>

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

@@ -56,7 +56,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
                 android:textColor="@color/white" />
 
         </LinearLayout>

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

@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </LinearLayout>

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

@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
         </LinearLayout>
     </RelativeLayout>

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

@@ -55,7 +55,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </RelativeLayout>

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

@@ -56,7 +56,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </RelativeLayout>

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

@@ -292,7 +292,7 @@
                             android:drawablePadding="20dp"
                             android:hint="密码"
                             android:maxLength="11"
-                            android:maxLines="1"
+
                             android:paddingEnd="20dp" />
 
                     </LinearLayout>
@@ -341,7 +341,7 @@
                             android:drawableStart="@drawable/ic_ble"
                             android:drawablePadding="20dp"
                             android:hint="MAC地址"
-                            android:maxLines="1"
+
                             android:paddingEnd="20dp" />
 
                     </RelativeLayout>

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

@@ -57,7 +57,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </RelativeLayout>

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

@@ -56,7 +56,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </RelativeLayout>

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

@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </LinearLayout>

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

@@ -54,7 +54,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </LinearLayout>

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

@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
                 android:layout_toRightOf="@+id/tvTitle"
-                android:maxLines="1"
+
                 android:textColor="@color/white" />
 
         </LinearLayout>

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

@@ -438,7 +438,7 @@
                     android:layout_width="300px"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:ellipsize="marquee"
+
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:gravity="center"

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="70px"
     tools:ignore="PxUsage">
 
     <CheckBox
@@ -22,8 +22,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/selectCB"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="申领单号"
         android:textColor="#333333"
@@ -35,8 +35,7 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/alreadyCodeTV"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
         android:paddingStart="15px"
         android:text="名称"
         android:textColor="#333333"
@@ -48,8 +47,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/name"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="类别"
         android:textColor="#333333"
@@ -61,8 +60,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/type"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="CAS"
         android:textColor="#333333"
@@ -74,8 +73,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/cas"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="纯度"
         android:textColor="#333333"
@@ -87,8 +86,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/purity"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="规格"
         android:textColor="#333333"
@@ -100,8 +99,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/specs"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="归属人"
         android:textColor="#333333"
@@ -113,8 +112,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/belongTV"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="申领人"
         android:textColor="#333333"
@@ -126,8 +125,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/applicantTV"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="编码"
         android:textColor="#333333"
@@ -139,8 +138,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/code"
-        android:ellipsize="middle"
-        android:maxLines="2"
+
+
         android:paddingStart="15px"
         android:text="存储位置"
         android:textColor="#0183FA"

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

@@ -59,7 +59,7 @@
                         android:layout_width="150px"
                         android:layout_height="match_parent"
                         android:gravity="center_vertical"
-                        android:maxLines="2"
+
                         android:text="名称"
                         android:textColor="#ff333333"
                         android:textSize="20px" />
@@ -98,7 +98,7 @@
                         android:layout_width="150px"
                         android:layout_height="match_parent"
                         android:gravity="center_vertical"
-                        android:maxLines="2"
+
                         android:text="名称"
                         android:textColor="#ff333333"
                         android:textSize="20px" />

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

@@ -14,7 +14,7 @@
         android:layout_marginStart="10dp"
         android:layout_weight="1"
         android:duplicateParentState="true"
-        android:ellipsize="marquee"
+
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
@@ -28,7 +28,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:duplicateParentState="true"
-        android:ellipsize="marquee"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
@@ -42,7 +41,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:duplicateParentState="true"
-        android:ellipsize="marquee"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
@@ -64,7 +62,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:duplicateParentState="true"
-        android:ellipsize="marquee"
+
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"

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

@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:ellipsize="marquee"
+
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:gravity="center"

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

@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="25dp"
             android:layout_weight="1"
-            android:ellipsize="marquee"
+
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:gravity="center"

app/src/main/res/values/styles.xml

@@ -34,6 +34,7 @@
     <style name="input_hint_text_size" parent="TextAppearance.AppCompat">
         <item name="android:textSize">12sp</item>
     </style>
+
     <style name="LoadingDialog" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -59,4 +60,9 @@
         <item name="android:windowEnterAnimation">@anim/bottom_enter</item>
         <item name="android:windowExitAnimation">@anim/bottom_exit</item>
     </style>
+
+    <style name="AppTextViewStyle" parent="Widget.AppCompat.TextView">
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+    </style>
 </resources>

app/src/main/res/values/themes.xml

@@ -19,8 +19,8 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@color/white</item>
+        <item name="android:textViewStyle">@style/AppTextViewStyle</item>
     </style>
 
 
-
 </resources>