From b03d75bb09fd62c4c2b0c531c9bd853e571511fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com> Date: Fri, 13 May 2022 19:12:47 +0800 Subject: [PATCH 1/2] flutter version upgrade --- .fvm/fvm_config.json | 2 +- lib/generated_plugin_registrant.dart | 1 + lib/main.dart | 2 +- .../work_order/history_report_page.dart | 2 +- pubspec.lock | 18 +++++++++--------- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 99820951..d4e14b2a 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "2.10.2", + "flutterSdkVersion": "3.0.0", "flavors": {} } \ No newline at end of file diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 8398580d..366ed6c3 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -4,6 +4,7 @@ // ignore_for_file: directives_ordering // ignore_for_file: lines_longer_than_80_chars +// ignore_for_file: depend_on_referenced_packages import 'package:audio_session/audio_session_web.dart'; import 'package:device_info_plus_web/device_info_plus_web.dart'; diff --git a/lib/main.dart b/lib/main.dart index 46763728..774eb5ea 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -52,7 +52,7 @@ class _MyAppState extends State { } }, child: MediaQuery( - data: MediaQueryData.fromWindow(WidgetsBinding.instance!.window), + data: MediaQueryData.fromWindow(WidgetsBinding.instance.window), child: ScreenUtilInit( designSize: Size(750, 1334), // minTextAdapt: true, diff --git a/lib/ui/function_and_service/work_order/history_report_page.dart b/lib/ui/function_and_service/work_order/history_report_page.dart index 20ef1037..382e8433 100644 --- a/lib/ui/function_and_service/work_order/history_report_page.dart +++ b/lib/ui/function_and_service/work_order/history_report_page.dart @@ -106,7 +106,7 @@ class _LineCardState extends State { @override void didChangeDependencies() { - WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { _height = context.size?.height ?? 0; print(context.size?.height); setState(() {}); diff --git a/pubspec.lock b/pubspec.lock index 81551d49..048266e0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -245,7 +245,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" color: dependency: transitive description: @@ -408,7 +408,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -717,7 +717,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" json_annotation: dependency: "direct main" description: @@ -787,7 +787,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -892,7 +892,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" path_drawing: dependency: transitive description: @@ -1172,7 +1172,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" sqflite: dependency: transitive description: @@ -1235,7 +1235,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" time: dependency: transitive description: @@ -1340,7 +1340,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" velocity_x: dependency: "direct main" description: @@ -1405,5 +1405,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.15.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.8.0" From e076f788b949cdc289ca09b40440404cbf24e4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com> Date: Fri, 13 May 2022 19:18:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=9D=A5=E6=BA=90=E5=AD=97=E6=A0=B7=20?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BA=AC=E4=B8=9C=E5=95=86=E5=93=81=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facility/facility_type_detail_card.dart | 1 + .../collection/collection_list_card.dart | 2 +- lib/ui/market/market_home_goods_card.dart | 18 +++++++++--------- lib/ui/market/market_page.dart | 8 ++++---- lib/ui/market/order/order_card.dart | 6 +++--- lib/ui/market/order/order_detail_page.dart | 6 +++--- lib/ui/market/search/good_detail_page.dart | 4 ++-- lib/ui/market/search/goods_list_card.dart | 2 +- .../search/submit_order_page_normal.dart | 6 +++--- lib/ui/market/search_goods_card.dart | 18 +++++++++--------- lib/ui/market/shop_car/shop_car_page.dart | 6 +++--- 11 files changed, 39 insertions(+), 38 deletions(-) diff --git a/lib/ui/community/facility/facility_type_detail_card.dart b/lib/ui/community/facility/facility_type_detail_card.dart index 88b883c7..d87f0761 100644 --- a/lib/ui/community/facility/facility_type_detail_card.dart +++ b/lib/ui/community/facility/facility_type_detail_card.dart @@ -1,3 +1,4 @@ +import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/market/collection/collection_list_card.dart b/lib/ui/market/collection/collection_list_card.dart index b6154147..350324b5 100644 --- a/lib/ui/market/collection/collection_list_card.dart +++ b/lib/ui/market/collection/collection_list_card.dart @@ -67,7 +67,7 @@ class CollectionListCard extends StatelessWidget { ), ), 5.hb, - _getIcon(2), + // _getIcon(2), //_getIcon(model.kind??0), Spacer(), 20.hb, diff --git a/lib/ui/market/market_home_goods_card.dart b/lib/ui/market/market_home_goods_card.dart index 3b41f507..207e3b3d 100644 --- a/lib/ui/market/market_home_goods_card.dart +++ b/lib/ui/market/market_home_goods_card.dart @@ -83,15 +83,15 @@ class MarketHomeGoodsCard extends StatelessWidget { style: TextStyle(fontSize: 28.sp, color: ktextPrimary), ), ), - Padding( - padding: EdgeInsets.only( - left: 16.w, - right: 16.w, - top: 10.w, - ), - child: Container( - child: _getIcon(1), - )), + // Padding( + // padding: EdgeInsets.only( + // left: 16.w, + // right: 16.w, + // top: 10.w, + // ), + // child: Container( + // child: _getIcon(1), + // )), 10.hb, Padding( padding: EdgeInsets.symmetric( diff --git a/lib/ui/market/market_page.dart b/lib/ui/market/market_page.dart index 42ea5964..f596c3c3 100644 --- a/lib/ui/market/market_page.dart +++ b/lib/ui/market/market_page.dart @@ -327,7 +327,7 @@ class _MarketPageState extends State 172 * 2.w, flexibleSpace: _flexibleSpaceBar(context), bottom: PreferredSize( - preferredSize: Size.fromHeight(tabBarHeight+50.h), + preferredSize: Size.fromHeight(tabBarHeight), child: _goodsTitle( normalTypeButton, salesTypeButton, @@ -600,9 +600,9 @@ class _MarketPageState extends State geSearch() { return Column( children: [ - 16.hb, - '本商城所有商品来源于京东'.text.color(Color(0xFFACACAC)).normal.size(30.sp).make(), - 16.hb, + // 16.hb, + // // '本商城所有商品来源于京东'.text.color(Color(0xFFACACAC)).normal.size(30.sp).make(), + // 16.hb, Row( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/ui/market/order/order_card.dart b/lib/ui/market/order/order_card.dart index f27f92f7..1f9ead38 100644 --- a/lib/ui/market/order/order_card.dart +++ b/lib/ui/market/order/order_card.dart @@ -527,9 +527,9 @@ class _OrderCardState extends State { Widget _goodCard(MyOrderListVoList model) { var top = RichText( text: TextSpan(children: [ - WidgetSpan( - child: _getKindWd(model.kind ?? 0), - ), + // WidgetSpan( + // child: _getKindWd(model.kind ?? 0), + // ), TextSpan( text: model.skuName, style: TextStyle(fontSize: 28.sp, color: ktextPrimary)), diff --git a/lib/ui/market/order/order_detail_page.dart b/lib/ui/market/order/order_detail_page.dart index bc64827c..053a8dfe 100644 --- a/lib/ui/market/order/order_detail_page.dart +++ b/lib/ui/market/order/order_detail_page.dart @@ -581,9 +581,9 @@ class _OrderDetailPageState extends State { Widget _goodCard(MyOrderListVoList model) { var top = RichText( text: TextSpan(children: [ - WidgetSpan( - child: _getKindWd(model.kind ?? 0), - ), + // WidgetSpan( + // child: _getKindWd(model.kind ?? 0), + // ), TextSpan( text: model.skuName, style: TextStyle(fontSize: 28.sp, color: ktextPrimary)), diff --git a/lib/ui/market/search/good_detail_page.dart b/lib/ui/market/search/good_detail_page.dart index 9a15d2eb..536ee89f 100644 --- a/lib/ui/market/search/good_detail_page.dart +++ b/lib/ui/market/search/good_detail_page.dart @@ -283,7 +283,7 @@ class _GoodDetailPageState extends State { overflow: TextOverflow.ellipsis, ), ), - _getIcon(_goodDetail!.kind), + // _getIcon(_goodDetail!.kind), 24.hb, Row( crossAxisAlignment: CrossAxisAlignment.center, @@ -348,7 +348,7 @@ class _GoodDetailPageState extends State { overflow: TextOverflow.ellipsis, ), ), - _getIcon(_goodDetail!.kind), + // _getIcon(_goodDetail!.kind), Spacer(), Row( crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/ui/market/search/goods_list_card.dart b/lib/ui/market/search/goods_list_card.dart index 46bf6a43..090865f2 100644 --- a/lib/ui/market/search/goods_list_card.dart +++ b/lib/ui/market/search/goods_list_card.dart @@ -76,7 +76,7 @@ class GoodsListCardState extends State { ), ), 5.hb, - _getIcon(2), + // _getIcon(2), //_getIcon(model.kind??0), Spacer(), 20.hb, diff --git a/lib/ui/market/search/submit_order_page_normal.dart b/lib/ui/market/search/submit_order_page_normal.dart index 5d3f604c..c193d887 100644 --- a/lib/ui/market/search/submit_order_page_normal.dart +++ b/lib/ui/market/search/submit_order_page_normal.dart @@ -455,9 +455,9 @@ class _SubmitOrderNormalPageState extends State { Widget _goodCard(GoodDetailModel model) { var top = RichText( text: TextSpan(children: [ - WidgetSpan( - child: _getKindWd(model.kind), - ), + // WidgetSpan( + // child: _getKindWd(model.kind), + // ), TextSpan( text: model.skuName, style: TextStyle(fontSize: 28.sp, color: ktextPrimary)), diff --git a/lib/ui/market/search_goods_card.dart b/lib/ui/market/search_goods_card.dart index 35431e2f..e84c5703 100644 --- a/lib/ui/market/search_goods_card.dart +++ b/lib/ui/market/search_goods_card.dart @@ -91,15 +91,15 @@ class _SearchGoodsCardState extends State { style: TextStyle(fontSize: 28.sp, color: ktextPrimary), ), ), - Padding( - padding: EdgeInsets.only( - left: 16.w, - right: 16.w, - top: 10.w, - ), - child: Container( - child: _getIcon(widget.item.kind ?? 0), - )), + // Padding( + // padding: EdgeInsets.only( + // left: 16.w, + // right: 16.w, + // top: 10.w, + // ), + // child: Container( + // child: _getIcon(widget.item.kind ?? 0), + // )), 10.hb, Padding( padding: EdgeInsets.symmetric( diff --git a/lib/ui/market/shop_car/shop_car_page.dart b/lib/ui/market/shop_car/shop_car_page.dart index 7ece0f71..185527e4 100644 --- a/lib/ui/market/shop_car/shop_car_page.dart +++ b/lib/ui/market/shop_car/shop_car_page.dart @@ -265,9 +265,9 @@ class _ShopCarPageState extends State { Widget _goodCard(ShopCarListModel model, int index) { var top = RichText( text: TextSpan(children: [ - WidgetSpan( - child: _getKindWd(model.kind ?? 0), - ), + // WidgetSpan( + // child: _getKindWd(model.kind ?? 0), + // ), TextSpan( text: model.skuName, style: TextStyle(fontSize: 28.sp, color: ktextPrimary)),