⚡ 025

niuhuan · Nov 2, 2023 · 846c323 · 846c323
1 parent bcbef17
commit 846c323
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 26 deletions.
diff --git a/ci/version.code.txt b/ci/version.code.txt
@@ -1 +1 @@
-v1.5.5
+v1.6.1
diff --git a/ci/version.info.txt b/ci/version.info.txt
@@ -1,3 +1,3 @@
-v1.5.5
+v1.6.1
 
 - [x] ♻️ Network
diff --git a/lib/configs/login.dart b/lib/configs/login.dart
@@ -170,23 +170,8 @@ class _LoginDialogState extends State<_LoginDialog> {
                   margin: const EdgeInsets.all(10),
                   child: MaterialButton(
                     color: Colors.orange.shade700,
-                    onPressed: () async {
-                      String? fen = await chooseMapDialog(
-                        context,
-                        values: {
-                          "国际分流1": "aHR0cHM6Ly8xOGNvbWljLnZpcC9zaWdudXA=",
-                          "国际分流2": "aHR0cHM6Ly8xOGNvbWljLm9yZy9zaWdudXA=",
-                          "东南亚分流3": "aHR0cHM6Ly9qbWNvbWljLm1lL3NpZ251cA==",
-                          "东南亚分流4": "aHR0cHM6Ly9qbWNvbWljMS5tZS9zaWdudXA=",
-                          "内地分流5": "aHR0cHM6Ly9qbS1jb21pYzIuY2Mvc2lnbnVw",
-                          "分流7": "aHR0cHM6Ly9qbS1jb21pYy5vcmcvc2lnbnVw",
-                          "分流8": "aHR0cHM6Ly9qbWNvbWljMi5ncm91cC9zaWdudXA=",
-                        },
-                        title: "选择注册分流",
-                      );
-                      if (fen != null) {
-                        openUrl(String.fromCharCodes(base64Decode(fen)));
-                      }
+                    onPressed: () {
+                      regxxx(context);
                     },
                     child: Container(
                       padding: const EdgeInsets.all(10),
@@ -223,3 +208,22 @@ class _LoginDialogState extends State<_LoginDialog> {
     );
   }
 }
+
+Future regxxx(BuildContext context) async {
+  String? fen = await chooseMapDialog(
+    context,
+    values: {
+      "國際通用網域1": "aHR0cHM6Ly8xOGNvbWljLnZpcC9zaWdudXA=",
+      "國際通用網域2": "aHR0cHM6Ly8xOGNvbWljLm9yZy9zaWdudXA=",
+      "东南亚分流1": "aHR0cHM6Ly9qbWNvbWljLm1lL3NpZ251cA==",
+      "东南亚分流2": "aHR0cHM6Ly9qbWNvbWljMS5tZS9zaWdudXA=",
+      "内地分流0": "aHR0cHM6Ly8xOGNvbWljLWdvZC5jYy9zaWdudXA=",
+      "内地分流1": "aHR0cHM6Ly8xOGNvbWljLWdvZC5jbHViL3NpZ251cA==",
+      "内地分流2": "aHR0cHM6Ly8xOGNvbWljLWdvZC54eXovc2lnbnVw",
+    },
+    title: "选择注册分流",
+  );
+  if (fen != null) {
+    openUrl(String.fromCharCodes(base64Decode(fen)));
+  }
+}
diff --git a/lib/screens/app_screen.dart b/lib/screens/app_screen.dart
@@ -20,7 +20,7 @@ class _AppScreenState extends State<AppScreen> {
 
   late final List<AppScreenData> _screens = [
     AppScreenData(
-      BrowserScreen(searchBarController: _searchBarController),
+      BrowserScreenWrapper(searchBarController: _searchBarController),
       '浏览',
       const Icon(Icons.menu_book_outlined),
       const Icon(Icons.menu_book),

diff --git a/lib/screens/browser_screen.dart b/lib/screens/browser_screen.dart
@@ -6,9 +6,64 @@ import 'package:jasmine/screens/components/comic_pager.dart';
 import 'package:jasmine/screens/components/content_builder.dart';
 import 'package:jasmine/screens/components/floating_search_bar.dart';
 
+import '../configs/login.dart';
 import 'components/browser_bottom_sheet.dart';
 import 'components/actions.dart';
 import 'components/comic_floating_search_bar.dart';
+import 'components/content_error.dart';
+import 'components/content_loading.dart';
+
+class BrowserScreenWrapper extends StatefulWidget {
+  final FloatingSearchBarController searchBarController;
+
+  const BrowserScreenWrapper({Key? key, required this.searchBarController})
+      : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() => _BrowserScreenWrapperState();
+}
+
+class _BrowserScreenWrapperState extends State<BrowserScreenWrapper> {
+  @override
+  void initState() {
+    loginEvent.subscribe(_setState);
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    loginEvent.unsubscribe(_setState);
+    super.dispose();
+  }
+
+  void _setState(_) {
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    switch (loginStatus) {
+      case LoginStatus.loginSuccess:
+        return BrowserScreen(searchBarController: widget.searchBarController);
+      case LoginStatus.loginField:
+        return ContentError(
+          error: "请先登录",
+          stackTrace: StackTrace.current,
+          onRefresh: () async {},
+        );
+      case LoginStatus.logging:
+        return const ContentLoading(
+          label: "登录中",
+        );
+      case LoginStatus.notSet:
+        return ContentError(
+          error: "请先登录",
+          stackTrace: StackTrace.current,
+          onRefresh: () async {},
+        );
+    }
+  }
+}
 
 class BrowserScreen extends StatefulWidget {
   final FloatingSearchBarController searchBarController;

diff --git a/lib/screens/calculator_screen.dart b/lib/screens/calculator_screen.dart
@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import '../basic/web_dav_sync.dart';
+import '../configs/login.dart';
 import '../configs/passed.dart';
 
 import 'app_screen.dart';
+import 'first_login_screen.dart';
 
 class CalculatorScreen extends StatelessWidget {
   const CalculatorScreen({Key? key}) : super(key: key);
@@ -556,11 +559,22 @@ class ContentBodyState extends State<ContentBody> {
   btnclick(e) {
     if (sums == "5686648") {
       firstPassed().then((value) {
-        Navigator.pushReplacement(context, MaterialPageRoute(
-          builder: (BuildContext context) {
-            return const AppScreen();
-          },
-        ));
+        if (loginStatus == LoginStatus.notSet) {
+          Future.delayed(Duration.zero, () async {
+            await webDavSyncAuto(context);
+            Navigator.of(context).pushReplacement(
+              MaterialPageRoute(builder: (BuildContext context) {
+                return firstLoginScreen;
+              }),
+            );
+          });
+        } else {
+          Navigator.pushReplacement(context, MaterialPageRoute(
+            builder: (BuildContext context) {
+              return const AppScreen();
+            },
+          ));
+        }
       });
     }
     for (var element in list) {

diff --git a/lib/screens/first_login_screen.dart b/lib/screens/first_login_screen.dart
@@ -121,6 +121,13 @@ class _FirstLoginScreenState extends State<FirstLoginScreen> {
           _passwordField(),
           apiHostSetting(),
           cdnHostSetting(),
+          const Divider(),
+          ListTile(
+            title: const Text("注册"),
+            onTap: () {
+              regxxx(context);
+            },
+          ),
         ],
       ),
     );

diff --git a/lib/screens/init_screen.dart b/lib/screens/init_screen.dart
@@ -61,6 +61,7 @@ class _InitScreenState extends State<InitScreen> {
     try {
       await methods.init();
       await initConfigs();
+      print("STATE : ${loginStatus}");
       if (!currentPassed()) {
         Future.delayed(Duration.zero, () async {
           await webDavSyncAuto(context);
@@ -70,6 +71,15 @@ class _InitScreenState extends State<InitScreen> {
             }),
           );
         });
+      } else if (loginStatus == LoginStatus.notSet) {
+        Future.delayed(Duration.zero, () async {
+          await webDavSyncAuto(context);
+          Navigator.of(context).pushReplacement(
+            MaterialPageRoute(builder: (BuildContext context) {
+              return firstLoginScreen;
+            }),
+          );
+        });
       } else {
         Future.delayed(Duration.zero, () async {
           await webDavSyncAuto(context);

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: jasmine comic browser
 
 publish_to: 'none'
 
-version: 1.5.5+23
+version: 1.6.1+23
 
 environment:
   sdk: ">=2.15.1 <3.0.0"