Skip to content

Commit 74ee72d

Browse files
HugoChaanenough0
HugoChaan
and
enough0
authored
Dev/4.3.0 cp (#36)
* merge ktvapi * update ktvapi * update ktvapi * merge code * update ktvapi --------- Co-authored-by: CP <[email protected]>
1 parent be0e9df commit 74ee72d

File tree

4 files changed

+40
-6
lines changed

4 files changed

+40
-6
lines changed

‎KTVAPI/iOS/Classes/KTVApiImpl.swift‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ fileprivate enum KTVSongMode: Int {
8080
private var songUrl: String = ""
8181
private var songCode: Int = 0
8282
private var songIdentifier: String = ""
83+
84+
private let tag = "KTV_API_LOG"
85+
private let messageId = "agora:scenarioAPI"
86+
private let version = "1_iOS_4.3.0"
87+
private let lyricSyncVersion = 2
8388

8489
private var singerRole: KTVSingRole = .audience {
8590
didSet {
@@ -168,6 +173,9 @@ fileprivate enum KTVSongMode: Int {
168173
engine.setParameters("{\"rtc.path_scheduling_strategy\": 0}")
169174
// engine.setParameters("{\"rtc.enableMultipath\": true}")
170175
engine.setParameters("{\"rtc.log_external_input\":true}")
176+
// 数据上报
177+
engine.setParameters("{\"rtc.direct_send_custom_event\": true}")
178+
// engine.setParameters("{\"rtc.qos_for_test_purpose\": true}")
171179
}
172180

173181
func renewInnerDataStreamId() {
@@ -1275,7 +1283,7 @@ extension KTVApiImpl {
12751283
}
12761284

12771285
private func sendCustomMessage(with event: String, label: String) {
1278-
apiConfig?.engine?.sendCustomReportMessage("scenarioAPI", category: "1_ios_4.0.0", event: event, label: label, value: 0)
1286+
apiConfig?.engine?.sendCustomReportMessage(messageId, category: version, event: event, label: label, value: 0)
12791287
}
12801288

12811289
private func sendStreamMessageWithDict(_ dict: [String: Any], success: ((_ success: Bool) -> Void)?) {

‎KTVAPI/iOS/Classes/KTVGiantChorusApiImpl.swift‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ fileprivate enum KTVSongMode: Int {
119119
private var subScribeSingerMap = [Int: Int]() // <uid, ntpE2eDelay>
120120
private var singerList = [Int]() // <uid>
121121
private var mainSingerDelay = 0
122+
123+
private let tag = "KTV_API_LOG"
124+
private let messageId = "agora:scenarioAPI"
125+
private let version = "1_iOS_4.3.0"
126+
private let lyricSyncVersion = 2
127+
122128
deinit {
123129
mcc?.register(nil)
124130
agoraPrint("deinit KTVApiImpl")
@@ -190,6 +196,10 @@ fileprivate enum KTVSongMode: Int {
190196
engine.setParameters("{\"rtc.remote_path_scheduling_strategy\": 0}")
191197
engine.setParameters("{\"rtc.path_scheduling_strategy\": 0}")
192198
engine.setParameters("{\"rtc.enableMultipath\": true}")
199+
200+
// 数据上报
201+
engine.setParameters("{\"rtc.direct_send_custom_event\": true}")
202+
// engine.setParameters("{\"rtc.qos_for_test_purpose\": true}")
193203
}
194204

195205
func renewInnerDataStreamId() {
@@ -1547,7 +1557,7 @@ extension KTVGiantChorusApiImpl {
15471557
}
15481558

15491559
private func sendCustomMessage(with event: String, label: String) {
1550-
apiConfig?.engine?.sendCustomReportMessage("scenarioAPI", category: "ktv_ios_3.3.0", event: event, label: label, value: 0)
1560+
apiConfig?.engine?.sendCustomReportMessage(messageId, category: version, event: event, label: label, value: 0)
15511561
}
15521562

15531563
private func sendStreamMessageWithDict(_ dict: [String: Any], success: ((_ success: Bool) -> Void)?) {
@@ -1971,4 +1981,3 @@ extension KTVGiantChorusApiImpl {
19711981
processSubscribeFuture = nil
19721982
}
19731983
}
1974-

‎KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo/KTVAPI/KTVApiImpl.swift‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ fileprivate enum KTVSongMode: Int {
8080
private var songUrl: String = ""
8181
private var songCode: Int = 0
8282
private var songIdentifier: String = ""
83+
84+
private let tag = "KTV_API_LOG"
85+
private let messageId = "agora:scenarioAPI"
86+
private let version = "1_iOS_4.3.0"
87+
private let lyricSyncVersion = 2
8388

8489
private var singerRole: KTVSingRole = .audience {
8590
didSet {
@@ -168,6 +173,9 @@ fileprivate enum KTVSongMode: Int {
168173
engine.setParameters("{\"rtc.path_scheduling_strategy\": 0}")
169174
// engine.setParameters("{\"rtc.enableMultipath\": true}")
170175
engine.setParameters("{\"rtc.log_external_input\":true}")
176+
// 数据上报
177+
engine.setParameters("{\"rtc.direct_send_custom_event\": true}")
178+
// engine.setParameters("{\"rtc.qos_for_test_purpose\": true}")
171179
}
172180

173181
func renewInnerDataStreamId() {
@@ -1275,7 +1283,7 @@ extension KTVApiImpl {
12751283
}
12761284

12771285
private func sendCustomMessage(with event: String, label: String) {
1278-
apiConfig?.engine?.sendCustomReportMessage("scenarioAPI", category: "1_ios_4.0.0", event: event, label: label, value: 0)
1286+
apiConfig?.engine?.sendCustomReportMessage(messageId, category: version, event: event, label: label, value: 0)
12791287
}
12801288

12811289
private func sendStreamMessageWithDict(_ dict: [String: Any], success: ((_ success: Bool) -> Void)?) {

‎KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo/KTVAPI/KTVGiantChorusApiImpl.swift‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ fileprivate enum KTVSongMode: Int {
119119
private var subScribeSingerMap = [Int: Int]() // <uid, ntpE2eDelay>
120120
private var singerList = [Int]() // <uid>
121121
private var mainSingerDelay = 0
122+
123+
private let tag = "KTV_API_LOG"
124+
private let messageId = "agora:scenarioAPI"
125+
private let version = "1_iOS_4.3.0"
126+
private let lyricSyncVersion = 2
127+
122128
deinit {
123129
mcc?.register(nil)
124130
agoraPrint("deinit KTVApiImpl")
@@ -190,6 +196,10 @@ fileprivate enum KTVSongMode: Int {
190196
engine.setParameters("{\"rtc.remote_path_scheduling_strategy\": 0}")
191197
engine.setParameters("{\"rtc.path_scheduling_strategy\": 0}")
192198
engine.setParameters("{\"rtc.enableMultipath\": true}")
199+
200+
// 数据上报
201+
engine.setParameters("{\"rtc.direct_send_custom_event\": true}")
202+
// engine.setParameters("{\"rtc.qos_for_test_purpose\": true}")
193203
}
194204

195205
func renewInnerDataStreamId() {
@@ -1547,7 +1557,7 @@ extension KTVGiantChorusApiImpl {
15471557
}
15481558

15491559
private func sendCustomMessage(with event: String, label: String) {
1550-
apiConfig?.engine?.sendCustomReportMessage("scenarioAPI", category: "ktv_ios_3.3.0", event: event, label: label, value: 0)
1560+
apiConfig?.engine?.sendCustomReportMessage(messageId, category: version, event: event, label: label, value: 0)
15511561
}
15521562

15531563
private func sendStreamMessageWithDict(_ dict: [String: Any], success: ((_ success: Bool) -> Void)?) {
@@ -1971,4 +1981,3 @@ extension KTVGiantChorusApiImpl {
19711981
processSubscribeFuture = nil
19721982
}
19731983
}
1974-

0 commit comments

Comments
 (0)