支持高刷

lib/base/routes.dart

@@ -12,7 +12,6 @@ import 'package:qinglong_app/module/others/backup/backup_page.dart';
 import 'package:qinglong_app/module/others/dependencies/add_dependency_page.dart';
 import 'package:qinglong_app/module/others/dependencies/dependency_page.dart';
 import 'package:qinglong_app/module/others/login_log/login_log_page.dart';
-import 'package:qinglong_app/module/others/scripts/acript_add_page.dart';
 import 'package:qinglong_app/module/others/scripts/script_detail_page.dart';
 import 'package:qinglong_app/module/others/scripts/script_edit_page.dart';
 import 'package:qinglong_app/module/others/scripts/script_page.dart';
@@ -28,6 +27,8 @@ import 'package:qinglong_app/module/task/add_task_page.dart';
 import 'package:qinglong_app/module/task/task_bean.dart';
 import 'package:qinglong_app/module/task/task_detail/task_detail_page.dart';
 
+import '../module/others/scripts/script_add_page.dart';
+
 class Routes {
   static const String routeHomePage = "/home/homepage";
   static const String routeLogin = "/login";
@@ -83,8 +84,7 @@ class Routes {
           return MaterialPageRoute(builder: (context) => const AddTaskPage());
         }
       case routeAddDependency:
-        return MaterialPageRoute(
+        return MaterialPageRoute(builder: (context) => const AddDependencyPage());
-            builder: (context) => const AddDependencyPage());
       case routeAddEnv:
         if (settings.arguments != null) {
           return MaterialPageRoute(
@@ -164,15 +164,19 @@ class Routes {
           ),
         );
       case routeScriptAdd:
-        return CupertinoPageRoute(
+        return MaterialPageRoute(
-          builder: (context) => const ScriptAddPage(),
+          builder: (context) => ScriptAddPage(
+            (settings.arguments as Map)["title"],
+            (settings.arguments as Map)["path"],
+          ),
         );
       case routerSubscription:
-        return CupertinoPageRoute(
+        //部分低端手机用Cupertino滑动时掉帧,左侧会出现白色空白
+        return MaterialPageRoute(
           builder: (context) => const SubscriptionPage(),
         );
       case routerSubscriptionDetail:
-        return CupertinoPageRoute(
+        return MaterialPageRoute(
           builder: (context) => SubscriptionDetailPage(
             settings.arguments as Subscription,
           ),
@@ -187,12 +191,11 @@ class Routes {
           return MaterialPageRoute(builder: (context) => const SubscriptionAddPage(null));
         }
       case routerBackup:
-        return CupertinoPageRoute(
+        return MaterialPageRoute(
           builder: (context) => const BackUpPage(),
         );
     }
 
-
     return null;
   }
 }

lib/main.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:dio_log/overlay_draggable_button.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
@@ -11,6 +12,7 @@ import 'package:qinglong_app/base/theme.dart';
 import 'package:qinglong_app/module/login/login_page.dart';
 import 'package:qinglong_app/utils/sp_utils.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_displaymode/flutter_displaymode.dart';
 
 import 'base/routes.dart';
 import 'base/userinfo_viewmodel.dart';
@@ -41,8 +43,7 @@ void main() async {
     ),
   );
   if (Platform.isAndroid) {
-    SystemUiOverlayStyle style =
+    SystemUiOverlayStyle style = const SystemUiOverlayStyle(statusBarColor: Colors.transparent);
-        const SystemUiOverlayStyle(statusBarColor: Colors.transparent);
     SystemChrome.setSystemUIOverlayStyle(style);
   }
 }
@@ -55,6 +56,29 @@ class QlApp extends ConsumerStatefulWidget {
 }
 
 class QlAppState extends ConsumerState<QlApp> {
+  List<DisplayMode> modes = <DisplayMode>[];
+  DisplayMode? active;
+  DisplayMode? preferred;
+
+  @override
+  void initState() {
+    super.initState();
+    SchedulerBinding.instance.addPostFrameCallback((_) {
+      fetchAll();
+    });
+  }
+
+  Future<void> fetchAll() async {
+    try {
+      modes = await FlutterDisplayMode.supported;
+      modes.forEach(print);
+      await FlutterDisplayMode.setHighRefreshRate();
+    } on PlatformException catch (e) {
+      print(e);
+    }
+    setState(() {});
+  }
+
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
@@ -62,11 +86,6 @@ class QlAppState extends ConsumerState<QlApp> {
       onTap: () {
         FocusScope.of(context).requestFocus(FocusNode());
       },
-      child: MediaQuery(
-        data:
-            MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
-          textScaleFactor: 1,
-        ),
       child: MaterialApp(
         title: "青龙",
         locale: const Locale('zh', 'CN'),
@@ -89,14 +108,11 @@ class QlAppState extends ConsumerState<QlApp> {
             if (!kReleaseMode) {
               showDebugBtn(context);
             }
-              return getIt<UserInfoViewModel>().isLogined()
+            return getIt<UserInfoViewModel>().isLogined() ? const HomePage() : const LoginPage();
-                  ? const HomePage()
-                  : const LoginPage();
           },
         ),
         // home: LoginPage(),
       ),
-      ),
     );
   }
 }

lib/module/others/scripts/script_add_page.dart

@@ -0,0 +1,186 @@
+import 'package:code_text_field/code_text_field.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:highlight/languages/javascript.dart';
+import 'package:highlight/languages/json.dart';
+import 'package:highlight/languages/powershell.dart';
+import 'package:highlight/languages/python.dart';
+import 'package:highlight/languages/vbscript-html.dart';
+import 'package:highlight/languages/yaml.dart';
+import 'package:qinglong_app/base/http/api.dart';
+import 'package:qinglong_app/base/http/http.dart';
+import 'package:qinglong_app/base/ql_app_bar.dart';
+import 'package:qinglong_app/base/sp_const.dart';
+import 'package:qinglong_app/base/theme.dart';
+import 'package:qinglong_app/utils/extension.dart';
+import 'package:qinglong_app/utils/sp_utils.dart';
+
+class ScriptAddPage extends ConsumerStatefulWidget {
+  final String title;
+  final String path;
+
+  const ScriptAddPage(this.title, this.path, {Key? key}) : super(key: key);
+
+  @override
+  ConsumerState createState() => _ScriptAddPageState();
+}
+
+class _ScriptAddPageState extends ConsumerState<ScriptAddPage> {
+  CodeController? _codeController;
+  late String result;
+  FocusNode focusNode = FocusNode();
+  late String preResult;
+
+  @override
+  void dispose() {
+    _codeController?.dispose();
+    super.dispose();
+  }
+
+  @override
+  void initState() {
+    result = "## created by 青龙客户端 ${DateTime.now().toString()}\n\n";
+    preResult = result;
+    super.initState();
+
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      focusNode.requestFocus();
+    });
+  }
+
+  getLanguageType(String title) {
+    if (title.endsWith(".js")) {
+      return javascript;
+    }
+
+    if (title.endsWith(".sh")) {
+      return powershell;
+    }
+
+    if (title.endsWith(".py")) {
+      return python;
+    }
+    if (title.endsWith(".json")) {
+      return json;
+    }
+    if (title.endsWith(".yaml")) {
+      return yaml;
+    }
+    return vbscriptHtml;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _codeController ??= CodeController(
+      text: result,
+      language: getLanguageType(widget.title),
+      onChange: (value) {
+        result = value;
+      },
+      theme: ref.watch(themeProvider).themeColor.codeEditorTheme(),
+      stringMap: {
+        "export": const TextStyle(fontWeight: FontWeight.normal, color: Color(0xff6B2375)),
+      },
+    );
+    return Scaffold(
+      appBar: QlAppBar(
+        canBack: true,
+        backCall: () {
+          FocusManager.instance.primaryFocus?.unfocus();
+
+          if (preResult == result) {
+            Navigator.of(context).pop();
+          } else {
+            showCupertinoDialog(
+              context: context,
+              useRootNavigator: false,
+              builder: (childContext) => CupertinoAlertDialog(
+                title: const Text("温馨提示"),
+                content: const Text("你新增的内容还没用提交,确定退出吗?"),
+                actions: [
+                  CupertinoDialogAction(
+                    child: const Text(
+                      "取消",
+                      style: TextStyle(
+                        color: Color(0xff999999),
+                      ),
+                    ),
+                    onPressed: () {
+                      Navigator.of(childContext).pop();
+                    },
+                  ),
+                  CupertinoDialogAction(
+                    child: Text(
+                      "确定",
+                      style: TextStyle(
+                        color: ref.watch(themeProvider).primaryColor,
+                      ),
+                    ),
+                    onPressed: () {
+                      Navigator.of(childContext).pop();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                ],
+              ),
+            );
+          }
+        },
+        title: '新增${widget.title}',
+        actions: [
+          InkWell(
+            onTap: () async {
+              try {
+                HttpResponse<NullResponse> response = await Api.addScript(
+                  widget.title,
+                  widget.path,
+                  result,
+                );
+                if (response.success) {
+                  "提交成功".toast();
+                  Navigator.of(context).pop(true);
+                } else {
+                  (response.message ?? "").toast();
+                }
+              } catch (e) {}
+            },
+            child: const Padding(
+              padding: EdgeInsets.symmetric(
+                horizontal: 15,
+              ),
+              child: Center(
+                child: Text(
+                  "提交",
+                  style: TextStyle(
+                    fontSize: 16,
+                  ),
+                ),
+              ),
+            ),
+          )
+        ],
+      ),
+      body: SafeArea(
+        top: false,
+        child: Padding(
+          padding: EdgeInsets.symmetric(
+            horizontal: SpUtil.getBool(spShowLine, defValue: false) ? 0 : 10,
+          ),
+          child: CodeField(
+            controller: _codeController!,
+            expands: true,
+            wrap: SpUtil.getBool(spShowLine, defValue: false) ? false : true,
+            hideColumn: !SpUtil.getBool(spShowLine, defValue: false),
+            lineNumberStyle: LineNumberStyle(
+              textStyle: TextStyle(
+                color: ref.watch(themeProvider).themeColor.descColor(),
+                fontSize: 12,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/module/others/subscription/subscription_detail_page.dart

@@ -154,7 +154,9 @@ class _SubscriptionDetailPageState extends State<SubscriptionDetailPage> {
           )
         ],
       ),
-      body: Column(
+      body: SingleChildScrollView(
+        primary: true,
+        child: Column(
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -226,6 +228,7 @@ class _SubscriptionDetailPageState extends State<SubscriptionDetailPage> {
             ),
           ],
         ),
+      ),
     );
   }
 

lib/module/others/subscription/subscription_page.dart

@@ -23,8 +23,7 @@ class SubscriptionPage extends ConsumerStatefulWidget {
   _ScriptPageState createState() => _ScriptPageState();
 }
 
-class _ScriptPageState extends ConsumerState<SubscriptionPage>
+class _ScriptPageState extends ConsumerState<SubscriptionPage> with LazyLoadState<SubscriptionPage> {
-    with LazyLoadState<SubscriptionPage> {
   List<Subscription> list = [];
 
   @override
@@ -63,15 +62,15 @@ class _ScriptPageState extends ConsumerState<SubscriptionPage>
         child: list.isEmpty
             ? const EmptyWidget()
             : ListView.builder(
-                  keyboardDismissBehavior:
+                keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
-                      ScrollViewKeyboardDismissBehavior.onDrag,
                 itemBuilder: (context, index) {
                   Subscription item = list[index];
                   return SubscriptionCell(list[index], index, ref);
                 },
                 itemCount: list.length,
               ),
-        ));
+      ),
+    );
   }
 
   Future<void> loadData() async {
@@ -100,8 +99,7 @@ class SubscriptionCell extends StatelessWidget {
   final int index;
   final WidgetRef ref;
 
-  const SubscriptionCell(this.bean, this.index, this.ref, {Key? key})
+  const SubscriptionCell(this.bean, this.index, this.ref, {Key? key}) : super(key: key);
-      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -117,9 +115,7 @@ class SubscriptionCell extends StatelessWidget {
                 backgroundColor: const Color(0xff5D5E70),
                 onPressed: (_) {
                   WidgetsBinding.instance.endOfFrame.then((timeStamp) {
-                    Navigator.of(context).pushNamed(
+                    Navigator.of(context).pushNamed(Routes.routerSubscriptionAdd, arguments: bean);
-                        Routes.routerSubscriptionAdd,
-                        arguments: bean);
                   });
                 },
                 foregroundColor: Colors.white,
@@ -131,9 +127,7 @@ class SubscriptionCell extends StatelessWidget {
                   changeSubscriptionEnable();
                 },
                 foregroundColor: Colors.white,
-                icon: bean.isDisabled == null || bean.isDisabled == 0
+                icon: bean.isDisabled == null || bean.isDisabled == 0 ? Icons.dnd_forwardslash : Icons.check_circle_outline_sharp,
-                    ? Icons.dnd_forwardslash
-                    : Icons.check_circle_outline_sharp,
               ),
               SlidableAction(
                 backgroundColor: const Color(0xffEA4D3E),
@@ -155,9 +149,7 @@ class SubscriptionCell extends StatelessWidget {
                   changeSubscriptionStatus();
                 },
                 foregroundColor: Colors.white,
-                icon: bean.status! == 1
+                icon: bean.status! == 1 ? CupertinoIcons.memories : CupertinoIcons.stop_circle,
-                    ? CupertinoIcons.memories
-                    : CupertinoIcons.stop_circle,
               ),
               SlidableAction(
                 backgroundColor: const Color(0xff606467),
@@ -176,9 +168,7 @@ class SubscriptionCell extends StatelessWidget {
           ),
           child: InkWell(
             onTap: () {
-              Navigator.of(context).pushNamed(
+              Navigator.of(context).pushNamed(Routes.routerSubscriptionDetail, arguments: bean);
-                  Routes.routerSubscriptionDetail,
-                  arguments: bean);
             },
             child: Column(
               mainAxisSize: MainAxisSize.min,
@@ -211,9 +201,7 @@ class SubscriptionCell extends StatelessWidget {
                                         height: 15,
                                         child: CircularProgressIndicator(
                                           strokeWidth: 2,
-                                          color: ref
+                                          color: ref.watch(themeProvider).primaryColor,
-                                              .watch(themeProvider)
-                                              .primaryColor,
                                         ),
                                       ),
                                 SizedBox(
@@ -228,10 +216,7 @@ class SubscriptionCell extends StatelessWidget {
                                       overflow: TextOverflow.ellipsis,
                                       style: TextStyle(
                                         overflow: TextOverflow.ellipsis,
-                                        color: ref
+                                        color: ref.watch(themeProvider).themeColor.titleColor(),
-                                            .watch(themeProvider)
-                                            .themeColor
-                                            .titleColor(),
                                         fontSize: 18,
                                       ),
                                     ),
@@ -247,10 +232,7 @@ class SubscriptionCell extends StatelessWidget {
                               maxLines: 1,
                               style: TextStyle(
                                 overflow: TextOverflow.ellipsis,
-                                color: ref
+                                color: ref.watch(themeProvider).themeColor.descColor(),
-                                    .watch(themeProvider)
-                                    .themeColor
-                                    .descColor(),
                                 fontSize: 12,
                               ),
                             ),
@@ -280,10 +262,7 @@ class SubscriptionCell extends StatelessWidget {
                               maxLines: 1,
                               style: TextStyle(
                                 overflow: TextOverflow.ellipsis,
-                                color: ref
+                                color: ref.watch(themeProvider).themeColor.descColor(),
-                                    .watch(themeProvider)
-                                    .themeColor
-                                    .descColor(),
                                 fontSize: 12,
                               ),
                             ),
@@ -301,8 +280,7 @@ class SubscriptionCell extends StatelessWidget {
                           overflow: TextOverflow.ellipsis,
                           style: TextStyle(
                             overflow: TextOverflow.ellipsis,
-                            color:
+                            color: ref.watch(themeProvider).themeColor.descColor(),
-                                ref.watch(themeProvider).themeColor.descColor(),
                             fontSize: 12,
                           ),
                         ),

pubspec.yaml

@@ -1,7 +1,7 @@
 name: qinglong_app
 description: A new Flutter project.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 1.1.0+110
+version: 1.1.1+111
 
 environment:
   sdk: ">=2.15.1 <3.0.0"
@@ -41,6 +41,8 @@ dependencies:
   code_text_field:
     path: ./pub/code_field-master
   path_provider: ^2.0.11
+  flutter_displaymode: ^0.4.0
+
 
   # flutter pub run build_runner build  --delete-conflicting-outputs
   # flutter pub run change_app_package_name:main work.master.qinglongapp

version

@@ -1 +1 @@
-1.1.0
+1.1.1