format code

2025-10-09 16:48:19 +08:00 · 2022-01-18 09:29:45 +08:00
parent 917425c5de
commit 074580952f
40 changed files with 414 additions and 568 deletions
--- a/lib/module/a.dart
+++ b/lib/module/a.dart
@@ -0,0 +1 @@
+
--- a/lib/module/config/config_bean.dart
+++ b/lib/module/config/config_bean.dart
@@ -2,7 +2,6 @@ import 'package:json_conversion_annotation/json_conversion_annotation.dart';

@JsonConversion()
 class ConfigBean {
-
  String? title;
  String? value;

@@ -19,6 +18,7 @@ class ConfigBean {
    data['value'] = this.value;
    return data;
  }
+
  static ConfigBean jsonConversion(Map<String, dynamic> json) {
    return ConfigBean.fromJson(json);
  }
--- a/lib/module/config/config_edit_page.dart
+++ b/lib/module/config/config_edit_page.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:qinglong_app/base/common_dialog.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/theme.dart';
 import 'package:qinglong_app/module/config/config_viewmodel.dart';
+import 'package:qinglong_app/utils/extension.dart';

 class ConfigEditPage extends ConsumerStatefulWidget {
  final String content;
@@ -41,15 +41,16 @@ class _ConfigEditPageState extends ConsumerState<ConfigEditPage> {
          InkWell(
            onTap: () async {
              if (value == null) {
-                failDialog(context, "请先点击保存");
+                "请先点击保存".toast();
                return;
              }
-              HttpResponse<NullResponse> response = await Api.saveFile(widget.title, _controller.text);
+              HttpResponse<NullResponse> response =
+                  await Api.saveFile(widget.title, _controller.text);
              if (response.success) {
                ref.read(configProvider).loadContent(widget.title);
                Navigator.of(context).pop();
              } else {
-                failDialog(context, response.message ?? "");
+                (response.message ?? "").toast();
              }
            },
            child: const Padding(
--- a/lib/module/config/config_page.dart
+++ b/lib/module/config/config_page.dart
@@ -16,7 +16,8 @@ class ConfigPage extends StatefulWidget {
  ConfigPageState createState() => ConfigPageState();
 }

-class ConfigPageState extends State<ConfigPage> with SingleTickerProviderStateMixin {
+class ConfigPageState extends State<ConfigPage>
+    with SingleTickerProviderStateMixin {
  TabController? _tabController;

  @override
@@ -28,7 +29,8 @@ class ConfigPageState extends State<ConfigPage> with SingleTickerProviderStateMi
  Widget build(BuildContext context) {
    return BaseStateWidget<ConfigViewModel>(
      builder: (ref, model, child) {
-        _tabController ??= TabController(length: model.list.length, vsync: this);
+        _tabController ??=
+            TabController(length: model.list.length, vsync: this);

        return Column(
          children: [
@@ -60,7 +62,10 @@ class ConfigPageState extends State<ConfigPage> with SingleTickerProviderStateMi
                          padding: const EdgeInsets.symmetric(
                            horizontal: 15,
                          ),
-                          theme: ref.watch(themeProvider).themeColor.codeEditorTheme(),
+                          theme: ref
+                              .watch(themeProvider)
+                              .themeColor
+                              .codeEditorTheme(),
                          tabSize: 14,
                        ),
                      ),
@@ -80,9 +85,10 @@ class ConfigPageState extends State<ConfigPage> with SingleTickerProviderStateMi

  void editMe(WidgetRef ref) {
    if (_tabController == null || _tabController!.length == 0) return;
-    navigatorState.currentState?.pushNamed(Routes.route_ConfigEdit, arguments: {
+    navigatorState.currentState?.pushNamed(Routes.routeConfigEdit, arguments: {
      "title": ref.read(configProvider).list[_tabController?.index ?? 0].title,
-      "content": ref.read(configProvider).content[ref.read(configProvider).list[_tabController?.index ?? 0].title]
+      "content": ref.read(configProvider).content[
+          ref.read(configProvider).list[_tabController?.index ?? 0].title]
    });
  }
 }
--- a/lib/module/env/add_env_page.dart
+++ b/lib/module/env/add_env_page.dart
@@ -1,14 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:qinglong_app/base/common_dialog.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/module/env/env_bean.dart';
 import 'package:qinglong_app/module/env/env_viewmodel.dart';
-import 'package:qinglong_app/module/task/task_bean.dart';
-import 'package:qinglong_app/module/task/task_detail/task_detail_bean.dart';
-import 'package:qinglong_app/module/task/task_viewmodel.dart';
+import 'package:qinglong_app/utils/extension.dart';

 class AddEnvPage extends ConsumerStatefulWidget {
  final EnvBean? taskBean;
@@ -180,11 +177,11 @@ class _AddEnvPageState extends ConsumerState<AddEnvPage> {

  void submit() async {
    if (_nameController.text.isEmpty) {
-      failDialog(context, "名称不能为空");
+      "名称不能为空".toast();
      return;
    }
    if (_valueController.text.isEmpty) {
-      failDialog(context, "值不能为空");
+      "值不能为空".toast();
      return;
    }

@@ -196,12 +193,11 @@ class _AddEnvPageState extends ConsumerState<AddEnvPage> {
        id: envBean.sId);

    if (response.success) {
-      successDialog(context, "操作成功").then((value) {
-        ref.read(envProvider).updateEnv(envBean);
-        Navigator.of(context).pop();
-      });
+      "操作成功".toast();
+      ref.read(envProvider).updateEnv(envBean);
+      Navigator.of(context).pop();
    } else {
-      failDialog(context, response.message ?? "");
+      (response.message ?? "").toast();
    }
  }
 }
--- a/lib/module/env/env_bean.dart
+++ b/lib/module/env/env_bean.dart
@@ -12,12 +12,12 @@ class EnvBean {

  EnvBean(
      {this.value,
-        this.sId,
-        this.created,
-        this.status,
-        this.timestamp,
-        this.name,
-        this.remarks});
+      this.sId,
+      this.created,
+      this.status,
+      this.timestamp,
+      this.name,
+      this.remarks});

  EnvBean.fromJson(Map<String, dynamic> json) {
    value = json['value'];
@@ -40,7 +40,8 @@ class EnvBean {
    data['remarks'] = this.remarks;
    return data;
  }
+
  static EnvBean jsonConversion(Map<String, dynamic> json) {
    return EnvBean.fromJson(json);
  }
-}
+}
--- a/lib/module/env/env_page.dart
+++ b/lib/module/env/env_page.dart
@@ -1,17 +1,16 @@
 import 'dart:io';

-import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:qinglong_app/base/base_state_widget.dart';
-import 'package:qinglong_app/base/common_dialog.dart';
 import 'package:qinglong_app/base/routes.dart';
 import 'package:qinglong_app/base/theme.dart';
 import 'package:qinglong_app/base/ui/empty_widget.dart';
 import 'package:qinglong_app/module/env/env_bean.dart';
 import 'package:qinglong_app/module/env/env_viewmodel.dart';
+import 'package:qinglong_app/utils/extension.dart';

 class EnvPage extends StatefulWidget {
  const EnvPage({Key? key}) : super(key: key);
@@ -50,14 +49,12 @@ class _EnvPageState extends State<EnvPage> {
                  return model.loadData(false);
                },
                child: ReorderableListView(
-                  keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
+                  keyboardDismissBehavior:
+                      ScrollViewKeyboardDismissBehavior.onDrag,
                  header: searchCell(ref),
                  onReorder: (int oldIndex, int newIndex) {
                    if (list.length != model.list.length) {
-                      WidgetsBinding.instance
-                          ?.addPostFrameCallback((timeStamp) {
-                        failDialog(context, "请先清空搜索关键词");
-                      });
+                      "请先清空搜索关键词".toast();
                      return;
                    }

@@ -68,7 +65,7 @@ class _EnvPageState extends State<EnvPage> {
                      }
                      final EnvBean item = model.list.removeAt(oldIndex);
                      model.list.insert(newIndex, item);
-                      model.update();
+                      model.update(item.sId ?? "", newIndex, oldIndex);
                    });
                  },
                  children: list,
@@ -146,7 +143,7 @@ class EnvItemCell extends StatelessWidget {
              flex: 1,
              onPressed: (_) {
                Navigator.of(context)
-                    .pushNamed(Routes.route_AddEnv, arguments: bean);
+                    .pushNamed(Routes.routeAddEnv, arguments: bean);
              },
              foregroundColor: Colors.white,
              icon: CupertinoIcons.pencil,
--- a/lib/module/env/env_viewmodel.dart
+++ b/lib/module/env/env_viewmodel.dart
@@ -19,7 +19,6 @@ class EnvViewModel extends BaseViewModel {
    if (result.success && result.bean != null) {
      list.clear();
      list.addAll(result.bean!);
-      sortList();
      success();
    } else {
      list.clear();
@@ -27,12 +26,6 @@ class EnvViewModel extends BaseViewModel {
    }
  }

-  void sortList() {
-    list.sort((a, b) {
-      return a.status!.compareTo(b.status!);
-    });
-  }
-
  Future<void> delEnv(String id) async {
    HttpResponse<NullResponse> result = await Api.delEnv(id);
    if (result.success) {
@@ -61,7 +54,6 @@ class EnvViewModel extends BaseViewModel {

      if (response.success) {
        list.firstWhere((element) => element.sId == sId).status = 0;
-        sortList();
        success();
      } else {
        failToast(response.message, notify: true);
@@ -71,14 +63,15 @@ class EnvViewModel extends BaseViewModel {

      if (response.success) {
        list.firstWhere((element) => element.sId == sId).status = 1;
-        sortList();
        success();
      } else {
        failToast(response.message, notify: true);
      }
    }
  }
-  void update(){
-    // update
+
+  void update(String id, int newIndex, int oldIndex) async {
+    await Api.moveEnv(id, oldIndex, newIndex);
+    loadData(false);
  }
 }
--- a/lib/module/home/home_page.dart
+++ b/lib/module/home/home_page.dart
@@ -38,7 +38,7 @@ class _HomePageState extends ConsumerState<HomePage> {
      actions.add(InkWell(
        onTap: () {
          Navigator.of(context).pushNamed(
-            Routes.route_AddTask,
+            Routes.routeAddTask,
          );
        },
        child: const Padding(
@@ -58,7 +58,7 @@ class _HomePageState extends ConsumerState<HomePage> {
      actions.add(InkWell(
        onTap: () {
          Navigator.of(context).pushNamed(
-            Routes.route_AddEnv,
+            Routes.routeAddEnv,
          );
        },
        child: const Padding(
--- a/lib/module/login/login_bean.dart
+++ b/lib/module/login/login_bean.dart
@@ -11,11 +11,11 @@ class LoginBean {

  LoginBean(
      {this.token,
-        this.lastip,
-        this.lastaddr,
-        this.lastlogon,
-        this.retries,
-        this.platform});
+      this.lastip,
+      this.lastaddr,
+      this.lastlogon,
+      this.retries,
+      this.platform});

  LoginBean.fromJson(Map<String, dynamic> json) {
    token = json['token'];
@@ -36,6 +36,7 @@ class LoginBean {
    data['platform'] = this.platform;
    return data;
  }
+
  static LoginBean jsonConversion(Map<String, dynamic> json) {
    return LoginBean.fromJson(json);
  }
--- a/lib/module/login/login_page.dart
+++ b/lib/module/login/login_page.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:qinglong_app/base/common_dialog.dart';
 import 'package:qinglong_app/base/http/api.dart';
 import 'package:qinglong_app/base/http/http.dart';
 import 'package:qinglong_app/base/routes.dart';
 import 'package:qinglong_app/base/theme.dart';
 import 'package:qinglong_app/base/userinfo_viewmodel.dart';
 import 'package:qinglong_app/main.dart';
+import 'package:qinglong_app/utils/extension.dart';
 import 'package:qinglong_app/utils/utils.dart';

 import 'login_bean.dart';
@@ -180,24 +180,24 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                              isLoading,
                          child: CupertinoButton(
                              color: (_hostController.text.isNotEmpty &&
-                                  _userNameController.text.isNotEmpty &&
-                                  _passwordController.text.isNotEmpty &&
-                                  !isLoading)
+                                      _userNameController.text.isNotEmpty &&
+                                      _passwordController.text.isNotEmpty &&
+                                      !isLoading)
                                  ? ref
-                                  .watch(themeProvider)
-                                  .themeColor
-                                  .buttonBgColor()
+                                      .watch(themeProvider)
+                                      .themeColor
+                                      .buttonBgColor()
                                  : Theme.of(context)
-                                  .primaryColor
-                                  .withOpacity(0.4),
+                                      .primaryColor
+                                      .withOpacity(0.4),
                              child: isLoading
                                  ? const CupertinoActivityIndicator()
                                  : const Text(
-                                "登 录",
-                                style: TextStyle(
-                                  fontSize: 16,
-                                ),
-                              ),
+                                      "登 录",
+                                      style: TextStyle(
+                                        fontSize: 16,
+                                      ),
+                                    ),
                              onPressed: () {
                                Http.pushedLoginPage = false;
                                Utils.hideKeyBoard(context);
@@ -227,9 +227,9 @@ class _LoginPageState extends ConsumerState<LoginPage> {
    HttpResponse<LoginBean> response = await Api.login(userName, password);
    if (response.success) {
      getIt<UserInfoViewModel>().updateToken(response.bean?.token ?? "");
-      Navigator.of(context).pushReplacementNamed(Routes.route_HomePage);
+      Navigator.of(context).pushReplacementNamed(Routes.routeHomePage);
    } else {
-      failDialog(context, response.message ?? "请检查网络情况");
+      (response.message ?? "请检查网络情况").toast();
      isLoading = false;
      setState(() {});
    }
--- a/lib/module/others/other_page.dart
+++ b/lib/module/others/other_page.dart
@@ -213,7 +213,8 @@ class _OtherPageState extends ConsumerState<OtherPage> {
                  ),
                  onPressed: () {
                    getIt<UserInfoViewModel>().updateToken("");
-                    Navigator.of(context).pushReplacementNamed(Routes.route_LOGIN);
+                    Navigator.of(context)
+                        .pushReplacementNamed(Routes.routeLogin);
                  }),
            ),
          ),
--- a/lib/module/task/add_task_page.dart
+++ b/lib/module/task/add_task_page.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:qinglong_app/base/common_dialog.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/module/task/task_bean.dart';
 import 'package:qinglong_app/module/task/task_detail/task_detail_bean.dart';
 import 'package:qinglong_app/module/task/task_viewmodel.dart';
+import 'package:qinglong_app/utils/extension.dart';

 class AddTaskPage extends ConsumerStatefulWidget {
  final TaskBean? taskBean;
@@ -180,15 +180,15 @@ class _AddTaskPageState extends ConsumerState<AddTaskPage> {

  void submit() async {
    if (_nameController.text.isEmpty) {
-      failDialog(context, "任务名称不能为空");
+      "任务名称不能为空".toast();
      return;
    }
    if (_commandController.text.isEmpty) {
-      failDialog(context, "命令不能为空");
+      "命令不能为空".toast();
      return;
    }
    if (_cronController.text.isEmpty) {
-      failDialog(context, "定时不能为空");
+      "定时不能为空".toast();
      return;
    }

@@ -200,12 +200,11 @@ class _AddTaskPageState extends ConsumerState<AddTaskPage> {
        id: taskBean.sId);

    if (response.success) {
-      successDialog(context, "操作成功").then((value) {
-        ref.read(taskProvider).updateBean(taskBean);
-        Navigator.of(context).pop();
-      });
+      "操作成功".toast();
+      ref.read(taskProvider).updateBean(taskBean);
+      Navigator.of(context).pop();
    } else {
-      failDialog(context, response.message ?? "");
+      response.message.toast();
    }
  }
 }
--- a/lib/module/task/intime_log/intime_log_page.dart
+++ b/lib/module/task/intime_log/intime_log_page.dart
@@ -9,7 +9,8 @@ class InTimeLogPage extends StatefulWidget {
  final String cronId;
  final bool needTimer;

-  const InTimeLogPage(this.cronId, this.needTimer, {Key? key}) : super(key: key);
+  const InTimeLogPage(this.cronId, this.needTimer, {Key? key})
+      : super(key: key);

  @override
  _InTimeLogPageState createState() => _InTimeLogPageState();
--- a/lib/module/task/task_detail/task_detail_bean.dart
+++ b/lib/module/task/task_detail/task_detail_bean.dart
@@ -17,17 +17,17 @@ class TaskDetailBean {

  TaskDetailBean(
      {this.name,
-        this.command,
-        this.schedule,
-        this.saved,
-        this.sId,
-        this.created,
-        this.status,
-        this.timestamp,
-        this.isSystem,
-        this.isDisabled,
-        this.logPath,
-        this.isPinned});
+      this.command,
+      this.schedule,
+      this.saved,
+      this.sId,
+      this.created,
+      this.status,
+      this.timestamp,
+      this.isSystem,
+      this.isDisabled,
+      this.logPath,
+      this.isPinned});

  TaskDetailBean.fromJson(Map<String, dynamic> json) {
    name = json['name'];
--- a/lib/module/task/task_detail/task_detail_page.dart
+++ b/lib/module/task/task_detail/task_detail_page.dart
@@ -27,7 +27,7 @@ class _TaskDetailPageState extends ConsumerState<TaskDetailPage> {
        builder: (WidgetRef context, TaskDetailViewModel value, Widget? child) {
          return Container();
        },
-        onReady: (model){
+        onReady: (model) {
          model.loadDetail(widget.taskBean.sId!);
        },
      ),
--- a/lib/module/task/task_detail/task_detail_viewmodel.dart
+++ b/lib/module/task/task_detail/task_detail_viewmodel.dart
@@ -4,7 +4,8 @@ import 'package:qinglong_app/base/http/api.dart';
 import 'package:qinglong_app/base/http/http.dart';
 import 'package:qinglong_app/module/task/task_detail/task_detail_bean.dart';

-var taskDetailProvider = AutoDisposeChangeNotifierProvider<TaskDetailViewModel>((ref) {
+var taskDetailProvider =
+    AutoDisposeChangeNotifierProvider<TaskDetailViewModel>((ref) {
  return TaskDetailViewModel();
 });

--- a/lib/module/task/task_page.dart
+++ b/lib/module/task/task_page.dart
@@ -196,7 +196,7 @@ class TaskItemCell extends StatelessWidget {
            onPressed: () {
              Navigator.of(context).pop();
              Navigator.of(context)
-                  .pushNamed(Routes.route_AddTask, arguments: bean);
+                  .pushNamed(Routes.routeAddTask, arguments: bean);
            },
            trailingIcon: CupertinoIcons.pencil_outline,
          ),
@@ -435,7 +435,7 @@ class TaskItemCell extends StatelessWidget {
            onPressed: () {
              Navigator.pop(context);
              Navigator.of(context)
-                  .pushNamed(Routes.route_AddTask, arguments: bean);
+                  .pushNamed(Routes.routeAddTask, arguments: bean);
            },
          ),
          CupertinoActionSheetAction(