diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 5ca6d79..ceaf3c6 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -13169,7 +13169,7 @@ 8876A5821BB83447007A4B54 = { CreatedOnToolsVersion = 7.0; DevelopmentTeam = WFX8GD5HFX; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.AccessWiFi = { enabled = 1; @@ -15697,7 +15697,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 13; + CURRENT_PROJECT_VERSION = 14; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15815,7 +15815,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 13; + CURRENT_PROJECT_VERSION = 14; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/GWP2PSDK/GWP2P.framework/GWP2P b/Ifish/GWP2PSDK/GWP2P.framework/GWP2P index b7b083e..3ac776d 100755 Binary files a/Ifish/GWP2PSDK/GWP2P.framework/GWP2P and b/Ifish/GWP2PSDK/GWP2P.framework/GWP2P differ diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h old mode 100644 new mode 100755 index 62d701f..0bfa60e --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h @@ -27,7 +27,6 @@ typedef void(^GWNetCompletionBlock)(BOOL success, NSString *errorCode, NSString extern NSString * const kGWNetSessionIdErrorNotification; -/// @interface GWNet : NSObject @property (nonatomic, assign) BOOL connectWithHttps;/**< 以https的方式连接我们的服务器.默认为NO,用http的方式连接 */ @@ -116,16 +115,7 @@ extern NSString * const kGWNetSessionIdErrorNotification; @param completion 请求完成回调 */ -(void)uploadIosPushToken:(NSString *)token withUserID:(NSString *)userID sessionID:(NSString *)sessionID completion:(GWNetCompletionBlock)completion; -#pragma mark - ios上传极光推送 -/** - ios上传极光推送 - - @param regid ios极光推送regid - @param userID 用户ID - @param sessionID 会话ID - @param completion 请求完成回调 - */ --(void)UploadPushParam:(NSString *)regid withUserID:(NSString *)userID sessionID:(NSString *)sessionID completion:(GWNetCompletionBlock)completion; + #pragma mark 第三方登录 /** 第三方登录 @@ -174,23 +164,6 @@ extern NSString * const kGWNetSessionIdErrorNotification; withUserId:(NSString *)userId sessionId:(NSString *)sessionId completion:(GWNetCompletionBlock)completion; -#pragma mark 注销用户 -/** - 注销用户 注销后用户的所有信息会被清空要重新注册 - - @param userId 用户ID,数据从登录时返回的json里获取 - @param sessionId 会话ID,数据从登录时返回的json里获取 - @param pwd 密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 - @param type 注销类型 注销原因类型：1：设备坏了、不好用 2：APP不好用 3：广告太多 4：已有其他平台账号 - @param desc 注销原因 - @param completion 回调 - */ --(void)cancellationWithUserId:(NSString*)userId//这个应该从登录时返回的json里获取 - withSessionId:(NSString*)sessionId//这个应该从登录时返回的json里获取 - withPwd:(NSString*)pwd //密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 - withType:(NSString*)type //注销类型 - withDesc:(NSString*)desc //注销原因 - completion:(GWNetCompletionBlock)completion;//请求完成回调 #pragma mark 退出登录 /** 退出登录 @@ -203,8 +176,6 @@ extern NSString * const kGWNetSessionIdErrorNotification; withSessionId:(NSString*)sessionId//这个应该从登录时返回的json里获取 completion:(GWNetCompletionBlock)completion;//请求完成回调 - - #pragma mark 邮箱注册 -(void)regEmailWithEmail:(NSString*)name //邮箱地址 withPwd:(NSString*)pwd //密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 @@ -489,24 +460,7 @@ extern NSString * const kGWNetSessionIdErrorNotification; remarkName:(NSString*)remarkName//设备昵称 permission:(NSInteger)permission completion:(GWNetCompletionBlock)completion; -#pragma mark 4g设备添加方式 -/** - 添加4g设备,修改一台设备信息 - - @param userID 用户ID - @param sessionID 会话ID - @param deviceId 设备ID - @param MasterKey 设备的主人密码 - @param GuestKey 设备的访客密码 - @param completion 回调 - */ -- (void)addDeviceByNetworkWithUserID:(NSString *)userID - sessionID:(NSString *)sessionID - deviceId:(NSString *)deviceId - masterKey:(NSString *)MasterKey - guestKey:(NSString *)GuestKey - completion:(GWNetCompletionBlock)completion; #pragma mark 设备同步-批量更新设备 /** 设备同步-批量更新设备 @@ -633,40 +587,7 @@ extern NSString * const kGWNetSessionIdErrorNotification; macAddr:(NSString *)macAddr//Mac地址，长度固定为12，获取不到时用0填充 isSupport:(BOOL)isSupport//是否支持权限管理，1代表支持，0或者传空代表不支持 completion:(GWNetCompletionBlock)completion; -/* -@param deviceID 设备ID -@param userID 用户(主人)ID -@param sessionID 登陆会话ID -@param modifyTime 绑定时时间戳 -@param deviceInfoVersion 设备信息版本号(现在传 0，后续可使用不同版本号对应不同的加密方式等) -@param groupID 分组ID(现在传 0，表示不支持设备分组) -@param permission 权限(必须是开启权限功能且是主人,按权限值计算) -@param secretKey 设备加密后的密码(主人密码) -@param guestKey 设备加密后的访客密码 -@param remarkName 设备备注名称 -@param keyID 由DeviceID+Rkey组成(其中DeviceID、RKey需要加密) -@param customID 顾客ID,获取不到时应传入0 -@param macAddr Mac地址，长度固定为12，获取不到时用0填充 -@param isSupport 是否支持权限管理，1代表支持，0或者传空代表不支持 -@param completion 绑定完成后的block -*/ -#pragma mark 绑定主人 -- (void)bindDevice:(NSString *)deviceID - withUserID:(NSString *)userID - sessionID:(NSString *)sessionID - modifyTime:(NSString *)modifyTime - deviceInfoVersion:(NSString *)deviceInfoVersion - groupID:(NSString *)groupID - permission:(NSInteger)permission - secretKey:(NSString *)secretKey - guestKey:(NSString *)guestKey - remarkName:(NSString *)remarkName - keyID:(UInt64)keyID - customID:(int)customID - macAddr:(NSString *)macAddr - isSupport:(BOOL)isSupport - isSupport4g:(BOOL)isSupport4g - completion:(GWNetCompletionBlock)completion; + #pragma mark 获取邀请码 /** 获取邀请码,此接口已经不用,改用获取邀请链接 @@ -705,8 +626,6 @@ extern NSString * const kGWNetSessionIdErrorNotification; guestID:(NSString *)guestID guestRemark:(NSString *)guestRemark appendMsg:(NSString *)appendMsg - masterNickName:(NSString *)masterNickName - deviceNickName:(NSString *)deviceNickName completion:(GWNetCompletionBlock)completion; #pragma mark 获取访客列表 @@ -723,23 +642,6 @@ extern NSString * const kGWNetSessionIdErrorNotification; deviceID:(NSString *)deviceID completion:(GWNetCompletionBlock)completion; - -#pragma mark 取消访客信息 - -/** -取消访客信息 - -@param userID 用户(主人)ID -@param sessionID 登陆会话ID -@param deviceID 设备ID -@param guestID 访客ID -@param completion 绑定完成后的block -*/ --(void)cancelGuestShare:(NSString *)userID - sessionID:(NSString *)sessionID - deviceID:(NSString *)deviceID - guestID:(NSString *)guestID - completion:(GWNetCompletionBlock)completion; #pragma mark 删除访客信息 /** 删除访客信息 @@ -959,7 +861,6 @@ extern NSString * const kGWNetSessionIdErrorNotification; sessionID:(NSString *)sessionID completion:(GWNetCompletionBlock)completion; - #pragma mark 已联网方式转分享模式 /** 已联网方式转分享模式 @@ -1001,24 +902,6 @@ extern NSString * const kGWNetSessionIdErrorNotification; - (void)shouldShowSplashADWithUserID:(NSString *)userID sessionID:(NSString *)sessionID completion:(GWNetCompletionBlock)completion; -#pragma mark 用户反馈信息 -/** - 用户反馈信息 - - @param userID 用户(主人)ID - @param email 邮箱 - @param content 反馈消息内容 - @param type 问题分类(1：连接问题; 2：录像问题; 3：离线问题; 4：配网问题; 5：云服务问题; 9：其它问题;) - @param appVersion app版本号 - @param imagePath 反馈图片或视频文件url地址 - @param completion 回调 - */ -- (void)feedBackWithUserID:(NSString *)userID - email:(NSString *)email - content:(NSString *)content - type:(NSString *)type - appVersion:(NSString *)appVersion - imagePath:(NSString*)imagePath completion:(GWNetCompletionBlock)completion; #pragma mark - 自定义服务器地址请求 /** diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h old mode 100644 new mode 100755 index e65ad98..ce54561 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h @@ -62,7 +62,6 @@ #define GWNET_RET_SHARING_IS_OWNER @"10905009" //已经是主人 #define GWNET_RET_SHARING_IS_VISITOR @"10905010" //已经是访客 #define GWNET_RET_PARAMETER_ERROR @"10901025" //参数错误 -#define GWNET_RET_PARAMETER_SHARECANCEL @"10905017" //分享已被主人取消 //设备数量限制 #define GWNET_RET_ADD_DEVICE_COUNT_LIMIT @"10905014" //添加的当前设备数量已达到上限 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h old mode 100644 new mode 100755 index 71dcf1b..d8fc23f --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h @@ -25,7 +25,6 @@ #import "GWP2PClient+HXVision.h" #import "GWP2PDefine.h" #import "GWP2PClient+P2PInfo.h" -#import "GWP2PClient+RemoteControl.h" //监控、视频通话、回放 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+APMode.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+APMode.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Alarm.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Alarm.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Defense.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Defense.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h old mode 100644 new mode 100755 index 7f1299e..d1f38ba --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h @@ -212,27 +212,6 @@ typedef NS_ENUM(NSUInteger, GWDeviceRTSPPasswordMode) { withDeviceID:(NSString *)deviceID devicePassword:(NSString *)devicePassword completionBlock:(CompletionBlock)completionBlock; -/** - 设置4g设备网络的模组 - - @param deviceID 设备ID - @param devicePassword 设备密码 - @param completionBlock 与设备交互完成后的回调Block - */ -- (void)getDevice4gNetworkTypeWithDeviceID:(NSString *)deviceID - devicePassword:(NSString *)devicePassword - completionBlock:(CompletionBlock)completionBlock; - -/** - 回复收到4g邦定信息 - - @param deviceID 设备ID - @param devicePassword 设备密码 - @param completionBlock 与设备交互完成后的回调Block - */ -- (void)backDevice4gBindNotiyWithDeviceID:(NSString *)deviceID - devicePassword:(NSString *)devicePassword - completionBlock:(CompletionBlock)completionBlock; /** 不再使用 @@ -320,7 +299,7 @@ typedef NS_ENUM(NSUInteger, GWDeviceRTSPPasswordMode) { 必须保证手机与设备在同一局域网中,否则回调只会收到参数错误. 这一接口在发指令时一定要确保手机与设备在同一局域网中,指令将deviceID转成4位设备IP的最后一位,若不在同一局域网,获取不到设备IP,指令不会成功 @param initialPassword 初始密码,必须为包含字母、数字、其它字符中两种的6~30位的字符串 - @param deviceID 设备ID,直接传设备ID + @param deviceID 设备ID,直接传设备ID,内部处理成IP地址,也可以传4位IP的最后一位数字 @param completionBlock 与设备交互完成后的回调Block */ - (void)setDeviceInitialPassword:(NSString *)initialPassword diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+GarageLight.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+GarageLight.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+HXVision.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+HXVision.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h old mode 100644 new mode 100755 index 149fa94..8180b33 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h @@ -12,14 +12,6 @@ NS_ASSUME_NONNULL_BEGIN @interface GWP2PClient (P2PInfo) -(NSString *)getP2PVersion; - -/** - 要先初始化p2p库 - - @param open 是否打开p2p打印 - */ --(void)setLogLevel:(BOOL)open; - @end NS_ASSUME_NONNULL_END diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h old mode 100644 new mode 100755 index 1c37c4b..df959e1 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h @@ -74,20 +74,6 @@ typedef enum GWP2PColorMode{ withDeviceID:(NSString *)deviceID devicePassword:(NSString *)devicePassword completionBlock:(CompletionBlock)completionBlock; -/** - 设置图像画框开关 - - 获取图像画框开关 getMultipledeviceStatusWithDeviceID:password:completionBlock: - - @param isImageReversed 图像是否倒转 - @param deviceID 设备ID - @param devicePassword 设备密码 - @param completionBlock 与设备交互完成后的回调Block - */ -- (void)setDeviceHumanTrackState:(BOOL)isOpen - withDeviceID:(NSString *)deviceID - devicePassword:(NSString *)devicePassword - completionBlock:(CompletionBlock)completionBlock; /** 获取设备指示灯状态 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h old mode 100644 new mode 100755 index 314241f..d2c8a96 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h @@ -211,19 +211,6 @@ typedef enum GWP2PRecordDefinition { devicePassword:(NSString *)devicePassword completionBlock:(CompletionBlock)completionBlock; -#pragma mark - 设置云回放上传开关 -/** - 设置云回放上传开关 - - @param on 开关 - @param deviceID 设备ID - @param devicePassword 设备密码 - @param completionBlock 与设备交互完成后的回调Block - */ -- (void)setVasSwitchOn:(BOOL)on - deviceID:(NSString *)deviceID - devicePassword:(NSString *)devicePassword - completionBlock:(CompletionBlock)completionBlock; #pragma mark - 获取回话文件 /** 获取设备回放文件 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+RemoteControl.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+RemoteControl.h deleted file mode 100644 index 2ef9666..0000000 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+RemoteControl.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// GWP2PClient+RemoteControl.h -// GWP2P -// -// Created by JonorZhang on 2019/8/29. -// Copyright © 2019 apple. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GWP2PClient (RemoteControl) - -/** - 多sensor支持。[15:8]支持sensor数量, [7:0]当前选择的sensor索引(注意：索引值是从1开始的，没有用0) - - @param index 当前选择的sensor索引(注意：索引值是从1开始的，没有用0) - @param deviceID 设备ID - @param devicePassword 设备密码 - @param completionBlock 与设备交互完成后的回调Block - */ -- (void)setMultiSensorIdx:(UInt16)index - deviceID:(NSString *)deviceID - devicePassword:(NSString *)devicePassword - completionBlock:(CompletionBlock)completionBlock; - - -/** - 手动红外灯控制 - - @param on 红外灯状态,1开；0关 - @param deviceID 设备ID - @param devicePassword 设备密码 - @param completionBlock 与设备交互完成后的回调Block - */ -- (void)setIRLEDLightOn:(BOOL)on - deviceID:(NSString *)deviceID - devicePassword:(NSString *)devicePassword - completionBlock:(CompletionBlock)completionBlock; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+SceneMode.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+SceneMode.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Sensor.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Sensor.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+WhiteLight.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+WhiteLight.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDefine.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDefine.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDevice.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDevice.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h old mode 100644 new mode 100755 index 6328c08..7eae27f --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h @@ -135,14 +135,5 @@ typedef void (^DeviceReceiveBlock)(NSString *deviceId, BOOL isSupport); 停止AP配网。如果配网中途停止，调此方法停止发送数据，正常配网成功不需要调此方法 */ - (void)p2pStopAPLink; -/** - 获取设备IP - - 若设备与手机在同一局域网中,则返回设备局域网IP,用于手机与设备的局域网通信,否则返回 0 - - @param deviceID 设备ID - - @return 设备IP地址 - */ -+ (NSInteger)getDeviceIPByID:(NSString *)deviceID; + @end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PLanDevice.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PLanDevice.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlaybackPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlaybackPlayer.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h old mode 100644 new mode 100755 index eb22f2d..c7bdbd3 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h @@ -24,11 +24,8 @@ typedef void (^P2PCallingBlock)(NSDictionary *parameters); /** 设备接受了呼叫请求,回调相关参数 - @param parameters kP2PCallingIsSameDomainKey; //与对方是否在同个局域网 - kP2PCallAcceptIsVideo960PKey; //对方视频是否960P - kP2PCallAcceptIsVideoWidescreenKey; //对方视频是否宽屏(16:9) - kP2PCallAcceptVideoScaleKey; //视频画面边缘切边比例，NSNumber(float)，范围0~1 - kP2PCallAcceptVideoCenterKey; //视频画面中心点, NSValue(CGPoint)，范围(0,0)~(1,1) + @param parameters kP2PCallAcceptIsVideo960PKey:视频是否960P + kP2PCallAcceptIsVideoWidescreenKey:是否是否宽屏(16:9) */ typedef void (^P2PAcceptBlock)(NSDictionary *parameters); @@ -73,14 +70,12 @@ typedef void (^ScreenshotCompletionBlock)(UIImage *screenshot, NSTimeInterval ti /** - 更新时间戳和视频尺寸 - + 更新时间戳 + @param player 播放器对象 @param pts 显示时间戳(Presentation Time Stamp) - @param size 视频尺寸 - */ -- (void)p2pPlayer:(GWP2PPlayer *)player didUpdatePTS:(NSTimeInterval)pts size:(CGSize)size; +- (void)p2pPlayer:(GWP2PPlayer *)player updatePTS:(NSTimeInterval)pts; @end @@ -169,12 +164,5 @@ typedef void (^ScreenshotCompletionBlock)(UIImage *screenshot, NSTimeInterval ti 设置开启关闭自动巡航 */ - (void)setWideAngleAuto:(BOOL)isAuto ; -/* - 是否支持人形框，默认支持 - */ -- (void)setShowHumanTack:(BOOL)isEnable; -/* -设置人形框的缩放因数，l默认为1 -*/ -- (void)setShowHumanTackZoom:(float)zoom; + @end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayerDefine.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayerDefine.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h old mode 100644 new mode 100755 index ae6c617..4d0a46a --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h @@ -50,13 +50,7 @@ extern NSString * const kGWP2PDeviceIsRejectNotification; @param speed 网速 */ - (void)p2pVideoPlayer:(GWP2PVideoPlayer *)player networkSpeedChanged:(NSInteger)speed; -/** - 监控人形追踪框变化 - - @param player 播放器 - @param humanTrack 人形追踪内容，个数及坐标，大小 - */ -- (void)p2pVideoPlayer:(GWP2PVideoPlayer *)player humanTrackChanged:(NSDictionary *)humanTrack; + /** 远程录像(SD卡录像)状态发送改变 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWQRCodeManager.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWQRCodeManager.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/MD5Manager.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/MD5Manager.h old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Info.plist b/Ifish/GWP2PSDK/GWP2P.framework/Info.plist old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Modules/module.modulemap b/Ifish/GWP2PSDK/GWP2P.framework/Modules/module.modulemap old mode 100644 new mode 100755 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources b/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources old mode 100644 new mode 100755 index a34fbc5..9a774b5 --- a/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources +++ b/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources @@ -6,15 +6,15 @@ Headers/GWNet.h - dfvsdp6O9Qp/hySjkk0+c+HIDvI= + qOvnF0hkPDvokoux41oP8C9VOR0= Headers/GWNetError.h - HGmBuYHfnqUsebGOeOjOf3tMtEo= + 0j5ICqr7VpHUeg/rzYYF1icxklc= Headers/GWP2P.h - 0npQu+c03GaevkHiNIm01qINh/Y= + liZyR4OOyDZJLVYePutP2FGuZ6w= Headers/GWP2PClient+APMode.h @@ -30,7 +30,7 @@ Headers/GWP2PClient+DeviceInfomation.h - Rx1u6l91qP1PbUuPSG6yi3wm6bY= + SSzr06APzjnAyW3Y1iPLmE1Y+6w= Headers/GWP2PClient+GarageLight.h @@ -42,19 +42,15 @@ Headers/GWP2PClient+P2PInfo.h - PfazOGEv3gXCceGt5zjqEn+EwFE= + n42B5UHL38UlOr/1jvqrrzvDC7Y= Headers/GWP2PClient+PictureAndSound.h - Txh3vLjLDwMSBw91o23/3jqgpDw= + UpLweCptlUapxU4NycpkJR0wEsU= Headers/GWP2PClient+Record.h - WCRGDWjO7HcImf6nFjIDZOfY9es= - - Headers/GWP2PClient+RemoteControl.h - - TtVAdm2o/mJ3pEzFdCEohyIpCO0= + 5bOV2cllYEWFjtNSr/WSShm2AEc= Headers/GWP2PClient+SceneMode.h @@ -82,7 +78,7 @@ Headers/GWP2PDeviceLinker.h - qduIUV8KMRY72zQvrGa4MvaB5UI= + SNU9iYiYC47fBYLndeQidexS0Bs= Headers/GWP2PLanDevice.h @@ -94,7 +90,7 @@ Headers/GWP2PPlayer.h - W4xcVxHhngJsKyR5Cg1hk1BRXM8= + htZ01wr4y8f2Ld/PbpG1Wec31Lc= Headers/GWP2PPlayerDefine.h @@ -102,7 +98,7 @@ Headers/GWP2PVideoPlayer.h - AbacSICHpL8mJiBZkVi1Y06aHVk= + BngQ84XqDG3xpnszWomlx3Boh14= Headers/GWQRCodeManager.h @@ -127,33 +123,33 @@ hash - dfvsdp6O9Qp/hySjkk0+c+HIDvI= + qOvnF0hkPDvokoux41oP8C9VOR0= hash2 - kdzqqqxsW0tMMNVRNGY9iB/aMQYG4hauwMFQG5lDeGI= + ZumI3TsE2ot1c4IY6lTZH5ONLSzQxuMiAHuJkK7DJmo= Headers/GWNetError.h hash - HGmBuYHfnqUsebGOeOjOf3tMtEo= + 0j5ICqr7VpHUeg/rzYYF1icxklc= hash2 - FTzOF8jUfxmBfxwXA0jKoPOqVDaD0z/GmxjdbepypGw= + f7p5ZveAo49m+rKPd5xZdSEjdg/XL4MVK4EdweRpoJ4= Headers/GWP2P.h hash - 0npQu+c03GaevkHiNIm01qINh/Y= + liZyR4OOyDZJLVYePutP2FGuZ6w= hash2 - T5StIPHSMHXgslSNBv8W6q6lJQO+LYcLucnzUEDEau8= + CArVnTeUTjI/UzBiRA4uW9iQ5wBWa+ENTOYwjIpEI6g= Headers/GWP2PClient+APMode.h @@ -193,11 +189,11 @@ hash - Rx1u6l91qP1PbUuPSG6yi3wm6bY= + SSzr06APzjnAyW3Y1iPLmE1Y+6w= hash2 - kYICzNSlg07BQ6MsunAvzaywhg8W7gsR0q14PIQRqQE= + kCCqjTuSk925OtaiPmJv3+ygA+h1dCZd9MFMs4WkqlI= Headers/GWP2PClient+GarageLight.h @@ -226,44 +222,33 @@ hash - PfazOGEv3gXCceGt5zjqEn+EwFE= + n42B5UHL38UlOr/1jvqrrzvDC7Y= hash2 - GxrPJCZOaWFPrHLe093b/Boz+9oSCfyZq1MvpSlhJMM= + 7rb6qFMtccJKGXcJUgA6z7ZNL1JJMSvPpEHuIHiShCc= Headers/GWP2PClient+PictureAndSound.h hash - Txh3vLjLDwMSBw91o23/3jqgpDw= + UpLweCptlUapxU4NycpkJR0wEsU= hash2 - Kx2GJB/MXOFrPrBIjBvCfr8cBO/ZwfGkCU5iiOoTHms= + YsAo3oH7aawUP8nqlQy9YcdQJYy+gex0dZeA4fybWNg= Headers/GWP2PClient+Record.h hash - WCRGDWjO7HcImf6nFjIDZOfY9es= + 5bOV2cllYEWFjtNSr/WSShm2AEc= hash2 - 7CApwZSAspHgIFf352fxV1Gzma+Q+hsIkB1QwG5KjqQ= - - - Headers/GWP2PClient+RemoteControl.h - - hash - - TtVAdm2o/mJ3pEzFdCEohyIpCO0= - - hash2 - - eAIsfMdwgum+UyH0mt6fH+Ry9PnUn7juq0lZ0nOCyuk= + jmMpVcBaOKv2p/37inz8msilwARs2kxyoJAkubrteTQ= Headers/GWP2PClient+SceneMode.h @@ -336,11 +321,11 @@ hash - qduIUV8KMRY72zQvrGa4MvaB5UI= + SNU9iYiYC47fBYLndeQidexS0Bs= hash2 - bIuGrkX2lcoz7ffG1K7PTQ8A8OVVTR/3Sqyba4sQb6k= + xdWYPxEsat0fBBthyGFQ3yC/xBR4sMWR1L4GuVzG+gI= Headers/GWP2PLanDevice.h @@ -369,11 +354,11 @@ hash - W4xcVxHhngJsKyR5Cg1hk1BRXM8= + htZ01wr4y8f2Ld/PbpG1Wec31Lc= hash2 - AyhjDv8i6TAoKIY2Tkm+OH04xr9vBY3i8U1CsuRoOmo= + ftFc90AfZVS/XHDlrQKYs1iCcgaEO11JKStE7rII3as= Headers/GWP2PPlayerDefine.h @@ -391,11 +376,11 @@ hash - AbacSICHpL8mJiBZkVi1Y06aHVk= + BngQ84XqDG3xpnszWomlx3Boh14= hash2 - gpksJMyNnRiRs0HsXputBquQAsdhbfD0FzDrBPGLRpI= + Ra6aFpCNNl/BwtNWr3IoZMEkpNG46c+/w9XhN6+jMMU= Headers/GWQRCodeManager.h diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 9033e70..3791d01 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -515,7 +515,7 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像 [self connectNormalView]; if ([[[CommonUtils getSSIDInfo] objectForKey:@"SSID"] isEqualToString:self.wifiName]) { - [self.view makeToast:[NSString stringWithFormat:@"请确认手机已经连接到%@",self.wifiName]]; + [self bindCameraDevice]; } else {