From e57a5b3c95d7831cbcfaef96c588506753f1d91a Mon Sep 17 00:00:00 2001 From: perol Date: Tue, 28 Jul 2020 16:50:34 +0800 Subject: [PATCH] singleTask --- .flutter-plugins-dependencies | 2 +- android/app/build.gradle | 4 ++-- lib/generated/intl/messages_en-US.dart | 2 ++ lib/generated/intl/messages_zh-CN.dart | 2 ++ lib/generated/intl/messages_zh-TW.dart | 2 ++ lib/generated/l10n.dart | 20 +++++++++++++++++++ lib/l10n/intl_en_US.arb | 4 +++- lib/l10n/intl_zh_CN.arb | 4 +++- lib/l10n/intl_zh_TW.arb | 4 +++- lib/lighting/lighting_page.dart | 8 +++++++- lib/main.dart | 27 ++++---------------------- lib/page/hello/android_hello_page.dart | 16 +++++++-------- lib/store/save_store.dart | 3 +-- 13 files changed, 58 insertions(+), 40 deletions(-) diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index f27c6735d..d75445b2d 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_downloader","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_downloader-1.4.4\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+4\\\\","dependencies":[]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"share_extend","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share_extend-1.1.9\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.8\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.5.0\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"android":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_displaymode","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_displaymode-0.1.0\\\\","dependencies":[]},{"name":"flutter_downloader","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_downloader-1.4.4\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+4\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"share_extend","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share_extend-1.1.9\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.8\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.5.0\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"macos":[{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+7\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_linux-0.0.2+1\\\\","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-0.0.1+1\\\\","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.2\\\\","dependencies":[]},{"name":"video_player_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player_web-0.1.3+2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_displaymode","dependencies":[]},{"name":"flutter_downloader","dependencies":[]},{"name":"flutter_inapp_purchase","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"receive_sharing_intent","dependencies":[]},{"name":"save_in_gallery","dependencies":[]},{"name":"screen","dependencies":[]},{"name":"share","dependencies":[]},{"name":"share_extend","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-07-28 11:11:26.655091","version":"1.17.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_downloader","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_downloader-1.4.4\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+4\\\\","dependencies":[]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"share_extend","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share_extend-1.1.9\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.8\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.5.0\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"android":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_displaymode","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_displaymode-0.1.0\\\\","dependencies":[]},{"name":"flutter_downloader","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_downloader-1.4.4\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+4\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"receive_sharing_intent","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\receive_sharing_intent-1.4.0+2\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"share_extend","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share_extend-1.1.9\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.8\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.5.0\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+2\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+2\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"macos":[{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+7\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_linux-0.0.2+1\\\\","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-0.0.1+1\\\\","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.2\\\\","dependencies":[]},{"name":"video_player_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player_web-0.1.3+2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_displaymode","dependencies":[]},{"name":"flutter_downloader","dependencies":[]},{"name":"flutter_inapp_purchase","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"receive_sharing_intent","dependencies":[]},{"name":"save_in_gallery","dependencies":[]},{"name":"screen","dependencies":[]},{"name":"share","dependencies":[]},{"name":"share_extend","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-07-28 11:31:42.701419","version":"1.17.5"} \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index d206df1ed..91fecad39 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -59,10 +59,10 @@ android { } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.perol.pixez" + applicationId "com.perol.play.pixez" minSdkVersion 21 targetSdkVersion 29 - versionCode 15 + versionCode 16 versionName "0.1.2 element" } compileOptions { diff --git a/lib/generated/intl/messages_en-US.dart b/lib/generated/intl/messages_en-US.dart index 7181c589d..c0d80a4d8 100644 --- a/lib/generated/intl/messages_en-US.dart +++ b/lib/generated/intl/messages_en-US.dart @@ -134,6 +134,7 @@ class MessageLookup extends MessageLookupByLibrary { "Recommend_for_you" : MessageLookupByLibrary.simpleMessage("For you"), "Reply" : MessageLookupByLibrary.simpleMessage("Reply"), "Report_Message" : MessageLookupByLibrary.simpleMessage("Report this content if it makes you feel uncomfortable, we will remove it ASAP once we confirmed that it\'s harmful."), + "Retry" : MessageLookupByLibrary.simpleMessage("Retry"), "Retry_Failed_Tasks" : MessageLookupByLibrary.simpleMessage("Retry failed tasks"), "Running" : MessageLookupByLibrary.simpleMessage("Running"), "Save" : MessageLookupByLibrary.simpleMessage("Save"), @@ -179,6 +180,7 @@ class MessageLookup extends MessageLookupByLibrary { "popular_desc" : MessageLookupByLibrary.simpleMessage("Popular"), "private" : MessageLookupByLibrary.simpleMessage("Private"), "public" : MessageLookupByLibrary.simpleMessage("Public"), + "refresh" : MessageLookupByLibrary.simpleMessage("Refresh"), "report" : MessageLookupByLibrary.simpleMessage("Report"), "title_and_caption" : MessageLookupByLibrary.simpleMessage("Title and description"), "total_bookmark" : MessageLookupByLibrary.simpleMessage("Total likes"), diff --git a/lib/generated/intl/messages_zh-CN.dart b/lib/generated/intl/messages_zh-CN.dart index 95ac17af5..8b8b20b11 100644 --- a/lib/generated/intl/messages_zh-CN.dart +++ b/lib/generated/intl/messages_zh-CN.dart @@ -134,6 +134,7 @@ class MessageLookup extends MessageLookupByLibrary { "Recommend_for_you" : MessageLookupByLibrary.simpleMessage("为你推荐"), "Reply" : MessageLookupByLibrary.simpleMessage("回复"), "Report_Message" : MessageLookupByLibrary.simpleMessage("如果该内容让你感到不适，点击确定回报给审核，该内容会在核实后立即删除，我们会尽快处理该内容"), + "Retry" : MessageLookupByLibrary.simpleMessage("重试"), "Retry_Failed_Tasks" : MessageLookupByLibrary.simpleMessage("重试失败任务"), "Running" : MessageLookupByLibrary.simpleMessage("进行中"), "Save" : MessageLookupByLibrary.simpleMessage("保存"), @@ -179,6 +180,7 @@ class MessageLookup extends MessageLookupByLibrary { "popular_desc" : MessageLookupByLibrary.simpleMessage("热度降序"), "private" : MessageLookupByLibrary.simpleMessage("非公开"), "public" : MessageLookupByLibrary.simpleMessage("公开"), + "refresh" : MessageLookupByLibrary.simpleMessage("刷新"), "report" : MessageLookupByLibrary.simpleMessage("举报"), "title_and_caption" : MessageLookupByLibrary.simpleMessage("标题和总结"), "total_bookmark" : MessageLookupByLibrary.simpleMessage("收藏量"), diff --git a/lib/generated/intl/messages_zh-TW.dart b/lib/generated/intl/messages_zh-TW.dart index a95f0d639..a0678a98d 100644 --- a/lib/generated/intl/messages_zh-TW.dart +++ b/lib/generated/intl/messages_zh-TW.dart @@ -134,6 +134,7 @@ class MessageLookup extends MessageLookupByLibrary { "Recommend_for_you" : MessageLookupByLibrary.simpleMessage("為你推薦"), "Reply" : MessageLookupByLibrary.simpleMessage("回覆"), "Report_Message" : MessageLookupByLibrary.simpleMessage("如果該內容讓你感到不適，可點擊確定以回報審核，我們會盡快處理，該內容將會在問題被核實後立即刪除"), + "Retry" : MessageLookupByLibrary.simpleMessage("重試"), "Retry_Failed_Tasks" : MessageLookupByLibrary.simpleMessage("重試失敗工作"), "Running" : MessageLookupByLibrary.simpleMessage("進行中"), "Save" : MessageLookupByLibrary.simpleMessage("儲存"), @@ -179,6 +180,7 @@ class MessageLookup extends MessageLookupByLibrary { "popular_desc" : MessageLookupByLibrary.simpleMessage("熱度降序"), "private" : MessageLookupByLibrary.simpleMessage("非公開"), "public" : MessageLookupByLibrary.simpleMessage("公開"), + "refresh" : MessageLookupByLibrary.simpleMessage("刷新"), "report" : MessageLookupByLibrary.simpleMessage("檢舉"), "title_and_caption" : MessageLookupByLibrary.simpleMessage("標題和簡介"), "total_bookmark" : MessageLookupByLibrary.simpleMessage("收藏量"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 9db50234e..e72970943 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -1612,6 +1612,26 @@ class I18n { args: [], ); } + + /// `Refresh` + String get refresh { + return Intl.message( + 'Refresh', + name: 'refresh', + desc: '', + args: [], + ); + } + + /// `Retry` + String get Retry { + return Intl.message( + 'Retry', + name: 'Retry', + desc: '', + args: [], + ); + } } class AppLocalizationDelegate extends LocalizationsDelegate { diff --git a/lib/l10n/intl_en_US.arb b/lib/l10n/intl_en_US.arb index 921946853..2267920b2 100644 --- a/lib/l10n/intl_en_US.arb +++ b/lib/l10n/intl_en_US.arb @@ -157,5 +157,7 @@ "Retry_Failed_Tasks": "Retry failed tasks", "Clear_Completed_Tasks": "Clear completed tasks", "Crosscount": "Crosscount", - "Need_To_Restart_App": "Need to restart app" + "Need_To_Restart_App": "Need to restart app", + "refresh": "Refresh", + "Retry": "Retry" } \ No newline at end of file diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 0050fee3d..2da37379c 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -157,5 +157,7 @@ "Retry_Failed_Tasks": "重试失败任务", "Clear_Completed_Tasks": "清空已完成任务", "Crosscount": "列数", - "Need_To_Restart_App": "需要重启app" + "Need_To_Restart_App": "需要重启app", + "refresh": "刷新", + "Retry": "重试" } \ No newline at end of file diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index dcdb9ebcb..f560e9474 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -157,5 +157,7 @@ "Retry_Failed_Tasks": "重試失敗工作", "Clear_Completed_Tasks": "清空已完成工作", "Crosscount": "列數", - "Need_To_Restart_App": "需要重啟app" + "Need_To_Restart_App": "需要重啟app", + "refresh": "刷新", + "Retry": "重試" } diff --git a/lib/lighting/lighting_page.dart b/lib/lighting/lighting_page.dart index d1a4a4396..c8aa48090 100644 --- a/lib/lighting/lighting_page.dart +++ b/lib/lighting/lighting_page.dart @@ -190,7 +190,13 @@ class _LightingListState extends State { Container( height: 90, ), - Text(':(', style: Theme.of(context).textTheme.headline4), + Padding( + padding: const EdgeInsets.all(8.0), + child: Text(':(', style: Theme.of(context).textTheme.headline4), + ), + FlatButton(onPressed: (){ + _store.fetch(); + }, child: Text(I18n.of(context).Retry)), Padding( padding: const EdgeInsets.all(16.0), child: Text('${_store.errorMessage}'), diff --git a/lib/main.dart b/lib/main.dart index b3bb2fea8..d591dbacd 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -72,25 +72,15 @@ class _MyAppState extends State { muteStore.fetchBanIllusts(); muteStore.fetchBanTags(); time = _port.hashCode; - debugPrint('time${time}'); initMethod(); super.initState(); } initMethod() async { - int portInt = 0; - bool success = IsolateNameServer.registerPortWithName( - _port.sendPort, 'downloader${portInt}'); - while (!success && portInt <= 1) { - portInt++; - success = IsolateNameServer.registerPortWithName( - _port.sendPort, 'downloader${portInt}'); - if(success) break; - } - print('final regitser :downloader${portInt}'); + bool success = + IsolateNameServer.registerPortWithName(_port.sendPort, 'downloader'); if (!success) return; _port.listen((dynamic data) async { - print('listen hash${saveStore.urls.hashCode}'); String id = data[0]; DownloadTaskStatus status = data[1]; if (status == DownloadTaskStatus.complete) { @@ -122,25 +112,16 @@ class _MyAppState extends State { removeUrl(String id) async { saveStore.maps[id] = null; String queryString = 'SELECT * FROM task WHERE task_id=\'${id}\''; - debugPrint(queryString); final tasks = await FlutterDownloader.loadTasksWithRawQuery(query: queryString); if (tasks != null && tasks.isNotEmpty) { - print('remove hash${saveStore.urls.hashCode}'); - print(saveStore.urls.remove(tasks.first.url)); + saveStore.urls.remove(tasks.first.url); } } static void downloadCallback( String id, DownloadTaskStatus status, int progress) { - int portInt = 0; - SendPort send = IsolateNameServer.lookupPortByName('downloader${portInt}'); - while (send == null && portInt <= 1) { - portInt++; - send = IsolateNameServer.lookupPortByName('downloader${portInt}'); //无奈之举 - } - - print('final regitsr :downloader${portInt}'); + SendPort send = IsolateNameServer.lookupPortByName('downloader'); if (send != null) send.send([id, status, progress]); final SendPort send1 = IsolateNameServer.lookupPortByName('downloader_pro'); if (send1 != null) send1.send([id, status, progress]); diff --git a/lib/page/hello/android_hello_page.dart b/lib/page/hello/android_hello_page.dart index 88db0296e..e51d8830b 100644 --- a/lib/page/hello/android_hello_page.dart +++ b/lib/page/hello/android_hello_page.dart @@ -128,7 +128,7 @@ class _AndroidHelloPageState extends State { try { int id = int.parse(idSource); Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return IllustPage( id: id, @@ -142,7 +142,7 @@ class _AndroidHelloPageState extends State { try { int id = int.parse(idSource); Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return UsersPage( id: id, @@ -159,7 +159,7 @@ class _AndroidHelloPageState extends State { try { int id = int.parse(paths[index + 1]); Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return IllustPage(id: id); })); @@ -174,7 +174,7 @@ class _AndroidHelloPageState extends State { try { int id = int.parse(paths[index + 1]); Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return UsersPage( id: id, @@ -189,7 +189,7 @@ class _AndroidHelloPageState extends State { try { var id = link.queryParameters['illust_id']; Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return IllustPage(id: int.parse(id)); })); @@ -201,7 +201,7 @@ class _AndroidHelloPageState extends State { try { var id = link.queryParameters['id']; Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return UsersPage( id: int.parse(id), @@ -217,7 +217,7 @@ class _AndroidHelloPageState extends State { try { int id = int.parse(link.pathSegments[link.pathSegments.length - 1]); Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return IllustPage(id: id); })); @@ -229,7 +229,7 @@ class _AndroidHelloPageState extends State { try { int id = int.parse(link.pathSegments[link.pathSegments.length - 1]); Navigator.of(context, rootNavigator: true) - .push(MaterialPageRoute(builder: (context) { + .pushReplacement(MaterialPageRoute(builder: (context) { saveStore.context = context; return UsersPage( id: id, diff --git a/lib/store/save_store.dart b/lib/store/save_store.dart index f114cf317..882e2c006 100644 --- a/lib/store/save_store.dart +++ b/lib/store/save_store.dart @@ -179,7 +179,6 @@ abstract class _SaveStoreBase with Store { } _joinQueue(String url, Illusts illusts, String fileName) async { - print('save hash${saveStore.urls.hashCode}'); if (saveStore.urls.contains(url)) { streamController.add(SaveStream(SaveState.INQUEUE, illusts)); return; @@ -198,7 +197,7 @@ abstract class _SaveStoreBase with Store { }, fileName: fileName, showNotification: - true, // show download progress in status bar (for Android) + false, // show download progress in status bar (for Android) openFileFromNotification: false, // click on notification to open downloaded file (for Android) );