Skip to content

Commit e81a346

Browse files
authored
Merge pull request #13 from HeraShowFeng/v4.0.0_samplecode
iOS update sample codes with QNRTCKit v4.0.0
2 parents e934d6c + 889f76f commit e81a346

File tree

172 files changed

+7481
-4720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+7481
-4720
lines changed

Group-Video/Group-Video-iOS/Group-Video.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
C3BD41D5224090AB006EAC1D /* Sources */,
117117
C3BD41D6224090AB006EAC1D /* Frameworks */,
118118
C3BD41D7224090AB006EAC1D /* Resources */,
119-
8A9A597390135A23AC72B63D /* [CP] Embed Pods Frameworks */,
119+
6A4E6016372D8195D8C2FABC /* [CP] Embed Pods Frameworks */,
120120
);
121121
buildRules = (
122122
);
@@ -195,7 +195,7 @@
195195
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
196196
showEnvVarsInLog = 0;
197197
};
198-
8A9A597390135A23AC72B63D /* [CP] Embed Pods Frameworks */ = {
198+
6A4E6016372D8195D8C2FABC /* [CP] Embed Pods Frameworks */ = {
199199
isa = PBXShellScriptBuildPhase;
200200
buildActionMask = 2147483647;
201201
files = (
1.98 KB
Binary file not shown.

Group-Video/Group-Video-iOS/Group-Video/Info.plist

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
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>NSAppTransportSecurity</key>
6+
<dict>
7+
<key>NSAllowsArbitraryLoads</key>
8+
<true/>
9+
</dict>
510
<key>NSMicrophoneUsageDescription</key>
611
<string>请允许访问麦克风权限</string>
712
<key>NSCameraUsageDescription</key>

Group-Video/Group-Video-iOS/Group-Video/RoomViewController.m

Lines changed: 116 additions & 171 deletions
Large diffs are not rendered by default.

Group-Video/Group-Video-iOS/Group-Video/ViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ - (void)layoutView {
133133

134134
// 版本 label
135135
UILabel *versionLabel = [[UILabel alloc] initWithFrame:CGRectMake(40, screenHeight - 130, screenWidth - 80, 60)];
136-
NSArray *infoArray = [[QNRTCEngine versionInfo] componentsSeparatedByString:@"-"];
136+
NSArray *infoArray = [[QNRTC versionInfo] componentsSeparatedByString:@"-"];
137137
versionLabel.text = [NSString stringWithFormat:@"版本:v%@\n\n更新时间:%@-%@-%@", infoArray[0], infoArray[1], infoArray[2], infoArray[3]];
138138
versionLabel.textColor = [UIColor colorWithRed:155/255.0 green:155/255.0 blue:155/255.0 alpha:1.0];
139139
versionLabel.font = [UIFont fontWithName:@"HelveticaNeue-Light" size:13.0];
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
PODS:
2-
- QNRTCKit (2.4.0)
2+
- QNRTCKit (4.0.0):
3+
- QNRTCKit/Core (= 4.0.0)
4+
- QNRTCKit/Core (4.0.0)
35

46
DEPENDENCIES:
57
- QNRTCKit
@@ -9,8 +11,8 @@ SPEC REPOS:
911
- QNRTCKit
1012

1113
SPEC CHECKSUMS:
12-
QNRTCKit: 06e6317ed855a0729550e2f1b9701202fc62cd90
14+
QNRTCKit: 57e4cc2b5273b274bab1ae8ea3d5e5b90fc984bb
1315

1416
PODFILE CHECKSUM: 950871f85093ecd5f5cd834cbdd3120d977fd4a7
1517

16-
COCOAPODS: 1.9.1
18+
COCOAPODS: 1.11.2

Group-Video/Group-Video-iOS/Pods/Manifest.lock

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)