merge

Notsfsssf · Jul 2, 2020 · f29ce3c · f29ce3c
2 parents 647b518 + ebc8c52
commit f29ce3c
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 25 deletions.
diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -2,6 +2,8 @@ PODS:
   - device_info (0.0.1):
     - Flutter
   - Flutter (1.0.0)
+  - flutter_displaymode (0.0.1):
+    - Flutter
   - flutter_inapp_purchase (0.0.1):
     - Flutter
   - flutter_plugin_android_lifecycle (0.0.1):
@@ -56,6 +58,7 @@ PODS:
 DEPENDENCIES:
   - device_info (from `.symlinks/plugins/device_info/ios`)
   - Flutter (from `Flutter`)
+  - flutter_displaymode (from `.symlinks/plugins/flutter_displaymode/ios`)
   - flutter_inapp_purchase (from `.symlinks/plugins/flutter_inapp_purchase/ios`)
   - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
@@ -89,6 +92,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/device_info/ios"
   Flutter:
     :path: Flutter
+  flutter_displaymode:
+    :path: ".symlinks/plugins/flutter_displaymode/ios"
   flutter_inapp_purchase:
     :path: ".symlinks/plugins/flutter_inapp_purchase/ios"
   flutter_plugin_android_lifecycle:
@@ -139,6 +144,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  flutter_displaymode: e1847a4c70dc07d58798a06f3db57cef6ecf6422
   flutter_inapp_purchase: 5c6a1ac3f11b11d0c8c0321c0c41c1f05805e4c8
   flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -374,7 +374,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = L9F8ZWCR8Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -387,7 +387,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.12;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez;
 				PRODUCT_NAME = PixEz;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -510,7 +510,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = L9F8ZWCR8Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -523,7 +523,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.12;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez;
 				PRODUCT_NAME = PixEz;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -539,7 +539,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = L9F8ZWCR8Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -552,7 +552,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.12;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez;
 				PRODUCT_NAME = PixEz;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/lib/page/about/about_page.dart b/lib/page/about/about_page.dart
@@ -306,6 +306,7 @@ class _AboutPageState extends State<AboutPage> {
           title: Text(I18n.of(context).Thanks),
           subtitle: Text('感谢帮助我测试的弹幕委员会群友们'),
           onTap: () {
+            if(Platform.isAndroid)
             Navigator.of(context).push(MaterialPageRoute(
                 builder: (_) => Scaffold(
                       appBar: AppBar(),
@@ -323,7 +324,7 @@ class _AboutPageState extends State<AboutPage> {
             }
           },
         ),
-        ...[
+        ...Platform.isAndroid?[
           ListTile(
             title: Text('如果你觉得这个应用还不错'),
             subtitle: Text('支持一下开发者吧!'),
@@ -354,7 +355,7 @@ class _AboutPageState extends State<AboutPage> {
               },
             ),
           ),
-        ],
+        ]:[],
         ...(Platform.isIOS)
             ? [
                 Card(

diff --git a/lib/page/hello/hello_page.dart b/lib/page/hello/hello_page.dart
@@ -44,11 +44,14 @@ class _HelloPageState extends State<HelloPage> {
   @override
   void dispose() {
     _sub?.cancel();
+    _pageController?.dispose();
     super.dispose();
   }
 
+  PageController _pageController;
   @override
   void initState() {
+    _pageController = PageController();
     super.initState();
     saveStore.saveStream.listen((stream) {
       listenBehavior(context, stream);
@@ -128,8 +131,8 @@ class _HelloPageState extends State<HelloPage> {
     } catch (e) {
       print(e);
     }
-      var prefs = await SharedPreferences.getInstance();
-       if (prefs.getInt('language_num') == null) {
+    var prefs = await SharedPreferences.getInstance();
+    if (prefs.getInt('language_num') == null) {
       Navigator.of(context)
           .pushReplacement(MaterialPageRoute(builder: (context) => InitPage()));
     }
@@ -141,17 +144,35 @@ class _HelloPageState extends State<HelloPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       body: Observer(builder: (_) {
-        return IndexedStack(
-          index: index,
-          children: accountStore.now != null
-              ? <Widget>[
-                  RecomSpolightPage(),
-                  NewPage(),
-                  SearchPage(),
-                  SettingPage()
-                ]
-              : [PreviewPage(), NewPage(), SearchPage(), SettingPage()],
-        );
+        return accountStore.now != null
+            ? PageView.builder(
+                controller: _pageController,
+                onPageChanged: (index) {
+                  setState(() {
+                    this.index = index;
+                  });
+                },
+                itemBuilder: (context, index) {
+                  var lists = <Widget>[
+                    RecomSpolightPage(),
+                    NewPage(),
+                    SearchPage(),
+                    SettingPage()
+                  ];
+
+                  return lists[index];
+                })
+            : PageView.builder(
+                controller: _pageController,
+                itemBuilder: (context, index) {
+                  var lists = [
+                    PreviewPage(),
+                    NewPage(),
+                    SearchPage(),
+                    SettingPage()
+                  ];
+                  return lists[index];
+                });
       }),
       bottomNavigationBar: BottomNavigationBar(
           type: BottomNavigationBarType.fixed,
@@ -160,6 +181,7 @@ class _HelloPageState extends State<HelloPage> {
             setState(() {
               this.index = index;
             });
+            _pageController.jumpToPage(index);
           },
           items: [
             BottomNavigationBarItem(

diff --git a/lib/page/hello/ranking/ranking_page.dart b/lib/page/hello/ranking/ranking_page.dart
@@ -41,7 +41,8 @@ class _RankingPageState extends State<RankingPage>
     "week",
     "month",
     "day_r18",
-    "week_r18"
+    "week_r18",
+    "week_r18g"
   ];
   var boolList = Map<String, bool>();
 

diff --git a/lib/page/hello/recom/recom_spotlight_page.dart b/lib/page/hello/recom/recom_spotlight_page.dart
@@ -26,6 +26,7 @@ import 'package:pixez/component/spotlight_card.dart';
 import 'package:pixez/generated/l10n.dart';
 import 'package:pixez/lighting/lighting_store.dart';
 import 'package:pixez/network/api_client.dart';
+import 'package:pixez/page/hello/ranking/rank_page.dart';
 import 'package:pixez/page/hello/ranking/ranking_page.dart';
 import 'package:pixez/page/hello/recom/spotlight_store.dart';
 import 'package:pixez/page/spotlight/spotlight_page.dart';
@@ -209,7 +210,7 @@ class _RecomSpolightPageState extends State<RecomSpolightPage>
               Navigator.of(context)
                   .push(MaterialPageRoute(builder: (BuildContext context) {
                 return Scaffold(
-                  body: RankingPage(),
+                  body: RankPage(),
                 );
               }));
             },

diff --git a/lib/page/hello/setting/setting_quality_page.dart b/lib/page/hello/setting/setting_quality_page.dart
@@ -14,6 +14,8 @@
  *
  */
 
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:pixez/generated/l10n.dart';
@@ -38,6 +40,7 @@ class _SettingQualityPageState extends State<SettingQualityPage>
     InkWell(
       onTap: () {
         try {
+                    if(Platform.isAndroid)
           launch('https://github.com/itzXian');
         } catch (e) {}
       },
@@ -59,6 +62,7 @@ class _SettingQualityPageState extends State<SettingQualityPage>
     InkWell(
       onTap: () {
         try {
+          if(Platform.isAndroid)
           launch('https://github.com/TragicLifeHu');
         } catch (e) {}
       },

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,7 +11,7 @@ description: A new Flutter project.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.12+35
+version: 1.1.0+37
 
 environment:
   sdk: ">=2.2.2 <3.0.0"