diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 489a2b3..bc25b5a 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15697,7 +15697,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; 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 = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/.DS_Store b/Ifish/.DS_Store index 94c50d3..54358c9 100644 Binary files a/Ifish/.DS_Store and b/Ifish/.DS_Store differ diff --git a/Ifish/GWP2PSDK/GWP2P.framework/GWP2P b/Ifish/GWP2PSDK/GWP2P.framework/GWP2P index 3ac776d..b7b083e 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 100755 new mode 100644 index 0bfa60e..62d701f --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h @@ -27,6 +27,7 @@ typedef void(^GWNetCompletionBlock)(BOOL success, NSString *errorCode, NSString extern NSString * const kGWNetSessionIdErrorNotification; +/// @interface GWNet : NSObject @property (nonatomic, assign) BOOL connectWithHttps;/**< 以https的方式连接我们的服务器.默认为NO,用http的方式连接 */ @@ -115,7 +116,16 @@ 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 第三方登录 /** 第三方登录 @@ -164,6 +174,23 @@ 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 退出登录 /** 退出登录 @@ -176,6 +203,8 @@ extern NSString * const kGWNetSessionIdErrorNotification; withSessionId:(NSString*)sessionId//这个应该从登录时返回的json里获取 completion:(GWNetCompletionBlock)completion;//请求完成回调 + + #pragma mark 邮箱注册 -(void)regEmailWithEmail:(NSString*)name //邮箱地址 withPwd:(NSString*)pwd //密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 @@ -460,7 +489,24 @@ 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 设备同步-批量更新设备 /** 设备同步-批量更新设备 @@ -587,7 +633,40 @@ 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 获取邀请码 /** 获取邀请码,此接口已经不用,改用获取邀请链接 @@ -626,6 +705,8 @@ extern NSString * const kGWNetSessionIdErrorNotification; guestID:(NSString *)guestID guestRemark:(NSString *)guestRemark appendMsg:(NSString *)appendMsg + masterNickName:(NSString *)masterNickName + deviceNickName:(NSString *)deviceNickName completion:(GWNetCompletionBlock)completion; #pragma mark 获取访客列表 @@ -642,6 +723,23 @@ 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 删除访客信息 /** 删除访客信息 @@ -861,6 +959,7 @@ extern NSString * const kGWNetSessionIdErrorNotification; sessionID:(NSString *)sessionID completion:(GWNetCompletionBlock)completion; + #pragma mark 已联网方式转分享模式 /** 已联网方式转分享模式 @@ -902,6 +1001,24 @@ 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 100755 new mode 100644 index ce54561..e65ad98 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h @@ -62,6 +62,7 @@ #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 100755 new mode 100644 index d8fc23f..71dcf1b --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h @@ -25,6 +25,7 @@ #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 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Alarm.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Alarm.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Defense.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Defense.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h old mode 100755 new mode 100644 index d1f38ba..7f1299e --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h @@ -212,6 +212,27 @@ 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; /** 不再使用 @@ -299,7 +320,7 @@ typedef NS_ENUM(NSUInteger, GWDeviceRTSPPasswordMode) { 必须保证手机与设备在同一局域网中,否则回调只会收到参数错误. 这一接口在发指令时一定要确保手机与设备在同一局域网中,指令将deviceID转成4位设备IP的最后一位,若不在同一局域网,获取不到设备IP,指令不会成功 @param initialPassword 初始密码,必须为包含字母、数字、其它字符中两种的6~30位的字符串 - @param deviceID 设备ID,直接传设备ID,内部处理成IP地址,也可以传4位IP的最后一位数字 + @param deviceID 设备ID,直接传设备ID @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 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+HXVision.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+HXVision.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h old mode 100755 new mode 100644 index 8180b33..149fa94 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+P2PInfo.h @@ -12,6 +12,14 @@ 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 100755 new mode 100644 index df959e1..1c37c4b --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h @@ -74,6 +74,20 @@ 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 100755 new mode 100644 index d2c8a96..314241f --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h @@ -211,6 +211,19 @@ 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 new file mode 100644 index 0000000..2ef9666 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+RemoteControl.h @@ -0,0 +1,44 @@ +// +// 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 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Sensor.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Sensor.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+WhiteLight.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+WhiteLight.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDefine.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDefine.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDevice.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDevice.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h old mode 100755 new mode 100644 index 7eae27f..6328c08 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h @@ -135,5 +135,14 @@ 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 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlaybackPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlaybackPlayer.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h old mode 100755 new mode 100644 index c7bdbd3..eb22f2d --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h @@ -24,8 +24,11 @@ typedef void (^P2PCallingBlock)(NSDictionary *parameters); /** 设备接受了呼叫请求,回调相关参数 - @param parameters kP2PCallAcceptIsVideo960PKey:视频是否960P - kP2PCallAcceptIsVideoWidescreenKey:是否是否宽屏(16:9) + @param parameters kP2PCallingIsSameDomainKey; //与对方是否在同个局域网 + kP2PCallAcceptIsVideo960PKey; //对方视频是否960P + kP2PCallAcceptIsVideoWidescreenKey; //对方视频是否宽屏(16:9) + kP2PCallAcceptVideoScaleKey; //视频画面边缘切边比例，NSNumber(float)，范围0~1 + kP2PCallAcceptVideoCenterKey; //视频画面中心点, NSValue(CGPoint)，范围(0,0)~(1,1) */ typedef void (^P2PAcceptBlock)(NSDictionary *parameters); @@ -70,12 +73,14 @@ typedef void (^ScreenshotCompletionBlock)(UIImage *screenshot, NSTimeInterval ti /** - 更新时间戳 - + 更新时间戳和视频尺寸 + @param player 播放器对象 @param pts 显示时间戳(Presentation Time Stamp) + @param size 视频尺寸 + */ -- (void)p2pPlayer:(GWP2PPlayer *)player updatePTS:(NSTimeInterval)pts; +- (void)p2pPlayer:(GWP2PPlayer *)player didUpdatePTS:(NSTimeInterval)pts size:(CGSize)size; @end @@ -164,5 +169,12 @@ 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 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h old mode 100755 new mode 100644 index 4d0a46a..ae6c617 --- a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h @@ -50,7 +50,13 @@ 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 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/MD5Manager.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/MD5Manager.h old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Info.plist b/Ifish/GWP2PSDK/GWP2P.framework/Info.plist old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Modules/module.modulemap b/Ifish/GWP2PSDK/GWP2P.framework/Modules/module.modulemap old mode 100755 new mode 100644 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources b/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources old mode 100755 new mode 100644 index 9a774b5..a34fbc5 --- a/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources +++ b/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources @@ -6,15 +6,15 @@ Headers/GWNet.h - qOvnF0hkPDvokoux41oP8C9VOR0= + dfvsdp6O9Qp/hySjkk0+c+HIDvI= Headers/GWNetError.h - 0j5ICqr7VpHUeg/rzYYF1icxklc= + HGmBuYHfnqUsebGOeOjOf3tMtEo= Headers/GWP2P.h - liZyR4OOyDZJLVYePutP2FGuZ6w= + 0npQu+c03GaevkHiNIm01qINh/Y= Headers/GWP2PClient+APMode.h @@ -30,7 +30,7 @@ Headers/GWP2PClient+DeviceInfomation.h - SSzr06APzjnAyW3Y1iPLmE1Y+6w= + Rx1u6l91qP1PbUuPSG6yi3wm6bY= Headers/GWP2PClient+GarageLight.h @@ -42,15 +42,19 @@ Headers/GWP2PClient+P2PInfo.h - n42B5UHL38UlOr/1jvqrrzvDC7Y= + PfazOGEv3gXCceGt5zjqEn+EwFE= Headers/GWP2PClient+PictureAndSound.h - UpLweCptlUapxU4NycpkJR0wEsU= + Txh3vLjLDwMSBw91o23/3jqgpDw= Headers/GWP2PClient+Record.h - 5bOV2cllYEWFjtNSr/WSShm2AEc= + WCRGDWjO7HcImf6nFjIDZOfY9es= + + Headers/GWP2PClient+RemoteControl.h + + TtVAdm2o/mJ3pEzFdCEohyIpCO0= Headers/GWP2PClient+SceneMode.h @@ -78,7 +82,7 @@ Headers/GWP2PDeviceLinker.h - SNU9iYiYC47fBYLndeQidexS0Bs= + qduIUV8KMRY72zQvrGa4MvaB5UI= Headers/GWP2PLanDevice.h @@ -90,7 +94,7 @@ Headers/GWP2PPlayer.h - htZ01wr4y8f2Ld/PbpG1Wec31Lc= + W4xcVxHhngJsKyR5Cg1hk1BRXM8= Headers/GWP2PPlayerDefine.h @@ -98,7 +102,7 @@ Headers/GWP2PVideoPlayer.h - BngQ84XqDG3xpnszWomlx3Boh14= + AbacSICHpL8mJiBZkVi1Y06aHVk= Headers/GWQRCodeManager.h @@ -123,33 +127,33 @@ hash - qOvnF0hkPDvokoux41oP8C9VOR0= + dfvsdp6O9Qp/hySjkk0+c+HIDvI= hash2 - ZumI3TsE2ot1c4IY6lTZH5ONLSzQxuMiAHuJkK7DJmo= + kdzqqqxsW0tMMNVRNGY9iB/aMQYG4hauwMFQG5lDeGI= Headers/GWNetError.h hash - 0j5ICqr7VpHUeg/rzYYF1icxklc= + HGmBuYHfnqUsebGOeOjOf3tMtEo= hash2 - f7p5ZveAo49m+rKPd5xZdSEjdg/XL4MVK4EdweRpoJ4= + FTzOF8jUfxmBfxwXA0jKoPOqVDaD0z/GmxjdbepypGw= Headers/GWP2P.h hash - liZyR4OOyDZJLVYePutP2FGuZ6w= + 0npQu+c03GaevkHiNIm01qINh/Y= hash2 - CArVnTeUTjI/UzBiRA4uW9iQ5wBWa+ENTOYwjIpEI6g= + T5StIPHSMHXgslSNBv8W6q6lJQO+LYcLucnzUEDEau8= Headers/GWP2PClient+APMode.h @@ -189,11 +193,11 @@ hash - SSzr06APzjnAyW3Y1iPLmE1Y+6w= + Rx1u6l91qP1PbUuPSG6yi3wm6bY= hash2 - kCCqjTuSk925OtaiPmJv3+ygA+h1dCZd9MFMs4WkqlI= + kYICzNSlg07BQ6MsunAvzaywhg8W7gsR0q14PIQRqQE= Headers/GWP2PClient+GarageLight.h @@ -222,33 +226,44 @@ hash - n42B5UHL38UlOr/1jvqrrzvDC7Y= + PfazOGEv3gXCceGt5zjqEn+EwFE= hash2 - 7rb6qFMtccJKGXcJUgA6z7ZNL1JJMSvPpEHuIHiShCc= + GxrPJCZOaWFPrHLe093b/Boz+9oSCfyZq1MvpSlhJMM= Headers/GWP2PClient+PictureAndSound.h hash - UpLweCptlUapxU4NycpkJR0wEsU= + Txh3vLjLDwMSBw91o23/3jqgpDw= hash2 - YsAo3oH7aawUP8nqlQy9YcdQJYy+gex0dZeA4fybWNg= + Kx2GJB/MXOFrPrBIjBvCfr8cBO/ZwfGkCU5iiOoTHms= Headers/GWP2PClient+Record.h hash - 5bOV2cllYEWFjtNSr/WSShm2AEc= + WCRGDWjO7HcImf6nFjIDZOfY9es= hash2 - jmMpVcBaOKv2p/37inz8msilwARs2kxyoJAkubrteTQ= + 7CApwZSAspHgIFf352fxV1Gzma+Q+hsIkB1QwG5KjqQ= + + + Headers/GWP2PClient+RemoteControl.h + + hash + + TtVAdm2o/mJ3pEzFdCEohyIpCO0= + + hash2 + + eAIsfMdwgum+UyH0mt6fH+Ry9PnUn7juq0lZ0nOCyuk= Headers/GWP2PClient+SceneMode.h @@ -321,11 +336,11 @@ hash - SNU9iYiYC47fBYLndeQidexS0Bs= + qduIUV8KMRY72zQvrGa4MvaB5UI= hash2 - xdWYPxEsat0fBBthyGFQ3yC/xBR4sMWR1L4GuVzG+gI= + bIuGrkX2lcoz7ffG1K7PTQ8A8OVVTR/3Sqyba4sQb6k= Headers/GWP2PLanDevice.h @@ -354,11 +369,11 @@ hash - htZ01wr4y8f2Ld/PbpG1Wec31Lc= + W4xcVxHhngJsKyR5Cg1hk1BRXM8= hash2 - ftFc90AfZVS/XHDlrQKYs1iCcgaEO11JKStE7rII3as= + AyhjDv8i6TAoKIY2Tkm+OH04xr9vBY3i8U1CsuRoOmo= Headers/GWP2PPlayerDefine.h @@ -376,11 +391,11 @@ hash - BngQ84XqDG3xpnszWomlx3Boh14= + AbacSICHpL8mJiBZkVi1Y06aHVk= hash2 - Ra6aFpCNNl/BwtNWr3IoZMEkpNG46c+/w9XhN6+jMMU= + gpksJMyNnRiRs0HsXputBquQAsdhbfD0FzDrBPGLRpI= Headers/GWQRCodeManager.h diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m index bef29df..c31b194 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m @@ -124,7 +124,7 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi [self.view makeToast:@"请先连接设备热点"]; return; } - if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound||[wifiName isEqualToString:@"WLAN"]) { + if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound||[wifiName.lowercaseString isEqualToString:@"wlan"]||![wifiName isEqualToString:self.wifiName]) { //wifi正确，则尝试连接设备 if(self.deviceType==DEVICECAMERA) { diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index 446c299..201d9a5 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -1380,7 +1380,13 @@ Assign BOOL isPush; [self delectTankWith:deviceListModel AtIndexPath:indexPath]; - }else{ + } + else if ([deviceListModel.type isEqualToString:@"pets"]) { + + [self delectTankWith:deviceListModel AtIndexPath:indexPath]; + + } + else{ //camera @@ -1490,14 +1496,34 @@ Assign BOOL isPush; mannager.responseSerializer=[AFHTTPResponseSerializer serializer]; NSMutableDictionary * para = [NSMutableDictionary dictionary]; - NSString *priId=deviceListModel.device.deviceId; - ; - NSString*userId=deviceListModel.device.userId; + NSString*string=[NSString stringWithFormat:@"%@/api/user/deleteDeviceUser.do",JIEKOUPORT]; + + + if ([deviceListModel.type isEqualToString:@"pets"]) { + string=[NSString stringWithFormat:@"%@/api/user/deletePetDeviceUser.do",JIEKOUPORT]; + DeviceModel*model=[deviceListModel.list firstObject]; + NSString *priId=model.deviceId; + ; + NSString*userId=model.userId; + para[@"userId"]=userId; + para[@"deviceId"]=priId; + + + + } + else + { + NSString *priId=deviceListModel.device.deviceId; + ; + NSString*userId=deviceListModel.device.userId; + + [para setValue:priId forKey:@"priId.deviceId"]; + [para setValue:userId forKey:@"priId.userId"]; + } - [para setValue:priId forKey:@"priId.deviceId"]; - [para setValue:userId forKey:@"priId.userId"]; __weak typeof (self)weakSelf=self; - [mannager POST:kDeleteDeviceUser parameters:para success:^(AFHTTPRequestOperation *operation, id responseObject) { + + [mannager POST:string parameters:para success:^(AFHTTPRequestOperation *operation, id responseObject) { if (responseObject) { NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil]; @@ -1543,9 +1569,10 @@ Assign BOOL isPush; [weakSelf.tableView reloadData]; }); + [weakSelf addDataRequestQueue]; /* - 而如果有循环的调用的话，可以用dispatch_source_set_timer来实现 用到GCD的事件源和事件监听的机制 + 而如果有循环的调用的话，可以用dispatch_source_set_timer来实现 用到GCD的事件源和事件监听的机制 int interval = 2; int leeway = 0; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 1d8bbfc..9033e70 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -568,6 +568,19 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像 } //智能联机 -(void)smartLinkConnect{ + + + //拿到AVAudioSession的单例对象 + AVAudioSession *audioSession = [AVAudioSession sharedInstance]; + + //设置为听筒模式 + //[audioSession overrideOutputAudioPort:AVAudioSessionPortOverrideNone error:nil]; + + //设置为公放模式 + [audioSession overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:nil]; + + //让我的App占用听筒或扬声器 + [audioSession setActive:YES error:nil]; WEAK_SELF; [[GWP2PDeviceLinker shareInstance] p2pStopSmartLink]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(100 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{