Browse Source

@fun: isNet

bai 3 years ago
parent
commit
c281d442e0

+ 6 - 6
app/src/main/AndroidManifest.xml

@@ -19,20 +19,20 @@
                 android:label="@string/app_name"
                 android:networkSecurityConfig="@xml/network_security_config"
                 android:theme="@style/Theme.Adm.NoActionBar">
-            <!--            <intent-filter>-->
-            <!--                <action android:name="android.intent.action.MAIN"/>-->
+                        <intent-filter>
+                            <action android:name="android.intent.action.MAIN"/>
 
-            <!--                <category android:name="android.intent.category.LAUNCHER"/>-->
-            <!--            </intent-filter>-->
+                            <category android:name="android.intent.category.LAUNCHER"/>
+                        </intent-filter>
         </activity>
 
 <!--        <activity android:name=".mvvm.ui.examine.ModelExamineActivity" android:exported="true"/>-->
         <activity android:name=".mvvm.ui.examine.Space3DActivity" android:exported="true">
-            <intent-filter>
+            <!--<intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+            </intent-filter>-->
         </activity>
     </application>
 

+ 4 - 2
app/src/main/java/com/ys/bdtp/adm/app/Tools.kt

@@ -8,6 +8,8 @@ import android.net.NetworkCapabilities
  */
 fun isNet(cm: ConnectivityManager): Boolean {
     val network = cm.activeNetwork
-    val networkCapabilities = cm.getNetworkCapabilities(network)
-    return networkCapabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false
+    val nc = cm.getNetworkCapabilities(network) ?: return false
+    val wifi = nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+    val cellular = nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+    return wifi || cellular
 }

+ 1 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/OfflineSide.kt

@@ -45,6 +45,7 @@ fun OfflineSide() {
                 contentColor = whiteColor,
                 backgroundColor = bgBlueColor
             ),
+            elevation = ButtonDefaults.elevation(0.dp)
         ) {
             Text(text = "全部同步")
         }