Update README.md

README.md

@@ -2,62 +2,37 @@
 
 版本更新通知 https://t.me/qinglongapp
 
-仅供学习交流, 禁止用于任何商业用途
+基于[qinglong](https://github.com/whyour/qinglong)API实现的三方客户端,采用Flutter编写 (API最低支持2.10.0)
 
-基于[qinglong](https://github.com/whyour/qinglong)API实现的三方客户端,采用Flutter编写 (API基于v2.10.13)
+Android端下载地址:[Release](https://github.com/qinglong-app/qinglong_app/releases)
 
-Android端去[release](https://github.com/qinglong-app/qinglong_app/releases)下载
-
-iOS端暂无上架打算，用户自行下载main分支源码编译安装
+iOS端下载地址: [AppStore](https://apps.apple.com/cn/app/id1625871665)
 
 
 <p float="left">
-  <img src="./art/14.jpg" width="200" />
-  <img src="./art/1.jpg" width="200" />
-  <img src="./art/9.jpg" width="200" />
+  <img src="./art/1.png" width="250" />
+  <img src="./art/2.png" width="250" />
+  <img src="./art/3.png" width="250" />
 </p>
 <p float="left">
-  <img src="./art/10.jpg" width="200" />
-  <img src="./art/11.jpg" width="200" /> 
-  <img src="./art/12.jpg" width="200" />
-</p>
-<p float="left">
-  <img src="./art/2.jpg" width="200" />
-  <img src="./art/3.jpg" width="200" /> 
-  <img src="./art/4.jpg" width="200" />
+  <img src="./art/4.png" width="250" />
+  <img src="./art/5.png" width="250" /> 
 </p>
 
-<p float="left">
-  <img src="./art/5.jpg" width="200" />
-  <img src="./art/6.jpg" width="200" /> 
-  <img src="./art/7.jpg" width="200" />
-</p>
-
-<p float="left">
-  <img src="./art/13.jpg" width="200" />
-  <img src="./art/8.jpg" width="200" />
-</p>
-
-## [更新记录](./CHANGELOG.md)
-
-
-### 不支持的功能
->* 应用设置
->* 通知设置
-
-
-版本更新通知 https://t.me/qinglongapp
 
 用于生成app的图标
 
-flutter pub run flutter_launcher_icons:main
+>* flutter pub run flutter_launcher_icons:main
+
 生成原生的启动页面
 
-flutter pub run flutter_native_splash:create
+>* flutter pub run flutter_native_splash:create
+
 修改app名称
 
-flutter pub run flutter_app_name
+>* flutter pub run flutter_app_name
 
 生成json.jc.dart文件
-flutter pub run build_runner build --delete-conflicting-outputs
+
+>* flutter pub run build_runner build --delete-conflicting-outputs
 

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(
-            builder: (context) => const AddDependencyPage());
+        return MaterialPageRoute(builder: (context) => const AddDependencyPage());
       case routeAddEnv:
         if (settings.arguments != null) {
           return MaterialPageRoute(
@@ -164,15 +164,19 @@ class Routes {
           ),
         );
       case routeScriptAdd:
-        return CupertinoPageRoute(
-          builder: (context) => const ScriptAddPage(),
+        return MaterialPageRoute(
+          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,
           ),
@@ -181,18 +185,17 @@ class Routes {
         if (settings.arguments != null) {
           return MaterialPageRoute(
               builder: (context) => SubscriptionAddPage(
-                settings.arguments as Subscription,
-              ));
+                    settings.arguments as Subscription,
+                  ));
         } else {
           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 =
-        const SystemUiOverlayStyle(statusBarColor: Colors.transparent);
+    SystemUiOverlayStyle style = 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,40 +86,32 @@ 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'),
-          navigatorKey: navigatorState,
-          localizationsDelegates: const [
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-            GlobalCupertinoLocalizations.delegate,
-          ],
-          supportedLocales: const [
-            Locale('zh', 'CN'),
-            Locale('en', 'US'),
-          ],
-          theme: ref.watch<ThemeViewModel>(themeProvider).currentTheme,
-          onGenerateRoute: (setting) {
-            return Routes.generateRoute(setting);
+      child: MaterialApp(
+        title: "青龙",
+        locale: const Locale('zh', 'CN'),
+        navigatorKey: navigatorState,
+        localizationsDelegates: const [
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        supportedLocales: const [
+          Locale('zh', 'CN'),
+          Locale('en', 'US'),
+        ],
+        theme: ref.watch<ThemeViewModel>(themeProvider).currentTheme,
+        onGenerateRoute: (setting) {
+          return Routes.generateRoute(setting);
+        },
+        home: Builder(
+          builder: (context) {
+            if (!kReleaseMode) {
+              showDebugBtn(context);
+            }
+            return getIt<UserInfoViewModel>().isLogined() ? const HomePage() : const LoginPage();
           },
-          home: Builder(
-            builder: (context) {
-              if (!kReleaseMode) {
-                showDebugBtn(context);
-              }
-              return getIt<UserInfoViewModel>().isLogined()
-                  ? const HomePage()
-                  : const LoginPage();
-            },
-          ),
-          // home: 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,77 +154,80 @@ class _SubscriptionDetailPageState extends State<SubscriptionDetailPage> {
           )
         ],
       ),
-      body: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          TaskDetailCell(
-            title: "名称",
-            desc: widget.bean.name,
-          ),
-          TaskDetailCell(
-            title: "仓库类型",
-            desc: widget.bean.type == "public-repo"
-                ? "公开仓库"
-                : widget.bean.type == "private-repo"
-                    ? "私有仓库"
-                    : "单文件",
-          ),
-          TaskDetailCell(
-            title: "链接",
-            desc: widget.bean.url ?? "",
-          ),
-          TaskDetailCell(
-            title: "分支",
-            desc: widget.bean.branch ?? "",
-          ),
-          TaskDetailCell(
-            title: "定时类型",
-            desc: widget.bean.scheduleType ?? "",
-          ),
-          TaskDetailCell(
-            title: "定时规则",
-            desc: widget.bean.scheduleType == "crontab"
-                ? widget.bean.schedule ?? ""
-                : widget.bean.intervalSchedule!.type == "days"
-                    ? "每" + widget.bean.intervalSchedule!.value.toString() + "天"
-                    : widget.bean.intervalSchedule!.type == "hours"
-                        ? "每" +
-                            widget.bean.intervalSchedule!.value.toString() +
-                            "小时"
-                        : widget.bean.intervalSchedule!.type == "minutes"
-                            ? "每" +
-                                widget.bean.intervalSchedule!.value.toString() +
-                                "分钟"
-                            : "每" +
-                                widget.bean.intervalSchedule!.value.toString() +
-                                "秒",
-          ),
-          TaskDetailCell(
-            title: "白名单",
-            desc: widget.bean.whitelist ?? "",
-          ),
-          TaskDetailCell(
-            title: "黑名单",
-            desc: widget.bean.blacklist ?? "",
-          ),
-          TaskDetailCell(
-            title: "依赖文件",
-            desc: widget.bean.dependences ?? "",
-          ),
-          TaskDetailCell(
-            title: "文件后缀",
-            desc: widget.bean.extensions ?? "",
-          ),
-          TaskDetailCell(
-            title: "执行前",
-            desc: widget.bean.subAfter ?? "",
-          ),
-          TaskDetailCell(
-            title: "执行后",
-            desc: widget.bean.subBefore ?? "",
-          ),
-        ],
+      body: SingleChildScrollView(
+        primary: true,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TaskDetailCell(
+              title: "名称",
+              desc: widget.bean.name,
+            ),
+            TaskDetailCell(
+              title: "仓库类型",
+              desc: widget.bean.type == "public-repo"
+                  ? "公开仓库"
+                  : widget.bean.type == "private-repo"
+                      ? "私有仓库"
+                      : "单文件",
+            ),
+            TaskDetailCell(
+              title: "链接",
+              desc: widget.bean.url ?? "",
+            ),
+            TaskDetailCell(
+              title: "分支",
+              desc: widget.bean.branch ?? "",
+            ),
+            TaskDetailCell(
+              title: "定时类型",
+              desc: widget.bean.scheduleType ?? "",
+            ),
+            TaskDetailCell(
+              title: "定时规则",
+              desc: widget.bean.scheduleType == "crontab"
+                  ? widget.bean.schedule ?? ""
+                  : widget.bean.intervalSchedule!.type == "days"
+                      ? "每" + widget.bean.intervalSchedule!.value.toString() + "天"
+                      : widget.bean.intervalSchedule!.type == "hours"
+                          ? "每" +
+                              widget.bean.intervalSchedule!.value.toString() +
+                              "小时"
+                          : widget.bean.intervalSchedule!.type == "minutes"
+                              ? "每" +
+                                  widget.bean.intervalSchedule!.value.toString() +
+                                  "分钟"
+                              : "每" +
+                                  widget.bean.intervalSchedule!.value.toString() +
+                                  "秒",
+            ),
+            TaskDetailCell(
+              title: "白名单",
+              desc: widget.bean.whitelist ?? "",
+            ),
+            TaskDetailCell(
+              title: "黑名单",
+              desc: widget.bean.blacklist ?? "",
+            ),
+            TaskDetailCell(
+              title: "依赖文件",
+              desc: widget.bean.dependences ?? "",
+            ),
+            TaskDetailCell(
+              title: "文件后缀",
+              desc: widget.bean.extensions ?? "",
+            ),
+            TaskDetailCell(
+              title: "执行前",
+              desc: widget.bean.subAfter ?? "",
+            ),
+            TaskDetailCell(
+              title: "执行后",
+              desc: widget.bean.subBefore ?? "",
+            ),
+          ],
+        ),
       ),
     );
   }

lib/module/others/subscription/subscription_page.dart

@@ -23,55 +23,54 @@ class SubscriptionPage extends ConsumerStatefulWidget {
   _ScriptPageState createState() => _ScriptPageState();
 }
 
-class _ScriptPageState extends ConsumerState<SubscriptionPage>
-    with LazyLoadState<SubscriptionPage> {
+class _ScriptPageState extends ConsumerState<SubscriptionPage> with LazyLoadState<SubscriptionPage> {
   List<Subscription> list = [];
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        appBar: QlAppBar(
-          title: "订阅管理",
-          canBack: true,
-          actions: [
-            InkWell(
-              onTap: () {
-                Navigator.of(context).pushNamed(
-                  Routes.routerSubscriptionAdd,
-                );
-              },
-              child: const Padding(
-                padding: EdgeInsets.symmetric(
-                  horizontal: 15,
-                ),
-                child: Center(
-                  child: Icon(
-                    CupertinoIcons.add,
-                    size: 24,
-                    color: Colors.white,
-                  ),
+      appBar: QlAppBar(
+        title: "订阅管理",
+        canBack: true,
+        actions: [
+          InkWell(
+            onTap: () {
+              Navigator.of(context).pushNamed(
+                Routes.routerSubscriptionAdd,
+              );
+            },
+            child: const Padding(
+              padding: EdgeInsets.symmetric(
+                horizontal: 15,
+              ),
+              child: Center(
+                child: Icon(
+                  CupertinoIcons.add,
+                  size: 24,
+                  color: Colors.white,
                 ),
               ),
             ),
-          ],
-        ),
-        body: RefreshIndicator(
-          color: Theme.of(context).primaryColor,
-          onRefresh: () async {
-            return loadData();
-          },
-          child: list.isEmpty
-              ? const EmptyWidget()
-              : ListView.builder(
-                  keyboardDismissBehavior:
-                      ScrollViewKeyboardDismissBehavior.onDrag,
-                  itemBuilder: (context, index) {
-                    Subscription item = list[index];
-                    return SubscriptionCell(list[index], index, ref);
-                  },
-                  itemCount: list.length,
-                ),
-        ));
+          ),
+        ],
+      ),
+      body: RefreshIndicator(
+        color: Theme.of(context).primaryColor,
+        onRefresh: () async {
+          return loadData();
+        },
+        child: list.isEmpty
+            ? const EmptyWidget()
+            : ListView.builder(
+                keyboardDismissBehavior: 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})
-      : super(key: key);
+  const SubscriptionCell(this.bean, this.index, this.ref, {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(
-                        Routes.routerSubscriptionAdd,
-                        arguments: bean);
+                    Navigator.of(context).pushNamed(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
-                    ? Icons.dnd_forwardslash
-                    : Icons.check_circle_outline_sharp,
+                icon: bean.isDisabled == null || bean.isDisabled == 0 ? 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
-                    ? CupertinoIcons.memories
-                    : CupertinoIcons.stop_circle,
+                icon: bean.status! == 1 ? CupertinoIcons.memories : CupertinoIcons.stop_circle,
               ),
               SlidableAction(
                 backgroundColor: const Color(0xff606467),
@@ -175,10 +167,8 @@ class SubscriptionCell extends StatelessWidget {
             ],
           ),
           child: InkWell(
-            onTap: (){
-              Navigator.of(context).pushNamed(
-                  Routes.routerSubscriptionDetail,
-                  arguments: bean);
+            onTap: () {
+              Navigator.of(context).pushNamed(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
-                                              .watch(themeProvider)
-                                              .primaryColor,
+                                          color: ref.watch(themeProvider).primaryColor,
                                         ),
                                       ),
                                 SizedBox(
@@ -228,10 +216,7 @@ class SubscriptionCell extends StatelessWidget {
                                       overflow: TextOverflow.ellipsis,
                                       style: TextStyle(
                                         overflow: TextOverflow.ellipsis,
-                                        color: ref
-                                            .watch(themeProvider)
-                                            .themeColor
-                                            .titleColor(),
+                                        color: ref.watch(themeProvider).themeColor.titleColor(),
                                         fontSize: 18,
                                       ),
                                     ),
@@ -247,10 +232,7 @@ class SubscriptionCell extends StatelessWidget {
                               maxLines: 1,
                               style: TextStyle(
                                 overflow: TextOverflow.ellipsis,
-                                color: ref
-                                    .watch(themeProvider)
-                                    .themeColor
-                                    .descColor(),
+                                color: ref.watch(themeProvider).themeColor.descColor(),
                                 fontSize: 12,
                               ),
                             ),
@@ -280,10 +262,7 @@ class SubscriptionCell extends StatelessWidget {
                               maxLines: 1,
                               style: TextStyle(
                                 overflow: TextOverflow.ellipsis,
-                                color: ref
-                                    .watch(themeProvider)
-                                    .themeColor
-                                    .descColor(),
+                                color: ref.watch(themeProvider).themeColor.descColor(),
                                 fontSize: 12,
                               ),
                             ),
@@ -301,8 +280,7 @@ class SubscriptionCell extends StatelessWidget {
                           overflow: TextOverflow.ellipsis,
                           style: TextStyle(
                             overflow: TextOverflow.ellipsis,
-                            color:
-                                ref.watch(themeProvider).themeColor.descColor(),
+                            color: ref.watch(themeProvider).themeColor.descColor(),
                             fontSize: 12,
                           ),
                         ),

lib/module/task/intime_log/intime_log_page.dart

@@ -55,10 +55,9 @@ class _InTimeLogPageState extends State<InTimeLogPage>
 
   @override
   Widget build(BuildContext context) {
-    return Material(
-      child: SafeArea(
+    return Scaffold(
+      body: SafeArea(
         child: Container(
-          color: Colors.white,
           padding: const EdgeInsets.symmetric(
             vertical: 10,
           ),
@@ -164,6 +163,7 @@ class _InTimeLogPageState extends State<InTimeLogPage>
           getLogData();
         },
       );
+      getLogData();
     } else {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
         getLogData();

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