From 105c0a7f881fe9dc082a24933b661478b92c23a9 Mon Sep 17 00:00:00 2001 From: fmk Date: Wed, 1 Mar 2023 14:14:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ios=EF=BC=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/community/community_details.dart | 2 - .../community_view/class_details.dart | 5 +- lib/community/new_community_details.dart | 2 - lib/mine/recharge_page.dart | 62 +++++++++---------- lib/web/web_page.dart | 3 +- lib/web/web_view/input_comment.dart | 2 - 6 files changed, 34 insertions(+), 42 deletions(-) diff --git a/lib/community/community_details.dart b/lib/community/community_details.dart index 6c918b2f..be23c401 100644 --- a/lib/community/community_details.dart +++ b/lib/community/community_details.dart @@ -51,7 +51,6 @@ class _CommunityDetails extends State final GlobalKey inputKey = GlobalKey(); final TextEditingController commentTextController = TextEditingController(); bool emojiShowing = false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -252,7 +251,6 @@ class _CommunityDetails extends State inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/community/community_view/class_details.dart b/lib/community/community_view/class_details.dart index cc60e937..e113f7ee 100644 --- a/lib/community/community_view/class_details.dart +++ b/lib/community/community_view/class_details.dart @@ -55,7 +55,6 @@ class _ClassDetails extends State with WidgetsBindingObserver { double height = 0; var isShowMore = false; bool emojiShowing = false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -117,6 +116,7 @@ class _ClassDetails extends State with WidgetsBindingObserver { @override void didChangeMetrics() { WidgetsBinding.instance.addPostFrameCallback((_) { + isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0; if (!mounted) return; if (MediaQuery.of(context).viewInsets.bottom == 0) { if (isKeyBoardShow) { @@ -185,7 +185,7 @@ class _ClassDetails extends State with WidgetsBindingObserver { @override Widget build(BuildContext context) { double h = MediaQuery.of(context).viewInsets.bottom; - if(h > 0 && keyboard <= 0) { + if(h > 0 && keyboard < h) { setState(() { keyboard = h; }); @@ -475,7 +475,6 @@ class _ClassDetails extends State with WidgetsBindingObserver { inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/community/new_community_details.dart b/lib/community/new_community_details.dart index 5b904034..993222af 100644 --- a/lib/community/new_community_details.dart +++ b/lib/community/new_community_details.dart @@ -57,7 +57,6 @@ class _NewCommunityDetails extends State with WidgetsBindin String commentsId; String userId; bool emojiShowing =false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -371,7 +370,6 @@ class _NewCommunityDetails extends State with WidgetsBindin inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index b511fea3..1889cb9e 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -327,37 +327,37 @@ class _RechargePage extends State { ), ), SizedBox(height:10.h), - // GestureDetector( - // onTap: () { - // setState(() { - // checkIndex = 3; - // }); - // }, - // child: Row( - // mainAxisAlignment: - // MainAxisAlignment.start, - // crossAxisAlignment: - // CrossAxisAlignment.start, - // children: [ - // Image.asset( - // "assets/image/icon_alipay.webp"), - // Expanded( - // flex: 1, - // child: Padding( - // padding: EdgeInsets.only(left: 8.w), - // child: Text( - // S.of(context).zhifubao, - // style: TextStyle( - // fontSize: 14.sp, - // color: Color(0xff353535), - // ), - // ), - // ), - // ), - // checkView(3), - // ], - // ), - // ), + GestureDetector( + onTap: () { + setState(() { + checkIndex = 3; + }); + }, + child: Row( + mainAxisAlignment: + MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Image.asset( + "assets/image/icon_alipay.webp"), + Expanded( + flex: 1, + child: Padding( + padding: EdgeInsets.only(left: 8.w), + child: Text( + S.of(context).zhifubao, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + ), + ), + ), + ), + checkView(3), + ], + ), + ), ], ), ), diff --git a/lib/web/web_page.dart b/lib/web/web_page.dart index 148e141d..48d27768 100644 --- a/lib/web/web_page.dart +++ b/lib/web/web_page.dart @@ -52,7 +52,6 @@ class _WebPage extends State with WidgetsBindingObserver { final ScrollController scrollController = ScrollController(); final TextEditingController commentTextController = TextEditingController(); bool emojiShowing = false; - static double keyboard_height=300; double keyboard = -1; bool needShowSmiley = false; bool needHideSmiley = false; @@ -72,6 +71,7 @@ class _WebPage extends State with WidgetsBindingObserver { @override void didChangeMetrics() { WidgetsBinding.instance.addPostFrameCallback((_) { + isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0; if (MediaQuery.of(context).viewInsets.bottom == 0) { if (isKeyBoardShow) { FocusScope.of(context).requestFocus(FocusNode()); @@ -363,7 +363,6 @@ class _WebPage extends State with WidgetsBindingObserver { inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/web/web_view/input_comment.dart b/lib/web/web_view/input_comment.dart index 4a11f1ae..7f919d07 100644 --- a/lib/web/web_view/input_comment.dart +++ b/lib/web/web_view/input_comment.dart @@ -13,7 +13,6 @@ class InputComment extends StatefulWidget { final Activity activity; final Article article; final bool isKeyBoardShow; - final double keyboard_height; final double keyboard; final bool emojiShowing; final FocusNode commentFocus; @@ -30,7 +29,6 @@ class InputComment extends StatefulWidget { Key key, this.hintText, this.isKeyBoardShow, - this.keyboard_height, this.keyboard, this.emojiShowing, this.commentFocus, From 3ca55db1fe3b66bd6f4a66c204aa53ec35e19021 Mon Sep 17 00:00:00 2001 From: fmk Date: Wed, 15 Mar 2023 15:22:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?ios,=E6=9B=B4=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- .../settlement_view/settlement_order_commodity.dart | 4 +++- lib/utils/flutter_utils.dart | 11 +++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 700e6296..6164ae63 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.2; + MARKETING_VERSION = 3.2.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -819,7 +819,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.2; + MARKETING_VERSION = 3.2.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -912,7 +912,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.2; + MARKETING_VERSION = 3.2.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 7e9d7012..1308a39d 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 +const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index d0cbdfe8..57d5221c 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -64,7 +64,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8766/app/";///本地 +const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 diff --git a/lib/settlement/settlement_view/settlement_order_commodity.dart b/lib/settlement/settlement_view/settlement_order_commodity.dart index fa7a2ee1..9932374e 100644 --- a/lib/settlement/settlement_view/settlement_order_commodity.dart +++ b/lib/settlement/settlement_view/settlement_order_commodity.dart @@ -218,7 +218,9 @@ class _SettlementOrderCommodity extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Text( - S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - double.tryParse(productList.discountAmount ?? "0"))), + productList.buyNum > 1? + S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - AppUtils.stringAsFixedDouble2(double.tryParse(productList.discountAmount ?? "0")/productList.buyNum))) + :S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - double.tryParse(productList.discountAmount ?? "0"))), style: TextStyle( fontWeight: MyFontWeight.medium, fontSize: 14.sp, diff --git a/lib/utils/flutter_utils.dart b/lib/utils/flutter_utils.dart index 4d6b7a61..61a85847 100644 --- a/lib/utils/flutter_utils.dart +++ b/lib/utils/flutter_utils.dart @@ -17,6 +17,17 @@ class AppUtils { return "${numberFormat.format(mi / 1000)}"; } + + ///保留两位小数 + static double stringAsFixedDouble2(double value) { + String valueStr = value.toString(); + if (!valueStr.contains(".")) return value; + if (valueStr.indexOf(".") + 3 >= valueStr.length) + return value; + else + return double.tryParse(valueStr.substring(0, valueStr.indexOf(".") + 3))??0; + } + ///版本号 static bool versionCompare(String localVersion, String serverVersion) { try { From 7d8a2851d3bb5546b1285b52c892ee592c5117f4 Mon Sep 17 00:00:00 2001 From: fmk Date: Fri, 17 Mar 2023 15:24:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ios=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=A2=9E=E9=95=BF=E4=B8=A4=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 328 +++++++++++++------------ ios/Runner.xcodeproj/project.pbxproj | 6 +- lib/union/location_map_page.dart | 4 +- lib/view_widget/new_coupon_widget.dart | 2 +- pubspec.lock | 10 +- 5 files changed, 176 insertions(+), 174 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5c696545..0fe04321 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,4 +1,5 @@ PODS: + - AEINFoundation (3.2.40) - AFNetworking (4.0.1): - AFNetworking/NSURLSession (= 4.0.1) - AFNetworking/Reachability (= 4.0.1) @@ -49,121 +50,121 @@ PODS: - image_pickers (0.0.1): - AFNetworking - Flutter - - ZLPhotoBrowser-objc (= 1.0.4) - - mob_sharesdk (4.4.8): - - mob_sharesdk/ShareSDK (= 4.4.8) - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDK (4.4.8): - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKExtension (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Line (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SMS (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKRestoreScene (4.4.8): - - mob_sharesdk/ShareSDKExtension - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKUI (4.4.8): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - MOBFoundation (3.2.37) + - SDWebImage + - ZLPhotoBrowser + - mob_sharesdk_spec2 (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK (= 0.0.1) + - mob_sharesdk_spec2/ShareSDK (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDKExtension (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/DingTalk (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Douyin (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Dropbox (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Evernote (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Facebook (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Flickr (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/GooglePlus (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Instagram (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Instapaper (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Kakao (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/KuaiShou (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Line (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/LinkedIn (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Messenger (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/MingDao (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Oasis (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Pinterest (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Pocket (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/QQ (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Reddit (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/SinaWeibo (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/SMS (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/SnapChat (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Telegram (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/TikTok (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Twitter (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/VKontakte (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WatermelonVideo (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WeChat_Lite (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WeWork (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/WhatsApp (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/Yixin (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKPlatforms/YouDaoNote (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK + - mob_sharesdk_spec2/ShareSDKRestoreScene (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDKExtension + - mob_sharesdk_spec2/ShareSDKUI (0.0.1): + - AEINFoundation + - mob_sharesdk_spec2/ShareSDK - number_precision (0.0.1): - Flutter - OpenWeChatSDK (1.9.6) @@ -180,45 +181,45 @@ PODS: - SDWebImage/Core (5.13.4) - shared_preferences_ios (0.0.1): - Flutter - - sharesdk_plugin (1.1.3): + - sharesdk_plugin (1.1.4): - Flutter - - mob_sharesdk - - mob_sharesdk/ShareSDKExtension - - mob_sharesdk/ShareSDKPlatforms/DingTalk - - mob_sharesdk/ShareSDKPlatforms/Douyin - - mob_sharesdk/ShareSDKPlatforms/Dropbox - - mob_sharesdk/ShareSDKPlatforms/Evernote - - mob_sharesdk/ShareSDKPlatforms/Facebook - - mob_sharesdk/ShareSDKPlatforms/Flickr - - mob_sharesdk/ShareSDKPlatforms/GooglePlus - - mob_sharesdk/ShareSDKPlatforms/Instagram - - mob_sharesdk/ShareSDKPlatforms/Instapaper - - mob_sharesdk/ShareSDKPlatforms/Kakao - - mob_sharesdk/ShareSDKPlatforms/KuaiShou - - mob_sharesdk/ShareSDKPlatforms/Line - - mob_sharesdk/ShareSDKPlatforms/LinkedIn - - mob_sharesdk/ShareSDKPlatforms/Messenger - - mob_sharesdk/ShareSDKPlatforms/MingDao - - mob_sharesdk/ShareSDKPlatforms/Oasis - - mob_sharesdk/ShareSDKPlatforms/Pinterest - - mob_sharesdk/ShareSDKPlatforms/Pocket - - mob_sharesdk/ShareSDKPlatforms/QQ - - mob_sharesdk/ShareSDKPlatforms/Reddit - - mob_sharesdk/ShareSDKPlatforms/SinaWeibo - - mob_sharesdk/ShareSDKPlatforms/SMS - - mob_sharesdk/ShareSDKPlatforms/SnapChat - - mob_sharesdk/ShareSDKPlatforms/Telegram - - mob_sharesdk/ShareSDKPlatforms/TikTok - - mob_sharesdk/ShareSDKPlatforms/Twitter - - mob_sharesdk/ShareSDKPlatforms/VKontakte - - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo - - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite - - mob_sharesdk/ShareSDKPlatforms/WeWork - - mob_sharesdk/ShareSDKPlatforms/WhatsApp - - mob_sharesdk/ShareSDKPlatforms/Yixin - - mob_sharesdk/ShareSDKPlatforms/YouDaoNote - - mob_sharesdk/ShareSDKRestoreScene - - mob_sharesdk/ShareSDKUI + - mob_sharesdk_spec2 + - mob_sharesdk_spec2/ShareSDKExtension + - mob_sharesdk_spec2/ShareSDKPlatforms/DingTalk + - mob_sharesdk_spec2/ShareSDKPlatforms/Douyin + - mob_sharesdk_spec2/ShareSDKPlatforms/Dropbox + - mob_sharesdk_spec2/ShareSDKPlatforms/Evernote + - mob_sharesdk_spec2/ShareSDKPlatforms/Facebook + - mob_sharesdk_spec2/ShareSDKPlatforms/Flickr + - mob_sharesdk_spec2/ShareSDKPlatforms/GooglePlus + - mob_sharesdk_spec2/ShareSDKPlatforms/Instagram + - mob_sharesdk_spec2/ShareSDKPlatforms/Instapaper + - mob_sharesdk_spec2/ShareSDKPlatforms/Kakao + - mob_sharesdk_spec2/ShareSDKPlatforms/KuaiShou + - mob_sharesdk_spec2/ShareSDKPlatforms/Line + - mob_sharesdk_spec2/ShareSDKPlatforms/LinkedIn + - mob_sharesdk_spec2/ShareSDKPlatforms/Messenger + - mob_sharesdk_spec2/ShareSDKPlatforms/MingDao + - mob_sharesdk_spec2/ShareSDKPlatforms/Oasis + - mob_sharesdk_spec2/ShareSDKPlatforms/Pinterest + - mob_sharesdk_spec2/ShareSDKPlatforms/Pocket + - mob_sharesdk_spec2/ShareSDKPlatforms/QQ + - mob_sharesdk_spec2/ShareSDKPlatforms/Reddit + - mob_sharesdk_spec2/ShareSDKPlatforms/SinaWeibo + - mob_sharesdk_spec2/ShareSDKPlatforms/SMS + - mob_sharesdk_spec2/ShareSDKPlatforms/SnapChat + - mob_sharesdk_spec2/ShareSDKPlatforms/Telegram + - mob_sharesdk_spec2/ShareSDKPlatforms/TikTok + - mob_sharesdk_spec2/ShareSDKPlatforms/Twitter + - mob_sharesdk_spec2/ShareSDKPlatforms/VKontakte + - mob_sharesdk_spec2/ShareSDKPlatforms/WatermelonVideo + - mob_sharesdk_spec2/ShareSDKPlatforms/WeChat_Lite + - mob_sharesdk_spec2/ShareSDKPlatforms/WeWork + - mob_sharesdk_spec2/ShareSDKPlatforms/WhatsApp + - mob_sharesdk_spec2/ShareSDKPlatforms/Yixin + - mob_sharesdk_spec2/ShareSDKPlatforms/YouDaoNote + - mob_sharesdk_spec2/ShareSDKRestoreScene + - mob_sharesdk_spec2/ShareSDKUI - SSZipArchive (2.4.3) - thumbnails (0.0.1): - Flutter @@ -236,8 +237,9 @@ PODS: - Flutter - webview_flutter (0.0.1): - Flutter - - ZLPhotoBrowser-objc (1.0.4): - - SDWebImage + - ZLPhotoBrowser (4.3.7): + - ZLPhotoBrowser/Core (= 4.3.7) + - ZLPhotoBrowser/Core (4.3.7) DEPENDENCIES: - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) @@ -267,16 +269,16 @@ DEPENDENCIES: SPEC REPOS: trunk: + - AEINFoundation - AFNetworking - BaiduMapKit - BMKLocationKit - - mob_sharesdk - - MOBFoundation + - mob_sharesdk_spec2 - OpenWeChatSDK - SDWebImage - SSZipArchive - TPNS-iOS - - ZLPhotoBrowser-objc + - ZLPhotoBrowser EXTERNAL SOURCES: emoji_picker_flutter: @@ -327,6 +329,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/webview_flutter/ios" SPEC CHECKSUMS: + AEINFoundation: e046b5fbe75aaf120a54fdc530b1d62d4ce88dfe AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777 BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780 @@ -338,9 +341,8 @@ SPEC CHECKSUMS: flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492 - image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451 - mob_sharesdk: b707987dfbe7e180ea60ddf4b5db30126ac98390 - MOBFoundation: 2fcfc8b48bf311ace31e99c941b70f573c88880a + image_pickers: 075764ed041c5e3089fcd4d040384ecdb23840e0 + mob_sharesdk_spec2: efa0cb438a29b37ab99d015a272dff69177e30a2 number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8 OpenWeChatSDK: 8fb6c3c7ce9a57f37d001060282de1f138d09940 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 @@ -349,7 +351,7 @@ SPEC CHECKSUMS: scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad - sharesdk_plugin: ad2cacfb74c4b82fbc4100cc882d05507f908aed + sharesdk_plugin: d9c8e928116aba323b21da64b4437ed766ee843e SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 @@ -359,7 +361,7 @@ SPEC CHECKSUMS: video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 - ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 + ZLPhotoBrowser: f571bdaec6d0b64ae94a29787e4c7cbd8900d10f PODFILE CHECKSUM: 9a26c1c4037e42be4afc95d70f8bd02a4b989a1c diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6164ae63..2a9e0e35 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.4; + MARKETING_VERSION = 3.2.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.4; + MARKETING_VERSION = 3.2.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.4; + MARKETING_VERSION = 3.2.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/union/location_map_page.dart b/lib/union/location_map_page.dart index cdc28cea..d63e223c 100644 --- a/lib/union/location_map_page.dart +++ b/lib/union/location_map_page.dart @@ -77,7 +77,7 @@ class _LocationMap extends State { ), body: Container( //BMFMapWidget 组件会自动默认沾满全屏，并且挡住所有遮盖物 ,BMFTextureMapWidget不会强制遮盖其他控件。 - child: BMFTextureMapWidget( + child:BMFMapWidget( mapOptions: BMFMapOptions( center: BMFCoordinate( double.tryParse(widget.arguments["lat"]), @@ -88,7 +88,7 @@ class _LocationMap extends State { zoomLevel: 12, ), onBMFMapCreated: onMapCreated, - ), + ) ), ); } diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index bd3cbc32..4abeec11 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -84,7 +84,7 @@ class NewCouponWidget extends StatelessWidget { children: [ Text( "${coupon != null ? coupon.couponName ?? "" : ""}", - maxLines: 1, + maxLines: 2, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 15.sp, diff --git a/pubspec.lock b/pubspec.lock index caa771cd..5589cb7d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,7 +173,7 @@ packages: name: flutter_baidu_mapapi_base url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.0" flutter_baidu_mapapi_map: dependency: "direct main" description: @@ -187,21 +187,21 @@ packages: name: flutter_baidu_mapapi_search url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.0" flutter_baidu_mapapi_utils: dependency: "direct main" description: name: flutter_baidu_mapapi_utils url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.0" flutter_bmflocation: dependency: "direct main" description: name: flutter_bmflocation url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.2.1" flutter_easyloading: dependency: "direct main" description: @@ -314,7 +314,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.12.2" + version: "3.9.0+2" font_awesome_flutter: dependency: "direct main" description: From 6e4d05c043a50c6779ed97f011f633c420690b20 Mon Sep 17 00:00:00 2001 From: fmk Date: Fri, 17 Mar 2023 15:55:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?ios=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=A2=9E=E9=95=BF=E4=B8=A4=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/view_widget/new_coupon_widget.dart | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2a9e0e35..19c6b784 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.5; + MARKETING_VERSION = 3.2.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -819,7 +819,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.5; + MARKETING_VERSION = 3.2.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -912,7 +912,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.5; + MARKETING_VERSION = 3.2.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index 4abeec11..550dd257 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -83,12 +83,12 @@ class NewCouponWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${coupon != null ? coupon.couponName ?? "" : ""}", + "${coupon != null ? coupon.couponName?? "" : ""}", maxLines: 2, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 15.sp, - height: 1.2.h, + height: 1.3.h, fontWeight: MyFontWeight.semi_bold, color: Color(0xFF0D0D0D), ),