diff --git a/go/cmd/init.go b/go/cmd/init.go index d8c1c79..c1f77b9 100644 --- a/go/cmd/init.go +++ b/go/cmd/init.go @@ -12,6 +12,7 @@ import ( "strings" ) +// 根据不通系统初始化数据的保存路径 func init() { applicationDir, err := os.UserHomeDir() if err != nil { diff --git a/go/main/controller/pikapi.go b/go/main/controller/pikapika.go similarity index 100% rename from go/main/controller/pikapi.go rename to go/main/controller/pikapika.go diff --git a/lib/basic/Method.dart b/lib/basic/Method.dart index 4d95e82..26f835b 100644 --- a/lib/basic/Method.dart +++ b/lib/basic/Method.dart @@ -574,7 +574,10 @@ class Method { Future> downloadGame(String url) async { if (url.startsWith("https://game.eroge.xyz/hhh.php")) { var data = await _flatInvoke("downloadGame", url); - return List.of(jsonDecode(data)).map((e) => e.toString()).toList(); + return [ + url, + ...List.of(jsonDecode(data)).map((e) => e.toString()), + ]; } return [url]; } @@ -675,5 +678,4 @@ class Method { Future httpGet(String url) async { return await _flatInvoke("httpGet", url); } - } diff --git a/lib/basic/Navigatior.dart b/lib/basic/Navigatior.dart index b95e4ee..346e989 100644 --- a/lib/basic/Navigatior.dart +++ b/lib/basic/Navigatior.dart @@ -1,33 +1,19 @@ -import 'dart:async'; +/// 导航相关 +import 'dart:async'; import 'package:flutter/material.dart'; +// 用于监听返回到当前页面的事件 +// (await Navigator.push 会在子页面pushReplacement时结束阻塞) final RouteObserver> routeObserver = RouteObserver>(); -Future navPushOrReplace( - BuildContext context, WidgetBuilder builder) async { - if (_depth < _depthMax) { - return Navigator.push( - context, - MaterialPageRoute(builder: builder), - ); - } else { - return Navigator.pushReplacement( - context, - MaterialPageRoute(builder: builder), - ); - } -} - -var navigatorObserver = _NavigatorObserver(); +// 路径深度计数 const _depthMax = 15; var _depth = 0; -int currentDepth() { - return _depth; -} +var navigatorObserver = _NavigatorObserver(); class _NavigatorObserver extends NavigatorObserver { @override @@ -44,3 +30,19 @@ class _NavigatorObserver extends NavigatorObserver { super.didPush(route, previousRoute); } } + +// 路径达到一定深度的时候使用 pushReplacement +Future navPushOrReplace( + BuildContext context, WidgetBuilder builder) async { + if (_depth < _depthMax) { + return Navigator.push( + context, + MaterialPageRoute(builder: builder), + ); + } else { + return Navigator.pushReplacement( + context, + MaterialPageRoute(builder: builder), + ); + } +} diff --git a/lib/basic/config/AndroidDisplayMode.dart b/lib/basic/config/AndroidDisplayMode.dart index 428b5c8..6dd0743 100644 --- a/lib/basic/config/AndroidDisplayMode.dart +++ b/lib/basic/config/AndroidDisplayMode.dart @@ -1,4 +1,4 @@ -// 显示模式, 仅安卓有效 +/// 显示模式, 仅安卓有效 import 'dart:io'; diff --git a/lib/basic/config/AutoClean.dart b/lib/basic/config/AutoClean.dart index b6dc28b..0ae9efa 100644 --- a/lib/basic/config/AutoClean.dart +++ b/lib/basic/config/AutoClean.dart @@ -1,7 +1,8 @@ +/// 自动清理 + import 'package:flutter/material.dart'; import 'package:pikapika/basic/Method.dart'; - const _autoCleanMap = { "一个月前": "${3600 * 24 * 30}", "一周前": "${3600 * 24 * 7}", @@ -52,7 +53,6 @@ Future _chooseAutoCleanSec(BuildContext context) async { } } - Widget autoCleanSecSetting() { return StatefulBuilder( builder: (BuildContext context, void Function(void Function()) setState) { diff --git a/lib/screens/components/Avatar.dart b/lib/screens/components/Avatar.dart index 5710fde..4c6fa2e 100644 --- a/lib/screens/components/Avatar.dart +++ b/lib/screens/components/Avatar.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; import 'package:pikapika/basic/Entities.dart'; -import 'package:pikapika/basic/Method.dart'; -import '../FilePhotoViewScreen.dart'; import 'Images.dart'; const double _avatarMargin = 5; diff --git a/lib/screens/components/Badge.dart b/lib/screens/components/Badge.dart index cd852c3..d5a4dce 100644 --- a/lib/screens/components/Badge.dart +++ b/lib/screens/components/Badge.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; +// 提示信息, 组件右上角的小红点 class Badged extends StatelessWidget { final String? badge; final Widget child;