diff --git a/assets/flutter.db b/assets/flutter.db index 132af61..2b1955d 100644 Binary files a/assets/flutter.db and b/assets/flutter.db differ diff --git a/lib/model/widget_model.dart b/lib/model/widget_model.dart index 16c36a0..1c0693a 100644 --- a/lib/model/widget_model.dart +++ b/lib/model/widget_model.dart @@ -63,7 +63,8 @@ class WidgetModel extends Equatable { ); } - static convertImage(String image) { + static AssetImage convertImage(String image) { + if(image==null) return null; return image.isEmpty ? null : AssetImage(image); } @@ -73,7 +74,7 @@ class WidgetModel extends Equatable { } static List formatLinkTo(String links) { - if(links.isEmpty){ + if(links!=null||links.isEmpty){ return []; } if(!links.contains(',')){ diff --git a/lib/storage/app_storage.dart b/lib/storage/app_storage.dart index fbc5f69..ca9bd17 100644 --- a/lib/storage/app_storage.dart +++ b/lib/storage/app_storage.dart @@ -54,9 +54,9 @@ class AppStorage { setupDatabase(); var databasesPath = await getApplicationSupportDirectory(); var dbPath = path.join(databasesPath.path, "flutter.db"); - + const bool inProduction = const bool.fromEnvironment("dart.vm.product"); var file = File(dbPath); - if (!file.existsSync()) { + if (!file.existsSync()||!inProduction) { await Directory(path.dirname(dbPath)).create(recursive: true); ByteData data = await rootBundle.load("assets/flutter.db"); List bytes = diff --git a/pubspec.lock b/pubspec.lock index 29bad36..bd39171 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.7.0" + version: "2.8.1" bloc: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.0" + version: "1.7.0" mime: dependency: transitive description: @@ -363,7 +363,7 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.1" + version: "0.4.2" toggle_rotate: dependency: "direct main" description: diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index c7a8c76..744f08a 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -91,6 +91,7 @@ add_custom_command( ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" windows-x64 $ + VERBATIM ) add_custom_target(flutter_assemble DEPENDS "${FLUTTER_LIBRARY}" diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 3f78b6b..3e1e0c4 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -2,11 +2,16 @@ // Generated file. Do not edit. // +// clang-format off + #include "generated_plugin_registrant.h" #include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { PathProviderPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PathProviderPlugin")); + UrlLauncherPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherPlugin")); } diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h index 9846246..dc139d8 100644 --- a/windows/flutter/generated_plugin_registrant.h +++ b/windows/flutter/generated_plugin_registrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 3fa4322..1aa89ad 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -4,6 +4,7 @@ list(APPEND FLUTTER_PLUGIN_LIST path_provider_fde + url_launcher_windows ) set(PLUGIN_BUNDLED_LIBRARIES)