Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive…

Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/Agora/FUSSwiftAgoraSession.swift

@@ -87,8 +87,10 @@ class FUSSwiftAgoraSession: NSObject {
     var rtcData:FUSRtcData = .init()
     var rtcData:FUSRtcData = .init()
     
     
     init(rtcData: FUSRtcData) {
     init(rtcData: FUSRtcData) {
-        self.rtcData = rtcData
         super.init()
         super.init()
+        self.rtcData = rtcData
+        setupViewModel()
+        setupNotification()
     }
     }
     /// 是否打开视频
     /// 是否打开视频
     var videoEnable: Bool = false {
     var videoEnable: Bool = false {
@@ -143,12 +145,6 @@ class FUSSwiftAgoraSession: NSObject {
     // MARK: Private
     // MARK: Private
     var reconnectDisposeBag: DisposeBag?
     var reconnectDisposeBag: DisposeBag?
     
     
-    override init() {
-        super.init()
-        setupViewModel()
-        setupNotification()
-    }
-    
     // MARK: Private
     // MARK: Private
     let disposeBag = DisposeBag()
     let disposeBag = DisposeBag()
     // MARK: Setup
     // MARK: Setup

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatHttpHelper.h

@@ -194,4 +194,10 @@
 +(void)fus_requestOneToOneCallConnectSuccessWith:(NSString *)callId
 +(void)fus_requestOneToOneCallConnectSuccessWith:(NSString *)callId
                                          success:(void (^)(void))success
                                          success:(void (^)(void))success
                                          failure:(void (^)(NSString *, int))failure;
                                          failure:(void (^)(NSString *, int))failure;
+
+
+/// 1对1 获取rtcdata
++ (void)fus_requestOneToOneGetRTCDataWithRoomId:(NSString *)roomId
+                                        succeed:(void(^)(NSDictionary *dataDict))succeed
+                                        failure:(void (^)(NSString *msg, int code))failure;
 @end
 @end

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatHttpHelper.m

@@ -432,4 +432,30 @@
     }];
     }];
 }
 }
 
 
+/// 1对1 获取rtcdata
++ (void)fus_requestOneToOneGetRTCDataWithRoomId:(NSString *)roomId
+                                        succeed:(void(^)(NSDictionary *dataDict))succeed
+                                        failure:(void (^)(NSString *msg, int code))failure
+{
+    if ([NSString isNull:roomId]) {
+        if (failure) failure(nil, ERROR_CODE);
+        return;
+    }
+    
+    NSDictionary *params = @{@"toUid":roomId};
+    
+    [FUSHttpHelper postRequestBinaryWithUrl:FUSChatCenterURLs.fus_URL_oneToOneRtcData params:params success:^(NSDictionary *dataDict, int code) {
+       
+        if (succeed) {
+            succeed(dataDict);
+        }
+        
+    } failure:^(NSDictionary *dataDict, int code) {
+        
+        if (failure) failure(FAILURE_MESSAGE, code);
+        
+    }];
+}
+
+
 @end
 @end

Modules/FUSChatCenterModule/FUSChatCenterModule/Others/FUSChatCenterURLs.h

@@ -157,6 +157,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 /// 1对1私房接听被叫方连接成功
 /// 1对1私房接听被叫方连接成功
 +(NSString *)fus_URL_oneToOneCallConnectSuccess;
 +(NSString *)fus_URL_oneToOneCallConnectSuccess;
+/// 1对1 获取rtcdata
++(NSString *)fus_URL_oneToOneRtcData;
 
 
 @end
 @end
 
 

Modules/FUSChatCenterModule/FUSChatCenterModule/Others/FUSChatCenterURLs.m

@@ -238,4 +238,10 @@
 +(NSString *)fus_URL_oneToOneCallConnectSuccess{
 +(NSString *)fus_URL_oneToOneCallConnectSuccess{
     return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/onetoone/call/connect/success"];
     return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/onetoone/call/connect/success"];
 }
 }
+
+/// 1对1 获取rtcdata
++(NSString *)fus_URL_oneToOneRtcData{
+    return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/onetoone/rtcdata/get"];
+}
+
 @end
 @end

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m

@@ -106,7 +106,7 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
 #pragma mark - 获取rtcData
 #pragma mark - 获取rtcData
 - (void)fus_getRTCDataWithForceUpdate:(BOOL)forceUpdate
 - (void)fus_getRTCDataWithForceUpdate:(BOOL)forceUpdate
 {
 {
-    [FUSLiveHttpHelper fus_requestliveGetRTCData:[FUSCacheDataShare shareStore].userDetailInfo.uid Success:^(NSDictionary * _Nonnull dataDict) {
+    [FUSLiveHttpHelper fus_requestliveGetRTCData:[FUSCacheDataShare shareStore].userDetailInfo.roomId Success:^(NSDictionary * _Nonnull dataDict) {
         if (FUSLiveHelper.shareInstance.liveRTCData == nil) {
         if (FUSLiveHelper.shareInstance.liveRTCData == nil) {
            
            
             FUSLiveRTCData *data =  [FUSLiveRTCData createFromArchieveWithKey:KLiveDataCenter_store_liveRTCData];
             FUSLiveRTCData *data =  [FUSLiveRTCData createFromArchieveWithKey:KLiveDataCenter_store_liveRTCData];