Explorar o código

修复美颜下未被释放的问题

Steven %!s(int64=2) %!d(string=hai) anos
pai
achega
14d6827f6a

BIN=BIN
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 6 - 6
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -62,8 +62,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1669"
-            endingLineNumber = "1669"
+            startingLineNumber = "1674"
+            endingLineNumber = "1674"
             landmarkName = "-pauseLiveActionBack:"
             landmarkType = "7">
          </BreakpointContent>
@@ -94,10 +94,10 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1407"
-            endingLineNumber = "1407"
-            landmarkName = "LiveRoomViewController"
-            landmarkType = "3">
+            startingLineNumber = "1412"
+            endingLineNumber = "1412"
+            landmarkName = "-sendMessage:displayMessage:callback:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

+ 14 - 14
KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch

@@ -116,23 +116,23 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-//#define hostURL (@"https://dev.colexiu.com")
-//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://dev.colexiu.com/teacher")
-//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (NO)
-//#define RCIM_KEY (@"0vnjpoad0jbdz")
-//#define SUBMIT_UUID (YES)
+#define hostURL (@"https://dev.colexiu.com")
+#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+#define WEBHOST (@"https://dev.colexiu.com/teacher")
+#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (NO)
+#define RCIM_KEY (@"0vnjpoad0jbdz")
+#define SUBMIT_UUID (YES)
 
 //#else
 
-#define hostURL (@"https://online.colexiu.com")
-#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-#define WEBHOST (@"https://online.colexiu.com/teacher")
-#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (YES)
-#define RCIM_KEY (@"e5t4ouvpe42pa")
-#define SUBMIT_UUID (YES)
+//#define hostURL (@"https://online.colexiu.com")
+//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://online.colexiu.com/teacher")
+//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (YES)
+//#define RCIM_KEY (@"e5t4ouvpe42pa")
+//#define SUBMIT_UUID (YES)
 
 
 //#endif

+ 13 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m

@@ -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