Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift

@@ -29,6 +29,8 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
     private var timer: DispatchSourceTimer?
     private var isDisappearFromZoom = false
     private let timeCount: Int = 120
+    // 进聊天室尝试次数
+    private let maxRetryCount = 3
 
     // MARK: - UI Components
 
@@ -347,12 +349,16 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
     // MARK: - Chat Room Methods
 
     private func joinChatRoom(roomId: String) {
-        func joinRoom() {
+        func joinRoom(retryCount: Int) {
             YHIMHelper.shared.joinChatRoom(roomID: roomId, leaveOtherRooms: true) { [weak self] error in
                 guard let self = self else { return }
-
-                if let error = error {
+                if let error = error, retryCount <= self.maxRetryCount {
                     printLog("joinChatRoom: \(error)")
+                    DispatchQueue.main.asyncAfter(deadline: .now() + TimeInterval(5 * (retryCount + 1))) {
+                        YHIMHelper.shared.registerAndLoginCurrentUser { _ in
+                            joinRoom(retryCount: retryCount + 1)
+                        }
+                    }
                 } else {
                     self.loadHistoryMessages(roomId: roomId)
                 }
@@ -361,10 +367,10 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
         
         if !YHIMHelper.shared.isCurrentUserLogin {
             YHIMHelper.shared.registerAndLoginCurrentUser { _ in
-                joinRoom()
+                joinRoom(retryCount: 0)
             }
         } else {
-            joinRoom()
+            joinRoom(retryCount: 0)
         }
     }