技威SDK还原

2020-06-08 22:04:32 +08:00
parent 16d4829ecf
commit 1f69653c19
33 changed files with 45 additions and 306 deletions
@@ -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;
@@ -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 - 自定义服务器地址请求
 /**
@@ -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" //添加的当前设备数量已达到上限
@@ -25,7 +25,6 @@
 #import "GWP2PClient+HXVision.h"
 #import "GWP2PDefine.h"
 #import "GWP2PClient+P2PInfo.h"
-#import "GWP2PClient+RemoteControl.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
@@ -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
@@ -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;

 /**
 获取设备指示灯状态
@@ -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 - 获取回话文件
 /**
 获取设备回放文件
@@ -1,44 +0,0 @@
-//
-//  GWP2PClient+RemoteControl.h
-//  GWP2P
-//
-//  Created by JonorZhang on 2019/8/29.
-//  Copyright © 2019 apple. All rights reserved.
-//
-
-#import <GWP2P/GWP2P.h>
-
-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
@@ -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
@@ -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
@@ -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卡录像)状态发送改变

@@ -6,15 +6,15 @@
 	<dict>
 		<key>Headers/GWNet.h</key>
 		<data>
-		dfvsdp6O9Qp/hySjkk0+c+HIDvI=
+		qOvnF0hkPDvokoux41oP8C9VOR0=
 		</data>
 		<key>Headers/GWNetError.h</key>
 		<data>
-		HGmBuYHfnqUsebGOeOjOf3tMtEo=
+		0j5ICqr7VpHUeg/rzYYF1icxklc=
 		</data>
 		<key>Headers/GWP2P.h</key>
 		<data>
-		0npQu+c03GaevkHiNIm01qINh/Y=
+		liZyR4OOyDZJLVYePutP2FGuZ6w=
 		</data>
 		<key>Headers/GWP2PClient+APMode.h</key>
 		<data>
@@ -30,7 +30,7 @@
 		</data>
 		<key>Headers/GWP2PClient+DeviceInfomation.h</key>
 		<data>
-		Rx1u6l91qP1PbUuPSG6yi3wm6bY=
+		SSzr06APzjnAyW3Y1iPLmE1Y+6w=
 		</data>
 		<key>Headers/GWP2PClient+GarageLight.h</key>
 		<data>
@@ -42,19 +42,15 @@
 		</data>
 		<key>Headers/GWP2PClient+P2PInfo.h</key>
 		<data>
-		PfazOGEv3gXCceGt5zjqEn+EwFE=
+		n42B5UHL38UlOr/1jvqrrzvDC7Y=
 		</data>
 		<key>Headers/GWP2PClient+PictureAndSound.h</key>
 		<data>
-		Txh3vLjLDwMSBw91o23/3jqgpDw=
+		UpLweCptlUapxU4NycpkJR0wEsU=
 		</data>
 		<key>Headers/GWP2PClient+Record.h</key>
 		<data>
-		WCRGDWjO7HcImf6nFjIDZOfY9es=
-		</data>
-		<key>Headers/GWP2PClient+RemoteControl.h</key>
-		<data>
-		TtVAdm2o/mJ3pEzFdCEohyIpCO0=
+		5bOV2cllYEWFjtNSr/WSShm2AEc=
 		</data>
 		<key>Headers/GWP2PClient+SceneMode.h</key>
 		<data>
@@ -82,7 +78,7 @@
 		</data>
 		<key>Headers/GWP2PDeviceLinker.h</key>
 		<data>
-		qduIUV8KMRY72zQvrGa4MvaB5UI=
+		SNU9iYiYC47fBYLndeQidexS0Bs=
 		</data>
 		<key>Headers/GWP2PLanDevice.h</key>
 		<data>
@@ -94,7 +90,7 @@
 		</data>
 		<key>Headers/GWP2PPlayer.h</key>
 		<data>
-		W4xcVxHhngJsKyR5Cg1hk1BRXM8=
+		htZ01wr4y8f2Ld/PbpG1Wec31Lc=
 		</data>
 		<key>Headers/GWP2PPlayerDefine.h</key>
 		<data>
@@ -102,7 +98,7 @@
 		</data>
 		<key>Headers/GWP2PVideoPlayer.h</key>
 		<data>
-		AbacSICHpL8mJiBZkVi1Y06aHVk=
+		BngQ84XqDG3xpnszWomlx3Boh14=
 		</data>
 		<key>Headers/GWQRCodeManager.h</key>
 		<data>
@@ -127,33 +123,33 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			dfvsdp6O9Qp/hySjkk0+c+HIDvI=
+			qOvnF0hkPDvokoux41oP8C9VOR0=
 			</data>
 			<key>hash2</key>
 			<data>
-			kdzqqqxsW0tMMNVRNGY9iB/aMQYG4hauwMFQG5lDeGI=
+			ZumI3TsE2ot1c4IY6lTZH5ONLSzQxuMiAHuJkK7DJmo=
 			</data>
 		</dict>
 		<key>Headers/GWNetError.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			HGmBuYHfnqUsebGOeOjOf3tMtEo=
+			0j5ICqr7VpHUeg/rzYYF1icxklc=
 			</data>
 			<key>hash2</key>
 			<data>
-			FTzOF8jUfxmBfxwXA0jKoPOqVDaD0z/GmxjdbepypGw=
+			f7p5ZveAo49m+rKPd5xZdSEjdg/XL4MVK4EdweRpoJ4=
 			</data>
 		</dict>
 		<key>Headers/GWP2P.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			0npQu+c03GaevkHiNIm01qINh/Y=
+			liZyR4OOyDZJLVYePutP2FGuZ6w=
 			</data>
 			<key>hash2</key>
 			<data>
-			T5StIPHSMHXgslSNBv8W6q6lJQO+LYcLucnzUEDEau8=
+			CArVnTeUTjI/UzBiRA4uW9iQ5wBWa+ENTOYwjIpEI6g=
 			</data>
 		</dict>
 		<key>Headers/GWP2PClient+APMode.h</key>
@@ -193,11 +189,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			Rx1u6l91qP1PbUuPSG6yi3wm6bY=
+			SSzr06APzjnAyW3Y1iPLmE1Y+6w=
 			</data>
 			<key>hash2</key>
 			<data>
-			kYICzNSlg07BQ6MsunAvzaywhg8W7gsR0q14PIQRqQE=
+			kCCqjTuSk925OtaiPmJv3+ygA+h1dCZd9MFMs4WkqlI=
 			</data>
 		</dict>
 		<key>Headers/GWP2PClient+GarageLight.h</key>
@@ -226,44 +222,33 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			PfazOGEv3gXCceGt5zjqEn+EwFE=
+			n42B5UHL38UlOr/1jvqrrzvDC7Y=
 			</data>
 			<key>hash2</key>
 			<data>
-			GxrPJCZOaWFPrHLe093b/Boz+9oSCfyZq1MvpSlhJMM=
+			7rb6qFMtccJKGXcJUgA6z7ZNL1JJMSvPpEHuIHiShCc=
 			</data>
 		</dict>
 		<key>Headers/GWP2PClient+PictureAndSound.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Txh3vLjLDwMSBw91o23/3jqgpDw=
+			UpLweCptlUapxU4NycpkJR0wEsU=
 			</data>
 			<key>hash2</key>
 			<data>
-			Kx2GJB/MXOFrPrBIjBvCfr8cBO/ZwfGkCU5iiOoTHms=
+			YsAo3oH7aawUP8nqlQy9YcdQJYy+gex0dZeA4fybWNg=
 			</data>
 		</dict>
 		<key>Headers/GWP2PClient+Record.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			WCRGDWjO7HcImf6nFjIDZOfY9es=
+			5bOV2cllYEWFjtNSr/WSShm2AEc=
 			</data>
 			<key>hash2</key>
 			<data>
-			7CApwZSAspHgIFf352fxV1Gzma+Q+hsIkB1QwG5KjqQ=
-			</data>
-		</dict>
-		<key>Headers/GWP2PClient+RemoteControl.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			TtVAdm2o/mJ3pEzFdCEohyIpCO0=
-			</data>
-			<key>hash2</key>
-			<data>
-			eAIsfMdwgum+UyH0mt6fH+Ry9PnUn7juq0lZ0nOCyuk=
+			jmMpVcBaOKv2p/37inz8msilwARs2kxyoJAkubrteTQ=
 			</data>
 		</dict>
 		<key>Headers/GWP2PClient+SceneMode.h</key>
@@ -336,11 +321,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			qduIUV8KMRY72zQvrGa4MvaB5UI=
+			SNU9iYiYC47fBYLndeQidexS0Bs=
 			</data>
 			<key>hash2</key>
 			<data>
-			bIuGrkX2lcoz7ffG1K7PTQ8A8OVVTR/3Sqyba4sQb6k=
+			xdWYPxEsat0fBBthyGFQ3yC/xBR4sMWR1L4GuVzG+gI=
 			</data>
 		</dict>
 		<key>Headers/GWP2PLanDevice.h</key>
@@ -369,11 +354,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			W4xcVxHhngJsKyR5Cg1hk1BRXM8=
+			htZ01wr4y8f2Ld/PbpG1Wec31Lc=
 			</data>
 			<key>hash2</key>
 			<data>
-			AyhjDv8i6TAoKIY2Tkm+OH04xr9vBY3i8U1CsuRoOmo=
+			ftFc90AfZVS/XHDlrQKYs1iCcgaEO11JKStE7rII3as=
 			</data>
 		</dict>
 		<key>Headers/GWP2PPlayerDefine.h</key>
@@ -391,11 +376,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			AbacSICHpL8mJiBZkVi1Y06aHVk=
+			BngQ84XqDG3xpnszWomlx3Boh14=
 			</data>
 			<key>hash2</key>
 			<data>
-			gpksJMyNnRiRs0HsXputBquQAsdhbfD0FzDrBPGLRpI=
+			Ra6aFpCNNl/BwtNWr3IoZMEkpNG46c+/w9XhN6+jMMU=
 			</data>
 		</dict>
 		<key>Headers/GWQRCodeManager.h</key>
@@ -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
        {