Merge branch 'v1.0.3_temp' of…

CHANGELOG.md

@@ -44,4 +44,6 @@
 * hideName姓名脱敏
 * ## 1.2.2
 * hideBankCard银行卡号脱敏
+* ## 1.2.3
+* SearchAppBar增加搜索背景圆角属性设置
   
\ No newline at end of file

lib/api/proxy.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_clx_base/flutter_clx_base.dart';
+import 'package:flutter_clx_base/utils/platform_utils.dart';
 
 import 'base_dio.dart';
 
@@ -13,7 +14,7 @@ bool setProxyFlag = false; // 设置代理标识 true 设置 false 不设置
 /// dio 设置代理uri
 void setProxyUri(Dio? dio, bool isProdEnv) {
   setProxyFlag = !isProdEnv; //生产环境不设置代理
-  if (!setProxyFlag) return;
+  if (!setProxyFlag || PlatformUtils.isWeb) return;
   String? proxyIP = SpUtil.getString(spProxyIp);
   String? proxyPort = SpUtil.getString(spProxyPort);
 
@@ -102,7 +103,10 @@ setProxyDialog(context) {
                   spProxyIp, ipController.value.text.toString().trim());
               SpUtil.putString(
                   spProxyPort, portController.value.text.toString().trim());
-              exit(0);
+              // 延迟1s 退出，修复保存失败问题
+              Future.delayed(const Duration(seconds: 1), () {
+                exit(0);
+              });
             },
             child: Container(
               margin: const EdgeInsets.only(
@@ -156,7 +160,8 @@ Widget _textFieldItem({title, controller}) {
             child: TextField(
               maxLines: 1,
               controller: controller,
-              keyboardType: const TextInputType.numberWithOptions(decimal: true),
+              keyboardType:
+                  const TextInputType.numberWithOptions(decimal: true),
               decoration: const InputDecoration(
                 counterText: "",
                 border: InputBorder.none, //去掉下划线

lib/utils/platform_utils.dart

+import 'dart:io';
+import 'package:flutter/foundation.dart';
+
+/// 平台信息
+class PlatformUtils {
+  static bool _isWeb() {
+    return kIsWeb == true;
+  }
+
+  static bool _isAndroid() {
+    return _isWeb() ? false : Platform.isAndroid;
+  }
+
+  static bool _isIOS() {
+    return _isWeb() ? false : Platform.isIOS;
+  }
+
+  static bool get isWeb => _isWeb();
+
+  static bool get isAndroid => _isAndroid();
+
+  static bool get isIOS => _isIOS();
+}

lib/utils/toast_util.dart

@@ -14,7 +14,7 @@ class ToastUtil {
         toastLength: toastDuration == ToastDuration.long
             ? Toast.LENGTH_LONG
             : Toast.LENGTH_SHORT,
-        gravity: gravity,
+        gravity: ToastGravity.CENTER,
         // timeInSecForIos: 1,
         backgroundColor: const Color(0xB3000000),
         textColor: Colors.white,

lib/widget/base_list_widget.dart

@@ -55,6 +55,8 @@ class _BaseListWidgetState extends State<BaseListWidget> {
   StateType _stateType = StateType.loading; // 列表状态
   // 禁止手动触发滚动，处理刷新过程中禁止滚动列表操作
   bool _disallowScroll = false;
+  // 禁止手动触发滚动遮罩State，单独刷新，否则列表项会刷新两次
+  StateSetter? _disallowScrollState;
   bool _callReloading = false; // 触发自动刷新标识
 
   @override
@@ -103,13 +105,17 @@ class _BaseListWidgetState extends State<BaseListWidget> {
           child: buildScrollView(),
         ),
         // 列表刷新时，增加透明遮罩，禁止滚动列表
-        Visibility(
-          visible: _disallowScroll,
-          child: Container(
+        StatefulBuilder(builder: (context, setState) {
+          _disallowScrollState = setState;
+          return Visibility(
+            visible: _disallowScroll,
+            child: Container(
               color: Colors.transparent,
               width: double.infinity,
-              height: double.infinity),
-        ),
+              height: double.infinity,
+            ),
+          );
+        }),
       ],
     );
   }
@@ -297,7 +303,7 @@ class _BaseListWidgetState extends State<BaseListWidget> {
   // 禁止手动触发滚动
   void setDisallowScroll() {
     if (mounted) {
-      setState(() {
+      _disallowScrollState?.call(() {
         _disallowScroll = true;
       });
     }

lib/widget/image_widget.dart

@@ -55,6 +55,7 @@ class ImageWidget {
     BoxFit? fit,
     String format = 'png',
     Color? color,
+    String? package,
   }) {
     return Image.asset(
       ImageUtils.getImgPath(image, format: format),
@@ -64,6 +65,7 @@ class ImageWidget {
       cacheHeight: cacheHeight,
       fit: fit,
       color: color,
+      package: package,
 
       /// 忽略图片语义
       excludeFromSemantics: true,

lib/widget/my_refresh_list_public.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_clx_base/utils/platform_utils.dart';
 
 import 'state_layout.dart';
 
@@ -292,7 +293,7 @@ class MyBehavior extends ScrollBehavior {
   @override
   Widget buildOverscrollIndicator(
       BuildContext context, Widget child, ScrollableDetails details) {
-    if (Platform.isAndroid || Platform.isFuchsia) {
+    if (PlatformUtils.isAndroid) {
       return child;
     } else {
       return super.buildOverscrollIndicator(context, child, details);

lib/widget/my_scaffold.dart

@@ -16,6 +16,7 @@ class MyScaffold extends StatelessWidget {
   final KeyboardActionsConfig? keyboardConfig;
   final Widget? floatingActionButton;
   final ScrollController? controller;
+  final Widget? endDrawer;
 
   const MyScaffold({
     Key? key,
@@ -30,6 +31,7 @@ class MyScaffold extends StatelessWidget {
     this.keyboardConfig,
     this.floatingActionButton,
     this.controller,
+    this.endDrawer,
   }) : super(key: key);
 
   @override
@@ -37,6 +39,7 @@ class MyScaffold extends StatelessWidget {
     return Scaffold(
       appBar: appBar ?? MyPageAppBar(title: title),
       backgroundColor: backgroundColor ?? const Color(0xFFf2f3f3),
+      endDrawer: endDrawer,
       body: SafeArea(
         child: body ??
             MyScrollView(

lib/widget/search_app_bar.dart

@@ -23,6 +23,7 @@ class SearchAppBar extends StatefulWidget implements PreferredSizeWidget {
   final bool automaticallyImplyLeading;
   final TextEditingController? textEditingController;
   final double? leadingWidth;
+  final double? searchBgRadius; // 搜索背景圆角
 
   const SearchAppBar({
     Key? key,
@@ -46,6 +47,7 @@ class SearchAppBar extends StatefulWidget implements PreferredSizeWidget {
     this.automaticallyImplyLeading = true,
     this.textEditingController,
     this.leadingWidth,
+    this.searchBgRadius,
   }) : super(key: key);
 
   @override
@@ -90,7 +92,8 @@ class _SearchAppBarState extends State<SearchAppBar> {
               child: Container(
                 margin: widget.margin,
                 decoration: BoxDecoration(
-                  borderRadius: const BorderRadius.all(Radius.circular(20.0)),
+                  borderRadius: BorderRadius.all(
+                      Radius.circular(widget.searchBgRadius ?? 20.0)),
                   color:
                       widget.searchBackgroundColor ?? const Color(0xFFEEEEEE),
                 ),

lib/widget/state_layout.dart

@@ -77,6 +77,7 @@ class _StateLayoutState extends State<StateLayout> {
                   img,
                   width: 133.5 * 2,
                   height: 95 * 2,
+                  package: "flutter_clx_base",
                 )
               : const SizedBox(),
           Text(

pubspec.yaml

@@ -87,6 +87,8 @@ flutter:
   # adding or updating assets for this project.
 
   # To add assets to your plugin package, add an assets section, like this:
+  assets:
+    - assets/images/
   # assets:
   #   - images/a_dot_burr.jpeg
   #   - images/a_dot_ham.jpeg