Skip to content

Commit 850be73

Browse files
rstrurstru
committed
更新iOS demo版本至6.8.7957
1 parent 13f1627 commit 850be73

File tree

174 files changed

+11707
-2597
lines changed

Some content is hidden

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

174 files changed

+11707
-2597
lines changed

‎iOS/TRTCDemo.xcodeproj/project.pbxproj

+848-330
Large diffs are not rendered by default.

‎iOS/TRTCDemo.xcodeproj/project.xcworkspace/xcuserdata/liuxiaoya.xcuserdatad/UserInterfaceState.xcuserstate

91.2 KB
Binary file not shown.

‎iOS/TRTCDemo.xcodeproj/project.xcworkspace/xcuserdata/rstru.xcuserdatad/UserInterfaceState.xcuserstate

18.1 KB
Binary file not shown.

‎iOS/TRTCDemo/Assets.xcassets/audio_pause.imageset/Contents.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "audio_pause.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "[email protected]",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "[email protected]",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎iOS/TRTCDemo/Assets.xcassets/audio_pause.imageset/audio_pause.png

114 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_pause.imageset/[email protected]

109 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_pause.imageset/[email protected]

143 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_play.imageset/Contents.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "audio_play.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "[email protected]",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "[email protected]",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎iOS/TRTCDemo/Assets.xcassets/audio_play.imageset/audio_play.png

185 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_play.imageset/[email protected]

249 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_play.imageset/[email protected]

325 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_stop.imageset/Contents.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "audio_stop.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "[email protected]",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "[email protected]",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎iOS/TRTCDemo/Assets.xcassets/audio_stop.imageset/audio_stop.png

100 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_stop.imageset/[email protected]

111 Bytes

‎iOS/TRTCDemo/Assets.xcassets/audio_stop.imageset/[email protected]

117 Bytes

‎iOS/TRTCDemo/Assets.xcassets/multi_room.imageset/Contents.json renamed to ‎iOS/TRTCDemo/Assets.xcassets/camera_dis.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
{
88
"idiom" : "universal",
9-
"filename" : "multi_room@2x.png",
9+
"filename" : "camera_dis.png",
1010
"scale" : "2x"
1111
},
1212
{

‎iOS/TRTCDemo/Assets.xcassets/camera_dis.imageset/camera_dis.png

2.52 KB

‎iOS/TRTCDemo/Assets.xcassets/camera_nol.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "camera_nol.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/camera_nol.imageset/camera_nol.png

2.27 KB

‎iOS/TRTCDemo/Assets.xcassets/cdnLogo.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "cdnLogo.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/cdnLogo.imageset/cdnLogo.png

6.18 KB

‎iOS/TRTCDemo/Assets.xcassets/linkmic_start.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "[email protected]",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/linkmic_start.imageset/[email protected]

3.49 KB

‎iOS/TRTCDemo/Assets.xcassets/linkmic_stop.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "[email protected]",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/linkmic_stop.imageset/[email protected]

3.35 KB

‎iOS/TRTCDemo/Assets.xcassets/members.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "members.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/members.imageset/members.png

6.34 KB

‎iOS/TRTCDemo/Assets.xcassets/multi_room.imageset/[email protected]

-1.72 KB
Binary file not shown.

‎iOS/TRTCDemo/Assets.xcassets/music.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "music.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/music.imageset/music.png

6.29 KB

‎iOS/TRTCDemo/Assets.xcassets/mute_b.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "静音-开.png",
65
"scale" : "1x"
76
},
87
{
98
"idiom" : "universal",
9+
"filename" : "mute_b.png",
1010
"scale" : "2x"
1111
},
1212
{

‎iOS/TRTCDemo/Assets.xcassets/mute_b.imageset/mute_b.png

6.3 KB

‎iOS/TRTCDemo/Assets.xcassets/mute_b.imageset/静音-开.png

-3.48 KB
Binary file not shown.

‎iOS/TRTCDemo/Assets.xcassets/sound.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "sound.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/sound.imageset/sound.png

2.52 KB

‎iOS/TRTCDemo/Assets.xcassets/sound_dis.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "sound_dis.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/sound_dis.imageset/sound_dis.png

2.31 KB

‎iOS/TRTCDemo/Assets.xcassets/watermark.imageset/Contents.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "watermark.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎iOS/TRTCDemo/Assets.xcassets/watermark.imageset/watermark.png

1.46 KB

‎iOS/TRTCDemo/Info.plist

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
<string>1</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
25+
<key>NSAppTransportSecurity</key>
26+
<dict>
27+
<key>NSAllowsArbitraryLoads</key>
28+
<true/>
29+
</dict>
2530
<key>NSCameraUsageDescription</key>
2631
<string>视频云工具包需要访问你的相机权限，开启后录制的视频才会有画面</string>
2732
<key>NSMicrophoneUsageDescription</key>

‎iOS/TRTCDemo/TRTC/Resources/giftSent.aac

5.43 KB
Binary file not shown.

‎iOS/TRTCDemo/TRTC/Resources/on_mic.aac

3.26 KB
Binary file not shown.

‎iOS/TRTCDemo/TRTC/Resources/record_test_background.mp3

114 KB
Binary file not shown.

‎iOS/TRTCDemo/TRTC/Resources/vchat_cheers.m4a

15.2 KB
Binary file not shown.

‎iOS/TRTCDemo/TRTC/Settings/BGMSettings/Bgm/TRTCBgmSettingsCell.h

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Module: TRTCBgmSettingsCell
3+
*
4+
* Function: BGM Cell, 包含播放、暂停、继续、停止操作，以及播放进度的显示
5+
*
6+
* 1. playButton根据BGM的播放状态，来切换播放、暂停和继续操作。
7+
*
8+
* 2. progressView用来显示BGM的播放进度
9+
*
10+
*/
11+
12+
#import "TRTCSettingsBaseCell.h"
13+
#import "TRTCBgmManager.h"
14+
15+
NS_ASSUME_NONNULL_BEGIN
16+
17+
@interface TRTCBgmSettingsCell : TRTCSettingsBaseCell
18+
19+
@end
20+
21+
22+
@interface TRTCBgmSettingsItem : TRTCSettingsBaseItem
23+
24+
@property (strong, nonatomic) TRTCBgmManager *bgmManager;
25+
26+
- (instancetype)initWithTitle:(NSString *)title bgmManager:(TRTCBgmManager *)bgmManager;
27+
28+
@end
29+
30+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)