|
@@ -205,24 +205,12 @@
|
|
|
if(_curPlayerVC){
|
|
|
[_curPlayerVC disconnectVideoServer];
|
|
|
|
|
|
+ _curPlayerVC.isNeedRecyclResource = YES;
|
|
|
[_curPlayerVC recyclResource];
|
|
|
- ///后续要清掉下面的代码
|
|
|
- [_curPlayerVC toStopRecoder];
|
|
|
- [_curPlayerVC toStopAudioRecoder];
|
|
|
-
|
|
|
- [_curPlayerVC removeNSNotification];
|
|
|
-
|
|
|
- //清空WebSocket连接
|
|
|
- [_curPlayerVC.commandChannelManager rc_close];
|
|
|
-
|
|
|
-// globalBlock(^{
|
|
|
-// [self->_curPlayerVC.liveStreamManager rc_release];
|
|
|
-// });
|
|
|
- /////////
|
|
|
|
|
|
_curPlayerVC.liveStreamManager = nil;
|
|
|
_curPlayerVC.commandChannelManager = nil;
|
|
|
- //[_curPlayerVC.navigationController popViewControllerAnimated:NO];
|
|
|
+ [_curPlayerVC.navigationController popViewControllerAnimated:NO];
|
|
|
_curPlayerVC = nil;
|
|
|
}
|
|
|
|
|
@@ -234,14 +222,15 @@
|
|
|
playerRootVC.isPwdVCShow = YES;
|
|
|
_curPlayerVC = playerRootVC;
|
|
|
|
|
|
- BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
|
|
|
- self.window.rootViewController = playerNav;
|
|
|
-// UIViewController *vc = [UIViewController new];
|
|
|
-//
|
|
|
-// BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
|
|
|
-// [playerNav pushViewController:playerRootVC animated:NO];
|
|
|
+// BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
|
|
|
// self.window.rootViewController = playerNav;
|
|
|
|
|
|
+ UIViewController *vc = [UIViewController new];
|
|
|
+
|
|
|
+ BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
|
|
|
+ [playerNav pushViewController:playerRootVC animated:NO];
|
|
|
+ self.window.rootViewController = playerNav;
|
|
|
+
|
|
|
_preRootPlayerNav = playerNav;
|
|
|
|
|
|
self.isLoginAgainType = NO;
|
|
@@ -282,13 +271,6 @@
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- //test code
|
|
|
- //[playerRootVC showSecretkeyFun];
|
|
|
-
|
|
|
-
|
|
|
-// MySetViewController *playerRootVC = [[MySetViewController alloc] init];
|
|
|
-// BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
|
|
|
-// self.window.rootViewController = playerNav;
|
|
|
}
|
|
|
|
|
|
#pragma mark 处理进来是非隐私模式的情况
|