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 700e6296..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 = 1; + 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.2; + 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 = 1; + 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.2; + 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 = 1; + 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.2; + MARKETING_VERSION = 3.2.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/base_state.dart b/lib/base_state.dart index 916e047a..1928ee9e 100644 --- a/lib/base_state.dart +++ b/lib/base_state.dart @@ -49,41 +49,41 @@ abstract class BaseState extends State if (pushMap != null) { String routeName = ""; Map params = {}; - switch (pushMap["typed"]) { - case 1: - routeName = "/router/store_detail_page"; - params["articleId"] = pushMap["info"]; - break; - case 2: - routeName = "/router/store_detail_page"; - params["activityId"] = pushMap["info"]; - break; - case 3: - routeName = "/router/store_order"; - params["id"] = pushMap["info"]; - params["tenant"] = pushMap["tenant"]; - params["storeName"] = pushMap["storeName"]; - break; - case 4: - routeName = "/router/integral_store_page"; - params["goodsId"] = pushMap["info"]; - break; - case 5: - routeName = "/router/order_details"; - params["id"] = pushMap["info"]; - break; - case 6: - routeName = "/router/community_details"; - params["businessId"] = pushMap["info"]; - break; - case 8: - routeName = "/router/mine_wallet"; - params["id"] = pushMap["info"]; - break; - case 9: - routeName = "/router/welfare_page"; - params["id"] = pushMap["info"]; - break; + switch (pushMap["typed"].toString()) { + case "1":case "ARTICLE": + routeName = "/router/web_page"; + params["articleId"] = pushMap["info"]; + break; + case "2":case "ACTIVITY": + routeName = "/router/web_page"; + params["activityId"] = pushMap["info"]; + break; + case "3":case "SHOP": + routeName = "/router/store_order"; + params["id"] = pushMap["info"]; + params["tenant"] = pushMap["tenant"]; + params["storeName"] = pushMap["storeName"]; + break; + case "4":case "CREDIT_GOODS": + routeName = "/router/integral_store_page"; + params["goodsId"] = pushMap["info"]; + break; + case "5":case "ORDER": + routeName = "/router/order_details"; + params["id"] = pushMap["info"]; + break; + case "6":case "MEMBER": + routeName = "/router/community_details"; + params["businessId"] = pushMap["info"]; + break; + case "8":case "WALLET": + routeName = "/router/mine_wallet"; + params["id"] = pushMap["info"]; + break; + case "9":case "WELFARE": + routeName = "/router/welfare_page"; + params["id"] = pushMap["info"]; + break; } sharedPreferences.setString("pushData", ""); print("xgPushClickAction: routeName: $routeName"); diff --git a/lib/community/community_details.dart b/lib/community/community_details.dart index 84bce1f9..2d4ce3fd 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 1a1652fc..f1f5e2f9 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; }); @@ -476,7 +476,6 @@ class _ClassDetails extends State with WidgetsBindingObserver { inputKey, hintText, isKeyBoardShow, - keyboard_height, keyboard, emojiShowing, commentFocus, diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index 64552d2b..da854f27 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -3,6 +3,7 @@ import 'dart:ui'; import 'package:chewie/chewie.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_svg/svg.dart'; import 'package:huixiang/generated/l10n.dart'; @@ -389,64 +390,62 @@ class _CommunityDynamic extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Expanded( - child: Container( - padding: EdgeInsets.only(bottom: 16.h), - child: Row( - children: [ - SvgPicture.asset( - "assets/svg/liulanliang.svg", - width: 16, - height: 16, - ), - SizedBox( - width: 5.w, + Container( + padding: EdgeInsets.only(bottom: 16.h), + margin: EdgeInsets.only(right: 52.w), + child: Row( + children: [ + SvgPicture.asset( + "assets/svg/liulanliang.svg", + width: 16, + height: 16, + ), + SizedBox( + width: 5.w, + ), + Text( + (widget.article != null) + ? "${widget.article.viewers}" + : "", + style: TextStyle( + fontSize: 14.sp, + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.regular, + color: Color(0xFF1A1A1A), ), - Text( - (widget.article != null) - ? "${widget.article.viewers}" - : "", - style: TextStyle( - fontSize: 14.sp, - fontFamily: 'JDZhengHT', - fontWeight: MyFontWeight.regular, - color: Color(0xFF1A1A1A), - ), + ), + ], + )), + Container( + padding: EdgeInsets.only(bottom: 16.h), + margin: EdgeInsets.only(right: 52.w), + child: Row( + children: [ + SvgPicture.asset( + "assets/svg/pinglun.svg", + width: 16, + height: 16, + ), + SizedBox( + width: 5.w, + ), + Text( + "${widget.article.comments ?? 0}", + style: TextStyle( + fontSize: 14.sp, + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.regular, + color: Color(0xFF1A1A1A), ), - ], - )), - ), - Expanded( - child: Container( - padding: EdgeInsets.only(bottom: 16.h), - child: Row( - children: [ - SvgPicture.asset( - "assets/svg/pinglun.svg", - width: 16, - height: 16, - ), - SizedBox( - width: 5.w, - ), - Text( - "${widget.article.comments ?? 0}", - style: TextStyle( - fontSize: 14.sp, - fontFamily: 'JDZhengHT', - fontWeight: MyFontWeight.regular, - color: Color(0xFF1A1A1A), - ), - ), - ], - ))), - Expanded( - child: GestureDetector( + ), + ], + )), + GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { setState(() { widget.article.liked = - !(widget.article.liked ?? false); + !(widget.article.liked ?? false); _queryInformationLikes( widget.article.liked ?? false); }); @@ -457,15 +456,15 @@ class _CommunityDynamic extends State { children: [ (widget.article.liked ?? false) ? Image.asset( - "assets/image/icon_like.webp", - width: 16, - height: 16, - ) + "assets/image/icon_like.webp", + width: 16, + height: 16, + ) : Image.asset( - "assets/image/icon_like_h.webp", - width: 16, - height: 16, - ), + "assets/image/icon_like_h.webp", + width: 16, + height: 16, + ), SizedBox( width: 5.w, ), @@ -480,10 +479,10 @@ class _CommunityDynamic extends State { ), ], )), - )), - if ((widget?.article?.author != widget.userId ?? "") && + ), + ((widget?.article?.author != widget.userId ?? "") && widget.commentType == 0) - Expanded( + ? Expanded( child: GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { @@ -494,13 +493,13 @@ class _CommunityDynamic extends State { child: Container( padding: EdgeInsets.only(top: 3.h, bottom: 16.h), - alignment: Alignment.center, + alignment: Alignment.centerRight, // color: Colors.red, child: Icon( Icons.more_horiz, color: Colors.black, ), - ))), + ))) :Spacer(), ], ), ), @@ -554,12 +553,27 @@ class _CommunityDynamic extends State { if (platform == ShareSDKPlatforms.line) { params.map["type"] = SSDKContentTypes.text.value; params.map["text"] = - "${widget?.article?.mainTitle ?? ""} ${buildShareUrl()}"; + "${widget?.article?.mainTitle ?? ""} ${buildShareUrl()}"; + } else if (platform == ShareSDKPlatforms.douyin) { + Navigator.of(context).popAndPushNamed('/router/share_trends', + arguments: {"articleId": widget.article.id}); + return; + } else if (platform == ShareSDKPlatforms.facebook) { + Navigator.of(context).popAndPushNamed('/router/chat_details_page', + arguments: {"articleId": widget.article.id, + "shareUrl":buildShareUrl(),}); + return; + } else if (platform == ShareSDKPlatforms.copy) { + copy(buildShareUrl()); + SmartDialog.showToast("已复制", alignment: Alignment.center); + Navigator.of(context).pop(); + return; } SharesdkPlugin.share(platform, params, - (state, userData, contentEntity, error) { - print("share！$state"); - }); + (state, userData, contentEntity, error) { + print("share！$state"); + }); + Navigator.of(context).pop(); }); }); } @@ -568,6 +582,11 @@ class _CommunityDynamic extends State { return "https://hx.lotus-wallet.com/communityShare.html?id=${widget.article.id}"; } + copy(String url) { + print(url); + Clipboard.setData(ClipboardData(text: url)); + } + ///动态内容 Widget buildMedia(String subjectInfo) { if (subjectInfo == null || !subjectInfo.startsWith("{")) { 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/community/share_trends.dart b/lib/community/share_trends.dart new file mode 100644 index 00000000..71190364 --- /dev/null +++ b/lib/community/share_trends.dart @@ -0,0 +1,229 @@ +import 'dart:convert'; +import 'dart:ui'; + +import 'package:dio/dio.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import '../../generated/l10n.dart'; +import '../../utils/font_weight.dart'; +import '../retrofit/data/article.dart'; +import '../retrofit/data/base_data.dart'; +import '../view_widget/custom_image.dart'; + +class ShareTrends extends StatefulWidget { + final Map arguments; + + ShareTrends({this.arguments}); + + @override + State createState() { + return _ShareTrends(); + } +} + +class _ShareTrends extends State{ + ApiService apiService; + bool topSetting = false; + final TextEditingController textController = TextEditingController(); + var commentFocus = FocusNode(); + Article article; + + @override + void initState() { + super.initState(); + queryDetails(widget.arguments["articleId"]); + } + + ///详情接口 + queryDetails(id) async { + SharedPreferences value = await SharedPreferences.getInstance(); + if (apiService == null) + apiService = ApiService( + Dio(), + context: context, + token: value.getString("token"), + showLoading: true + ); + BaseData
baseData = + await apiService.informationInfo(id).catchError((onError) { + debugPrint(onError.toString()); + }); + if (baseData != null && baseData.isSuccess) { + setState(() { + article = baseData.data; + }); + } + } + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Color(0xFFF9FAF7), + // appBar: MyAppBar( + // title:"转发", + // titleColor: Colors.black, + // titleSize: 18.sp, + // background: Colors.white, + // leading: false, + // leadingColor: Colors.black, + // actions: [ + // Container( + // alignment: Alignment.center , + // color: Color(0xFF32A060), + // margin:EdgeInsets.only(right: 16.w) , + // child: Text( + // S.of(context).fabu, + // style: TextStyle( + // color: Colors.white, + // fontSize:12.sp, + // fontWeight: MyFontWeight.regular, + // ), + // ), + // ) + // ], + // ), + body: Container( + child: Column( + children: [ + Container( + padding:EdgeInsets.only(top: MediaQuery.of(context).padding.top+11.h,bottom:14.w), + color: Colors.white, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded( + child: Container( + alignment: Alignment.center, + margin: EdgeInsets.only(left:60.w,), + child: Text( + "转发", + style: TextStyle( + color: Colors.black, + fontSize:17.sp, + fontWeight: MyFontWeight.regular, + ), + ),)), + Container( + alignment: Alignment.center , + margin:EdgeInsets.only(right: 16.w) , + padding: EdgeInsets.symmetric(horizontal: 16.w,vertical: 3.h), + decoration: BoxDecoration( + color: Color(0xFF32A060), + borderRadius: BorderRadius.circular(10.5), + ), + child: Text( + S.of(context).fabu, + style: TextStyle( + color: Colors.white, + fontSize:12.sp, + fontWeight: MyFontWeight.regular, + ), + ), + ), + ], + ), + ), + Expanded(child: + Container( + margin: EdgeInsets.symmetric(vertical: 14.h), + width: double.infinity, + color: Colors.white, + padding: EdgeInsets.only(left: 20.w,right: 16.w), + child: Column( + children: [ + Container( + decoration: BoxDecoration( + color: Color(0xffF2F2F2), + borderRadius: BorderRadius.circular(6), + ), + margin: EdgeInsets.only(top: 30.w), + child: Container( + margin: EdgeInsets.only(left:16.w,right: 10.w,), + alignment: Alignment.topLeft, + child: TextField( + textInputAction:TextInputAction.send, + onEditingComplete: () { + }, + maxLines: 8, + minLines: 1, + focusNode:commentFocus, + controller: textController, + decoration: InputDecoration( + border: InputBorder.none, + hintText: "想说点什么...", + hintStyle: TextStyle( + fontSize: 14.sp, + color: Color(0xFF7C7C7C), + ), + ), + ), + ), + ), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: (){ + Navigator.of(context).pushNamed( + '/router/scan_web', + arguments: { + "result": widget.arguments["shareUrl"], + "title":"", + }, + ); + }, + child: Container( + decoration: BoxDecoration( + color: Color(0xFFF2F2F2), + borderRadius: BorderRadius.circular(6), + ), + padding: EdgeInsets.only(top: 8.h,bottom: 8.h,left: 8.w,right: 10.w), + margin: EdgeInsets.only(top: 12.w), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if(article?.content != null && article.content.contains("images\":[\"") || (article?.coverImg ?? "")!= "") + MImage( + article?.content != null && + article.content.contains("images\":[\"") + ? jsonDecode(article.content)["images"][0] + : article?.coverImg ?? "", + radius: BorderRadius.circular(2), + fit: BoxFit.fill, + width: 64, + height: 64, + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", + ), + if(article?.content != null || article?.coverImg != null) + SizedBox(width: 7.w,), + Expanded(child: Text( + article?.mainTitle ?? "", + maxLines: 3, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: Color(0xFF4D4D4D), + fontSize:14.sp, + height: 1.4.h, + fontWeight: MyFontWeight.regular, + ), + ),), + ], + ), + )), + ], + ), + ), + ) + ], + ), + ), + ); + } +} diff --git a/lib/login/new_login_page.dart b/lib/login/new_login_page.dart index 4edfb2e4..78229327 100644 --- a/lib/login/new_login_page.dart +++ b/lib/login/new_login_page.dart @@ -416,7 +416,7 @@ class _NewLoginPage extends State { Container( height: 30.h, width: MediaQuery.of(context).size.width - 100.w, - margin: EdgeInsets.only(bottom: 10.h), + margin: EdgeInsets.only(bottom:5.h), child: TextField( style: TextStyle( height: 1.h, diff --git a/lib/main_page.dart b/lib/main_page.dart index f6ff558d..7e825893 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -58,6 +58,7 @@ class _MainPage extends State with WidgetsBindingObserver { final GlobalKey vipPageKey = GlobalKey(); // List iconn; ApiService apiService; + int lastTime = DateTime.now().millisecondsSinceEpoch; @override @@ -74,8 +75,11 @@ class _MainPage extends State with WidgetsBindingObserver { break; case AppLifecycleState.resumed: //从后台切换前台，界面可见 pushRoute(); + if(DateTime.now().millisecondsSinceEpoch - lastTime > 300000) + Navigator.of(context).popAndPushNamed('/router/main_page'); break; case AppLifecycleState.paused: // 界面不可见，后台 + lastTime = DateTime.now().millisecondsSinceEpoch; break; case AppLifecycleState.detached: // APP结束时调用 break; @@ -232,7 +236,7 @@ class _MainPage extends State with WidgetsBindingObserver { // SmartDialog.showToast("当前不在聊天页面", alignment: Alignment.center); // }); - /// @typed: 1文章 2活动 3店铺 4积分商品 5订单 6动态 7用户 8平台余额/钱包 9福利中心 + /// @typed: ARTICLE(1)文章 ACTIVITY(2)活动 SHOP(3)店铺 CREDIT_GOODS(4)积分商品 ORDER(5)订单 TREND(6)动态 MEMBER(7)用户 WALLET(8)平台余额/钱包 WELFARE(9)福利中心 xgFlutterPlugin.addEventHandler(xgPushClickAction: (event) async { print("xgPushClickAction1: $event"); if (event["actionType"] == 2) return event; @@ -296,38 +300,38 @@ class _MainPage extends State with WidgetsBindingObserver { if (pushMap != null) { String routeName = ""; Map params = {}; - switch (pushMap["typed"]) { - case 1: + switch (pushMap["typed"].toString()) { + case "1":case "ARTICLE": routeName = "/router/web_page"; params["articleId"] = pushMap["info"]; break; - case 2: + case "2":case "ACTIVITY": routeName = "/router/web_page"; params["activityId"] = pushMap["info"]; break; - case 3: + case "3":case "SHOP": routeName = "/router/store_order"; params["id"] = pushMap["info"]; params["tenant"] = pushMap["tenant"]; params["storeName"] = pushMap["storeName"]; break; - case 4: + case "4":case "CREDIT_GOODS": routeName = "/router/integral_store_page"; params["goodsId"] = pushMap["info"]; break; - case 5: + case "5":case "ORDER": routeName = "/router/order_details"; params["id"] = pushMap["info"]; break; - case 6: + case "6":case "MEMBER": routeName = "/router/community_details"; params["businessId"] = pushMap["info"]; break; - case 8: + case "8":case "WALLET": routeName = "/router/mine_wallet"; params["id"] = pushMap["info"]; break; - case 9: + case "9":case "WELFARE": routeName = "/router/welfare_page"; params["id"] = pushMap["info"]; break; diff --git a/lib/message/im/chat_details_page.dart b/lib/message/im/chat_details_page.dart index bc558cfc..27760c06 100644 --- a/lib/message/im/chat_details_page.dart +++ b/lib/message/im/chat_details_page.dart @@ -18,6 +18,10 @@ import 'im_view/on_chat_message.dart'; import 'im_view/on_chat_msg_instance.dart'; class ChatDetailsPage extends StatefulWidget { + final Map arguments; + + ChatDetailsPage({this.arguments}); + @override State createState() { return _ChatDetailsPage(); diff --git a/lib/message/system_details.dart b/lib/message/system_details.dart index fdb354fd..a89231f0 100644 --- a/lib/message/system_details.dart +++ b/lib/message/system_details.dart @@ -240,9 +240,9 @@ class _SystemDetails extends State { children: [ Image.asset( (message.typed == 1) - ? "assets/image/icon_system_message.webp" + ? "assets/image/icon_order.webp" : (message.typed == 2) - ? "assets/image/icon_system_message.webp" + ? "assets/image/icon_order.webp" : "assets/image/icon_cz.webp", width: 24.w, height: 24.h, diff --git a/lib/mine/mine_view/mine_view.dart b/lib/mine/mine_view/mine_view.dart index 705dbc74..f8b5c7d0 100644 --- a/lib/mine/mine_view/mine_view.dart +++ b/lib/mine/mine_view/mine_view.dart @@ -131,8 +131,8 @@ class _MineView extends State { padding: EdgeInsets.only(left: 12.w,right:16.w,top:8.h,bottom:8.h), child: Image.asset( "assets/image/icon_scan_qr_code.webp", - width: 24, - height: 24, + width: 22, + height: 22, ), ), ), diff --git a/lib/order/order_history_page.dart b/lib/order/order_history_page.dart index c65f5708..ae78e3d5 100644 --- a/lib/order/order_history_page.dart +++ b/lib/order/order_history_page.dart @@ -314,13 +314,10 @@ class _OrderHistoryList extends State // ), // ), // ), - Container( - margin: EdgeInsets.only(left: 5.w, top: 12.h), - ), Expanded( child: Container( width: double.infinity, - margin: EdgeInsets.only(left: 6.w, top: 12.h), + margin: EdgeInsets.only(left:12.w, top: 12.h), alignment: Alignment.centerLeft, child: Text( (orderInfo != null) ? orderInfo.storeName : "", @@ -353,7 +350,7 @@ class _OrderHistoryList extends State color: (orderInfo == null) ? Color(0xFF32A060) : (orderInfo.refundStatus == 1 || - orderInfo.orderStatus >= 5) + orderInfo.orderStatus == -1 || orderInfo.orderStatus >= 5) ? Colors.grey : (orderInfo.orderStatus == 4) ? Color(0xFF32A060) diff --git a/lib/order/order_view/order_status.dart b/lib/order/order_view/order_status.dart index 3d320c1f..595d6b23 100644 --- a/lib/order/order_view/order_status.dart +++ b/lib/order/order_view/order_status.dart @@ -142,7 +142,7 @@ class _OrderStatus extends State { children: timeWidget(), ), ), - visible: (widget.orderStatus >= 4 || widget.isTakeOut == 2) + visible: (widget.orderStatus == -1 || widget.orderStatus >= 4 || widget.isTakeOut == 2) ? false : (widget.isTakeOut == 0) ? !(widget.payStatus == 1) diff --git a/lib/utils/status_utils.dart b/lib/utils/status_utils.dart index 13b8c46f..fe58f78c 100644 --- a/lib/utils/status_utils.dart +++ b/lib/utils/status_utils.dart @@ -9,7 +9,7 @@ class StatusUtils { context, refundStatus, orderStatus, payStatus, sendStatus, isTakeOut) { String statusText = ""; if (isTakeOut == 0) { - if (payStatus == 0) { + if (payStatus == 0 && orderStatus != -1) { statusText = S.of(context).daizhifu; } else { statusText = S.of(context).yizhifu; @@ -79,7 +79,7 @@ class StatusUtils { if (refundStatus == 1) { statusText = S.of(context).yituikuan; } - if (orderStatus == 5) { + if (orderStatus == 5 || orderStatus == -1) { statusText = S.of(context).yiquxiao; } return statusText; @@ -110,7 +110,7 @@ class StatusUtils { ), ]; } - if (orderStatus > 4) { + if (orderStatus > 4 || orderStatus == -1) { return [ RoundButton( text: S.of(context).zailaiyidan, @@ -125,7 +125,7 @@ class StatusUtils { ), ]; } else { - if (payStatus == 0) { + if (payStatus == 0 && orderStatus != -1) { return [ RoundButton( text: S.of(context).quzhifu, diff --git a/lib/view_widget/classic_header.dart b/lib/view_widget/classic_header.dart index 1bb7cccc..cc09d91a 100644 --- a/lib/view_widget/classic_header.dart +++ b/lib/view_widget/classic_header.dart @@ -11,6 +11,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:rive/rive.dart'; class MyHeader extends StatelessWidget { + final Color color; + MyHeader({this.color}); @override Widget build(BuildContext context) { return MyClassicHeader( @@ -22,11 +24,11 @@ class MyHeader extends StatelessWidget { idleText: S.of(context).xialashuaxin, iconPos: IconPosition.left, completeTextStyle: TextStyle( - color: Color(0xFF32A060), + color: color??Color(0xFF32A060), ), completeIcon: Icon( Icons.done, - color: Color(0xFF32A060), + color: color??Color(0xFF32A060), ), refreshingIcon: SpinKitCircle( color: Colors.grey, diff --git a/lib/view_widget/my_appbar.dart b/lib/view_widget/my_appbar.dart index 7a3ce7c5..813b16df 100644 --- a/lib/view_widget/my_appbar.dart +++ b/lib/view_widget/my_appbar.dart @@ -93,7 +93,7 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget { }, child: Container( width: double.infinity, - margin: EdgeInsets.only(right:34.w), + margin: EdgeInsets.only(right:actions.length == 0 ? 34.w:0), padding: EdgeInsets.all(10), alignment: Alignment.center, child: Text( 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/lib/view_widget/share_dialog.dart b/lib/view_widget/share_dialog.dart index 27d6b54c..5a38f8a9 100644 --- a/lib/view_widget/share_dialog.dart +++ b/lib/view_widget/share_dialog.dart @@ -6,6 +6,7 @@ import 'package:sharesdk_plugin/sharesdk_defines.dart'; class ShareDialog extends StatefulWidget { final Function(ShareSDKPlatform platform) onTap; + ShareDialog(this.onTap); @override @@ -27,10 +28,10 @@ class _ShareDialog extends State { // "assets/image/icon_facebook.webp" ]; List platforms = [ - ShareSDKPlatforms.line, + ShareSDKPlatforms.douyin,//转至回乡 ShareSDKPlatforms.wechatSession, ShareSDKPlatforms.wechatTimeline, - ShareSDKPlatforms.facebook, + ShareSDKPlatforms.facebook,//转至私信 ShareSDKPlatforms.copy ]; @@ -42,7 +43,7 @@ class _ShareDialog extends State { @override Widget build(BuildContext context) { return Container( - height: 200.h, + height: 180.h, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.vertical(top: Radius.circular(8),), @@ -60,7 +61,7 @@ class _ShareDialog extends State { ), ), SizedBox( - height: 28.h, + height: 30.h, ), Row( children: platforms @@ -68,7 +69,7 @@ class _ShareDialog extends State { child: InkWell( onTap: () { widget.onTap(e); - Navigator.of(context).pop(); + // Navigator.of(context).pop(); }, child: Container( child: Column( @@ -81,10 +82,11 @@ class _ShareDialog extends State { height: 40, ), SizedBox( - height: 4.h, + height:8.h, ), Container( - width: 40.w, + width: 42.w, + padding: EdgeInsets.symmetric(horizontal:4.w), child: Text( platformNames[platforms.indexOf(e)], style: TextStyle( @@ -101,26 +103,25 @@ class _ShareDialog extends State { )) .toList(), ), - Spacer(), - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: (){ - Navigator.of(context).pop(); - }, - child: Container( - width: double.infinity, - alignment: Alignment.center, - padding: EdgeInsets.only(top: 14.h,bottom:17.h), - color: Color(0xFF32A060), - child: Text( - S.of(context).quxiao, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 16.sp, - color: Colors.white), - ), - ), - ) + // GestureDetector( + // behavior: HitTestBehavior.opaque, + // onTap: (){ + // Navigator.of(context).pop(); + // }, + // child: Container( + // width: double.infinity, + // alignment: Alignment.center, + // padding: EdgeInsets.only(top: 14.h,bottom:17.h), + // color: Color(0xFF32A060), + // child: Text( + // S.of(context).quxiao, + // style: TextStyle( + // fontWeight: FontWeight.bold, + // fontSize: 16.sp, + // color: Colors.white), + // ), + // ), + // ) ], ), ); 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 f04bcf95..cf5603c4 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, diff --git a/pubspec.lock b/pubspec.lock index a7f3519c..a8dcf94e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -166,7 +166,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: @@ -180,21 +180,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: @@ -307,7 +307,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: