remove flutter_image_compress device_info_plus

githubityu · githubityu · commit 585a784cc0d7 · 2023-11-08T15:54:03.000+08:00
diff --git a/lib/util/utils.dart b/lib/util/utils.dart
@@ -4,7 +4,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_image_compress/flutter_image_compress.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:intl/intl.dart' as intl;
 import 'package:ityu_tools/exports.dart';
@@ -99,6 +98,10 @@ class Utils {
     return data ?? false;
   }
 
+  static String getStringForDefault(dynamic data, {String defaultStr = ""}) {
+    return data ?? defaultStr;
+  }
+
   static bool getSafeIsEmpty(dynamic data) {
     return (data == null ? 0 : data.length) == 0;
   }
@@ -281,31 +284,31 @@ class Utils {
     return time;
   }
 
-  static Future<ResponseBodyMt> postFormData3Web(
-      Dio dio, List<XFile> files) async {
-    const extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final headers = <String, dynamic>{};
-    final data = FormData();
-
-    for (int i = 0; i < files.length; i++) {
-      final bytes = await files[i].readAsBytes();
-      final entry = MapEntry(
-          'file', MultipartFile.fromBytes(bytes, filename: files[i].name));
-      data.files.add(entry);
-    }
-    final result = await dio.fetch<Map<String, dynamic>>(
-        setStreamType2<ResponseBodyMt>(Options(
-                method: 'POST',
-                headers: headers,
-                extra: extra,
-                contentType: 'multipart/form-data')
-            .compose(dio.options, 'comm/uploadFile',
-                queryParameters: queryParameters, data: data)
-            .copyWith(baseUrl: dio.options.baseUrl)));
-    final value = ResponseBodyMt.fromJson(result.data!);
-    return value;
-  }
+  // static Future<ResponseBodyMt> postFormData3Web(
+  //     Dio dio, List<XFile> files) async {
+  //   const extra = <String, dynamic>{};
+  //   final queryParameters = <String, dynamic>{};
+  //   final headers = <String, dynamic>{};
+  //   final data = FormData();
+  //
+  //   for (int i = 0; i < files.length; i++) {
+  //     final bytes = await files[i].readAsBytes();
+  //     final entry = MapEntry(
+  //         'file', MultipartFile.fromBytes(bytes, filename: files[i].name));
+  //     data.files.add(entry);
+  //   }
+  //   final result = await dio.fetch<Map<String, dynamic>>(
+  //       setStreamType2<ResponseBodyMt>(Options(
+  //               method: 'POST',
+  //               headers: headers,
+  //               extra: extra,
+  //               contentType: 'multipart/form-data')
+  //           .compose(dio.options, 'comm/uploadFile',
+  //               queryParameters: queryParameters, data: data)
+  //           .copyWith(baseUrl: dio.options.baseUrl)));
+  //   final value = ResponseBodyMt.fromJson(result.data!);
+  //   return value;
+  // }
 
   static RequestOptions setStreamType2<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
diff --git a/lib/widget/export_widget.dart b/lib/widget/export_widget.dart
@@ -16,7 +16,6 @@ export 'my_iframe/my_iframe.dart';
 export 'pin_code_widget.dart';
 export 'radio_list_title_x.dart';
 export 'refresh_loadmore/empty_wrap_widget.dart';
-export 'refresh_loadmore/load_more_child.dart';
 export 'refresh_loadmore/refresh_nested_widget.dart';
 export 'round_widget.dart';
 export 'segment_control_x.dart';
diff --git a/lib/widget/tree_list.dart b/lib/widget/tree_list.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:ityu_tools/exports.dart';
+
+typedef ListExpansionTile<T> = List<T> Function(T);
+typedef ModelToMap<T> = Map<String, dynamic> Function(T);
+typedef ButtonsByT<T> = Widget? Function(T);
+
+class TreeUtils {
+  static List<Widget> generateRows<T>(List<T> items,
+      {int depth = 0,
+      required ListExpansionTile<T> listExpansionTile,
+      required ModelToMap<T> modelToMap,
+      ButtonsByT<T>? btnS}) {
+    final list = items
+        .map((e) => listExpansionTile(e).isNotEmpty == true
+            ? ExpansionTile(
+                controlAffinity: ListTileControlAffinity.leading,
+                tilePadding: EdgeInsets.only(left: (depth) * 15),
+                title: ItemExpansionTile(
+                  dept: depth,
+                  item: modelToMap(e),
+                  btnS: btnS?.call(e),
+                ),
+                children: generateRows(listExpansionTile(e),
+                    listExpansionTile: listExpansionTile,
+                    depth: depth + 1,
+                    btnS: btnS,
+                    modelToMap: modelToMap),
+              )
+            : Padding(
+                padding: EdgeInsets.only(left: (depth * 20.0) + 30),
+                child: ItemExpansionTile(
+                  item: modelToMap(e),
+                  dept: depth,
+                  btnS: btnS?.call(e),
+                ),
+              ))
+        .toList();
+    return list;
+  }
+}
+
+class ItemExpansionTileHeader extends StatelessWidget {
+  final List<String> headers;
+  final double width;
+
+  const ItemExpansionTileHeader(
+      {super.key, required this.headers, this.width = 150});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        SizedBox(
+          width: 40 + width,
+          height: 60,
+          child: Center(
+              child: Padding(
+            padding: const EdgeInsets.only(right: 30),
+            child: Text(headers.first),
+          )),
+        ),
+        ...headers.skip(1).map((e) => Expanded(child: Center(child: Text(e))))
+      ],
+    );
+  }
+}
+
+class ItemExpansionTile extends StatelessWidget {
+  final int dept;
+  final Map<String, dynamic> item;
+  final Widget? btnS;
+
+  const ItemExpansionTile(
+      {super.key, required this.item, this.dept = 0, this.btnS});
+
+  @override
+  Widget build(BuildContext context) {
+    const space = 20.0;
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        SizedBox(
+          width: 150 - space * dept,
+          child: Text(
+            item[item.keys.first] ?? "",
+            style: TextStyle(color: context.colorScheme.primary),
+          ),
+        ),
+        ...item.keys.skip(1).map((e) => Expanded(
+            child: Center(child: Text(Utils.getStringForDefault(item[e]))))),
+        if (btnS != null) Expanded(child: Center(child: btnS!)),
+      ],
+    );
+  }
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -13,7 +13,8 @@ dependencies:
   cupertino_icons: ^1.0.6
   intl: any
   dio: ^5.3.2
-  logger: ^2.0.2
+#  logger: ^2.0.2
+  logger: ^2.0.2+1
   #路由相关
   #  go_router: ^7.0.1
 
@@ -35,9 +36,7 @@ dependencies:
   #选择图片
   image_picker: ^1.0.4
   #侧滑
-  flutter_image_compress: ^2.0.4
   webview_flutter: ^4.2.4
-  device_info_plus: ^9.0.3
   path_provider: ^2.1.1
 
 dev_dependencies:
diff --git a/test/ityu_tools_test.dart b/test/ityu_tools_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-
+import 'package:ityu_tools/exports.dart';
 import 'package:ityu_tools/ityu_tools.dart';
 
 void main() {
@@ -9,4 +9,9 @@ void main() {
     expect(calculator.addOne(-7), -6);
     expect(calculator.addOne(0), 1);
   });
+
+  test('test getStringForDefault', () {
+    int? a;
+    expect(Utils.getStringForDefault(a), "");
+  });
 }
