Skip to content

Commit 2466e4c

Browse files
authored
[API-Example][Mac] TRTC-Example: High-version permission adaptation & changing digital room numbers to string room numbers (#40)
1 parent ff2c829 commit 2466e4c

53 files changed

Lines changed: 83 additions & 53 deletions

File tree

Some content is hidden

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

TRTC-API-Example-OC/Advanced/CustomCamera/CustomCaptureViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ - (void)enterRoom {
137137
// Enter trtc room.
138138
TRTCParams *params = [[TRTCParams alloc] init];
139139
params.sdkAppId = SDKAppID;
140-
params.roomId = [self.roomIDTextField.text intValue];
140+
params.strRoomId = self.roomIDTextField.text;
141141
params.userId = self.userIDTextField.text;
142142
params.userSig = [GenerateTestUserSig genTestUserSig:self.userIDTextField.text];
143143
params.role = TRTCRoleAnchor;

TRTC-API-Example-OC/Advanced/CustomCamera/Helper/Render/CustomCameraFrameRender.m

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@ - (void)start:(NSString *)userId videoView:(UIImageView *)videoView
3838
}
3939

4040
- (void)stop {
41-
UIGraphicsBeginImageContext(_localVideoView.bounds.size);
41+
CGSize size = _localVideoView.bounds.size;
42+
if (size.width <= 0 || size.height <= 0) {
43+
_localVideoView.image = nil;
44+
return;
45+
}
46+
47+
UIGraphicsBeginImageContext(size);
4248
UIColor * color = [UIColor clearColor];
4349
[color setFill];
4450
UIImage * image = UIGraphicsGetImageFromCurrentImageContext();

TRTC-API-Example-OC/Advanced/JoinMultipleRoom/JoinMultipleRoomViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ - (void)enterRoomWithSubId:(NSInteger)subId {
104104
params.sdkAppId = SDKAppID;
105105

106106
UITextField* roomIdTextField = _roomIdArr[subId];
107-
params.roomId = [roomIdTextField.text intValue];
107+
params.strRoomId = roomIdTextField.text;
108108
params.userId = @"1345736";
109109
params.role = TRTCRoleAnchor;
110110
params.userSig = [GenerateTestUserSig genTestUserSig:params.userId];

TRTC-API-Example-OC/Advanced/LocalRecord/LocalRecordViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ - (void)startPushStream {
114114

115115
TRTCParams *params = [[TRTCParams alloc] init];
116116
params.sdkAppId = SDKAppID;
117-
params.roomId = roomId;
117+
params.strRoomId = [@(roomId) stringValue];
118118
params.userId = [NSString generateRandomUserId];
119119
params.userSig = [GenerateTestUserSig genTestUserSig:params.userId];
120120
params.role = TRTCRoleAnchor;

TRTC-API-Example-OC/Advanced/LocalVideoShare/LocalVideoShareViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ - (void)setupTRTCCloud {
119119
TRTCParams *params = [TRTCParams new];
120120

121121
params.sdkAppId = SDKAppID;
122-
params.roomId = [_roomIdTextField.text intValue];
122+
params.strRoomId = _roomIdTextField.text;
123123
params.userId = @"4123567";
124124
params.role = TRTCRoleAnchor;
125125
params.userSig = [GenerateTestUserSig genTestUserSig:params.userId];

TRTC-API-Example-OC/Advanced/LocalVideoShare/helper/CustomFrameRender.m

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ @implementation CustomFrameRender
1212

1313
+ (void)clearImageView:(UIImageView*)imageView {
1414
dispatch_async(dispatch_get_main_queue(), ^{
15-
UIGraphicsBeginImageContext(imageView.bounds.size);
15+
CGSize size = imageView.bounds.size;
16+
if (size.width <= 0 || size.height <= 0) {
17+
imageView.image = nil;
18+
return;
19+
}
20+
21+
UIGraphicsBeginImageContext(size);
1622
UIColor * color = [UIColor clearColor];
1723
[color setFill];
1824
UIImage * image = UIGraphicsGetImageFromCurrentImageContext();

TRTC-API-Example-OC/Advanced/PictureInPicture/PictureInPictureViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ - (void)enterRoom {
128128
// Enter trtc room.
129129
TRTCParams *params = [[TRTCParams alloc] init];
130130
params.sdkAppId = SDKAppID;
131-
params.roomId = [self.roomIDTextField.text intValue];
131+
params.strRoomId = self.roomIDTextField.text;
132132
params.userId = self.userIDTextField.text;
133133
params.userSig = [GenerateTestUserSig genTestUserSig:self.userIDTextField.text];
134134
params.role = TRTCRoleAnchor;

TRTC-API-Example-OC/Advanced/PushCDN/PushCDNAnchorViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ - (void)enterTRTCRoom {
277277

278278
TRTCParams *params = [[TRTCParams alloc] init];
279279
params.sdkAppId = SDKAppID;
280-
params.roomId = [self.roomIDTextField.text intValue];
280+
params.strRoomId = self.roomIDTextField.text;
281281
params.userId = self.userID;
282282
params.userSig = [GenerateTestUserSig genTestUserSig:self.userID];
283283
params.role = TRTCRoleAnchor;

TRTC-API-Example-OC/Advanced/RoomPk/RoomPkViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ - (void)setupTRTCCloud {
100100

101101
TRTCParams *params = [TRTCParams new];
102102
params.sdkAppId = SDKAppID;
103-
params.roomId = [_roomIdTextField.text intValue];
103+
params.strRoomId = _roomIdTextField.text;
104104
params.userId = _userIdTextField.text;
105105
params.role = TRTCRoleAnchor;
106106
params.userSig = [GenerateTestUserSig genTestUserSig:params.userId];

TRTC-API-Example-OC/Advanced/SEIMessage/SendAndReceiveSEIMessageViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ - (void)startPushStream {
228228
self.title = localizeReplace(localize(@"TRTC-API-Example.SendAndReceiveSEI.Title"), self.roomIdTextField.text);
229229
TRTCParams *params = [[TRTCParams alloc] init];
230230
params.sdkAppId = SDKAppID;
231-
params.roomId = [self.roomIdTextField.text intValue];
231+
params.strRoomId = self.roomIdTextField.text;
232232
params.userId = self.userIdTextField.text;
233233
params.userSig = [GenerateTestUserSig genTestUserSig:self.userIdTextField.text];
234234
params.role = TRTCRoleAnchor;

0 commit comments

Comments
 (0)