From cc3b183a78ff5a34ac3459a0992149fb73f87c15 Mon Sep 17 00:00:00 2001 From: lcy <2503978335@qq.com> Date: Sun, 2 Jul 2023 17:40:04 +0800 Subject: [PATCH] feat:ios启动图/logo --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++++++++ ios/Runner/Assets.xcassets/AppIcon.appiconset/1024*1024.png | Bin 0 -> 290099 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120 1.png | Bin 0 -> 18285 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120.png | Bin 0 -> 18285 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/152*152.png | Bin 0 -> 24068 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/167*167.png | Bin 0 -> 27228 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/180*180.png | Bin 0 -> 30314 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/20*20.png | Bin 0 -> 4833 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29 1.png | Bin 0 -> 5452 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29.png | Bin 0 -> 5452 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 1.png | Bin 0 -> 6433 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 2.png | Bin 0 -> 6433 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 3.png | Bin 0 -> 6433 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 1.png | Bin 0 -> 8494 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 2.png | Bin 0 -> 8494 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/60*60.png | Bin 0 -> 8817 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/76*76.png | Bin 0 -> 11353 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80 1.png | Bin 0 -> 11378 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80.png | Bin 0 -> 11378 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png | Bin 10932 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 295 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 406 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 450 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 282 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 462 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 704 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 406 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 586 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 862 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 862 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 1674 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 762 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 1226 -> 0 bytes ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png | Bin 1418 -> 0 bytes ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json | 8 +++----- ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png | Bin 68 -> 0 bytes ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png | Bin 68 -> 0 bytes ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png | Bin 68 -> 0 bytes ios/Runner/Assets.xcassets/LaunchImage.imageset/qidongye.png | Bin 0 -> 250341 bytes lib/app/splash_page.dart | 14 ++++++++++++++ lib/main.dart | 11 ++--------- lib/pages/repeataftercontent/bloc/repeat_after_content_bloc.dart | 22 ++++++++++++++++++++-- lib/pages/repeataftercontent/bloc/repeat_after_content_event.dart | 2 ++ 44 files changed, 112 insertions(+), 75 deletions(-) create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/1024*1024.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120 1.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/152*152.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/167*167.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/180*180.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/20*20.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29 1.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 1.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 2.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 3.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 1.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 2.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/60*60.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/76*76.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80 1.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png delete mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png delete mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/qidongye.png diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 5eb4cfe..c2b4410 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -505,8 +505,12 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.kouyuxingqiu.wowenglish; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; @@ -685,9 +689,13 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.kouyuxingqiu.wowenglish; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -709,8 +717,12 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.kouyuxingqiu.wowenglish; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024*1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024*1024.png new file mode 100644 index 0000000..0d45666 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024*1024.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120 1.png new file mode 100644 index 0000000..8674340 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120.png new file mode 100644 index 0000000..8674340 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120*120.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152*152.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152*152.png new file mode 100644 index 0000000..3ea10da Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152*152.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167*167.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167*167.png new file mode 100644 index 0000000..03c7fe7 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167*167.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180*180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180*180.png new file mode 100644 index 0000000..3fec390 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180*180.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20*20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20*20.png new file mode 100644 index 0000000..3cdb365 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20*20.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29 1.png new file mode 100644 index 0000000..943f272 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29.png new file mode 100644 index 0000000..943f272 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29*29.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 1.png new file mode 100644 index 0000000..7e19ec3 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 2.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 2.png new file mode 100644 index 0000000..7e19ec3 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 2.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 3.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 3.png new file mode 100644 index 0000000..7e19ec3 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40*40 3.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 1.png new file mode 100644 index 0000000..e1ecb56 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 2.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 2.png new file mode 100644 index 0000000..e1ecb56 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58*58 2.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60*60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60*60.png new file mode 100644 index 0000000..b9e2479 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60*60.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76*76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76*76.png new file mode 100644 index 0000000..220adae Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76*76.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80 1.png new file mode 100644 index 0000000..25b0c36 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80.png new file mode 100644 index 0000000..25b0c36 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80*80.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fa..42346c9 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1,122 @@ { "images" : [ { - "size" : "20x20", + "filename" : "40*40 1.png", "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "60*60.png", "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "29*29.png", "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "58*58 1.png", "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "80*80.png", "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "120*120.png", "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { - "size" : "60x60", + "filename" : "120*120 1.png", "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { - "size" : "60x60", + "filename" : "180*180.png", "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", + "filename" : "20*20.png", "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "40*40 2.png", "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "29*29 1.png", "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "58*58 2.png", "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "40*40 3.png", "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "80*80 1.png", "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "76x76", + "filename" : "76*76.png", "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", + "filename" : "152*152.png", "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" }, { - "size" : "83.5x83.5", + "filename" : "167*167.png", "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", + "filename" : "1024*1024.png", "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada4..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 7353c41..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 797d452..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index 6ed2d93..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cd7b00..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index fe73094..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index 321773c..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 797d452..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index 502f463..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index 0ec3034..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index 0ec3034..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index e9f5fea..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index 84ac32a..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 8953cba..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index 0467bf1..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json index 0bedcf2..199bc44 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -1,23 +1,21 @@ { "images" : [ { + "filename" : "qidongye.png", "idiom" : "universal", - "filename" : "LaunchImage.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "LaunchImage@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "LaunchImage@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/qidongye.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/qidongye.png new file mode 100644 index 0000000..3786558 Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/qidongye.png differ diff --git a/lib/app/splash_page.dart b/lib/app/splash_page.dart index 72c8c23..1bb4d0d 100644 --- a/lib/app/splash_page.dart +++ b/lib/app/splash_page.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -7,6 +8,8 @@ import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/models/user_entity.dart'; import 'package:wow_english/route/route.dart'; import 'package:wow_english/utils/sp_util.dart'; +import 'package:flutter/services.dart'; +import 'package:limiting_direction_csx/limiting_direction_csx.dart'; class SplashPage extends StatelessWidget { const SplashPage({super.key}); @@ -52,6 +55,17 @@ class _TransitionViewState extends State { void init() async { await SpUtil.preInit(); startTime(); + changeDevice(); + } + + void changeDevice() async { + ///设置设备默认方向 + WidgetsFlutterBinding.ensureInitialized(); + if (Platform.isIOS) { + await LimitingDirectionCsx.setScreenDirection(DeviceDirectionMask.Landscape); + } else { + await SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft,DeviceOrientation.landscapeRight]); + } } @override diff --git a/lib/main.dart b/lib/main.dart index b4229ab..1a00d79 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,17 +5,10 @@ import 'package:limiting_direction_csx/limiting_direction_csx.dart'; import 'package:wow_english/app/app.dart'; import 'package:flutter/services.dart'; -void main() async { +void main() { ///设置设备默认方向 WidgetsFlutterBinding.ensureInitialized(); - if (Platform.isIOS) { - await LimitingDirectionCsx.setScreenDirection(DeviceDirectionMask.Landscape); - } else { - await SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft,DeviceOrientation.landscapeRight]); - // SystemChrome.setEnabledSystemUIMode( - // SystemUiMode.manual, - // overlays: [SystemUiOverlay.top], - // ); + if (Platform.isAndroid) { SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( //设置状态栏透明 statusBarColor: Colors.transparent, )); diff --git a/lib/pages/repeataftercontent/bloc/repeat_after_content_bloc.dart b/lib/pages/repeataftercontent/bloc/repeat_after_content_bloc.dart index 2311203..b8898b7 100644 --- a/lib/pages/repeataftercontent/bloc/repeat_after_content_bloc.dart +++ b/lib/pages/repeataftercontent/bloc/repeat_after_content_bloc.dart @@ -2,7 +2,6 @@ import 'package:audioplayers/audioplayers.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:wow_english/common/request/dao/listen_dao.dart'; import '../../../common/request/exception.dart'; @@ -47,6 +46,8 @@ class RepeatAfterContentBloc extends Bloc _videoPlaying; @@ -67,6 +68,7 @@ class RepeatAfterContentBloc extends Bloc(_voiceRecordStateChange); + on(_postFollowReadContent); on(_videoPlayStateChange); on(_recordeVoicePlay); on(_voiceXsResult); @@ -103,6 +105,7 @@ class RepeatAfterContentBloc extends Bloc emitter) async { + try { + await loading(() async { + _entityList = await ListenDao.followResult(_recordNumber.toString(),courseLessonId); + + }); + } catch (e) { + if (e is ApiException) { + + } + } + } + void _videoPlayStateChange(VideoPlayChangeEvent event,Emitter emitter) async { _videoPlaying = !_videoPlaying; emitter(VideoPlayChangeState()); @@ -165,6 +182,7 @@ class RepeatAfterContentBloc extends Bloc