From 0bc15e888f22134e8c1b2ed9f6be1b245ffcd095 Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Sat, 4 Sep 2021 09:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcshou/gogogo/GoApplication.java |  7 ----
 .../main/java/com/zcshou/utils/GoUtils.java   | 35 ++-----------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/com/zcshou/gogogo/GoApplication.java b/app/src/main/java/com/zcshou/gogogo/GoApplication.java
index 1e7873b..5d1cef3 100644
--- a/app/src/main/java/com/zcshou/gogogo/GoApplication.java
+++ b/app/src/main/java/com/zcshou/gogogo/GoApplication.java
@@ -7,7 +7,6 @@ import com.baidu.mapapi.SDKInitializer;
 import com.elvishew.xlog.LogConfiguration;
 import com.elvishew.xlog.LogLevel;
 import com.elvishew.xlog.XLog;
-//import com.elvishew.xlog.printer.AndroidPrinter;
 import com.elvishew.xlog.printer.ConsolePrinter;
 import com.elvishew.xlog.printer.Printer;
 import com.elvishew.xlog.printer.file.FilePrinter;
@@ -64,12 +63,6 @@ public class GoApplication extends Application {
                 .backupStrategy(new NeverBackupStrategy())              // 指定日志文件备份策略，默认为 FileSizeBackupStrategy(1024 * 1024)
                 .cleanStrategy(new FileLastModifiedCleanStrategy(MAX_TIME))     // 指定日志文件清除策略，默认为 NeverCleanStrategy()
                 .build();
-
-//        XLog.init(                                                 // 初始化 XLog
-//                config,                                                // 指定日志配置，如果不指定，会默认使用 new LogConfiguration.Builder().build()
-//                androidPrinter,                                        // 添加任意多的打印器。如果没有添加任何打印器，会默认使用 AndroidPrinter(Android)/ConsolePrinter(java)
-//                consolePrinter,
-//                filePrinter);
         XLog.init(config, consolePrinter, filePrinter);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/zcshou/utils/GoUtils.java b/app/src/main/java/com/zcshou/utils/GoUtils.java
index 665d6be..0b67520 100644
--- a/app/src/main/java/com/zcshou/utils/GoUtils.java
+++ b/app/src/main/java/com/zcshou/utils/GoUtils.java
@@ -21,8 +21,6 @@ import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
 
-import com.zcshou.gogogo.MainActivity;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -30,15 +28,7 @@ import java.util.Locale;
 public class GoUtils {
     //WIFI是否可用
     public static boolean isWifiConnected(Context context) {
-//        ConnectivityManager mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-//        NetworkInfo mWiFiNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
-//
-//        if (mWiFiNetworkInfo != null && mWiFiNetworkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-//            return mWiFiNetworkInfo.isAvailable();
-//        }
-//        return false;
-
-        // 从 API 29 开始，NetworkInfo 被标记为过时
+        // 从 API 29 开始，NetworkInfo 被标记为过时，这里更换新方法
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         Network nw = connectivityManager.getActiveNetwork();
         if (nw == null) {
@@ -55,16 +45,7 @@ public class GoUtils {
 
     //MOBILE网络是否可用
     public static boolean isMobileConnected(Context context) {
-//        ConnectivityManager mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-//        NetworkInfo mMobileNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
-//
-//        if (mMobileNetworkInfo != null && mMobileNetworkInfo.getType() == ConnectivityManager.TYPE_MOBILE) {
-//            return mMobileNetworkInfo.isAvailable();
-//        }
-//
-//        return false;
-
-        // 从 API 29 开始，NetworkInfo 被标记为过时
+        // 从 API 29 开始，NetworkInfo 被标记为过时，这里更换新方法
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         Network nw = connectivityManager.getActiveNetwork();
         if (nw == null) {
@@ -76,14 +57,7 @@ public class GoUtils {
 
     // 断是否有网络连接，但是如果该连接的网络无法上网，也会返回true
     public static boolean isNetworkConnected(Context context) {
-//        ConnectivityManager mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-//        NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
-//
-//        if (mNetworkInfo != null) {
-//            return mNetworkInfo.isConnected();
-//        }
-//
-//        return false;
+        // 从 API 29 开始，NetworkInfo 被标记为过时，这里更换新方法
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         Network nw = connectivityManager.getActiveNetwork();
         if (nw == null) return false;
@@ -193,11 +167,8 @@ public class GoUtils {
         //获取包信息
         try {
             PackageInfo packageInfo = pm.getPackageInfo(context.getPackageName(), 0);
-            //获取应用 信息
             ApplicationInfo applicationInfo = packageInfo.applicationInfo;
-            //获取albelRes
             int labelRes = applicationInfo.labelRes;
-            //返回App的名称
             return context.getResources().getString(labelRes);
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();