From 5c59833233754c9e50bea5ffe6535318190a339d Mon Sep 17 00:00:00 2001 From: Junyuan Feng Date: Tue, 3 May 2022 12:06:18 +0800 Subject: [PATCH] Fix exception caused by LANG > Chinese --- ios/Podfile.lock | 12 ------------ ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/data/provider/server.dart | 2 +- lib/data/res/build_data.dart | 9 ++++----- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 180242ec..7255ed87 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,10 +2,6 @@ PODS: - countly_flutter (20.11.4): - Flutter - Flutter (1.0.0) - - flutter_icmp_ping (0.0.1): - - Flutter - - open_file (0.0.1): - - Flutter - path_provider_ios (0.0.1): - Flutter - r_upgrade (0.0.1): @@ -16,8 +12,6 @@ PODS: DEPENDENCIES: - countly_flutter (from `.symlinks/plugins/countly_flutter/ios`) - Flutter (from `Flutter`) - - flutter_icmp_ping (from `.symlinks/plugins/flutter_icmp_ping/ios`) - - open_file (from `.symlinks/plugins/open_file/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - r_upgrade (from `.symlinks/plugins/r_upgrade/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) @@ -27,10 +21,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/countly_flutter/ios" Flutter: :path: Flutter - flutter_icmp_ping: - :path: ".symlinks/plugins/flutter_icmp_ping/ios" - open_file: - :path: ".symlinks/plugins/open_file/ios" path_provider_ios: :path: ".symlinks/plugins/path_provider_ios/ios" r_upgrade: @@ -41,8 +31,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: countly_flutter: 38419412e193a1faa5babeb5d28a63fda260687d Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - flutter_icmp_ping: 07e508847df7fa9262d050bb0b203de074bbe517 - open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 r_upgrade: 44d715c61914cce3d01ea225abffe894fd51c114 url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4cc722f6..ee83b286 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 115; + CURRENT_PROJECT_VERSION = 118; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -362,7 +362,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.115; + MARKETING_VERSION = 1.0.118; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -484,7 +484,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 115; + CURRENT_PROJECT_VERSION = 118; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.115; + MARKETING_VERSION = 1.0.118; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -508,7 +508,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 115; + CURRENT_PROJECT_VERSION = 118; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -516,7 +516,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.115; + MARKETING_VERSION = 1.0.118; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/data/provider/server.dart b/lib/data/provider/server.dart index 6ca3de7a..bc86d8cf 100644 --- a/lib/data/provider/server.dart +++ b/lib/data/provider/server.dart @@ -244,7 +244,7 @@ class ServerProvider extends BusyProvider { } String _getCPUTemp(String type, String value) { - const noMatch = 'No such file or directory'; + const noMatch = r"cat: '/sys/class/thermal/thermal_zone*/type'"; // Not support to get CPU temperature if (value.contains(noMatch) || type.contains(noMatch) || diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 8ed166cb..4a9e2d6d 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 117; - static const String engine = - "Flutter 2.10.4 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision c860cba910 (6 weeks ago) • 2022-03-25 00:23:12 -0500\nEngine • revision 57d3bac3dd\nTools • Dart 2.16.2 • DevTools 2.9.2\n"; - static const String buildAt = "2022-05-03 11:39:22.853075"; - static const int modifications = 6; + static const int build = 118; + static const String engine = "Flutter 2.10.4 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision c860cba910 (6 weeks ago) • 2022-03-25 00:23:12 -0500\nEngine • revision 57d3bac3dd\nTools • Dart 2.16.2 • DevTools 2.9.2\n"; + static const String buildAt = "2022-05-03 12:05:15.250795"; + static const int modifications = 4; }