|
@@ -309,7 +309,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
|
|
|
FILTER_TYPE type = [self getFilterType:filter];
|
|
|
MJWeakSelf;
|
|
|
[self.settingView evaluateMessageWithWhite:option.whitenessLevel smoothLevel:option.smoothLevel ruddyLevel:option.ruddyLevel brightLevel:option.brightLevel filter:type filterLevel:self.filterLevel callback:^(BOOL isOpenBeauty, NSInteger white, NSInteger smoothLevel, NSInteger ruddyLevel, NSInteger brightLevel, FILTER_TYPE type, int filterLevel) {
|
|
|
- [weakSelf configSettingBeauty:YES white:white smoothLevel:smoothLevel ruddyLevel:ruddyLevel brightLevel:brightLevel filter:[self getRongBeautyWithType:type] filterLevel:filterLevel];
|
|
|
+ [weakSelf configSettingBeauty:YES white:white smoothLevel:smoothLevel ruddyLevel:ruddyLevel brightLevel:brightLevel filter:[weakSelf getRongBeautyWithType:type] filterLevel:filterLevel];
|
|
|
}];
|
|
|
}
|
|
|
|
|
@@ -783,8 +783,8 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
|
|
|
for (LiveSeatMember *member in seatApplyArray) {
|
|
|
if ([member.userId isEqualToString:userId]) {
|
|
|
containUser = YES;
|
|
|
- NSLog(@"---- continue --");
|
|
|
- continue;
|
|
|
+// NSLog(@"---- continue --");
|
|
|
+// continue;
|
|
|
}
|
|
|
}
|
|
|
if (containUser == NO) {
|
|
@@ -1071,6 +1071,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
|
|
|
MJWeakSelf;
|
|
|
[[RCRTCEngine sharedInstance] leaveRoom:^(BOOL isSuccess, RCRTCCode code) {
|
|
|
NSLog(@"----- leave code -----%zd",code);
|
|
|
+ [weakSelf uninitEngine];
|
|
|
dispatch_main_async_safe(^{
|
|
|
[weakSelf sendLeaveMessageCallback:^(BOOL success) {
|
|
|
callback(success);
|
|
@@ -1079,6 +1080,10 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
|
|
|
}];
|
|
|
}
|
|
|
|
|
|
+- (void)uninitEngine {
|
|
|
+ [[RCRTCEngine sharedInstance] unInit];
|
|
|
+}
|
|
|
+
|
|
|
// 销毁房间
|
|
|
- (void)distoryRoomCallback:(void(^)(BOOL success))callback {
|
|
|
[[RCRTCEngine sharedInstance].defaultVideoStream stopCapture];
|
|
@@ -1708,12 +1713,11 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
|
|
|
[weakSelf quitNotiferService];
|
|
|
[weakSelf quitChatRoom];
|
|
|
[weakSelf.moreView hideView];
|
|
|
- if (self.callback) {
|
|
|
- self.callback();
|
|
|
+ if (weakSelf.callback) {
|
|
|
+ weakSelf.callback();
|
|
|
}
|
|
|
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
[weakSelf.navigationController dismissViewControllerAnimated:YES completion:nil];
|
|
|
-
|
|
|
});
|
|
|
}];
|
|
|
}
|
|
@@ -2029,6 +2033,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
|
|
|
}
|
|
|
|
|
|
- (void)dealloc {
|
|
|
+ NSLog(@"------- dealloc --------");
|
|
|
if (_timeManager) {
|
|
|
[_timeManager stopDurationTimer];
|
|
|
}
|
|
@@ -2105,6 +2110,8 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
|
|
|
|
|
|
}];
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
/*
|
|
|
#pragma mark - Navigation
|
|
|
|