aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-17 07:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

opt. & fix.

Browse Source 
fix: setting page update item display issue.
fix: `bgRun` condition issue.
opt: `r_upgrade` use 0.3.8+2
This commit is contained in:
lollipopkit
2023-04-04 17:38:00 +08:00
parent 0ac6984576
commit 19baff5dde
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -359,7 +359,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 250; CURRENT_PROJECT_VERSION = 252;
DEVELOPMENT_TEAM = BA88US33G6; DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -367,7 +367,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.250; MARKETING_VERSION = 1.0.252;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -490,7 +490,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 250; CURRENT_PROJECT_VERSION = 252;
DEVELOPMENT_TEAM = BA88US33G6; DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -498,7 +498,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.250; MARKETING_VERSION = 1.0.252;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -515,7 +515,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 250; CURRENT_PROJECT_VERSION = 252;
DEVELOPMENT_TEAM = BA88US33G6; DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -523,7 +523,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.250; MARKETING_VERSION = 1.0.252;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

4
lib/core/update.dart
View File

@@ -27,8 +27,6 @@ Future<bool> isFileAvailable(String url) async {
Future<void> doUpdate(BuildContext context, {bool force = false}) async { Future<void> doUpdate(BuildContext context, {bool force = false}) async {
final update = await locator<AppService>().getUpdate(); final update = await locator<AppService>().getUpdate();
locator<AppProvider>().setNewestBuild(update.newest);
final newest = () { final newest = () {
if (isAndroid) { if (isAndroid) {
return update.androidbuild; return update.androidbuild;
@@ -40,6 +38,8 @@ Future<void> doUpdate(BuildContext context, {bool force = false}) async {
return update.newest; return update.newest;
}(); }();
locator<AppProvider>().setNewestBuild(newest);
if (!force && newest <= BuildData.build) { if (!force && newest <= BuildData.build) {
_logger.info('Update ignored due to current: ${BuildData.build}, ' _logger.info('Update ignored due to current: ${BuildData.build}, '
'update: $newest'); 'update: $newest');

2
lib/core/utils/server.dart
View File

@@ -9,7 +9,7 @@ import '../../locator.dart';
/// Must put this func out of any Class. /// Must put this func out of any Class.
/// ///
/// Because of this function is called by [compute] in [ServerProvider.genClient]. /// Because of this function is called by [compute].
/// ///
/// https://stackoverflow.com/questions/51998995/invalid-arguments-illegal-argument-in-isolate-message-object-is-a-closure /// https://stackoverflow.com/questions/51998995/invalid-arguments-illegal-argument-in-isolate-message-object-is-a-closure
List<SSHKeyPair> loadIndentity(String key) { List<SSHKeyPair> loadIndentity(String key) {

10
lib/view/page/home.dart
View File

@@ -44,8 +44,11 @@ class _MyHomePageState extends State<MyHomePage>
AutomaticKeepAliveClientMixin, AutomaticKeepAliveClientMixin,
AfterLayoutMixin, AfterLayoutMixin,
WidgetsBindingObserver { WidgetsBindingObserver {
late final ServerProvider _serverProvider; final _serverProvider = locator<ServerProvider>();
final _setting = locator<SettingStore>();
late final PageController _pageController; late final PageController _pageController;
late int _selectIndex; late int _selectIndex;
late double _width; late double _width;
late S _s; late S _s;
@@ -53,9 +56,8 @@ class _MyHomePageState extends State<MyHomePage>
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_serverProvider = locator<ServerProvider>();
WidgetsBinding.instance.addObserver(this); WidgetsBinding.instance.addObserver(this);
_selectIndex = locator<SettingStore>().launchPage.fetch()!; _selectIndex = _setting.launchPage.fetch()!;
_pageController = PageController(initialPage: _selectIndex); _pageController = PageController(initialPage: _selectIndex);
} }
@@ -85,7 +87,7 @@ class _MyHomePageState extends State<MyHomePage>
} }
break; break;
case AppLifecycleState.paused: case AppLifecycleState.paused:
if (isAndroid) { if (isAndroid && _setting.bgRun.fetch()!) {
// Keep running in background on Android device // Keep running in background on Android device
bgRunChannel.invokeMethod('sendToBackground'); bgRunChannel.invokeMethod('sendToBackground');
} else { } else {

4
pubspec.yaml
View File

@@ -47,7 +47,9 @@ dependencies:
url: https://github.com/lollipopkit/circle_chart url: https://github.com/lollipopkit/circle_chart
ref: main ref: main
# path: ../circle_chart # path: ../circle_chart
r_upgrade: ^0.3.6
# TODO: Update this :)
r_upgrade: 0.3.8+2
path_provider: ^2.0.9 path_provider: ^2.0.9
easy_isolate: ^1.3.0 easy_isolate: ^1.3.0
share_plus: ^6.3.1 share_plus: ^6.3.1