From e5888eb8600f2d6808b55b498a3e26ab1e730610 Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Wed, 28 Apr 2021 10:52:09 +0800
Subject: [PATCH] fix null-safety error

---
 lib/pages/life_pay/life_pay_page.dart           | 6 +++---
 lib/pages/sign/sign_in_page.dart                | 4 ++--
 lib/pages/things_page/widget/bee_list_view.dart | 2 +-
 lib/ui/manager/advice/advice_detail_page.dart   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart
index 43f217bc..c5fb9b52 100644
--- a/lib/pages/life_pay/life_pay_page.dart
+++ b/lib/pages/life_pay/life_pay_page.dart
@@ -36,7 +36,7 @@ class SelectPay {
 class _LifePayPageState extends State<LifePayPage> {
   EasyRefreshController? _controller;
   List<int> _selectYears = [];
-  List<LifePayModel> _models = [];
+  List<LifePayModel?> _models = [];
   List<SelectPay> _selectPay = [];
   double _totalCost = 0;
   int _count = 0;
@@ -237,7 +237,7 @@ class _LifePayPageState extends State<LifePayPage> {
           ),
         ),
       ],
-      body: BeeListView(
+      body: BeeListView<LifePayModel>(
           path: API.manager.dailyPaymentList,
           controller: _controller,
           extraParams: {'estateId': appProvider.selectedHouse!.estateId},
@@ -253,7 +253,7 @@ class _LifePayPageState extends State<LifePayPage> {
             return lifePayModels;
           },
           builder: (items) {
-            _models = items as List<LifePayModel>;
+            if (items != null) _models = items as List<LifePayModel?>;
             return Column(
               children: [
                 _buildHouseCard(),
diff --git a/lib/pages/sign/sign_in_page.dart b/lib/pages/sign/sign_in_page.dart
index 1af2533d..b0cc8084 100644
--- a/lib/pages/sign/sign_in_page.dart
+++ b/lib/pages/sign/sign_in_page.dart
@@ -120,8 +120,8 @@ class _SignInPageState extends State<SignInPage> {
           else if (TextUtil.isEmpty(_code.text))
             BotToast.showText(text: '验证码不能为空');
           else {
-            bool result = await (_showLoginVerify() as FutureOr<bool>);
-            _parseLogin(result);
+            bool? result = await _showLoginVerify();
+            if (result != null) _parseLogin(result);
           }
         },
         height: 89.w,
diff --git a/lib/pages/things_page/widget/bee_list_view.dart b/lib/pages/things_page/widget/bee_list_view.dart
index 8a179286..970f2c58 100644
--- a/lib/pages/things_page/widget/bee_list_view.dart
+++ b/lib/pages/things_page/widget/bee_list_view.dart
@@ -50,7 +50,7 @@ class BeeListView<T> extends StatefulWidget {
   final List<T> Function(BaseListModel model) convert;
 
   ///子组件构造器
-  final Widget Function(List<T> items) builder;
+  final Widget Function(dynamic items) builder;
 
   ///每页记录数
   final int size;
diff --git a/lib/ui/manager/advice/advice_detail_page.dart b/lib/ui/manager/advice/advice_detail_page.dart
index 3aebcf7a..e8bf7200 100644
--- a/lib/ui/manager/advice/advice_detail_page.dart
+++ b/lib/ui/manager/advice/advice_detail_page.dart
@@ -147,7 +147,7 @@ class _AdviceDetailPageState extends State<AdviceDetailPage> {
         ),
         ..._model.appAdviceDetailVo!.appAdviceContentVos!
             .map((e) => _buildAdviceContent(e))
-            .toList() as Iterable<Widget>,
+            .toList(),
       ],
     );
   }