diff --git a/lib/main.dart b/lib/main.dart index 04f41cd..12673f3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -43,7 +43,6 @@ void main() async { WidgetsFlutterBinding.ensureInitialized(); cameras = await availableCameras(); - //TODO ios settings PackageInfo _packageInfo = await PackageInfo.fromPlatform(); AppConfig.versionNumber = _packageInfo.buildNumber; //初始化AMap diff --git a/lib/models/after_sales_log_list_model.dart b/lib/models/after_sales_log_list_model.dart index 8a8ccc7..2e18136 100644 --- a/lib/models/after_sales_log_list_model.dart +++ b/lib/models/after_sales_log_list_model.dart @@ -9,7 +9,7 @@ class AfterSalesLogListModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new AfterSalesLogModel.fromJson(v)); }); @@ -34,7 +34,8 @@ class AfterSalesLogModel { String content; String ctime; - AfterSalesLogModel({this.id, this.asId, this.title, this.content, this.ctime}); + AfterSalesLogModel( + {this.id, this.asId, this.title, this.content, this.ctime}); AfterSalesLogModel.fromJson(Map json) { id = json['id']; diff --git a/lib/models/balance_page_model.dart b/lib/models/balance_page_model.dart index 010597f..b73d42f 100644 --- a/lib/models/balance_page_model.dart +++ b/lib/models/balance_page_model.dart @@ -31,7 +31,7 @@ class Data { Data.fromJson(Map json) { balance = json['balance']; if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new DataList.fromJson(v)); }); diff --git a/lib/models/commission_income_model.dart b/lib/models/commission_income_model.dart index 5396af7..140d724 100644 --- a/lib/models/commission_income_model.dart +++ b/lib/models/commission_income_model.dart @@ -30,7 +30,7 @@ class Data { Data.fromJson(Map json) { if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new IncomeList.fromJson(v)); }); diff --git a/lib/models/goods_detail_images_model.dart b/lib/models/goods_detail_images_model.dart index e54674a..d4884d3 100644 --- a/lib/models/goods_detail_images_model.dart +++ b/lib/models/goods_detail_images_model.dart @@ -31,7 +31,7 @@ class Data { Data.fromJson(Map json) { brand = json['brand'] != null ? new Brand.fromJson(json['brand']) : null; if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new Images.fromJson(v)); }); diff --git a/lib/models/goods_hot_sell_list_model.dart b/lib/models/goods_hot_sell_list_model.dart index b4fc260..25b1b3c 100644 --- a/lib/models/goods_hot_sell_list_model.dart +++ b/lib/models/goods_hot_sell_list_model.dart @@ -9,7 +9,7 @@ class GoodsHotSellListModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new Data.fromJson(v)); }); @@ -46,26 +46,26 @@ class Data { int isImport; int isFerme; int storehouse; - Data( - {this.id, - this.goodsName, - this.description, - this.inventory, - this.salesVolume, - this.mainPhotoUrl, - this.promotionName, - this.discountPrice, - this.originalPrice, - this.commission, - this.coupon, - this.index = 0, - this.brandName, - this.brandImg, - this.brandId, - this.isFerme, - this.isImport, - this.storehouse, - }); + Data({ + this.id, + this.goodsName, + this.description, + this.inventory, + this.salesVolume, + this.mainPhotoUrl, + this.promotionName, + this.discountPrice, + this.originalPrice, + this.commission, + this.coupon, + this.index = 0, + this.brandName, + this.brandImg, + this.brandId, + this.isFerme, + this.isImport, + this.storehouse, + }); Data.fromJson(Map json) { id = json['id']; @@ -82,9 +82,9 @@ class Data { brandName = json['brandName']; brandImg = json['brandImg']; brandId = json['brandId']; - isImport=json['isImport']; - isFerme=json['isFerme']; - storehouse=json['storehouse']; + isImport = json['isImport']; + isFerme = json['isFerme']; + storehouse = json['storehouse']; } Map toJson() { @@ -100,9 +100,9 @@ class Data { data['originalPrice'] = this.originalPrice; data['commission'] = this.commission; data['coupon'] = this.coupon; - data['isImport']=this.isImport; - data['isFerme']=this.isFerme; - data['storehouse']=this.storehouse; + data['isImport'] = this.isImport; + data['isFerme'] = this.isFerme; + data['storehouse'] = this.storehouse; return data; } } diff --git a/lib/models/goods_simple_list_model.dart b/lib/models/goods_simple_list_model.dart index 58de6e3..3da6d6f 100644 --- a/lib/models/goods_simple_list_model.dart +++ b/lib/models/goods_simple_list_model.dart @@ -10,7 +10,7 @@ class GoodsSimpleListModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new GoodsSimple.fromJson(v)); }); @@ -50,29 +50,29 @@ class GoodsSimple { int isImport; int isFerme; int storehouse; - GoodsSimple( - {this.id, - this.goodsName, - this.description, - this.inventory, - this.salesVolume, - this.mainPhotoUrl, - this.promotionName, - this.originalPrice, - this.discountPrice, - this.commission, - this.tags, - this.percent, - this.startTime, - this.endTime, - this.coupon, - this.brandName, - this.brandImg, - this.brandId, - this.isFerme, - this.isImport, - this.storehouse, - }); + GoodsSimple({ + this.id, + this.goodsName, + this.description, + this.inventory, + this.salesVolume, + this.mainPhotoUrl, + this.promotionName, + this.originalPrice, + this.discountPrice, + this.commission, + this.tags, + this.percent, + this.startTime, + this.endTime, + this.coupon, + this.brandName, + this.brandImg, + this.brandId, + this.isFerme, + this.isImport, + this.storehouse, + }); GoodsSimple.fromJson(Map json) { id = json['id']; @@ -95,9 +95,9 @@ class GoodsSimple { brandName = json['brandName']; brandImg = json['brandImg']; brandId = json['brandId']; - isImport=json['isImport']; - isFerme=json['isFerme']; - storehouse=json['storehouse']; + isImport = json['isImport']; + isFerme = json['isFerme']; + storehouse = json['storehouse']; } Map toJson() { @@ -116,14 +116,13 @@ class GoodsSimple { data['percent'] = this.percent; data['startTime'] = this.startTime; data['endTime'] = this.endTime; - data['isImport']=this.isImport; - data['isFerme']=this.isFerme; - data['storehouse']=this.storehouse; + data['isImport'] = this.isImport; + data['isFerme'] = this.isFerme; + data['storehouse'] = this.storehouse; return data; } - getPromotionStatus(){ + getPromotionStatus() { return PromotionTimeTool.getPromotionStatusWithGoodsSimple(this); } - } diff --git a/lib/models/guide_order_item_model.dart b/lib/models/guide_order_item_model.dart index f0f37a8..138df03 100644 --- a/lib/models/guide_order_item_model.dart +++ b/lib/models/guide_order_item_model.dart @@ -49,7 +49,7 @@ class GuideOrderItemModel { goodsTotalAmount = json['goodsTotalAmount']; actualTotalAmount = json['actualTotalAmount']; if (json['goods'] != null) { - goods = new List(); + goods = []; json['goods'].forEach((v) { goods.add(new Goods.fromJson(v)); }); diff --git a/lib/models/income_list_model.dart b/lib/models/income_list_model.dart index e6fd530..8e23d2b 100644 --- a/lib/models/income_list_model.dart +++ b/lib/models/income_list_model.dart @@ -9,7 +9,7 @@ class IncomeListModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new Data.fromJson(v)); }); diff --git a/lib/models/invite_list_model.dart b/lib/models/invite_list_model.dart index 8ec3303..043287e 100644 --- a/lib/models/invite_list_model.dart +++ b/lib/models/invite_list_model.dart @@ -9,7 +9,7 @@ class InviteListModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new InviteModel.fromJson(v)); }); diff --git a/lib/models/performance_info_model.dart b/lib/models/performance_info_model.dart index 609374a..71d3764 100644 --- a/lib/models/performance_info_model.dart +++ b/lib/models/performance_info_model.dart @@ -30,7 +30,7 @@ class Data { Data.fromJson(Map json) { if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new PerformanceList.fromJson(v)); }); @@ -58,9 +58,13 @@ class PerformanceList { int userId; num salesAmount; num role; - - PerformanceList({this.nickname, this.avatarPath, this.userId, this.salesAmount, this.role}); + PerformanceList( + {this.nickname, + this.avatarPath, + this.userId, + this.salesAmount, + this.role}); PerformanceList.fromJson(Map json) { nickname = json['nickname']; @@ -68,7 +72,6 @@ class PerformanceList { userId = json['userId']; salesAmount = json['salesAmount']; role = json['role']; - } Map toJson() { @@ -78,7 +81,7 @@ class PerformanceList { data['userId'] = this.userId; data['salesAmount'] = this.salesAmount; data['role'] = this.role; - + return data; } } @@ -90,7 +93,12 @@ class Statistics { num ratio; num actualIncome; - Statistics({this.salesAmount, this.income, this.subIncome, this.ratio,this.actualIncome }); + Statistics( + {this.salesAmount, + this.income, + this.subIncome, + this.ratio, + this.actualIncome}); Statistics.fromJson(Map json) { salesAmount = json['salesAmount']; diff --git a/lib/models/rui_coin_list_model.dart b/lib/models/rui_coin_list_model.dart index f1312b3..0b66ead 100644 --- a/lib/models/rui_coin_list_model.dart +++ b/lib/models/rui_coin_list_model.dart @@ -33,7 +33,7 @@ class CoinData { total = json['total']; history = json['history']; if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new CoinList.fromJson(v)); }); @@ -102,14 +102,12 @@ class UserCoin { } } - - // /* // * ==================================================== -// * package : +// * package : // * author : Created by nansi. -// * time : 2019-08-27 11:41 -// * remark : +// * time : 2019-08-27 11:41 +// * remark : // * ==================================================== // */ @@ -205,7 +203,6 @@ class UserCoin { // part 'rui_coin_list_model.g.dart'; - // @JsonSerializable() // class RuiCoinListModel extends BaseModel { @@ -219,7 +216,6 @@ class UserCoin { // } - // @JsonSerializable() // class RuiCoinModel extends Object { @@ -237,7 +233,6 @@ class UserCoin { // } - // @JsonSerializable() // class Detail extends Object { diff --git a/lib/models/shop_summary_model.dart b/lib/models/shop_summary_model.dart index 7a03e5b..c3db3b7 100644 --- a/lib/models/shop_summary_model.dart +++ b/lib/models/shop_summary_model.dart @@ -163,7 +163,7 @@ class Stand { level = json['Level']; basePercent = json['BasePercent']; if (json['IncreaseNum'] != null) { - increaseNum = new List(); + increaseNum = []; json['IncreaseNum'].forEach((v) { increaseNum.add(new IncreaseNum.fromJson(v)); }); diff --git a/lib/models/team_income_model.dart b/lib/models/team_income_model.dart index d37a2d7..9274597 100644 --- a/lib/models/team_income_model.dart +++ b/lib/models/team_income_model.dart @@ -44,7 +44,7 @@ class Data { ? new AccumulateIncome.fromJson(json['accumulateIncome']) : null; if (json['incomes'] != null) { - incomes = new List(); + incomes = []; json['incomes'].forEach((v) { incomes.add(new Incomes.fromJson(v)); }); diff --git a/lib/models/upgrade_card_model.dart b/lib/models/upgrade_card_model.dart index 60da2c9..30f9aca 100644 --- a/lib/models/upgrade_card_model.dart +++ b/lib/models/upgrade_card_model.dart @@ -58,13 +58,13 @@ class UpCode { UpCode.fromJson(Map json) { if (json['usedCode'] != null) { - usedCode = new List(); + usedCode = []; json['usedCode'].forEach((v) { usedCode.add(new UnusedCode.fromJson(v)); }); } if (json['unusedCode'] != null) { - unusedCode = new List(); + unusedCode = []; json['unusedCode'].forEach((v) { unusedCode.add(new UnusedCode.fromJson(v)); }); diff --git a/lib/models/withdraw_history_model.dart b/lib/models/withdraw_history_model.dart index c4f9656..7868c13 100644 --- a/lib/models/withdraw_history_model.dart +++ b/lib/models/withdraw_history_model.dart @@ -9,7 +9,7 @@ class WithdrawHistoryModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new Data.fromJson(v)); }); diff --git a/lib/pages/live/models/activity_list_model.dart b/lib/pages/live/models/activity_list_model.dart index 0c4511e..ce966ff 100644 --- a/lib/pages/live/models/activity_list_model.dart +++ b/lib/pages/live/models/activity_list_model.dart @@ -55,7 +55,7 @@ class ActivityListModel { goods = json['goods'] != null ? new Goods.fromJson(json['goods']) : null; id = json['id']; if (json['imgList'] != null) { - imgList = new List(); + imgList = []; json['imgList'].forEach((v) { imgList.add(new ImgList.fromJson(v)); }); diff --git a/lib/pages/live/models/activity_review_list_model.dart b/lib/pages/live/models/activity_review_list_model.dart index 4adc211..8c2da37 100644 --- a/lib/pages/live/models/activity_review_list_model.dart +++ b/lib/pages/live/models/activity_review_list_model.dart @@ -33,7 +33,7 @@ class ActivityReviewListModel { praise = json['praise']; isPraise = json['isPraise']; if (json['sub'] != null) { - sub = new List(); + sub = []; json['sub'].forEach((v) { sub.add(new Sub.fromJson(v)); }); diff --git a/lib/pages/live/models/goods_window_model.dart b/lib/pages/live/models/goods_window_model.dart index d5d06be..a00c8e9 100644 --- a/lib/pages/live/models/goods_window_model.dart +++ b/lib/pages/live/models/goods_window_model.dart @@ -6,7 +6,7 @@ class GoodsWindowModel { GoodsWindowModel.fromJson(Map json) { if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new GoodsList.fromJson(v)); }); diff --git a/lib/pages/live/models/live_resume_model.dart b/lib/pages/live/models/live_resume_model.dart index d8e1c2d..9df5e37 100644 --- a/lib/pages/live/models/live_resume_model.dart +++ b/lib/pages/live/models/live_resume_model.dart @@ -31,7 +31,7 @@ class LiveResumeModel { praise = json['praise']; isFirst = json['isFirst']; if (json['goodsLists'] != null) { - goodsLists = new List(); + goodsLists = []; json['goodsLists'].forEach((v) { goodsLists.add(new GoodsLists.fromJson(v)); }); diff --git a/lib/pages/live/models/live_stream_info_model.dart b/lib/pages/live/models/live_stream_info_model.dart index 5490b7c..c49b6a6 100644 --- a/lib/pages/live/models/live_stream_info_model.dart +++ b/lib/pages/live/models/live_stream_info_model.dart @@ -44,7 +44,7 @@ class LiveStreamInfoModel { praise = json['praise']; groupId = json['groupId']; if (json['goodsLists'] != null) { - goodsLists = new List(); + goodsLists = []; json['goodsLists'].forEach((v) { goodsLists.add(new GoodsLists.fromJson(v)); }); diff --git a/lib/pages/live/models/live_time_data_model.dart b/lib/pages/live/models/live_time_data_model.dart index 3b080e3..76d2e6e 100644 --- a/lib/pages/live/models/live_time_data_model.dart +++ b/lib/pages/live/models/live_time_data_model.dart @@ -56,37 +56,37 @@ class LiveTimeDataModel { count = json['count']; duration = json['duration']; if (json['datePrise'] != null) { - datePrise = new List(); + datePrise = []; json['datePrise'].forEach((v) { datePrise.add(new LiveTimeDataBase.fromJson(v)); }); } if (json['dateLook'] != null) { - dateLook = new List(); + dateLook = []; json['dateLook'].forEach((v) { dateLook.add(new LiveTimeDataBase.fromJson(v)); }); } if (json['dateFans'] != null) { - dateFans = new List(); + dateFans = []; json['dateFans'].forEach((v) { dateFans.add(new LiveTimeDataBase.fromJson(v)); }); } if (json['dateBuy'] != null) { - dateBuy = new List(); + dateBuy = []; json['dateBuy'].forEach((v) { dateBuy.add(new LiveTimeDataBase.fromJson(v)); }); } if (json['dateSalesVolume'] != null) { - dateSalesVolume = new List(); + dateSalesVolume = []; json['dateSalesVolume'].forEach((v) { dateSalesVolume.add(new LiveTimeDataBase.fromJson(v)); }); } if (json['dateAnticipatedRevenue'] != null) { - dateAnticipatedRevenue = new List(); + dateAnticipatedRevenue = []; json['dateAnticipatedRevenue'].forEach((v) { dateAnticipatedRevenue.add(new LiveTimeDataBase.fromJson(v)); }); diff --git a/lib/pages/noticeList/notice_list_model.dart b/lib/pages/noticeList/notice_list_model.dart index a702d2f..7bb2fc5 100644 --- a/lib/pages/noticeList/notice_list_model.dart +++ b/lib/pages/noticeList/notice_list_model.dart @@ -9,7 +9,7 @@ class NoticeListModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new NoticeData.fromJson(v)); }); diff --git a/lib/pages/shop/model/shop_self_income_model.dart b/lib/pages/shop/model/shop_self_income_model.dart index bdd7a80..be4de43 100644 --- a/lib/pages/shop/model/shop_self_income_model.dart +++ b/lib/pages/shop/model/shop_self_income_model.dart @@ -33,7 +33,7 @@ class Data { Data.fromJson(Map json) { if (json['incomes'] != null) { - incomes = new List(); + incomes = []; json['incomes'].forEach((v) { incomes.add(new Incomes.fromJson(v)); }); diff --git a/lib/pages/shop/model/shop_team_income_model.dart b/lib/pages/shop/model/shop_team_income_model.dart index 0e01a0c..f600522 100644 --- a/lib/pages/shop/model/shop_team_income_model.dart +++ b/lib/pages/shop/model/shop_team_income_model.dart @@ -37,7 +37,7 @@ class Data { income = json['income']; memberCount = json['memberCount']; if (json['members'] != null) { - members = new List(); + members = []; json['members'].forEach((v) { members.add(new Members.fromJson(v)); }); diff --git a/lib/pages/user/model/return_reason_model.dart b/lib/pages/user/model/return_reason_model.dart index 69d65d3..705501b 100644 --- a/lib/pages/user/model/return_reason_model.dart +++ b/lib/pages/user/model/return_reason_model.dart @@ -9,7 +9,7 @@ class ReturnReasonModel { code = json['code']; msg = json['msg']; if (json['data'] != null) { - data = new List(); + data = []; json['data'].forEach((v) { data.add(new ReasonModel.fromJson(v)); }); diff --git a/lib/pages/user/model/user_balance_history_model.dart b/lib/pages/user/model/user_balance_history_model.dart index 015bf94..8de152c 100644 --- a/lib/pages/user/model/user_balance_history_model.dart +++ b/lib/pages/user/model/user_balance_history_model.dart @@ -35,7 +35,7 @@ class Data { Data.fromJson(Map json) { if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new ListItem.fromJson(v)); }); diff --git a/lib/pages/user/model/user_benefit_expect_extra_model.dart b/lib/pages/user/model/user_benefit_expect_extra_model.dart index d9c214e..02140dc 100644 --- a/lib/pages/user/model/user_benefit_expect_extra_model.dart +++ b/lib/pages/user/model/user_benefit_expect_extra_model.dart @@ -22,19 +22,19 @@ class UserBenefitExpectExtraModel { json['recommend'] != null ? new Team.fromJson(json['recommend']) : null; reward = json['reward'] != null ? new Team.fromJson(json['reward']) : null; if (json['teamList'] != null) { - teamList = new List(); + teamList = []; json['teamList'].forEach((v) { teamList.add(new TeamList.fromJson(v)); }); } if (json['recommendList'] != null) { - recommendList = new List(); + recommendList = []; json['recommendList'].forEach((v) { recommendList.add(new TeamList.fromJson(v)); }); } if (json['rewardList'] != null) { - rewardList = new List(); + rewardList = []; json['rewardList'].forEach((v) { rewardList.add(new TeamList.fromJson(v)); }); diff --git a/lib/pages/user/model/user_benefit_extra_detail_model.dart b/lib/pages/user/model/user_benefit_extra_detail_model.dart index aa43a05..a2e7a89 100644 --- a/lib/pages/user/model/user_benefit_extra_detail_model.dart +++ b/lib/pages/user/model/user_benefit_extra_detail_model.dart @@ -42,7 +42,7 @@ class Data { Data.fromJson(Map json) { if (json['userIncome'] != null) { - userIncome = new List(); + userIncome = []; json['userIncome'].forEach((v) { userIncome.add(new UserIncome.fromJson(v)); }); diff --git a/lib/pages/user/model/user_benefit_month_expect_model.dart b/lib/pages/user/model/user_benefit_month_expect_model.dart index 8dcf080..ee9897f 100644 --- a/lib/pages/user/model/user_benefit_month_expect_model.dart +++ b/lib/pages/user/model/user_benefit_month_expect_model.dart @@ -15,14 +15,14 @@ class UserBenefitMonthExpectModel { : null; guide = json['guide'] != null ? new Purchase.fromJson(json['guide']) : null; if (json['purchaseList'] != null) { - purchaseList = new List(); + purchaseList = []; json['purchaseList'].forEach((v) { purchaseList.add(new PurchaseList.fromJson(v)); }); } else purchaseList = []; if (json['guideList'] != null) { - guideList = new List(); + guideList = []; json['guideList'].forEach((v) { guideList.add(new PurchaseList.fromJson(v)); }); diff --git a/lib/pages/user/model/user_self_income_model.dart b/lib/pages/user/model/user_self_income_model.dart index ee95a10..9389424 100644 --- a/lib/pages/user/model/user_self_income_model.dart +++ b/lib/pages/user/model/user_self_income_model.dart @@ -37,7 +37,7 @@ class Data { date = json['date']; coinNum = json['coinNum']; if (json['list'] != null) { - list = new List(); + list = []; json['list'].forEach((v) { list.add(new IncomeList.fromJson(v)); }); diff --git a/lib/pages/user/model/user_team_income_model.dart b/lib/pages/user/model/user_team_income_model.dart index 0ca1e7e..883ed7e 100644 --- a/lib/pages/user/model/user_team_income_model.dart +++ b/lib/pages/user/model/user_team_income_model.dart @@ -39,7 +39,7 @@ class Data { ? new IncomeDetail.fromJson(json['incomeDetail']) : null; if (json['billboard'] != null) { - billboard = new List(); + billboard = []; json['billboard'].forEach((v) { billboard.add(new Billboard.fromJson(v)); }); diff --git a/lib/pages/user/review/models/review_result_model.dart b/lib/pages/user/review/models/review_result_model.dart index 1a3b6d1..0dc6a33 100644 --- a/lib/pages/user/review/models/review_result_model.dart +++ b/lib/pages/user/review/models/review_result_model.dart @@ -9,7 +9,7 @@ class ReviewResultModel { ? new GoodsEva.fromJson(json['goodsEva']) : null; if (json['goodsEvaGoods'] != null) { - goodsEvaGoods = new List(); + goodsEvaGoods = []; json['goodsEvaGoods'].forEach((v) { goodsEvaGoods.add(new GoodsEvaGoods.fromJson(v)); }); diff --git a/lib/utils/base_controller.dart b/lib/utils/base_controller.dart index 1907b1d..508d47f 100644 --- a/lib/utils/base_controller.dart +++ b/lib/utils/base_controller.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; class BaseController { - List _cacheList = List(); + List _cacheList = []; addValueNotifier(ValueNotifier notify) { _cacheList.add(notify); diff --git a/lib/utils/simple_date_util.dart b/lib/utils/simple_date_util.dart index eca2dcf..f35d20e 100644 --- a/lib/utils/simple_date_util.dart +++ b/lib/utils/simple_date_util.dart @@ -1,6 +1,6 @@ class SimpleDataUtils { static List createData(T createFactory(int index), {size = 10}) { - List lists = new List(); + List lists = []; for (int i = 0; i < size; i++) { lists.add(createFactory(i)); } diff --git a/lib/widgets/list_adapter.dart b/lib/widgets/list_adapter.dart index 279cef7..159c74a 100644 --- a/lib/widgets/list_adapter.dart +++ b/lib/widgets/list_adapter.dart @@ -1,7 +1,7 @@ import 'package:flutter/widgets.dart'; abstract class BaseAdapter { - final _listData = new List(); + final _listData = []; IndexedWidgetBuilder getBuilder() { return (context, index) { diff --git a/lib/widgets/mvp_list_view/mvp_list_view.dart b/lib/widgets/mvp_list_view/mvp_list_view.dart index b449b97..0b17b84 100644 --- a/lib/widgets/mvp_list_view/mvp_list_view.dart +++ b/lib/widgets/mvp_list_view/mvp_list_view.dart @@ -137,8 +137,8 @@ class _MvpListViewState extends State GSRefreshController(initialRefresh: widget.autoRefresh); if (widget.controller == null) { - _mvpController = MvpListViewController( - controller: gsRefreshController, data: List()); + _mvpController = + MvpListViewController(controller: gsRefreshController, data: []); } else { _mvpController = widget.controller; if (_mvpController.refreshController == null) { diff --git a/lib/widgets/sc_grid_view.dart b/lib/widgets/sc_grid_view.dart index efae5ac..3bc368b 100644 --- a/lib/widgets/sc_grid_view.dart +++ b/lib/widgets/sc_grid_view.dart @@ -58,8 +58,8 @@ class SCGridView extends StatefulWidget { this.crossAxisSpacing = 5, this.insetPadding = const EdgeInsets.all(5), this.margin = const EdgeInsets.all(0), - this.viewportHeight = 0, this.childAspectRatio =1 - }); + this.viewportHeight = 0, + this.childAspectRatio = 1}); @override State createState() { @@ -82,31 +82,33 @@ class _SCGridViewState extends State @override Widget build(BuildContext context) { super.build(context); - List stackViews = List(); - List gridViews = List(); + List stackViews = []; + List gridViews = []; for (int i = 0; i < widget.sectionCount; i++) { Widget sectionView = _buildSection(context, i); gridViews.add(sectionView); } - stackViews.add(ListView(physics: NeverScrollableScrollPhysics(), shrinkWrap:true, children: gridViews,)); + stackViews.add(ListView( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + children: gridViews, + )); if (widget.viewportHeight > 0) { - stackViews.add(Container(height: widget.viewportHeight,)); + stackViews.add(Container( + height: widget.viewportHeight, + )); } return Container( margin: widget.margin, child: ListView( - controller: _controller, - physics: BouncingScrollPhysics(), - children: [ - Stack( - children: stackViews - ) - ], - ), + controller: _controller, + physics: BouncingScrollPhysics(), + children: [Stack(children: stackViews)], + ), ); } @@ -129,7 +131,7 @@ class _SCGridViewState extends State physics: NeverScrollableScrollPhysics(), itemCount: widget.itemCount(section), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - childAspectRatio: widget.childAspectRatio, + childAspectRatio: widget.childAspectRatio, mainAxisSpacing: widget.mainAxisSpacing, crossAxisSpacing: widget.crossAxisSpacing, crossAxisCount: widget.crossAxisCount),