From e8fd85f3dd92b1c5f065abbce13ab0cb7ba5a118 Mon Sep 17 00:00:00 2001
From: wbzhan <zhanwenbaoit@126.com>
Date: Sat, 20 Jul 2019 17:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=BF=80=E6=B4=BB=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IfishP2PMonitorController.m               | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
index 7df0315..87738ef 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
@@ -151,16 +151,16 @@ Strong UIImage *screenShotImage;//截图
 
         return;
     }
-//    if ([self.contact.isActive isEqualToString:@"1"]) {
+    if ([self.contact.isActive isEqualToString:@"1"]) {
     
         [self  cameraConnectSeting];
-//    }else if ([self.contact.isActive isEqualToString:@"0"]){
+    }else if ([self.contact.isActive isEqualToString:@"0"]){
 
-//        UIAlertView *alert=[[UIAlertView alloc] initWithTitle:@"" message:@"请扫描产品外包装上的激活码来激活摄像头" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"前往扫描", nil];
-//        alert.tag = WEIJIHUO_ALERT;
-//        [alert show];
-//
-//    }
+        UIAlertView *alert=[[UIAlertView alloc] initWithTitle:@"" message:@"请扫描产品外包装上的激活码来激活摄像头" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"前往扫描", nil];
+        alert.tag = WEIJIHUO_ALERT;
+        [alert show];
+
+    }
 }
 //环境校验
 -(void)checkNetStatus{
@@ -236,19 +236,19 @@ Strong UIImage *screenShotImage;//截图
     _isReject=YES;
     _isStop = NO;
     _isPushNextView = NO;
-//    if ([self.contact.isActive isEqualToString:@"1"]) {
+    if ([self.contact.isActive isEqualToString:@"1"]) {
         [self connectDevice];
-//    }
+    }
         //监控竖屏时，各控件初始化(先)
     [self initComponentForPortrait];
     //监控横屏时，各控件初始化(后)
     [self initComponentForHorizontalScreen];
 
-//    if ([self.contact.isActive isEqualToString:@"1"]) {
-//
-//    }else{
+    if ([self.contact.isActive isEqualToString:@"1"]) {
+
+    }else{
         [self.yProgressView stop];
-//    }
+    }
 }
 #pragma mark --LoadBaseUI
 -(UIView *)canvasView{