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

V4.9.9测试版第一次提交 构建版本9.9.1

Browse Source
This commit is contained in:
wbzhan
2019-07-12 14:09:23 +08:00
parent 8693efe121
commit 33254ad734
54 changed files with 1019 additions and 3719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.h
-10
View File
@@ -51,18 +51,15 @@
@interface IfishP2PMonitorController : UIViewController<
AVCaptureVideoDataOutputSampleBufferDelegate,UIGestureRecognizerDelegate,TouchButtonDelegate,UIScrollViewDelegate,UIAlertViewDelegate,MonitorBottomCollcetionSelectDelegate,LxPopViewDelegate,CameraBottomHViewDelegate,IfishSegmentViewDelegate>
//@property (nonatomic, strong) OpenGLView *remoteView;
@property (nonatomic, strong) GWP2PVideoPlayer *player;//摄像头页面
@property (nonatomic) BOOL isReject;
@property (nonatomic) BOOL isFullScreen4B3;
@property (nonatomic) BOOL isShowControllerBar;
@property (nonatomic) BOOL isShowVToolBar;
@property (nonatomic) BOOL isVideoModeHD;
//@property (strong, nonatomic) MBProgressHUD *progressAlert;
@property (nonatomic,strong) IfishCameraModel *contact;
@property (nonatomic,strong) UIScrollView *scrollView;//监控界面缩放
@property (nonatomic) BOOL isScale;//监控界面缩放
@property (strong, nonatomic) UIView *bottomView;//重新调整监控画面
@property (strong, nonatomic) UIView *pressView;
@property (nonatomic) BOOL isTalking;
@@ -113,7 +110,6 @@
@property (nonatomic,strong) UIView *canvasView; //显示监控画面的载体
@property (assign,nonatomic) CGRect canvasframe;
@property (nonatomic,strong) UIButton *promptButton;
@property (nonatomic,strong) UILabel *labelTip;
@property (strong, nonatomic) ProgressImageView *yProgressView;
@property (nonatomic,strong) UIView *midToolHView; //全屏时，隐藏
@property (nonatomic,strong) CameraBottomHView *bottomToolHView; //全屏时，隐藏
@@ -121,13 +117,7 @@
//YES表示当前处于监控中，且接收到推送，点击观看监控
@property (assign,nonatomic) BOOL isIntoMonitorFromMonitor;
//分享工具栏 竖屏显示 全屏时，隐藏
//@property (nonatomic,strong) UIView *midSecondToolHView;
//@property (nonatomic,strong) UISegmentedControl *segmentControl;
@property (nonatomic,strong) IifshSegmentView *segControl;
//@property (nonatomic,strong) UIButton *soundButtonH;
@property (nonatomic,strong) UIButton *stopBtnH;
@property (nonatomic,strong) UIImageView *stopImageViewH;
@property (nonatomic,strong) UIButton *switchScreenButtonH;