root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改为静音播放视频，不再播放声音

This commit is contained in:
wbzhan 2019-07-23 13:50:58 +08:00
parent 0b7755866e
commit e5c41967ab
5 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ifish/Info.plist
View File

@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>9.9.8</string> <string>9.9.11</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

10
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m
View File

@ -102,16 +102,10 @@
#pragma mark- 暂停 挂断 #pragma mark- 暂停 挂断
-(void)stopP2PPlayingGLViewVideo{ -(void)stopP2PPlayingGLViewVideo{
if(!self.isReject){
if ([self.player isPlaying]) {
self.isReject = !self.isReject;
while (self.isPlaying) {
usleep(50*1000);
}
[self.player p2pStop]; [self.player p2pStop];
} }
} }
#pragma mark -已有人观看事件 #pragma mark -已有人观看事件

1
Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m
View File

@ -465,6 +465,7 @@
//添加播放器VC //添加播放器VC
self.player = [[GWP2PVideoPlayer alloc] init]; self.player = [[GWP2PVideoPlayer alloc] init];
self.player.delegate = self; self.player.delegate = self;
self.player.mute = YES;
self.player.viewController.view.backgroundColor = [UIColor clearColor]; self.player.viewController.view.backgroundColor = [UIColor clearColor];
[self.canvasView addSubview:self.player.viewController.view]; [self.canvasView addSubview:self.player.viewController.view];
[self addChildViewController:self.player.viewController]; [self addChildViewController:self.player.viewController];

1
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
View File

@ -476,6 +476,7 @@ Strong UIImage *screenShotImage;//截图
//添加播放器VC //添加播放器VC
self.player = [[GWP2PVideoPlayer alloc] init]; self.player = [[GWP2PVideoPlayer alloc] init];
self.player.delegate = self; self.player.delegate = self;
self.player.mute = YES;
self.player.viewController.view.backgroundColor = [UIColor clearColor]; self.player.viewController.view.backgroundColor = [UIColor clearColor];
[self.canvasView addSubview:self.player.viewController.view]; [self.canvasView addSubview:self.player.viewController.view];
[self addChildViewController:self.player.viewController]; [self addChildViewController:self.player.viewController];

32
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
View File

@ -49,11 +49,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
} }
@property (strong,nonatomic) NSMutableDictionary *addresses; @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,copy) NSString *wifiName;
@property (nonatomic,strong) UIButton *sBtn; @property (nonatomic,strong) UIButton *sBtn;
@property(nonatomic)BOOL autodismiss; @property(nonatomic)BOOL autodismiss;
@ -183,7 +178,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
CGFloat wifiFileH=wifiFileW*percentHbiW; CGFloat wifiFileH=wifiFileW*percentHbiW;
self.wifiSecFiled=[[UITextField alloc] initWithFrame:CGRectMake(10,CGRectGetMaxY(self.wifilabel.frame) + 10, wifiFileW, wifiFileH)]; 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.placeholder = @"请输入WiFi密码";
self.wifiSecFiled.delegate=self; self.wifiSecFiled.delegate=self;
self.wifiSecFiled.layer.masksToBounds=YES; self.wifiSecFiled.layer.masksToBounds=YES;
@ -343,19 +337,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
if(buttonIndex==0){ 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){ }else if (alertView.tag==ALERT_TAG_B_SURE){
if (buttonIndex ==1) { if (buttonIndex ==1) {
@ -648,9 +629,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
[self.view makeToast:@"已经绑定过了"]; [self.view makeToast:@"已经绑定过了"];
return; return;
} }
} }
UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"]; UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
[AFNOHeaderHttpTool bindCameraWith:cameraId userId:model.userId success:^(id response) { [AFNOHeaderHttpTool bindCameraWith:cameraId userId:model.userId success:^(id response) {
NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
@ -659,16 +638,10 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
if ([resultDic[@"result"] isEqualToString:@"100"]) { if ([resultDic[@"result"] isEqualToString:@"100"]) {
self.lodviewMissStyle =lodingViewdissMissSuccsess; self.lodviewMissStyle =lodingViewdissMissSuccsess;
_canDissMissController = YES; _canDissMissController = YES;
[self connectNormalView]; //绑定成功之后，直接跳转详情页面
//绑定成功
/** /**
* 存储摄像头设备信息 存储摄像头设备信息
*/ */
NSMutableArray *newCamerArr = [[NSMutableArray alloc] initWithArray:oldCameraArr]; NSMutableArray *newCamerArr = [[NSMutableArray alloc] initWithArray:oldCameraArr];
NSDictionary * cameraDic=resultDic[@"data"]; NSDictionary * cameraDic=resultDic[@"data"];
@ -708,6 +681,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
} failure:^(NSError *err) { } failure:^(NSError *err) {
[self connectNormalView];
[self.view makeToast:@"绑定失败未知错误"]; [self.view makeToast:@"绑定失败未知错误"];
}]; }];