Merge pull request #257 from AgoraIO/dev/3.6.2-nosleep-macos

xia ning · web-flow · commit e80db67bc241 · 2022-01-28T17:09:44.000+08:00
[Bug] : remove Thread sleep on change splitview and fix unowned object crash
diff --git a/macOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift b/macOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift
@@ -91,7 +91,7 @@ class AudioMixing: BaseViewController {
     @IBOutlet weak var selectMicsPicker: Picker!
     var mics:[AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})
             }
         }
diff --git a/macOS/APIExample/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift b/macOS/APIExample/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift
@@ -23,7 +23,7 @@ class CustomAudioRender: BaseViewController {
     @IBOutlet weak var selectMicsPicker: Picker!
     var mics: [AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})
             }
         }
diff --git a/macOS/APIExample/Examples/Advanced/CustomAudioSource/CustomAudioSource.swift b/macOS/APIExample/Examples/Advanced/CustomAudioSource/CustomAudioSource.swift
@@ -22,7 +22,7 @@ class CustomAudioSource: BaseViewController {
     @IBOutlet weak var selectMicsPicker: Picker!
     var mics: [AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})
             }
         }
diff --git a/macOS/APIExample/Examples/Advanced/PrecallTest/PrecallTest.swift b/macOS/APIExample/Examples/Advanced/PrecallTest/PrecallTest.swift
@@ -37,7 +37,7 @@ class PrecallTest: BaseViewController {
     @IBOutlet weak var echoValidatePopover: NSView!
     var cameras:[AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.cameraPicker.addItems(withTitles: self.cameras.map({ (device: AgoraRtcDeviceInfo) -> String in
                     return (device.deviceName ?? "")
                 }))
@@ -46,7 +46,7 @@ class PrecallTest: BaseViewController {
     }
     var mics:[AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.micPicker.addItems(withTitles: self.mics.map({ (device: AgoraRtcDeviceInfo) -> String in
                     return (device.deviceName ?? "")
                 }))
@@ -55,7 +55,7 @@ class PrecallTest: BaseViewController {
     }
     var speakers:[AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.speakerPicker.addItems(withTitles: self.speakers.map({ (device: AgoraRtcDeviceInfo) -> String in
                     return (device.deviceName ?? "")
                 }))
@@ -303,6 +303,7 @@ extension PrecallTest: AgoraRtcEngineDelegate {
     /// @params totalVolume Total volume after audio mixing. The value range is [0,255].
     func rtcEngine(_ engine: AgoraRtcEngineKit, reportAudioVolumeIndicationOfSpeakers speakers: [AgoraRtcAudioVolumeInfo], totalVolume: Int) {
         for speaker in speakers {
+            print("reportAudioVolumeIndicationOfSpeakers:\(speaker.uid), \(speaker.volume)")
             if(speaker.uid == 0) {
                 micTestingVolumeIndicator.doubleValue = Double(speaker.volume)
             }
diff --git a/macOS/APIExample/Examples/Advanced/RawAudioData/RawAudioData.swift b/macOS/APIExample/Examples/Advanced/RawAudioData/RawAudioData.swift
@@ -23,7 +23,7 @@ class RawAudioData: BaseViewController {
     @IBOutlet weak var selectMicsPicker: Picker!
     var mics: [AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})
             }
         }
diff --git a/macOS/APIExample/Examples/Advanced/VoiceChanger/VoiceChanger.swift b/macOS/APIExample/Examples/Advanced/VoiceChanger/VoiceChanger.swift
@@ -57,7 +57,7 @@ class VoiceChanger: BaseViewController {
     @IBOutlet weak var selectMicsPicker: Picker!
     var mics:[AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})
             }
         }
diff --git a/macOS/APIExample/Examples/Basic/JoinChannelAudio/JoinChannelAudio.swift b/macOS/APIExample/Examples/Basic/JoinChannelAudio/JoinChannelAudio.swift
@@ -79,7 +79,7 @@ class JoinChannelAudioMain: BaseViewController {
     @IBOutlet weak var selectMicsPicker: Picker!
     var mics:[AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})
             }
         }
diff --git a/macOS/APIExample/Examples/Basic/JoinChannelVideo/JoinChannelVideo.swift b/macOS/APIExample/Examples/Basic/JoinChannelVideo/JoinChannelVideo.swift
@@ -22,7 +22,7 @@ class JoinChannelVideoMain: BaseViewController {
     @IBOutlet weak var selectCameraPicker: Picker!
     var cameras: [AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectCameraPicker.picker.addItems(withTitles: self.cameras.map {$0.deviceName ?? "unknown"})
             }
         }
@@ -135,7 +135,7 @@ class JoinChannelVideoMain: BaseViewController {
     @IBOutlet weak var selectMicsPicker: Picker!
     var mics: [AgoraRtcDeviceInfo] = [] {
         didSet {
-            DispatchQueue.main.async {[unowned self] in
+            DispatchQueue.main.async {
                 self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})
             }
         }
@@ -268,7 +268,7 @@ class JoinChannelVideoMain: BaseViewController {
         initChannelField()
         initJoinChannelButton()
     }
-        
+            
     func layoutVideos(_ count: Int) {
         videos = []
         for i in 0...count - 1 {
diff --git a/macOS/APIExample/ViewController.swift b/macOS/APIExample/ViewController.swift
@@ -110,7 +110,6 @@ extension MenuController: NSTableViewDataSource, NSTableViewDelegate {
     
     func tableViewSelectionDidChange(_ notification: Notification) {
         if tableView.selectedRow >= 0 && tableView.selectedRow < menus.count {
-            Thread.sleep(forTimeInterval: 1)
             loadSplitViewItem(item: menus[tableView.selectedRow])
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class AudioMixing: BaseViewController {`
`91`	`91`	`@IBOutlet weak var selectMicsPicker: Picker!`
`92`	`92`	`var mics:[AgoraRtcDeviceInfo] = [] {`
`93`	`93`	`didSet {`
`94`		`- DispatchQueue.main.async {[unowned self] in`
	`94`	`+ DispatchQueue.main.async {`
`95`	`95`	`self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class CustomAudioRender: BaseViewController {`
`23`	`23`	`@IBOutlet weak var selectMicsPicker: Picker!`
`24`	`24`	`var mics: [AgoraRtcDeviceInfo] = [] {`
`25`	`25`	`didSet {`
`26`		`- DispatchQueue.main.async {[unowned self] in`
	`26`	`+ DispatchQueue.main.async {`
`27`	`27`	`self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class CustomAudioSource: BaseViewController {`
`22`	`22`	`@IBOutlet weak var selectMicsPicker: Picker!`
`23`	`23`	`var mics: [AgoraRtcDeviceInfo] = [] {`
`24`	`24`	`didSet {`
`25`		`- DispatchQueue.main.async {[unowned self] in`
	`25`	`+ DispatchQueue.main.async {`
`26`	`26`	`self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class RawAudioData: BaseViewController {`
`23`	`23`	`@IBOutlet weak var selectMicsPicker: Picker!`
`24`	`24`	`var mics: [AgoraRtcDeviceInfo] = [] {`
`25`	`25`	`didSet {`
`26`		`- DispatchQueue.main.async {[unowned self] in`
	`26`	`+ DispatchQueue.main.async {`
`27`	`27`	`self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class VoiceChanger: BaseViewController {`
`57`	`57`	`@IBOutlet weak var selectMicsPicker: Picker!`
`58`	`58`	`var mics:[AgoraRtcDeviceInfo] = [] {`
`59`	`59`	`didSet {`
`60`		`- DispatchQueue.main.async {[unowned self] in`
	`60`	`+ DispatchQueue.main.async {`
`61`	`61`	`self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class JoinChannelAudioMain: BaseViewController {`
`79`	`79`	`@IBOutlet weak var selectMicsPicker: Picker!`
`80`	`80`	`var mics:[AgoraRtcDeviceInfo] = [] {`
`81`	`81`	`didSet {`
`82`		`- DispatchQueue.main.async {[unowned self] in`
	`82`	`+ DispatchQueue.main.async {`
`83`	`83`	`self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class JoinChannelVideoMain: BaseViewController {`
`22`	`22`	`@IBOutlet weak var selectCameraPicker: Picker!`
`23`	`23`	`var cameras: [AgoraRtcDeviceInfo] = [] {`
`24`	`24`	`didSet {`
`25`		`- DispatchQueue.main.async {[unowned self] in`
	`25`	`+ DispatchQueue.main.async {`
`26`	`26`	`self.selectCameraPicker.picker.addItems(withTitles: self.cameras.map {$0.deviceName ?? "unknown"})`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -135,7 +135,7 @@ class JoinChannelVideoMain: BaseViewController {`
`135`	`135`	`@IBOutlet weak var selectMicsPicker: Picker!`
`136`	`136`	`var mics: [AgoraRtcDeviceInfo] = [] {`
`137`	`137`	`didSet {`
`138`		`- DispatchQueue.main.async {[unowned self] in`
	`138`	`+ DispatchQueue.main.async {`
`139`	`139`	`self.selectMicsPicker.picker.addItems(withTitles: self.mics.map {$0.deviceName ?? "unknown"})`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -268,7 +268,7 @@ class JoinChannelVideoMain: BaseViewController {`
`268`	`268`	`initChannelField()`
`269`	`269`	`initJoinChannelButton()`
`270`	`270`	`}`
`271`		`-`
	`271`	`+`
`272`	`272`	`func layoutVideos(_ count: Int) {`
`273`	`273`	`videos = []`
`274`	`274`	`for i in 0...count - 1 {`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,6 @@ extension MenuController: NSTableViewDataSource, NSTableViewDelegate {`
`110`	`110`
`111`	`111`	`func tableViewSelectionDidChange(_ notification: Notification) {`
`112`	`112`	`if tableView.selectedRow >= 0 && tableView.selectedRow < menus.count {`
`113`		`- Thread.sleep(forTimeInterval: 1)`
`114`	`113`	`loadSplitViewItem(item: menus[tableView.selectedRow])`
`115`	`114`	`}`
`116`	`115`	`}`