Skip to content
This repository was archived by the owner on Nov 8, 2025. It is now read-only.

Commit b6011b8

Browse files
suzp1984suzp1984
committed
debug #4052: let project works for latest flutter sdk.
1 parent 02a861b commit b6011b8

File tree

11 files changed

+405
-292
lines changed

11 files changed

+405
-292
lines changed

‎example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
additional functionality it is fine to subclass or reimplement
77
FlutterApplication and put your custom class here. -->
88
<application
9-
android:name="io.flutter.app.FlutterApplication"
9+
android:name="{applicationName}"
1010
android:label="SRS直播"
1111
android:icon="@mipmap/ic_launcher">
1212
<activity
@@ -44,6 +44,10 @@
4444
android:name="flutterEmbedding"
4545
android:value="2" />
4646
</application>
47+
<meta-data
48+
android:name="flutterEmbedding"
49+
android:value="2"
50+
/>
4751
<!-- Play network live streaming -->
4852
<uses-permission android:name="android.permission.INTERNET" />
4953
<!-- For webrtc live streaming -->

‎example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎example/ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '10.0'
2+
platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎example/ios/Podfile.lock‎

Lines changed: 31 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,42 @@
11
PODS:
2-
- BIJKPlayer (0.7.15)
3-
- camera_with_rtmp (0.0.1):
4-
- Flutter
5-
- HaishinKit (~> 1.0.10)
6-
- fijkplayer (0.8.8):
7-
- BIJKPlayer (~> 0.7.10)
2+
- BIJKPlayer (0.7.16)
3+
- fijkplayer (0.11.0):
4+
- BIJKPlayer (~> 0.7.16)
85
- Flutter
96
- Flutter (1.0.0)
107
- flutter_live (0.0.1):
118
- Flutter
12-
- flutter_webrtc (0.2.2):
9+
- flutter_webrtc (0.9.36):
1310
- Flutter
14-
- GoogleWebRTC (= 1.1.31999)
15-
- Libyuv (= 1703)
16-
- GoogleWebRTC (1.1.31999)
17-
- HaishinKit (1.0.13):
18-
- Logboard (~> 2.1.3)
19-
- Libyuv (1703)
20-
- Logboard (2.1.3)
11+
- WebRTC-SDK (= 114.5735.10)
2112
- package_info (0.0.1):
2213
- Flutter
23-
- path_provider (0.0.1):
14+
- path_provider_foundation (0.0.1):
2415
- Flutter
25-
- shared_preferences (0.0.1):
16+
- FlutterMacOS
17+
- shared_preferences_foundation (0.0.1):
2618
- Flutter
27-
- url_launcher (0.0.1):
19+
- FlutterMacOS
20+
- url_launcher_ios (0.0.1):
2821
- Flutter
22+
- WebRTC-SDK (114.5735.10)
2923

3024
DEPENDENCIES:
31-
- camera_with_rtmp (from `.symlinks/plugins/camera_with_rtmp/ios`)
3225
- fijkplayer (from `.symlinks/plugins/fijkplayer/ios`)
3326
- Flutter (from `Flutter`)
3427
- flutter_live (from `.symlinks/plugins/flutter_live/ios`)
3528
- flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
3629
- package_info (from `.symlinks/plugins/package_info/ios`)
37-
- path_provider (from `.symlinks/plugins/path_provider/ios`)
38-
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
39-
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
30+
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
31+
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
32+
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
4033

4134
SPEC REPOS:
4235
trunk:
4336
- BIJKPlayer
44-
- GoogleWebRTC
45-
- HaishinKit
46-
- Libyuv
47-
- Logboard
37+
- WebRTC-SDK
4838

4939
EXTERNAL SOURCES:
50-
camera_with_rtmp:
51-
:path: ".symlinks/plugins/camera_with_rtmp/ios"
5240
fijkplayer:
5341
:path: ".symlinks/plugins/fijkplayer/ios"
5442
Flutter:
@@ -59,29 +47,25 @@ EXTERNAL SOURCES:
5947
:path: ".symlinks/plugins/flutter_webrtc/ios"
6048
package_info:
6149
:path: ".symlinks/plugins/package_info/ios"
62-
path_provider:
63-
:path: ".symlinks/plugins/path_provider/ios"
64-
shared_preferences:
65-
:path: ".symlinks/plugins/shared_preferences/ios"
66-
url_launcher:
67-
:path: ".symlinks/plugins/url_launcher/ios"
50+
path_provider_foundation:
51+
:path: ".symlinks/plugins/path_provider_foundation/darwin"
52+
shared_preferences_foundation:
53+
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
54+
url_launcher_ios:
55+
:path: ".symlinks/plugins/url_launcher_ios/ios"
6856

6957
SPEC CHECKSUMS:
70-
BIJKPlayer: 37fd8033360eedfb1afc3658e14fbf5a25ace540
71-
camera_with_rtmp: 606d566f89a21f1fed15ffda99cb247304beccd4
72-
fijkplayer: 0d3793a2822d030ef5bba77f904bff1f7a91a115
73-
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
58+
BIJKPlayer: 4c5d66e5cb99ae5bade6f22a4fcc031722a81c64
59+
fijkplayer: 8b6d864948dc28e6e07248ed4fce61a7467db4df
60+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
7461
flutter_live: efecc5d284c5a3721d436eebd5ea4322eef31a08
75-
flutter_webrtc: 39898454258b54ba51996850d5da8d5d53bf1524
76-
GoogleWebRTC: b39a78c4f5cc6b0323415b9233db03a2faa7b0f0
77-
HaishinKit: d1786896ace24065d466bde02356c5352ac001b0
78-
Libyuv: 5f79ced0ee66e60a612ca97de1e6ccacd187a437
79-
Logboard: e74ec2d9941abd22f4db3a3ddcd0735011df92c7
62+
flutter_webrtc: b33475c3a57d59ff05bf87b4f5d3feceac63f291
8063
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
81-
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
82-
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
83-
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
64+
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
65+
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
66+
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
67+
WebRTC-SDK: 8c0edd05b880a39648118192c252667ea06dea51
8468

85-
PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
69+
PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
8670

87-
COCOAPODS: 1.10.2
71+
COCOAPODS: 1.15.2

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -155,7 +155,7 @@
155155
97C146E61CF9000F007C117D /* Project object */ = {
156156
isa = PBXProject;
157157
attributes = {
158-
LastUpgradeCheck = 1020;
158+
LastUpgradeCheck = 1510;
159159
ORGANIZATIONNAME = "";
160160
TargetAttributes = {
161161
97C146ED1CF9000F007C117D = {
@@ -199,10 +199,12 @@
199199
/* Begin PBXShellScriptBuildPhase section */
200200
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
201201
isa = PBXShellScriptBuildPhase;
202+
alwaysOutOfDate = 1;
202203
buildActionMask = 2147483647;
203204
files = (
204205
);
205206
inputPaths = (
207+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
206208
);
207209
name = "Thin Binary";
208210
outputPaths = (
@@ -230,6 +232,7 @@
230232
};
231233
9740EEB61CF901F6004384FC /* Run Script */ = {
232234
isa = PBXShellScriptBuildPhase;
235+
alwaysOutOfDate = 1;
233236
buildActionMask = 2147483647;
234237
files = (
235238
);
@@ -339,7 +342,7 @@
339342
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
340343
GCC_WARN_UNUSED_FUNCTION = YES;
341344
GCC_WARN_UNUSED_VARIABLE = YES;
342-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
345+
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
343346
MTL_ENABLE_DEBUG_INFO = NO;
344347
SDKROOT = iphoneos;
345348
SUPPORTED_PLATFORMS = iphoneos;
@@ -355,6 +358,7 @@
355358
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
356359
CLANG_ENABLE_MODULES = YES;
357360
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
361+
DEVELOPMENT_TEAM = 4X75RZ9C85;
358362
ENABLE_BITCODE = NO;
359363
FRAMEWORK_SEARCH_PATHS = (
360364
"$(inherited)",
@@ -369,7 +373,7 @@
369373
"$(inherited)",
370374
"$(PROJECT_DIR)/Flutter",
371375
);
372-
PRODUCT_BUNDLE_IDENTIFIER = net.ossrs.flutterLive;
376+
PRODUCT_BUNDLE_IDENTIFIER = net.ossrs.flutterLive2;
373377
PRODUCT_NAME = "$(TARGET_NAME)";
374378
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
375379
SWIFT_VERSION = 5.0;
@@ -424,7 +428,7 @@
424428
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
425429
GCC_WARN_UNUSED_FUNCTION = YES;
426430
GCC_WARN_UNUSED_VARIABLE = YES;
427-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
431+
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
428432
MTL_ENABLE_DEBUG_INFO = YES;
429433
ONLY_ACTIVE_ARCH = YES;
430434
SDKROOT = iphoneos;
@@ -473,7 +477,7 @@
473477
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
474478
GCC_WARN_UNUSED_FUNCTION = YES;
475479
GCC_WARN_UNUSED_VARIABLE = YES;
476-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
480+
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
477481
MTL_ENABLE_DEBUG_INFO = NO;
478482
SDKROOT = iphoneos;
479483
SUPPORTED_PLATFORMS = iphoneos;
@@ -491,6 +495,7 @@
491495
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
492496
CLANG_ENABLE_MODULES = YES;
493497
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
498+
DEVELOPMENT_TEAM = 4X75RZ9C85;
494499
ENABLE_BITCODE = NO;
495500
FRAMEWORK_SEARCH_PATHS = (
496501
"$(inherited)",
@@ -505,7 +510,7 @@
505510
"$(inherited)",
506511
"$(PROJECT_DIR)/Flutter",
507512
);
508-
PRODUCT_BUNDLE_IDENTIFIER = net.ossrs.flutterLive;
513+
PRODUCT_BUNDLE_IDENTIFIER = net.ossrs.flutterLive2;
509514
PRODUCT_NAME = "$(TARGET_NAME)";
510515
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
511516
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -521,6 +526,7 @@
521526
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
522527
CLANG_ENABLE_MODULES = YES;
523528
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
529+
DEVELOPMENT_TEAM = 4X75RZ9C85;
524530
ENABLE_BITCODE = NO;
525531
FRAMEWORK_SEARCH_PATHS = (
526532
"$(inherited)",
@@ -535,7 +541,7 @@
535541
"$(inherited)",
536542
"$(PROJECT_DIR)/Flutter",
537543
);
538-
PRODUCT_BUNDLE_IDENTIFIER = net.ossrs.flutterLive;
544+
PRODUCT_BUNDLE_IDENTIFIER = net.ossrs.flutterLive2;
539545
PRODUCT_NAME = "$(TARGET_NAME)";
540546
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
541547
SWIFT_VERSION = 5.0;

‎example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:Runner.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Runner.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Profile"

‎example/ios/Runner/Info.plist‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>$(DEVELOPMENT_LANGUAGE)</string>
79
<key>CFBundleExecutable</key>
@@ -22,6 +24,12 @@
2224
<string>$(FLUTTER_BUILD_NUMBER)</string>
2325
<key>LSRequiresIPhoneOS</key>
2426
<true/>
27+
<key>NSCameraUsageDescription</key>
28+
<string>$(PRODUCT_NAME) Camera Usage!</string>
29+
<key>NSMicrophoneUsageDescription</key>
30+
<string>$(PRODUCT_NAME) Microphone Usage!</string>
31+
<key>UIApplicationSupportsIndirectInputEvents</key>
32+
<true/>
2533
<key>UILaunchStoryboardName</key>
2634
<string>LaunchScreen</string>
2735
<key>UIMainStoryboardFile</key>
@@ -41,9 +49,5 @@
4149
</array>
4250
<key>UIViewControllerBasedStatusBarAppearance</key>
4351
<false/>
44-
<key>NSCameraUsageDescription</key>
45-
<string>$(PRODUCT_NAME) Camera Usage!</string>
46-
<key>NSMicrophoneUsageDescription</key>
47-
<string>$(PRODUCT_NAME) Microphone Usage!</string>
4852
</dict>
4953
</plist>

0 commit comments

Comments
 (0)