1.优化锁屏对话框布局并添加网络提示功能- 将锁屏对话框的主布局从 LinearLayout 改为 FrameLayout，以优化布局结构

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -164,6 +164,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     private var lockDialogEt:EditText?=null
     private var lockversionTv:TextView?=null
     private var lockDialogNetset:View?=null
+    private var lockDialogNetTips:View?=null
     //表示是否是设置wifi是的话，暂时隐藏锁屏弹窗
     private var goWifiFlag=false
 
@@ -965,7 +966,16 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     }
     private fun postPwdDetail(code: String) {
         if (!NetworkUtils.isAvailable(this)) {
-
+            Toast.makeText(this, "没有网络", Toast.LENGTH_SHORT).show()
+            lockDialogNetTips?.let {
+                it.visibility= View.VISIBLE
+                lifecycleScope.launch(Dispatchers.IO){
+                    delay(2000)
+                    withContext(Dispatchers.Main){
+                        it.visibility= View.GONE
+                    }
+                }
+            }
             return
         }
         if (code.isNullOrBlank()) {
@@ -2155,6 +2165,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
              lockDialogTv=v.findViewById<TextView>(R.id.locktips_tv)
              lockversionTv=v.findViewById<TextView>(R.id.version_tv)
              lockDialogNetset=v.findViewById<View>(R.id.netset_llayout)
+             lockDialogNetTips=v.findViewById<View>(R.id.tv_tips)
              lockllayout.setOnClickListener {
                  //限制最多1分钟请求一次策略,
                  if (lastTimeLong + 1 * 60 * 1000 < System.currentTimeMillis()) {

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

@@ -1,4 +1,4 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/lock_llayout"
     android:layout_width="match_parent"
@@ -7,94 +7,109 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="157dp"
-        android:layout_height="151dp"
-        android:layout_marginTop="104dp"
-        android:src="@drawable/icon_lock" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="53dp"
-        android:layout_marginTop="26dp">
+        <ImageView
+            android:layout_width="157dp"
+            android:layout_height="151dp"
+            android:layout_marginTop="104dp"
+            android:src="@drawable/icon_lock" />
 
-        <EditText
-            android:id="@+id/lock_et"
-            android:layout_width="357dp"
+        <FrameLayout
+            android:layout_width="wrap_content"
             android:layout_height="53dp"
-            android:background="@drawable/shape_shadow_bg"
-            android:hint="@string/passcode"
-            android:maxLength="20"
-            android:paddingLeft="28dp"
-            android:paddingRight="28dp"
-            android:singleLine="true"
-            android:textColor="@color/codetipscolor"
-            android:textColorHint="@color/codehintcolor"
-            android:textSize="16sp" />
+            android:layout_marginTop="26dp">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/codeenter_cv"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical|right"
-            android:layout_marginRight="18dp"
-            app:cardBackgroundColor="@color/white">
+            <EditText
+                android:id="@+id/lock_et"
+                android:layout_width="357dp"
+                android:layout_height="53dp"
+                android:background="@drawable/shape_shadow_bg"
+                android:hint="@string/passcode"
+                android:maxLength="20"
+                android:paddingLeft="28dp"
+                android:paddingRight="28dp"
+                android:singleLine="true"
+                android:textColor="@color/codetipscolor"
+                android:textColorHint="@color/codehintcolor"
+                android:textSize="16sp" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="11dp"
-                android:layout_gravity="center"
-                android:src="@drawable/icon_etenter" />
-        </androidx.cardview.widget.CardView>
-    </FrameLayout>
+            <androidx.cardview.widget.CardView
+                android:id="@+id/codeenter_cv"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center_vertical|right"
+                android:layout_marginRight="18dp"
+                app:cardBackgroundColor="@color/white">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="11dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/icon_etenter" />
+            </androidx.cardview.widget.CardView>
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/locktips_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:text="@string/locktips"
+            android:textColor="@color/codetipscolor"
+            android:textSize="17sp" />
+
+    </LinearLayout>
 
     <TextView
-        android:id="@+id/locktips_tv"
+        android:id="@+id/version_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="18dp"
-        android:text="@string/locktips"
-        android:textColor="@color/codetipscolor"
-        android:textSize="17sp" />
-   <RelativeLayout
-       android:layout_width="match_parent"
-       android:layout_height="match_parent">
-       <TextView
-           android:id="@+id/version_tv"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:layout_gravity="bottom|left"
-           android:layout_alignParentBottom="true"
-           android:layout_marginLeft="10dp"
-           android:layout_marginBottom="10dp"
-           android:textColor="#253A70"
-           android:textSize="8sp" />
+        android:layout_gravity="bottom|left"
+        android:layout_marginLeft="10dp"
+        android:layout_marginBottom="10dp"
+        android:textColor="#253A70"
+        android:textSize="8sp" />
 
-       <LinearLayout
-           android:id="@+id/netset_llayout"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:layout_alignParentRight="true"
-           android:layout_marginRight="10dp"
-           android:layout_alignParentBottom="true"
-           android:layout_marginBottom="10dp"
-           android:paddingLeft="10dp"
-           android:paddingTop="10dp"
-           android:gravity="center"
-           android:orientation="horizontal">
 
-           <ImageView
-               android:layout_width="10dp"
-               android:layout_height="10dp"
-               android:layout_marginRight="3dp"
-               android:src="@drawable/icon_wifiset" />
+    <LinearLayout
+        android:id="@+id/netset_llayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_gravity="bottom|right"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="10dp"
+        android:paddingTop="10dp">
+
+        <ImageView
+            android:layout_width="10dp"
+            android:layout_height="10dp"
+            android:layout_marginRight="3dp"
+            android:src="@drawable/icon_wifiset" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/netset"
+            android:textColor="#253A70"
+            android:textSize="8sp" />
+    </LinearLayout>
 
-           <TextView
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:text="@string/netset"
-               android:textColor="#253A70"
-               android:textSize="8sp" />
-       </LinearLayout>
-   </RelativeLayout>
-</LinearLayout>
+    <TextView
+        android:id="@+id/tv_tips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@color/black80"
+        android:padding="30dp"
+        android:visibility="gone"
+        android:text="@string/checknettips"
+        android:textColor="@color/white" />
+</FrameLayout>