Skip to content

Commit 1991e57

Browse files
enough0enough0
committed
merge ktvapi
1 parent e3fb5a6 commit 1991e57

20 files changed

+4101
-1447
lines changed

‎KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
E3CB4D602A935EBD00322389 /* 成都.xml in Resources */ = {isa = PBXBuildFile; fileRef = E3CB4D5F2A935EBD00322389 /* 成都.xml */; };
10+
E38BDE782B6F7A78007A2834 /* KTVGiantChorusApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38BDE772B6F7A77007A2834 /* KTVGiantChorusApiImpl.swift */; };
11+
E38BDE7A2B6F7ABD007A2834 /* ApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38BDE792B6F7ABD007A2834 /* ApiManager.swift */; };
12+
E39BAF762B6CC695002C692F /* LrcTime.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = E39BAF742B6CC695002C692F /* LrcTime.pb.swift */; };
13+
E39BAF772B6CC695002C692F /* LrcTime.proto in Sources */ = {isa = PBXBuildFile; fileRef = E39BAF752B6CC695002C692F /* LrcTime.proto */; };
14+
E39BAF792B6CCC65002C692F /* 不如跳舞.xml in Resources */ = {isa = PBXBuildFile; fileRef = E39BAF782B6CCC65002C692F /* 不如跳舞.xml */; };
15+
E39BAF7B2B6CCC74002C692F /* 不如跳舞.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = E39BAF7A2B6CCC74002C692F /* 不如跳舞.mp4 */; };
1116
E3ED270B2A822E9D0087B7AA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3ED270A2A822E9D0087B7AA /* AppDelegate.swift */; };
1217
E3ED270D2A822E9D0087B7AA /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3ED270C2A822E9D0087B7AA /* SceneDelegate.swift */; };
1318
E3ED270F2A822E9D0087B7AA /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3ED270E2A822E9D0087B7AA /* ViewController.swift */; };
@@ -28,15 +33,19 @@
2833
E3ED27392A8312120087B7AA /* AgoraStringExtention.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3ED27312A8312120087B7AA /* AgoraStringExtention.swift */; };
2934
E3ED273A2A8312120087B7AA /* AgoraURLExtention.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3ED27322A8312120087B7AA /* AgoraURLExtention.swift */; };
3035
E3ED273B2A8312120087B7AA /* AgoraDownLoadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3ED27332A8312120087B7AA /* AgoraDownLoadManager.swift */; };
31-
E3FE65332B20638D001D6BF9 /* 成都.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E3FE65322B20638D001D6BF9 /* 成都.mp3 */; };
3236
F33427D772BC45C43FBC8F23 /* Pods_KTVApiDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AFBE8E6CA2314F17EF33468 /* Pods_KTVApiDemo.framework */; };
3337
/* End PBXBuildFile section */
3438

3539
/* Begin PBXFileReference section */
3640
0AFBE8E6CA2314F17EF33468 /* Pods_KTVApiDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_KTVApiDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3741
91649F2302F7D5A73F303630 /* Pods-KTVApiDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KTVApiDemo.release.xcconfig"; path = "Target Support Files/Pods-KTVApiDemo/Pods-KTVApiDemo.release.xcconfig"; sourceTree = "<group>"; };
3842
AFA8596CCA93FAF74AD1D2D5 /* Pods-KTVApiDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KTVApiDemo.debug.xcconfig"; path = "Target Support Files/Pods-KTVApiDemo/Pods-KTVApiDemo.debug.xcconfig"; sourceTree = "<group>"; };
39-
E3CB4D5F2A935EBD00322389 /* 成都.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "成都.xml"; sourceTree = "<group>"; };
43+
E38BDE772B6F7A77007A2834 /* KTVGiantChorusApiImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KTVGiantChorusApiImpl.swift; sourceTree = "<group>"; };
44+
E38BDE792B6F7ABD007A2834 /* ApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApiManager.swift; sourceTree = "<group>"; };
45+
E39BAF742B6CC695002C692F /* LrcTime.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LrcTime.pb.swift; sourceTree = "<group>"; };
46+
E39BAF752B6CC695002C692F /* LrcTime.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = LrcTime.proto; sourceTree = "<group>"; };
47+
E39BAF782B6CCC65002C692F /* 不如跳舞.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "不如跳舞.xml"; sourceTree = "<group>"; };
48+
E39BAF7A2B6CCC74002C692F /* 不如跳舞.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "不如跳舞.mp4"; sourceTree = "<group>"; };
4049
E3ED27072A822E9D0087B7AA /* KTVApiDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KTVApiDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
4150
E3ED270A2A822E9D0087B7AA /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4251
E3ED270C2A822E9D0087B7AA /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -59,7 +68,6 @@
5968
E3ED27312A8312120087B7AA /* AgoraStringExtention.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgoraStringExtention.swift; sourceTree = "<group>"; };
6069
E3ED27322A8312120087B7AA /* AgoraURLExtention.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgoraURLExtention.swift; sourceTree = "<group>"; };
6170
E3ED27332A8312120087B7AA /* AgoraDownLoadManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgoraDownLoadManager.swift; sourceTree = "<group>"; };
62-
E3FE65322B20638D001D6BF9 /* 成都.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "成都.mp3"; sourceTree = "<group>"; };
6371
/* End PBXFileReference section */
6472

6573
/* Begin PBXFrameworksBuildPhase section */
@@ -115,9 +123,9 @@
115123
E3ED27232A8230A00087B7AA /* KeyCenter.swift */,
116124
E3ED270A2A822E9D0087B7AA /* AppDelegate.swift */,
117125
E3ED270C2A822E9D0087B7AA /* SceneDelegate.swift */,
118-
E3CB4D5F2A935EBD00322389 /* 成都.xml */,
119-
E3FE65322B20638D001D6BF9 /* 成都.mp3 */,
120126
E3ED270E2A822E9D0087B7AA /* ViewController.swift */,
127+
E39BAF782B6CCC65002C692F /* 不如跳舞.xml */,
128+
E39BAF7A2B6CCC74002C692F /* 不如跳舞.mp4 */,
121129
E3ED27252A8236750087B7AA /* KTVViewController.swift */,
122130
E3ED27292A826B0D0087B7AA /* KTVLyricView.swift */,
123131
E3ED272B2A8312120087B7AA /* FileDownloadCache */,
@@ -136,6 +144,10 @@
136144
children = (
137145
E3ED271F2A822ED30087B7AA /* KTVApiImpl.swift */,
138146
E3ED27202A822ED30087B7AA /* KTVApi.swift */,
147+
E38BDE772B6F7A77007A2834 /* KTVGiantChorusApiImpl.swift */,
148+
E38BDE792B6F7ABD007A2834 /* ApiManager.swift */,
149+
E39BAF742B6CC695002C692F /* LrcTime.pb.swift */,
150+
E39BAF752B6CC695002C692F /* LrcTime.proto */,
139151
);
140152
path = KTVAPI;
141153
sourceTree = "<group>";
@@ -217,9 +229,9 @@
217229
files = (
218230
E3ED27172A822E9E0087B7AA /* LaunchScreen.storyboard in Resources */,
219231
E3ED27142A822E9E0087B7AA /* Assets.xcassets in Resources */,
220-
E3FE65332B20638D001D6BF9 /* 成都.mp3 in Resources */,
221-
E3CB4D602A935EBD00322389 /* 成都.xml in Resources */,
222232
E3ED27122A822E9D0087B7AA /* Main.storyboard in Resources */,
233+
E39BAF7B2B6CCC74002C692F /* 不如跳舞.mp4 in Resources */,
234+
E39BAF792B6CCC65002C692F /* 不如跳舞.xml in Resources */,
223235
);
224236
runOnlyForDeploymentPostprocessing = 0;
225237
};
@@ -275,11 +287,14 @@
275287
E3ED27392A8312120087B7AA /* AgoraStringExtention.swift in Sources */,
276288
E3ED273B2A8312120087B7AA /* AgoraDownLoadManager.swift in Sources */,
277289
E3ED27212A822ED30087B7AA /* KTVApiImpl.swift in Sources */,
290+
E39BAF772B6CC695002C692F /* LrcTime.proto in Sources */,
278291
E3ED27222A822ED30087B7AA /* KTVApi.swift in Sources */,
279292
E3ED270F2A822E9D0087B7AA /* ViewController.swift in Sources */,
280293
E3ED270B2A822E9D0087B7AA /* AppDelegate.swift in Sources */,
281294
E3ED27342A8312120087B7AA /* AgoraMiguXmlLrcParse.swift in Sources */,
295+
E39BAF762B6CC695002C692F /* LrcTime.pb.swift in Sources */,
282296
E3ED27282A8243480087B7AA /* NetworkManager.swift in Sources */,
297+
E38BDE7A2B6F7ABD007A2834 /* ApiManager.swift in Sources */,
283298
E3ED27242A8230A00087B7AA /* KeyCenter.swift in Sources */,
284299
E3ED27382A8312120087B7AA /* AgoraCacheFileHandle.swift in Sources */,
285300
E3ED272A2A826B0D0087B7AA /* KTVLyricView.swift in Sources */,
@@ -288,6 +303,7 @@
288303
E3ED27352A8312120087B7AA /* AgoraLrcParse.swift in Sources */,
289304
E3ED273A2A8312120087B7AA /* AgoraURLExtention.swift in Sources */,
290305
E3ED27372A8312120087B7AA /* AgoraLrcModel.swift in Sources */,
306+
E38BDE782B6F7A78007A2834 /* KTVGiantChorusApiImpl.swift in Sources */,
291307
E3ED27362A8312120087B7AA /* AgoraRequestTask.swift in Sources */,
292308
);
293309
runOnlyForDeploymentPostprocessing = 0;

‎KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo.xcodeproj/xcuserdata/cp.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>KTVApiDemo.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>6</integer>
10+
<integer>8</integer>
1111
</dict>
1212
</dict>
1313
</dict>

‎KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo/Base.lproj/Main.storyboard‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PHV-xQ-rL3">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PHV-xQ-rL3">
33
<device id="retina6_12" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -40,29 +40,22 @@
4040
<nil key="highlightedColor"/>
4141
</label>
4242
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="Gal-P1-Fh2">
43-
<rect key="frame" x="50" y="233.33333333333337" width="293" height="200"/>
43+
<rect key="frame" x="50" y="233.33333333333337" width="293" height="150"/>
4444
<subviews>
4545
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IQn-Bc-0KE">
46-
<rect key="frame" x="0.0" y="0.0" width="293" height="53.333333333333336"/>
46+
<rect key="frame" x="0.0" y="0.0" width="293" height="65"/>
4747
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
48+
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
4849
<state key="normal" title="Button"/>
4950
<buttonConfiguration key="configuration" style="plain" title="主唱"/>
5051
<connections>
5152
<action selector="leadSet:" destination="BYZ-38-t0r" eventType="touchUpInside" id="SCt-Fw-OfS"/>
5253
</connections>
5354
</button>
54-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4rw-8l-oX6">
55-
<rect key="frame" x="0.0" y="73.333333333333343" width="293" height="53.333333333333343"/>
56-
<color key="backgroundColor" red="0.25098039220000001" green="0.25098039220000001" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
57-
<state key="normal" title="Button"/>
58-
<buttonConfiguration key="configuration" style="plain" title="合唱"/>
59-
<connections>
60-
<action selector="coSet:" destination="BYZ-38-t0r" eventType="touchUpInside" id="4kg-aC-Lp8"/>
61-
</connections>
62-
</button>
6355
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LD5-tS-pCb">
64-
<rect key="frame" x="0.0" y="146.66666666666666" width="293" height="53.333333333333343"/>
56+
<rect key="frame" x="0.0" y="84.999999999999972" width="293" height="65"/>
6557
<color key="backgroundColor" red="0.1176470588" green="0.047058823530000002" blue="0.066666666669999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
58+
<color key="tintColor" red="0.96862745100000003" green="0.96862745100000003" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
6659
<state key="normal" title="Button"/>
6760
<buttonConfiguration key="configuration" style="plain" title="观众"/>
6861
<connections>
@@ -71,11 +64,11 @@
7164
</button>
7265
</subviews>
7366
<constraints>
74-
<constraint firstAttribute="height" constant="200" id="t0B-6u-A1a"/>
67+
<constraint firstAttribute="height" constant="150" id="t0B-6u-A1a"/>
7568
</constraints>
7669
</stackView>
7770
<textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="请输入频道名称" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AAL-sd-AO6">
78-
<rect key="frame" x="20" y="483.33333333333331" width="353" height="43.999999999999943"/>
71+
<rect key="frame" x="20" y="433.33333333333331" width="353" height="44"/>
7972
<constraints>
8073
<constraint firstAttribute="height" constant="44" id="5Iv-Sp-b9v"/>
8174
</constraints>
@@ -96,7 +89,7 @@
9689
</connections>
9790
</button>
9891
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="sms-yZ-8dD">
99-
<rect key="frame" x="64" y="557.33333333333337" width="265" height="32"/>
92+
<rect key="frame" x="64" y="507.33333333333326" width="265" height="32"/>
10093
<segments>
10194
<segment title="MCC 声网歌曲中心"/>
10295
<segment title="Local 本地音乐"/>
@@ -105,13 +98,25 @@
10598
<action selector="valueChange:" destination="BYZ-38-t0r" eventType="valueChanged" id="GZ7-MG-QPM"/>
10699
</connections>
107100
</segmentedControl>
101+
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="VJw-JP-EGs">
102+
<rect key="frame" x="64" y="558.33333333333337" width="265" height="32"/>
103+
<segments>
104+
<segment title="小合唱"/>
105+
<segment title="大合唱"/>
106+
</segments>
107+
<connections>
108+
<action selector="ktvTypeChange:" destination="BYZ-38-t0r" eventType="valueChanged" id="15A-Oh-J99"/>
109+
</connections>
110+
</segmentedControl>
108111
</subviews>
109112
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
110113
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
111114
<constraints>
115+
<constraint firstItem="VJw-JP-EGs" firstAttribute="top" secondItem="sms-yZ-8dD" secondAttribute="bottom" constant="20" id="35v-We-2Zo"/>
112116
<constraint firstItem="sms-yZ-8dD" firstAttribute="top" secondItem="AAL-sd-AO6" secondAttribute="bottom" constant="30" id="BjY-Xb-grB"/>
113117
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="AAL-sd-AO6" secondAttribute="trailing" constant="20" id="Csj-at-DfJ"/>
114118
<constraint firstItem="sms-yZ-8dD" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="Fem-l4-qbZ"/>
119+
<constraint firstItem="VJw-JP-EGs" firstAttribute="leading" secondItem="sms-yZ-8dD" secondAttribute="leading" id="ISq-DL-2vX"/>
115120
<constraint firstItem="Gal-P1-Fh2" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="M2m-1p-yiO"/>
116121
<constraint firstItem="Gal-P1-Fh2" firstAttribute="top" secondItem="jy6-HN-gmr" secondAttribute="bottom" constant="60" id="Mqq-nG-y6f"/>
117122
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="cTX-TJ-qC4" secondAttribute="bottom" constant="50" id="NQl-4w-CSB"/>
@@ -124,6 +129,7 @@
124129
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="Gal-P1-Fh2" secondAttribute="trailing" constant="50" id="rEM-vJ-8kG"/>
125130
<constraint firstItem="Gal-P1-Fh2" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="50" id="tmY-GR-W9k"/>
126131
<constraint firstItem="AAL-sd-AO6" firstAttribute="top" secondItem="Gal-P1-Fh2" secondAttribute="bottom" constant="50" id="u2B-Pk-0a6"/>
132+
<constraint firstItem="VJw-JP-EGs" firstAttribute="trailing" secondItem="sms-yZ-8dD" secondAttribute="trailing" id="y7s-aq-UDi"/>
127133
</constraints>
128134
</view>
129135
<navigationItem key="navigationItem" id="fpu-Ki-NEV"/>

‎KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo/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>UIApplicationSceneManifest</key>
611
<dict>
712
<key>UIApplicationSupportsMultipleScenes</key>

0 commit comments

Comments
 (0)