Commit 9b29687f by ludi

修复一个心跳单位统一问题

parent 4ca2107a
......@@ -61,6 +61,6 @@
+ (void)fus_addSocketMessageWithModel:(FUSSocketMessageModel *)messageModel;
/// 重设心跳时间
+ (void)fus_setSocketHeartbeatInterval:(NSTimeInterval)interval;
+ (void)fus_setSocketHeartbeatInterval:(NSInteger)millisec;
@end
......@@ -91,9 +91,9 @@ typedef void(^ConnectBlock)(BOOL isSuccess); // 连接回调
[[FUSSocketMessageCenter shareInstance] fus_monitorSocketStatus:block];
}
+ (void)fus_setSocketHeartbeatInterval:(NSTimeInterval)interval
+ (void)fus_setSocketHeartbeatInterval:(NSInteger)millisec
{
[[FUSSocketMessageCenter shareInstance] fus_setSocketHeartbeatInterval:interval];
[[FUSSocketMessageCenter shareInstance] fus_setSocketHeartbeatInterval:millisec];
}
......@@ -361,10 +361,10 @@ typedef void(^ConnectBlock)(BOOL isSuccess); // 连接回调
[FUSSocketMessageHelper fus_sendSocketHeartbeatMessage];
}
- (void)fus_setSocketHeartbeatInterval:(NSTimeInterval)interval
- (void)fus_setSocketHeartbeatInterval:(NSInteger)millisec
{
if (interval > 0) {
mHeartbeatInterval = interval;
if (millisec > 1000) {
mHeartbeatInterval = (double)millisec/1000;
if ([self isConnected]) {
[mConnectTimer invalidate];
mConnectTimer = [NSTimer scheduledTimerWithTimeInterval:[self heartbeatIntervalValue] target:[YYWeakProxy proxyWithTarget:self] selector:@selector(sendHeartbeatPacket) userInfo:nil repeats:YES];
......
......@@ -42,7 +42,7 @@
/// 重设心跳时间
+ (void)fus_setSocketHeartbeatInterval:(NSTimeInterval)interval;
+ (void)fus_setSocketHeartbeatInterval:(NSInteger)millisec;
/**
* 发送文本消息
......
......@@ -46,9 +46,9 @@ typedef void(^VerifyBlock)(NSDictionary *dataDict); // Socket验证回调
[[FUSSocketMessageHelper shareInstance] fus_sendSocketHeartbeatMessage];
}
+ (void)fus_setSocketHeartbeatInterval:(NSTimeInterval)interval {
if (interval > 0) {
[FUSSocketMessageCenter fus_setSocketHeartbeatInterval:interval];
+ (void)fus_setSocketHeartbeatInterval:(NSInteger)millisec {
if (millisec > 1000) {
[FUSSocketMessageCenter fus_setSocketHeartbeatInterval:millisec];
}
}
......
......@@ -140,6 +140,8 @@ import SwiftyJSON
FUSLoadingView.fus_showProgressView(withMessage: "")
self.otherFriendInfoDisposeBag = .init()
self.otherFriendInfoIsReady.distinctUntilChanged()
.filter({ $0?.uid == fid })
.take(1)
.timeout(.seconds(10), scheduler: MainScheduler.instance)
.subscribe(onNext: {[weak self] model in
FUSLog.info("FUSChatCallHelper---监听获取到对方的信息:\(model?.uid ?? "")")
......@@ -720,9 +722,9 @@ import SwiftyJSON
.skip(1)
.subscribe(onNext: { isCall in
if isCall {
FUSSocketMessageHelper.fus_setSocketHeartbeatInterval(10.0)
FUSSocketMessageHelper.fus_setSocketHeartbeatInterval(10*1000)
}else {
FUSSocketMessageHelper.fus_setSocketHeartbeatInterval(30.0)
FUSSocketMessageHelper.fus_setSocketHeartbeatInterval(30*1000)
}
})
.disposed(by: disposeBag)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment