修复调整部分代码

CarGuo · CarGuo · commit 52eacc427253 · 2023-05-16T16:09:26.000+08:00
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,21 @@
          flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
+
+
+    <queries>
+        <!-- If your app checks for call support -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="tel" />
+        </intent>
+        <!-- If your app checks for call support -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
+
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/lib/common/dao/user_dao.dart b/lib/common/dao/user_dao.dart
@@ -37,7 +37,6 @@ class UserDao {
     );
     dynamic resultData = null;
     if (res != null && res.result) {
-      print("#### ${res.data}");
       var result = Uri.parse("gsy://oauth?" + res.data);
       var token = result.queryParameters["access_token"]!;
       var _token = 'token ' + token;
diff --git a/lib/common/utils/common_utils.dart b/lib/common/utils/common_utils.dart
@@ -34,15 +34,15 @@ import 'package:url_launcher/url_launcher.dart';
 typedef StringList = List<String>;
 
 class CommonUtils {
-  static final double MILLIS_LIMIT = 1000.0;
+  static const double MILLIS_LIMIT = 1000.0;
 
-  static final double SECONDS_LIMIT = 60 * MILLIS_LIMIT;
+  static const double SECONDS_LIMIT = 60 * MILLIS_LIMIT;
 
-  static final double MINUTES_LIMIT = 60 * SECONDS_LIMIT;
+  static const double MINUTES_LIMIT = 60 * SECONDS_LIMIT;
 
-  static final double HOURS_LIMIT = 24 * MINUTES_LIMIT;
+  static const double HOURS_LIMIT = 24 * MINUTES_LIMIT;
 
-  static final double DAYS_LIMIT = 30 * HOURS_LIMIT;
+  static const double DAYS_LIMIT = 30 * HOURS_LIMIT;
 
   static Locale? curLocale;
 
@@ -66,44 +66,38 @@ class CommonUtils {
   static String getNewsTimeStr(DateTime date) {
     int subTimes =
         DateTime.now().millisecondsSinceEpoch - date.millisecondsSinceEpoch;
-
-    if (subTimes < MILLIS_LIMIT) {
-      return (curLocale != null)
+    return switch (subTimes) {
+      < MILLIS_LIMIT => (curLocale != null)
           ? (curLocale!.languageCode != "zh")
               ? "right now"
               : "刚刚"
-          : "刚刚";
-    } else if (subTimes < SECONDS_LIMIT) {
-      return (subTimes / MILLIS_LIMIT).round().toString() +
+          : "刚刚",
+      < SECONDS_LIMIT => (subTimes / MILLIS_LIMIT).round().toString() +
           ((curLocale != null)
               ? (curLocale!.languageCode != "zh")
                   ? " seconds ago"
                   : " 秒前"
-              : " 秒前");
-    } else if (subTimes < MINUTES_LIMIT) {
-      return (subTimes / SECONDS_LIMIT).round().toString() +
+              : " 秒前"),
+      < MINUTES_LIMIT => (subTimes / SECONDS_LIMIT).round().toString() +
           ((curLocale != null)
               ? (curLocale!.languageCode != "zh")
                   ? " min ago"
                   : " 分钟前"
-              : " 分钟前");
-    } else if (subTimes < HOURS_LIMIT) {
-      return (subTimes / MINUTES_LIMIT).round().toString() +
+              : " 分钟前"),
+      < HOURS_LIMIT => (subTimes / MINUTES_LIMIT).round().toString() +
           ((curLocale != null)
               ? (curLocale!.languageCode != "zh")
                   ? " hours ago"
                   : " 小时前"
-              : " 小时前");
-    } else if (subTimes < DAYS_LIMIT) {
-      return (subTimes / HOURS_LIMIT).round().toString() +
+              : " 小时前"),
+      < DAYS_LIMIT => (subTimes / HOURS_LIMIT).round().toString() +
           ((curLocale != null)
               ? (curLocale!.languageCode != "zh")
                   ? " days ago"
                   : " 天前"
-              : " 天前");
-    } else {
-      return getDateStr(date);
-    }
+              : " 天前"),
+      _ => getDateStr(date)
+    };
   }
 
   static getLocalPath() async {
@@ -326,18 +320,21 @@ class CommonUtils {
 
     if (parseUrl.host == "github.com" && parseUrl.path.length > 0) {
       StringList pathnames = parseUrl.path.split("/");
-      if (pathnames.length == 2) {
-        //解析人
-        String userName = pathnames[1];
-        NavigatorUtils.goPerson(context, userName);
-      } else if (pathnames.length >= 3) {
-        //解析仓库
-        if (pathnames.length == 3) {
-          var [_, userName, repoName] = pathnames;
-          NavigatorUtils.goReposDetail(context, userName, repoName);
-        } else {
-          launchWebView(context, "", url);
-        }
+      switch (pathnames.length) {
+        case == 2:
+          //解析人
+          String userName = pathnames[1];
+          NavigatorUtils.goPerson(context, userName);
+          break;
+        case >= 3:
+          //解析仓库
+          if (pathnames.length == 3) {
+            var [_, userName, repoName] = pathnames;
+            NavigatorUtils.goReposDetail(context, userName, repoName);
+          } else {
+            launchWebView(context, "", url);
+          }
+          break;
       }
     } else if (url.startsWith("http")) {
       launchWebView(context, "", url);
diff --git a/lib/common/utils/event_utils.dart b/lib/common/utils/event_utils.dart
@@ -11,7 +11,7 @@ import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
  */
 class EventUtils {
   ///事件描述与动作
-  static getActionAndDes(Event event) {
+  static ({String? actionStr, String? des})getActionAndDes(Event event) {
     String? actionStr;
     String? des;
     switch (event.type) {
@@ -143,7 +143,7 @@ class EventUtils {
         break;
     }
 
-    return {"actionStr": actionStr, "des": des != null ? des : ""};
+    return (actionStr: actionStr, des: des != null ? des : "");
   }
 
   ///跳转
diff --git a/lib/page/debug/debug_label.dart b/lib/page/debug/debug_label.dart
@@ -20,7 +20,7 @@ class DebugLabel {
       return false;
     }
     hadShow = true;
-    var list = await _getDeviceInfo();
+    var (version, platform) = await _getDeviceInfo();
     PackageInfo packInfo = await PackageInfo.fromPlatform();
     var language = GSYLocalizations.of(context)!.locale.languageCode;
     if (_overlayEntry != null) {
@@ -31,8 +31,8 @@ class DebugLabel {
     _overlayEntry = new OverlayEntry(builder: (context) {
       return GlobalLabel(
           version: packInfo.version,
-          deviceInfo: list[0],
-          platform: list[1],
+          deviceInfo: version,
+          platform: platform,
           language: language);
     });
     overlayState.insert(_overlayEntry!);
@@ -52,15 +52,15 @@ class DebugLabel {
   }
 }
 
-Future<StringList> _getDeviceInfo() async {
+Future<(String, String)> _getDeviceInfo() async {
   DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
   if (Platform.isAndroid) {
     AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
-    return [androidInfo.version.sdkInt.toString(), "Android"];
+    return (androidInfo.version.sdkInt.toString(), "Android");
   }
   IosDeviceInfo iosInfo = await deviceInfo.iosInfo;
   String device = await CommonUtils.getDeviceInfo();
-  return [iosInfo.systemVersion ?? "", device];
+  return (iosInfo.systemVersion ?? "", device);
 }
 
 class GlobalLabel extends StatefulWidget {
diff --git a/lib/widget/gsy_event_item.dart b/lib/widget/gsy_event_item.dart
@@ -93,9 +93,9 @@ class EventViewModel {
     actionTime = CommonUtils.getNewsTimeStr(event.createdAt!);
     actionUser = event.actor!.login;
     actionUserPic = event.actor!.avatar_url;
-    var other = EventUtils.getActionAndDes(event);
-    actionDes = other["des"];
-    actionTarget = other["actionStr"];
+    var as = EventUtils.getActionAndDes(event);
+    actionDes = as.des;
+    actionTarget = as.actionStr;
   }
 
   EventViewModel.fromCommitMap(RepoCommit eventMap) {
