format code

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();
     }
   }
 }

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);
   }
-}
+}

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,

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);
   }
 }