|
|
@@ -52,7 +52,6 @@
|
|
|
@property(nonatomic, strong) HWWebViewController *webVC;
|
|
|
@property(nonatomic, strong) inputPWDViewController *inputVC;
|
|
|
@property(nonatomic, strong) customLaunchView *customLaunchV;//
|
|
|
-//@property(nonatomic, strong) PlayerViewController *curPlayerVC;
|
|
|
|
|
|
@property(nonatomic, strong) BaseNavigationController *preRootPlayerNav;
|
|
|
|
|
|
@@ -369,92 +368,6 @@
|
|
|
|
|
|
//数据埋点
|
|
|
[[netWorkManager shareInstance] DataEmbeddingPointBy:1 withEventValue:@"Nas"];
|
|
|
- return;
|
|
|
-
|
|
|
-// if(_curPlayerVC){
|
|
|
-// //[_curPlayerVC disconnectVideoServer];
|
|
|
-//
|
|
|
-// _curPlayerVC.isNeedRecyclResource = YES;
|
|
|
-// [_curPlayerVC recyclResource];
|
|
|
-//
|
|
|
-// _curPlayerVC.liveStreamManager = nil;
|
|
|
-// [_curPlayerVC.navigationController popViewControllerAnimated:NO];
|
|
|
-// _curPlayerVC = nil;
|
|
|
-// }
|
|
|
-//
|
|
|
-// //每次进入
|
|
|
-// PlayerViewController *playerRootVC = [[PlayerViewController alloc] init];
|
|
|
-// if(self.isLoginAgainType){
|
|
|
-// playerRootVC.isLoginAgainType = self.isLoginAgainType;
|
|
|
-// }
|
|
|
-// 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];
|
|
|
-// self.window.rootViewController = playerNav;
|
|
|
-//
|
|
|
-// _preRootPlayerNav = playerNav;
|
|
|
-//
|
|
|
-// self.isLoginAgainType = NO;
|
|
|
-//
|
|
|
-// __block BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
|
|
|
-//
|
|
|
-// KWeakSelf
|
|
|
-// if(!_isQRCodeType){
|
|
|
-//
|
|
|
-// if(isPrivacyMode)
|
|
|
-// {
|
|
|
-// [playerRootVC setShowImgAndVoiceTypeFun:NO];
|
|
|
-// [self showCalculatorVC];
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// [self HandleEnterNotPrivacyModeFun];
|
|
|
-//
|
|
|
-// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
-// mainBlock(^{
|
|
|
-// [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
|
|
|
-// playerRootVC.isPwdVCShow = NO;
|
|
|
-// [playerRootVC setShowImgAndVoiceTypeFun:YES];
|
|
|
-// //[weakSelf shareAwakenAppBy:weakSelf.getShareStr];
|
|
|
-//
|
|
|
-// if(self->_session && self->_connectionOptions){
|
|
|
-// [self scene:self->_session openURLContexts:self->_connectionOptions.URLContexts];
|
|
|
-// }
|
|
|
-// });
|
|
|
-// });
|
|
|
-// }
|
|
|
-//
|
|
|
-// //_isQRCodeType = NO;
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// if(isPrivacyMode)
|
|
|
-// {
|
|
|
-// [playerRootVC setShowImgAndVoiceTypeFun:NO];
|
|
|
-// [self showCalculatorVC];
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
-// mainBlock(^{
|
|
|
-// playerRootVC.isPwdVCShow = NO;
|
|
|
-// [playerRootVC setShowImgAndVoiceTypeFun:YES];
|
|
|
-// });
|
|
|
-// });
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-//
|
|
|
-// _isQRCodeType = NO;
|
|
|
-//
|
|
|
-// //获取NAS相关信息
|
|
|
-// [self getNASMsgFun];
|
|
|
-//
|
|
|
-// [self initMainTabbarFun];
|
|
|
}
|
|
|
|
|
|
#pragma mark 1.4.1 新增tabbar
|
|
|
@@ -1096,8 +1009,6 @@
|
|
|
|
|
|
[self closeCalculatorVC];
|
|
|
|
|
|
- _curPlayerVC.isPwdVCShow = NO;
|
|
|
- [_curPlayerVC setShowImgAndVoiceTypeFun:YES];
|
|
|
[connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
|
|
|
}
|
|
|
|