LianjiaTech · violinday · Mar 4, 2022 · Dec 15, 2021 · Dec 16, 2021 · Dec 16, 2021
diff --git a/lib/src/components/actionsheet/brn_selected_list_action_sheet.dart b/lib/src/components/actionsheet/brn_selected_list_action_sheet.dart
@@ -286,7 +286,7 @@ class _BrnActionSheetSelectedItemListState<T>
     AnimationController alphaAnimationController = AnimationController(
         duration: const Duration(milliseconds: 200), vsync: this);
     widget._alphaAnimationController = alphaAnimationController;
-    Animation yAnimation = Tween(begin: 65.0, end: this.getContentHeight())
+    Animation<double> yAnimation = Tween<double>(begin: 65.0, end: this.getContentHeight())
         .animate(yAnimationController)
       ..addListener(() {
         setState(() => {});

diff --git a/lib/src/components/charts/broken_line/brn_broken_line.dart b/lib/src/components/charts/broken_line/brn_broken_line.dart
@@ -95,7 +95,7 @@ class BrnBrokenLine extends StatefulWidget {
     this.isShowXDialText = false,
     this.isShowYDialText = false,
   }) : super(key: key) {
-    /// 设置自定义 X 轴时，检查 x轴的最大、最小刻度范围
+    // 设置自定义 X 轴时，检查 x轴的最大、最小刻度范围
     if (xDialValues != null) {
       assert(xDialMin != null);
       assert(xDialMax != null);

diff --git a/lib/src/components/charts/broken_line/brn_line_painter.dart b/lib/src/components/charts/broken_line/brn_line_painter.dart
@@ -377,8 +377,8 @@ class BrnLinePainter extends BrnBasePainter {
   void _drawLine(Canvas canvas) {
     _lineCanvasModels.forEach((element) {
       //阴影区域
-      if (element.shadowPaths != null && element.shaderColors != null) {
-        element.shadowPaths!.forEach((shadowPathElement) {
+      if (element.shaderColors != null) {
+        element.shadowPaths.forEach((shadowPathElement) {
           var shader = LinearGradient(
                   begin: Alignment.topCenter,
                   end: Alignment.bottomCenter,
@@ -577,7 +577,7 @@ class LineCanvasModel {
   final Color pathColor;
   final double pathWidth;
 
-  final List<Path>? shadowPaths;
+  final List<Path> shadowPaths;
   final List<Color>? shaderColors;
 
   final List<Point>? points;

diff --git a/lib/src/components/dialog/brn_dialog.dart b/lib/src/components/dialog/brn_dialog.dart
@@ -78,7 +78,7 @@ const Divider cDividerLine = const Divider(
   color: Color(0xF0F0F0F0),
 );
 
-enum ButtonType {
+enum _ButtonType {
   /// 单按钮
   single,
 
@@ -239,9 +239,6 @@ class BrnDialog extends AlertDialog {
   /// 水平分割线
   final Divider divider;
 
-  /// 对话框样式
-  final BrnDialogStyle? brnDialogStyle;
-
   /// 底部按钮的点击监听回调
   final DialogIndexedActionClickCallback? indexedActionCallback;
 
@@ -267,7 +264,6 @@ class BrnDialog extends AlertDialog {
     this.warningText,
     this.warningWidget,
     this.actionsWidget,
-    this.brnDialogStyle,
     this.divider = cDividerLine,
     this.verticalDivider = cVerticalDivider,
     this.actionsText,
@@ -278,8 +274,7 @@ class BrnDialog extends AlertDialog {
 
   @override
   Widget build(BuildContext context) {
-    BrnDialogConfig? defaultConfig =
-        _convertStyleToConfig() ?? BrnDialogConfig();
+    BrnDialogConfig? defaultConfig = BrnDialogConfig();
 
     defaultConfig = BrnThemeConfigurator.instance
         .getConfig(configId: defaultConfig.configId)
@@ -441,23 +436,23 @@ class BrnDialog extends AlertDialog {
   /// 单个button 左右有圆角
   /// 两个button 左button有左圆角&右直角 右button有右圆角&左直角
   /// 多个button 最后一个左右圆角  其他均直角
-  Widget _generateMainWidget(Widget widget, Color background, ButtonType type,
+  Widget _generateMainWidget(Widget widget, Color background, _ButtonType type,
       int index, BrnDialogConfig dialogConfig) {
     return Container(
       decoration: ShapeDecoration(
           color: background,
           shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.only(
-                  bottomLeft: Radius.circular(type == ButtonType.single ||
-                          type == ButtonType.left ||
-                          (type == ButtonType.multi &&
+                  bottomLeft: Radius.circular(type == _ButtonType.single ||
+                          type == _ButtonType.left ||
+                          (type == _ButtonType.multi &&
                               actionsText != null &&
                               index == actionsText!.length - 1)
                       ? BrnDialogUtils.getDialogRadius(dialogConfig)
                       : 0),
-                  bottomRight: Radius.circular(type == ButtonType.single ||
-                          type == ButtonType.right ||
-                          (type == ButtonType.multi &&
+                  bottomRight: Radius.circular(type == _ButtonType.single ||
+                          type == _ButtonType.right ||
+                          (type == _ButtonType.multi &&
                               actionsText != null &&
                               index == actionsText!.length - 1)
                       ? BrnDialogUtils.getDialogRadius(dialogConfig)
@@ -476,24 +471,24 @@ class BrnDialog extends AlertDialog {
   /// 单个button 左右有圆角
   /// 两个button 左button有左圆角&右直角 右button有右圆角&左直角
   /// 多个button 最后一个左右圆角  其他均直角
-  Widget _generateGreyWidget(Widget widget, Color background, ButtonType type,
+  Widget _generateGreyWidget(Widget widget, Color background, _ButtonType type,
       int index, BrnDialogConfig dialogConfig) {
     return Container(
       constraints: BoxConstraints.tightFor(height: cBottomHeight),
       decoration: ShapeDecoration(
           color: background,
           shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.only(
-                  bottomLeft: Radius.circular(type == ButtonType.single ||
-                          type == ButtonType.left ||
-                          (type == ButtonType.multi &&
+                  bottomLeft: Radius.circular(type == _ButtonType.single ||
+                          type == _ButtonType.left ||
+                          (type == _ButtonType.multi &&
                               actionsText != null &&
                               index == actionsText!.length - 1)
                       ? BrnDialogUtils.getDialogRadius(dialogConfig)
                       : 0),
-                  bottomRight: Radius.circular(type == ButtonType.single ||
-                          type == ButtonType.right ||
-                          (type == ButtonType.multi &&
+                  bottomRight: Radius.circular(type == _ButtonType.single ||
+                          type == _ButtonType.right ||
+                          (type == _ButtonType.multi &&
                               actionsText != null &&
                               index == actionsText!.length - 1)
                       ? BrnDialogUtils.getDialogRadius(dialogConfig)
@@ -519,7 +514,7 @@ class BrnDialog extends AlertDialog {
               0,
               true,
               defaultConfig,
-              type: ButtonType.single,
+              type: _ButtonType.single,
             )
           : actionsWidget![0];
     } else if (length == 2) {
@@ -531,7 +526,7 @@ class BrnDialog extends AlertDialog {
             child: showTextActions
                 ? _mapTextToGesWidget(
                     context, actionsText![0], 0, false, defaultConfig,
-                    type: ButtonType.left)
+                    type: _ButtonType.left)
                 : actionsWidget![0],
           ),
           Container(
@@ -542,7 +537,7 @@ class BrnDialog extends AlertDialog {
             child: showTextActions
                 ? _mapTextToGesWidget(
                     context, actionsText![1], 1, true, defaultConfig,
-                    type: ButtonType.right)
+                    type: _ButtonType.right)
                 : actionsWidget![1],
           )
         ],
@@ -558,7 +553,7 @@ class BrnDialog extends AlertDialog {
               return showTextActions
                   ? _mapTextToGesWidget(
                       context, actionsText![i], i, true, defaultConfig,
-                      type: ButtonType.multi)
+                      type: _ButtonType.multi)
                   : actionsWidget![i];
             },
             separatorBuilder: (context, i) {
@@ -571,7 +566,7 @@ class BrnDialog extends AlertDialog {
 
   Widget _mapTextToGesWidget(BuildContext context, String label, int index,
       bool main, BrnDialogConfig dialogConfig,
-      {ButtonType type = ButtonType.single}) {
+      {_ButtonType type = _ButtonType.single}) {
     Text text = Text(label);
     Widget ges = GestureDetector(
       child: main
@@ -619,43 +614,6 @@ class BrnDialog extends AlertDialog {
     return actionsWidget == null || actionsWidget!.isEmpty;
   }
 
-  /// 将已有的BrnDialogStyle转换成BrnDialogConfig
-  /// 当用户配置了最新的themeData则ljDialogStyle失效
-  /// 当用户配置仅配置ljDialogStyle，则将ljDialogStyle转换成themeData
-  BrnDialogConfig? _convertStyleToConfig() {
-    if (brnDialogStyle == null) {
-      return themeData;
-    }
-    BrnDialogConfig defaultConfig = themeData ?? BrnDialogConfig();
-    defaultConfig = defaultConfig.merge(BrnDialogConfig(
-      mainActionTextStyle:
-          BrnTextStyle.withStyle(brnDialogStyle!.mainTextStyle),
-      mainActionBackgroundColor: brnDialogStyle!.mainBackgroundColor,
-      assistActionsTextStyle:
-          BrnTextStyle.withStyle(brnDialogStyle!.greyActionsTextStyle),
-      assistActionsBackgroundColor: brnDialogStyle!.greyActionsBackgroundColor,
-      radius: brnDialogStyle!.radius,
-      iconPadding: brnDialogStyle!.iconPadding,
-      titlePaddingSm: brnDialogStyle!.titlePadding,
-      titlePaddingLg: brnDialogStyle!.titlePadding,
-      titleTextAlign: brnDialogStyle!.titleTextAlign,
-      titleTextStyle: BrnTextStyle.withStyle(brnDialogStyle!.titleTextStyle),
-      contentPaddingSm: brnDialogStyle!.contentPadding,
-      contentPaddingLg: brnDialogStyle!.contentPadding,
-      contentTextAlign: brnDialogStyle!.contentTextAlign,
-      contentTextStyle:
-          BrnTextStyle.withStyle(brnDialogStyle!.contentTextStyle),
-      warningPaddingSm: brnDialogStyle!.warningPadding,
-      warningPaddingLg: brnDialogStyle!.warningPadding,
-      warningTextAlign: brnDialogStyle!.warningTextAlign,
-      warningTextStyle:
-          BrnTextStyle.withStyle(brnDialogStyle!.warningTextStyle),
-      bottomHeight: brnDialogStyle!.bottomHeight,
-      backgroundColor: brnDialogStyle!.backgroundColor,
-    ));
-    return defaultConfig;
-  }
-
   /// 主题配置的标题间距
   EdgeInsetsGeometry _configTitlePadding(BrnDialogConfig dialogConfig) {
     return _isShowIcon()
@@ -743,7 +701,6 @@ class BrnDialogManager {
           warningText: warning,
           warningWidget: warningWidget,
           actionsText: [label],
-          brnDialogStyle: dialogStyle,
           actionsWidget: actionsWidget,
           titleMaxLines: titleMaxLines,
           themeData: themeData,
@@ -808,7 +765,6 @@ class BrnDialogManager {
           warningText: warning,
           themeData: themeData,
           titleMaxLines: titleMaxLines,
-          brnDialogStyle: dialogStyle,
           actionsText: [cancel, confirm],
           actionsWidget: actionsWidget,
           indexedActionCallback: (index) {
@@ -862,7 +818,6 @@ class BrnDialogManager {
             contentWidget: messageWidget,
             warningWidget: warningWidget,
             warningText: warning,
-            brnDialogStyle: dialogStyle,
             actionsText: actions,
             actionsWidget: actionsWidget,
             themeData: themeData,

diff --git a/lib/src/components/dialog/brn_enhance_operation_dialog.dart b/lib/src/components/dialog/brn_enhance_operation_dialog.dart
@@ -8,16 +8,16 @@ import 'package:flutter/material.dart';
 
 class BrnDialogConstants {
   /// 提示图标
-  static const int ICON_ALERT = 0;
+  static const int iconAlert = 0;
 
   /// 警示图标
-  static const int ICON_WARNING = 1;
+  static const int iconWarning = 1;
 
   /// 成功图标
-  static const int ICON_SUCCESS = 2;
+  static const int iconSuccess = 2;
 
   /// 自定义图标
-  static const int ICON_CUSTOM = 100;
+  static const int iconCustom = 100;
 
   /// icon地址列表
   static const List shareItemImagePathList = [
@@ -34,7 +34,7 @@ class BrnEnhanceOperationDialog extends StatelessWidget {
   /// 构建环境上下文
   final BuildContext context;
 
-  /// 图片类型，默认 0，[BrnDialogConstants.ICON_ALERT]
+  /// 图片类型，默认 0，[BrnDialogConstants.iconAlert]
   final int iconType;
 
   /// 自定义图标
@@ -62,7 +62,7 @@ class BrnEnhanceOperationDialog extends StatelessWidget {
   BrnDialogConfig? themeData;
 
   BrnEnhanceOperationDialog({
-    this.iconType = BrnDialogConstants.ICON_ALERT,
+    this.iconType = BrnDialogConstants.iconAlert,
     this.customIconWidget,
     required this.context,
     this.titleText,
@@ -86,7 +86,7 @@ class BrnEnhanceOperationDialog extends StatelessWidget {
       type: MaterialType.transparency,
       child: BrnDialog(
         themeData: themeData,
-        iconImage: (iconType == BrnDialogConstants.ICON_CUSTOM)
+        iconImage: (iconType == BrnDialogConstants.iconCustom)
             ? customIconWidget as Image
             : BrunoTools.getAssetImage(
                 BrnDialogConstants.shareItemImagePathList[iconType]),

diff --git a/lib/src/components/selectcity/brn_base_azlistview_page.dart b/lib/src/components/selectcity/brn_base_azlistview_page.dart
@@ -48,7 +48,7 @@ abstract class BaseAZListViewPage extends StatefulWidget {
 }
 
 class _BaseAZListViewPageState extends State<BaseAZListViewPage> {
-  String? suspensionTag = "";
+  String suspensionTag = "";
 
   List<ISuspensionBean> _dataList = [];
   late StreamController<String> streamController;

diff --git a/lib/src/components/selectcity/brn_index_bar.dart b/lib/src/components/selectcity/brn_index_bar.dart
@@ -200,7 +200,7 @@ class _IndexBarState extends State<_IndexBar> {
       onVerticalDragDown: (DragDownDetails details) {
         if (_widgetTop == -1 || _widgetTopChange) {
           _widgetTopChange = false;
-          RenderBox? box = context.findRenderObject() as RenderBox;
+          RenderBox box = context.findRenderObject() as RenderBox;
           Offset topLeftPosition = box.localToGlobal(Offset.zero);
           _widgetTop = topLeftPosition.dy.toInt();
         }