diff --git a/Ifish/Info.plist b/Ifish/Info.plist
index c8d4caa..ce20b9b 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -70,7 +70,7 @@
CFBundleVersion
- 9.9.8
+ 9.9.11
ITSAppUsesNonExemptEncryption
LSApplicationCategoryType
diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m
index 6116e1f..84a9792 100644
--- a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m
+++ b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m
@@ -102,16 +102,10 @@
#pragma mark- 暂停 挂断
-(void)stopP2PPlayingGLViewVideo{
- if(!self.isReject){
-
- self.isReject = !self.isReject;
-
- while (self.isPlaying) {
- usleep(50*1000);
- }
+
+ if ([self.player isPlaying]) {
[self.player p2pStop];
}
-
}
#pragma mark -已有人观看事件
diff --git a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m
index 006a467..434bacd 100644
--- a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m
+++ b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m
@@ -465,6 +465,7 @@
//添加播放器VC
self.player = [[GWP2PVideoPlayer alloc] init];
self.player.delegate = self;
+ self.player.mute = YES;
self.player.viewController.view.backgroundColor = [UIColor clearColor];
[self.canvasView addSubview:self.player.viewController.view];
[self addChildViewController:self.player.viewController];
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
index 8a62f5d..b3b5116 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
@@ -476,6 +476,7 @@ Strong UIImage *screenShotImage;//截图
//添加播放器VC
self.player = [[GWP2PVideoPlayer alloc] init];
self.player.delegate = self;
+ self.player.mute = YES;
self.player.viewController.view.backgroundColor = [UIColor clearColor];
[self.canvasView addSubview:self.player.viewController.view];
[self addChildViewController:self.player.viewController];
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
index 30b07ac..fff0a6f 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
@@ -49,11 +49,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
}
@property (strong,nonatomic) NSMutableDictionary *addresses;
-//技威服务器 socket返回contactID 即cameraId
-//@property (nonatomic,copy) NSString *contactID;
-@property (nonatomic,assign) NSInteger flag;
-@property (nonatomic,assign) NSInteger type;
-@property (nonatomic,copy) NSString *address;
@property (nonatomic,copy) NSString *wifiName;
@property (nonatomic,strong) UIButton *sBtn;
@property(nonatomic)BOOL autodismiss;
@@ -183,7 +178,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
CGFloat wifiFileH=wifiFileW*percentHbiW;
self.wifiSecFiled=[[UITextField alloc] initWithFrame:CGRectMake(10,CGRectGetMaxY(self.wifilabel.frame) + 10, wifiFileW, wifiFileH)];
- //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wifiviewkeyboradWillShow:) name:UIKeyboardWillChangeFrameNotification object:nil];
self.wifiSecFiled.placeholder = @"请输入WiFi密码";
self.wifiSecFiled.delegate=self;
self.wifiSecFiled.layer.masksToBounds=YES;
@@ -343,19 +337,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
if(buttonIndex==0){
}
- }else if(alertView.tag==ALERT_TAG_SET_SUCCESS){
-
- if(buttonIndex==0){
-
- if (self.flag == 0) {//设备未初始化过密码
-
- NSString *newPassword = GIWEI_INITPASS;
- self.lastSetPassword = [Utils GetTreatedPassword:newPassword];;
-
- }else{
-
- }
- }
}else if (alertView.tag==ALERT_TAG_B_SURE){
if (buttonIndex ==1) {
@@ -648,9 +629,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
[self.view makeToast:@"已经绑定过了"];
return;
}
-
}
-
UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
[AFNOHeaderHttpTool bindCameraWith:cameraId userId:model.userId success:^(id response) {
NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
@@ -659,16 +638,10 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
if ([resultDic[@"result"] isEqualToString:@"100"]) {
self.lodviewMissStyle =lodingViewdissMissSuccsess;
_canDissMissController = YES;
- [self connectNormalView];
-
-
- //绑定成功
-
+ //绑定成功之后,直接跳转详情页面
/**
- * 存储摄像头设备信息
-
+ 存储摄像头设备信息
*/
-
NSMutableArray *newCamerArr = [[NSMutableArray alloc] initWithArray:oldCameraArr];
NSDictionary * cameraDic=resultDic[@"data"];
@@ -708,6 +681,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
} failure:^(NSError *err) {
+ [self connectNormalView];
[self.view makeToast:@"绑定失败未知错误"];
}];