diff --git a/lib/main_page.dart b/lib/main_page.dart index 5b4f313e..717afd4a 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -129,6 +129,7 @@ class _MainPage extends State with WidgetsBindingObserver { UnionPage(unionPageKey,0), // (Theme.of(context).platform == TargetPlatform.android) ? OrderPage() :CommunityPage(), CommunityPage(), + // OrderPage(), MinePage(minePageKey), ]; @@ -353,7 +354,7 @@ class _MainPage extends State with WidgetsBindingObserver { PackageInfo packageInfo = await PackageInfo.fromPlatform(); BaseData baseData = await apiService.appVersion().catchError((onError) {}); if (baseData != null && baseData.isSuccess) { - // baseData.data.appLastVersion = "1.0.4"; + // baseData.data.appLastVersion = "2.0.11"; // baseData.data.appLastVersionUp = "1.0.1"; if(AppUtils.versionCompare(packageInfo.version,baseData.data?.appLastVersion) && AppUtils.versionCompare(value.getString("appLastVersion")??"1.0.0",baseData.data?.appLastVersion)){ diff --git a/lib/utils/flutter_utils.dart b/lib/utils/flutter_utils.dart index 372e858e..794d9694 100644 --- a/lib/utils/flutter_utils.dart +++ b/lib/utils/flutter_utils.dart @@ -26,7 +26,7 @@ class AppUtils { return false; if (int.tryParse(localVersionArr[1]) > int.tryParse(serverVersionArr[1])) return false; - if (int.tryParse(localVersionArr[2]) > int.tryParse(serverVersionArr[2])) + if (int.tryParse(localVersionArr[2]) >= int.tryParse(serverVersionArr[2])) return false; } catch (ex) {} return true; diff --git a/lib/view_widget/update_dialog.dart b/lib/view_widget/update_dialog.dart index 35460b29..3e0d9b27 100644 --- a/lib/view_widget/update_dialog.dart +++ b/lib/view_widget/update_dialog.dart @@ -30,46 +30,48 @@ class _UpdateDialog extends State { child: Center( child: Container( width: MediaQuery.of(context).size.width - 80.w, - height: 165.h, + // height: 216.h, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(8.r), ), child: Column( + mainAxisSize: MainAxisSize.min, children: [ Container( - width: double.infinity, - // height: 110.h, - alignment: Alignment.center, - padding: EdgeInsets.all(20), - child: Column( - children: [ - Text( - "检测到新版本 v${widget.appUpdate.appLastVersion}", - style: TextStyle( - fontSize: 17.sp, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF000000), + width: double.infinity, + // height: 110.h, + alignment: Alignment.center, + padding: EdgeInsets.all(20), + child: Column( + children: [ + Text( + "发现新版本 v${widget.appUpdate.appLastVersion}", + style: TextStyle( + fontSize: 17.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF000000), + ), ), - ), - SizedBox(height: 12.h,), - Text( - "是否需要更新到最新版本?", - style: TextStyle( - fontSize: 17.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF333333), + SizedBox(height: 12.h,), + Text( + widget.appUpdate.appLastVersionExplain ?? "", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 17.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF333333), + ), ), - ), - ], - ) + ], + ) ), Container( color: Color(0x1A000000), height: 1.h, ), Container( - height: 69.h, + height:55.h, child: Row( mainAxisSize: MainAxisSize.max, children: [ @@ -81,7 +83,7 @@ class _UpdateDialog extends State { }, child: Container( width: double.infinity, - height: 90.h, + // height: 90.h, alignment: Alignment.center, child: Text( "下次再说", @@ -107,7 +109,7 @@ class _UpdateDialog extends State { }, child: Container( width: double.infinity, - height: 90.h, + // height: 90.h, alignment: Alignment.center, child: Text( "立即更新", diff --git a/pubspec.yaml b/pubspec.yaml index 024de055..79ff9585 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: 一心回乡. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 2.0.12+9 +version: 2.0.14+9 environment: sdk: ">=2.7.0 <3.0.0"