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

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
@@ -8,13 +8,12 @@
#import <UIKit/UIKit.h>
#import "TouchButton.h"
#import "OpenGLView.h"
#import "P2PClient.h"
#import <AVFoundation/AVFoundation.h>
#import "CustomBorderButton.h"
#import "CustomView.h"
#import "ProgressImageView.h"
#import "KanHuListModel.h"
#import <GWP2P/GWP2P.h>
//竖屏
#define STOPBTN_TAG 1603227
#define SOUND_BUTTON_H_TAG 1603221
@@ -34,14 +33,12 @@
@interface ShopKanHuP2PViewController : BaseViewController <AVCaptureVideoDataOutputSampleBufferDelegate, UIGestureRecognizerDelegate,
TouchButtonDelegate,
OpenGLViewDelegate,
UIScrollViewDelegate,
UIAlertViewDelegate,
P2PClientDelegate,
KanHuBaoGaoViewDelegate>
@property (nonatomic, strong) OpenGLView *remoteView;
@property (nonatomic, strong) UIView *remoteView;
@property (nonatomic,strong) KanHuListModel *kanHuCamera;
@property (nonatomic) BOOL isPlaying;
@property (nonatomic) BOOL isReject;
@@ -64,7 +61,8 @@
@property (nonatomic) BOOL isAlreadyShowResolution;//重新调整监控画面
@property (nonatomic) BOOL isDefenceOn;//重新调整监控画面
//监控画面
Strong GWP2PVideoPlayer *player;
@property (assign,nonatomic) BOOL isFullScreen;
@property (strong, nonatomic) UIView *fullScreenBgView;
@@ -110,7 +108,6 @@
@property (assign,nonatomic) BOOL isIntoMonitorFromMonitor;
//下半部生成报告部分 竖屏显示 全屏时,隐藏
//@property (nonatomic,strong) KanHuBaoGaoView *baoGaoToolHView;
@property (nonatomic,strong) UIView *HbootmView;
@property (nonatomic,strong) NSDictionary*baGaoDic;
@property (nonatomic,strong) NSArray *pinFenArray;