V5.0.0bug修复

2019-08-29 14:07:40 +08:00
parent 23c5d6f60d
commit 685a2b8676
17 changed files with 247 additions and 485 deletions
@@ -98,8 +98,6 @@
@property(nonatomic,strong) RusunHaveHeateSetViewController *rusunSet;
@property(nonatomic,strong) RunSun84CHSetViewController *rusun84Set;
@property (nonatomic, strong) RuiMeiSetViewController *ruimeiSet;
-//@property(nonatomic,strong) DXPopover *popover;
-//@property(nonatomic,strong) LXPopView *popView;
 Strong MessageAlertView *popView;
@property(nonatomic,strong) UIButton *rightPopButton;
@property (nonatomic,strong) SetNameTextViewController *setNameVC;
@@ -110,7 +108,6 @@ Strong MessageAlertView *popView;
@property(nonatomic,strong) HaveHotCoolWenDuPicview *xuanduoPicView;
 Weak UIView *remoteView;//显示player的载体
 Strong UIImage *screenShotImage;//截图
-
@end
 extern BOOL formLogIn;//连接页面是否来自登录界面
 BOOL isfromCameraView;//未绑定鱼缸时，去绑定鱼缸 判断是否从摄像头界面进入
@@ -128,6 +125,7 @@ Strong UIImage *screenShotImage;//截图

 -(void)viewWillAppear:(BOOL)animated{
    [super viewWillAppear:animated];
+
    //跳转到录制界面会将cameraHViewDelegate 置nil
    _bottomToolHView.cameraHViewDelegate=self;
    //扫码激活用 更新isActive
@@ -145,7 +143,6 @@ Strong UIImage *screenShotImage;//截图
    _isCanAutoOrientation = YES;
    //设置默认竖屏
    [[AppDelegate sharedDefault] application:[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[AppDelegate sharedDefault].window];
-    [self.view hideToast];
    //先判断是否授权
    if (!self.contact.isActive) {

@@ -200,6 +197,7 @@ Strong UIImage *screenShotImage;//截图
 -(void)viewWillDisappear:(BOOL)animated{
    
    [super viewWillDisappear:animated];
+    [self.view hideToast];//隐藏所有弹出框
    //屏幕长亮关闭
    [[ UIApplication sharedApplication] setIdleTimerDisabled:NO];
    
@@ -215,7 +213,6 @@ Strong UIImage *screenShotImage;//截图
    }
    [self.player p2pStop];
    [[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil];
-    [self.bottomToolHView removeObViserFromSelf];
    
 }
 - (void)dealloc {
@@ -344,6 +341,7 @@ Strong UIImage *screenShotImage;//截图
            _isReject=YES;
            NSLog(@"摄像头连接失败");
            dispatch_async(dispatch_get_main_queue(), ^{
+                [self.view hideToast];
                [self.view makeToast:@"连接失败"];
                [self hiddenMonitoringUI:NO callWithErrorType:(NSInteger)error isReCall:NO];
            });
@@ -2738,6 +2736,7 @@ Strong UIImage *screenShotImage;//截图
        
        [self.canvasView bringSubviewToFront:self.promptButton];
    }
+    
 }
 /*
 GWP2PCallErrorNone = 0,        //0无原因
@@ -19,8 +19,4 @@
@property (strong, nonatomic) MBProgressHUD *progressAlert;
@property (nonatomic,strong) IfishCameraModel *camera;

-(void)removeObViserFromSelf;
-
-(void)addObViserFromSelf;
-
@end
@@ -28,10 +28,8 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell";
 - (instancetype)initWithFrame:(CGRect)frame {
    self = [super initWithFrame:frame];
    if (self) {
-        //[self addObViserFromSelf];
        [self setCollectionFrame:frame];
        
-        
    }
    return self;
 }
@@ -39,26 +37,12 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell";

 -(void)dealloc{
    
-    //[[NSNotificationCenter defaultCenter] removeObserver:self name:ACK_RECEIVE_REMOTE_MESSAGE object:nil];
-   // [[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil];
    if (_progressAlert) {
        
        _progressAlert =nil;
    }
 }

-(void)removeObViserFromSelf{
-    ////录制回放功能打开
-   // [[NSNotificationCenter defaultCenter] removeObserver:self name:ACK_RECEIVE_REMOTE_MESSAGE object:nil];
-    //[[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil];
-    
-}
-
-(void)addObViserFromSelf{
-    
-    //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ack_receiveRemoteMessage:) name:ACK_RECEIVE_REMOTE_MESSAGE object:nil];
-    //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveRemoteMessage:) name:RECEIVE_REMOTE_MESSAGE object:nil];
-}

 -(void)setCollectionFrame:(CGRect)frame{
    
@@ -741,7 +741,8 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
            }
            //存储摄像头设备关系数组
            [[DataCenter defaultDtacenter]setValue:devicamerArr forKey:@"devicamerArr"];
-            
+            //添加设备之后，先断开device连接，之后进入摄像头页面再重新添加链接
+            [[GWP2PClient sharedClient] disconnect];
            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                IfishP2PMonitorController *monitorVC=[[IfishP2PMonitorController alloc] init];
                monitorVC.contact = cameraMdel;