From 3698c13aba988cd3e41b91b255e1c682c057e565 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期四, 23 三月 2023 11:49:58 +0800 Subject: [PATCH] 1.新增历史记录相关页面及功能 2.修改配网为热点配网 3.设备列表增加过滤门锁功能 4.增加添加设备通知功能 --- EZSDK/EZSDK/SDK/include/EZPlayer.h | 84 +++++++++++++++++++++++++++++++++++------ 1 files changed, 71 insertions(+), 13 deletions(-) diff --git a/EZSDK/EZSDK/SDK/include/EZPlayer.h b/EZSDK/EZSDK/SDK/include/EZPlayer.h index a1dd6b7..baea2e2 100644 --- a/EZSDK/EZSDK/SDK/include/EZPlayer.h +++ b/EZSDK/EZSDK/SDK/include/EZPlayer.h @@ -12,6 +12,8 @@ @class EZCloudRecordFile; @class EZPlayer; @class EZPlayerExParamInfo; +@class EZDevicePtzAngleInfo; +@class EZPMPlayPrivateTokenInfo; /** * 棰勮娓呮櫚搴� @@ -95,6 +97,34 @@ */ - (void)player:(EZPlayer *)player didReceivedDisplayHeight:(NSInteger)height displayWidth:(NSInteger)width; +/** + * 璁惧浜戝彴瑙掑害鏁版嵁鍥炶皟 + * + * @param player 鎾斁鍣ㄥ璞� + * @param info 绉佹湁鏁版嵁 + */ +- (void)player:(EZPlayer *)player didReceivedDevicePtzAngleInfo:(EZDevicePtzAngleInfo *)info; + +/** + * 鎾斁杩囩▼涓� 鍥炶皟瑙ｇ爜鏁版嵁 + * 閲嶈锛氳鍥炶皟浼氭瘮杈冮绻�(涓�绉掕嫢骞叉)锛屽悓鏃剁洿鎺ョ敱鎾斁搴撶嚎绋嬪洖璋冧笂鏉ワ紝璇峰嬁鍦ㄦ柟娉曚腑鍋氳�楁椂鎿嶄綔 + * 閲嶈锛氬洖璋冪殑鏁版嵁鐨勫唴瀛樻槸鐢辨挱鏀惧簱鍐呴儴鍒嗛厤骞剁鐞嗙殑锛屽湪浣跨敤鏃讹紝璇峰悓姝ュ鐞嗗洖璋冪殑data锛涘闇�寮傛澶勭悊锛岃鎷疯礉璇ユ暟鎹� + * + * @param player 鎾斁鍣ㄥ璞� + * @param data 鎾斁搴撹В鐮佸嚭鐨勬暟鎹� + * @param width 瑙嗛瀹藉害 + * @param height 瑙嗛楂樺害 + */ +- (void)player:(EZPlayer *)player didDecodedData:(NSData *)data width:(NSInteger)width height:(NSInteger)height; + +/** + * 鍙栨祦鏁版嵁涓幏鍙栧紑闂╰oken鍥炶皟 + * + * @param player 鎾斁鍣ㄥ璞� + * @param tokenInfo token瀵硅薄 + */ +- (void)player:(EZPlayer *)player playPrivateTokenInfo:(EZPMPlayPrivateTokenInfo *)tokenInfo; + @end /// 姝ょ被涓鸿悿鐭虫挱鏀惧櫒绫� @@ -104,7 +134,7 @@ @property (nonatomic, weak) id<EZPlayerDelegate> delegate; /// 鏄惁璁╂挱鏀惧櫒澶勭悊杩涘叆鍚庡彴,YES:鑷姩澶勭悊;NO:涓嶅鐞�,榛樿涓篩ES -@property (nonatomic) BOOL backgroundModeByPlayer; +@property (nonatomic, assign) BOOL backgroundModeByPlayer; /** * 鏍规嵁璁惧搴忓垪鍙峰拰閫氶亾鍙峰垱寤篍ZPlayer瀵硅薄 @@ -135,7 +165,19 @@ @param streamType 鐮佹祦绫诲瀷 1:涓荤爜娴� 2:瀛愮爜娴� @return EZPlayer瀵硅薄 */ -+ (instancetype)createPlayerWithUserId:(NSInteger) userId cameraNo:(NSInteger) cameraNo streamType:(NSInteger) streamType; ++ (instancetype)createPlayerWithUserId:(NSInteger)userId cameraNo:(NSInteger)cameraNo streamType:(NSInteger)streamType; + +/** + * @since 4.19.2 + * 涓�涓〉闈㈠瓨鍦ㄥ涓棰戜娇鐢ㄦ渶灏忕殑鐮佹祦锛屾病鏈夊瓙鐮佹祦鐨勮瘽杩樻槸浣跨敤涓荤爜娴� + * + * @param deviceSerial 璁惧搴忓垪鍙� + * @param cameraNo 铏氭嫙閫氶亾 + * @param useSubStream 鏄惁浣跨敤瀛愮爜娴� + * + * @return EZPlayer瀵硅薄 + */ ++ (instancetype)createPlayerWithDeviceSerial:(NSString *)deviceSerial cameraNo:(NSInteger)cameraNo useSubStream:(BOOL)useSubStream; /** * 閿�姣丒ZPlayer @@ -149,21 +191,21 @@ * * @param HDPriority 鏄惁纭В浼樺厛 */ --(void)setHDPriority:(BOOL)HDPriority; +- (void)setHDPriority:(BOOL)HDPriority; /** 鑾峰彇褰撳墠鐨勮蒋纭В鎯呭喌锛屽湪鐮佹祦姝ｅ父鎾斁鍚庤皟鐢� @return 1锛氳蒋瑙� 2锛氱‖瑙� 0锛氬嚭閿� */ -- (int) getHDPriorityStatus; +- (int)getHDPriorityStatus; /** * 璁剧疆璁惧褰掑睘涓氬姟鏉ユ簮锛岄渶瑕佸湪棰勮鍥炴斁鍓嶈皟鐢� 鍥芥爣璁惧浣跨敤 * * @param bizType 绫诲瀷 鍥芥爣涓� bizType='GB28181' */ --(void)setBizType:(NSString *)bizType; +- (void)setBizType:(NSString *)bizType; /** * 骞冲彴id 鍥芥爣璁惧浣跨敤 @@ -178,6 +220,13 @@ * @param playerView 鎾斁鍣╲iew */ - (void)setPlayerView:(UIView *)playerView; + +/** + * 鏄惁闈欓煶鎾斁锛宻tartRealPlay涔嬪墠璋冪敤 + * + * @param isSilencePlay 鏄惁闈欓煶鎾斁 + */ +- (void)setSilencePlay:(BOOL)isSilencePlay; /** * 寮�濮嬫挱鏀撅紝寮傛鎺ュ彛锛岃繑鍥炲�煎彧鏄〃绀烘搷浣滄垚鍔燂紝涓嶄唬琛ㄦ挱鏀炬垚鍔� @@ -219,7 +268,7 @@ @return 鎾斁搴撶殑port,鍙兘涓�-1锛堟棤鏁堝�硷級 */ -- (int) getInnerPlayerPort; +- (int)getInnerPlayerPort; /** 鑾峰彇褰撳墠宸叉挱鏀剧殑鎬绘祦閲忥紝鍗曚綅瀛楄妭 @@ -231,7 +280,7 @@ @return 娴侀噺鍊� */ -- (NSInteger) getStreamFlow; +- (NSInteger)getStreamFlow; /** * 寮�濮婽TS瀵硅锛屽紓姝ユ帴鍙ｏ紝杩斿洖鍊煎彧鏄〃绀烘搷浣滄垚鍔燂紝涓嶄唬琛ㄦ挱鏀炬垚鍔� @@ -347,14 +396,14 @@ @return 灏忎簬0涓烘棤鏁堝�硷紝澶т簬绛変簬0涓烘湁鏁堝�� */ -- (int) getPlayPort; +- (int)getPlayPort; /** 鑾峰彇褰撳墠鍙栨祦鏂瑰紡锛� - @return + @return 褰撳墠鍙栨祦绫诲瀷 */ -- (int) getStreamFetchType; +- (int)getStreamFetchType; /** sd鍗″強浜戝瓨鍌ㄥ�嶉�熷洖鏀炬帴鍙� @@ -371,18 +420,27 @@ @param mode 鍥炴斁鏃剁殑鎶藉抚鎺у埗锛屽綋鍓嶄粎浜戝瓨鍌ㄦ敮鎸併��0锛� 4鍊嶉�熷叏甯э紝8鍊嶉�熶互涓婃娊甯� 1锛氭娊甯� 2锛氬叏甯� 锛堝璁惧鍥炴斁褰撳墠涓嶆敮鎸侊紝浼犲叆0鍗冲彲锛� @return YES/NO */ -- (BOOL) setPlaybackRate:(EZPlaybackRate) rate mode:(NSUInteger)mode; +- (BOOL)setPlaybackRate:(EZPlaybackRate) rate mode:(NSUInteger)mode; /** 璁剧疆鍏ㄥ弻宸ュ璁叉椂鐨勬ā寮�,瀵硅鎴愬姛鍚庤皟鐢� @param routeToSpeaker YES:浣跨敤鎵０鍣� NO:浣跨敤鍚瓛 */ -- (void) changeTalkingRouteMode:(BOOL) routeToSpeaker; +- (void)changeTalkingRouteMode:(BOOL)routeToSpeaker; /// //鎵╁睍鍙傛暟 UIKit涓撶敤 /// @param exParamInfo EZPlayerExParamInfo -- (void) setExParamInfo:(EZPlayerExParamInfo *) exParamInfo; +- (void)setExParamInfo:(EZPlayerExParamInfo *)exParamInfo; + +/** + * 璁剧疆鎵撳紑鎾斁搴撶殑鏅鸿兘鍒嗘瀽锛屽綋鍓嶆俯鎰熺浉鏈虹殑妗嗘浣跨敤浜嗚鏅鸿兘鍒嗘瀽鏁版嵁锛岄瑙堟垚鍔熷悗璋冪敤锛屽湪鎾斁杩囩▼涓殢鏃跺紑鍏� + * + * @param enable YES锛氬紑 NO锛氬叧 + * + * @return 杩斿洖鐘舵�� + */ +- (BOOL)setIntelAnalysis:(BOOL)enable; @end -- Gitblit v1.8.0