EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs
@@ -25,6 +25,11 @@ [NullAllowed, Export("delegate", ArgumentSemantic.Weak)] NSObject WeakDelegate { get; set; } // @property (nonatomic, strong) NSArray * connectTipModels; [Export("connectTipModels", ArgumentSemantic.Strong)] //[Verify(StronglyTypedNSArray)] NSObject[] ConnectTipModels { get; set; } // +(instancetype)sharedInstance; [Static] [Export("sharedInstance")] EZSDK.IOS/EZSDK.IOS/EZSDK.IOS.csproj
@@ -73,6 +73,14 @@ <BundleResource Include="Resources\hdl_ez_temp_pass_word%402x.png" /> <BundleResource Include="Resources\hdl_ez_temp_pass_word%403x.png" /> <BundleResource Include="Resources\hdl_ez_ic_unlock_disable%402x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step_one%402x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step_one%403x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step_two%402x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step_two%403x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step1%402x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step1%403x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step2%402x.png" /> <BundleResource Include="Resources\hdl_ez_wifi_connect_step2%403x.png" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" /> </Project> EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.aBinary files differ
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. [assembly: AssemblyVersion("1.5.3")] [assembly: AssemblyVersion("1.6.2")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. EZSDK.IOS/EZSDK.IOS/Resources/hdl_ez_wifi_connect_step1@2x.png
@@ -33,6 +33,9 @@ @property (nonatomic, copy) NSString *configDevSerial; //指定设备序列号（可选） @property (nonatomic, assign) HDLEZDeviceType deviceType;//设备类型 @property (nonatomic, copy) NSString *WiFiConfigPrefix;//配网的前缀：萤石是EZVIZ + (instancetype)shareKit; - (void)clearSession; EZSDK/EZSDK/EZ/Global/GlobalKit.m
@@ -35,6 +35,8 @@ _hdlRefreshToken = [[NSUserDefaults standardUserDefaults] objectForKey:EZhdlRefreshToken]; _deviceVerifyCodeBySerial = [NSMutableDictionary new]; self.WiFiConfigPrefix = @"EZVIZ"; } return self; } EZSDK/EZSDK/EZ/Global/HDLEZConstants.h
@@ -44,8 +44,8 @@ // Design Width&Height #define HDLEZDesignWidth 375 #define HDLEZDesignHeight 667 #define HDLEZGetRealWidth(W) W / (HDLEZDesignWidth * 1.0f / APP_SCREEN_WIDTH) #define HDLEZGetRealHeight(H) H / (HDLEZDesignHeight * 1.0f / APP_SCREEN_HEIGHT) #define HDLEZGetRealWidth(W) W / (HDLEZDesignWidth * 1.0f / HDLEZ_APP_SCREEN_WIDTH) #define HDLEZGetRealHeight(H) H / (HDLEZDesignHeight * 1.0f / HDLEZ_APP_SCREEN_HEIGHT) // 字体颜色* EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m
@@ -70,6 +70,10 @@ [self.view addSubview:self.verifiedBtn]; [self.verifiedBtn setHidden:YES]; //国际化语言 [self.doneBtn setTitle:HDLEZLocallizedString(@"complete") forState:UIControlStateNormal]; [self.retryBtn setTitle:HDLEZLocallizedString(@"retry") forState:UIControlStateNormal]; self.msgLabel.text=HDLEZLocallizedString(@"ad_adding_msg"); } #pragma mark - actions @@ -184,6 +188,7 @@ } else { [self stopTimer]; // [EZOpenSDK addDevice:[GlobalKit shareKit].deviceSerialNo // verifyCode:[GlobalKit shareKit].deviceVerifyCode // completion:^(NSError *error) { EZSDK/EZSDK/EZ/UIViewControllers/EZAPWiFiConfigViewController.m
@@ -23,6 +23,14 @@ @property (weak, nonatomic) IBOutlet UILabel *stepTwoLabel; @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *processingIndicator; @property (weak, nonatomic) IBOutlet UIButton *addBtn; @property (unsafe_unretained, nonatomic) IBOutlet UILabel *stepThreeLable; @property (unsafe_unretained, nonatomic) IBOutlet UILabel *tipLable; @property (unsafe_unretained, nonatomic) IBOutlet UILabel *step1TipLable; @property (unsafe_unretained, nonatomic) IBOutlet UILabel *passwordLable; @property (unsafe_unretained, nonatomic) IBOutlet UILabel *nameL; @property (unsafe_unretained, nonatomic) IBOutlet UIButton *toCopBtn; @property (unsafe_unretained, nonatomic) IBOutlet UIButton *toSetBtn; @property (nonatomic,copy) NSString *devicWifiName; @property (nonatomic,strong) NSTimer *timer; @@ -61,9 +69,12 @@ - (void) initSubviews { self.processingIndicator.hidden = YES; self.devicWifiName = [NSString stringWithFormat:@"EZVIZ_%@",[GlobalKit shareKit].deviceSerialNo]; // self.devicWifiName = [NSString stringWithFormat:@"EZVIZ_%@",[GlobalKit shareKit].deviceSerialNo]; self.devicWifiName = [NSString stringWithFormat:@"%@_%@",[GlobalKit shareKit].WiFiConfigPrefix,[GlobalKit shareKit].deviceSerialNo]; self.wifiNameLabel.text = self.devicWifiName; self.wifiPwdLabel.text = [NSString stringWithFormat:@"EZVIZ_%@",[GlobalKit shareKit].deviceVerifyCode]; // self.wifiPwdLabel.text = [NSString stringWithFormat:@"EZVIZ_%@",[GlobalKit shareKit].deviceVerifyCode]; self.wifiPwdLabel.text = [NSString stringWithFormat:@"%@_%@",[GlobalKit shareKit].WiFiConfigPrefix,[GlobalKit shareKit].deviceVerifyCode]; NSString *str = [NSString stringWithFormat:NSLocalizedString(@"wifi_step_two_msg",@"进入手机系统Wi-Fi设置界面，选择名称为%@的网络，用提示的密码进行连接"),self.devicWifiName]; NSMutableAttributedString *aStr = [[NSMutableAttributedString alloc] initWithString:str]; @@ -78,6 +89,31 @@ [aStr addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, [aStr length])]; self.stepTwoLabel.attributedText = aStr; //第三步 NSString *stepThreeStr=HDLEZLocallizedString(@"wifi_config_step_three"); NSString *tipStr=HDLEZLocallizedString(@"wifi_config_step_three_tip"); NSString *step3FinalStr=[NSString stringWithFormat:@"%@ %@",stepThreeStr,tipStr]; NSMutableAttributedString *aTipStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@",stepThreeStr,tipStr]]; //关键字符颜色调整 [aTipStr addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:[step3FinalStr rangeOfString:tipStr]]; self.stepThreeLable.attributedText = aTipStr; self.stepThreeLable.adjustsFontSizeToFitWidth=YES; //设置国际化语言 self.tipLable.text=HDLEZLocallizedString(@"wifi_config_tip"); self.tipLable.adjustsFontSizeToFitWidth=YES; self.step1TipLable.text=HDLEZLocallizedString(@"wifi_config_step_1_tips"); self.nameL.text=HDLEZLocallizedString(@"wifi_config_name"); self.passwordLable.text=HDLEZLocallizedString(@"wifi_config_step_2_password"); [self.toCopBtn setTitle:HDLEZLocallizedString(@"wifi_config_copy_pwd") forState:UIControlStateNormal]; [self.toSetBtn setTitle:HDLEZLocallizedString(@"wifi_config_to_setting") forState:UIControlStateNormal]; [self.addBtn setTitle:HDLEZLocallizedString(@"wifi_ap_add_device_title") forState:UIControlStateNormal]; } -(void) startAction EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
@@ -71,6 +71,7 @@ HDLEZLog(@"导航栏子view：%@",self.prevController ); self.tipsLabel.text=HDLEZLocallizedString(@"device_add_device_qr_code"); } - (void)viewWillAppear:(BOOL)animated EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m
@@ -29,6 +29,21 @@ @property (nonatomic,assign) BOOL supportApMode; @property (nonatomic,assign) BOOL supportSmartMode; @property (nonatomic,assign) BOOL supportSoundMode; @property (nonatomic,strong) UIView *tipView ;//配网提示view @property (nonatomic,strong) UIImageView *step1TipImgV ;//步骤1提示图view @property (nonatomic,strong) UIImageView *step1ImgV ;//步骤1图view @property (nonatomic,strong) UILabel *step1DescribeL ;//步骤1描述lable @property (nonatomic,strong) UIImageView *step2TipImgV ;//步骤2提示图view @property (nonatomic,strong) UIImageView *step2ImgV ;//步骤2图view @property (nonatomic,strong) UILabel *step2DescribeL ;//步骤2描述lable @property (nonatomic,strong) UIView *btnBackView ;//按钮背景view @property (nonatomic,strong) UIButton *connectedBtn;//已连接按钮 @end @implementation EZDeviceResultViewController @@ -223,6 +238,10 @@ error.code == EZ_HTTPS_DEVICE_NOT_EXISTS || error.code == EZ_HTTPS_DEVICE_OFFLINE_IS_ADDED_MYSELF) { if ([[EZSDK sharedInstance].connectTipModels containsObject:deviceInfo.model]||[self checkIfShouldTipWithDeviceModel:deviceInfo.model]) {//为需要提示配网的类型 [self showConnectWifiTipView]; return; } self.statusLabel.hidden = NO; self.actionButton.hidden = NO; if (deviceInfo) @@ -238,6 +257,9 @@ self.supportSmartMode = YES; self.supportSoundMode = YES; } self.statusLabel.text =HDLEZLocallizedString(@"wifi_config_not_connected"); [self.actionButton setTitle:NSLocalizedString(@"ad_connect_net", @"连接网络") forState:UIControlStateNormal]; } else @@ -261,6 +283,155 @@ } /*检测model是否包含需要提示的类型 */ -(BOOL)checkIfShouldTipWithDeviceModel:(NSString*)deviceModel{ for (NSString *model in [EZSDK sharedInstance].connectTipModels) { if ([deviceModel containsString:[NSString stringWithFormat:@"-%@-",model]]) { return YES; break; } } return NO; } /*提示view */ -(UIView*)tipView{ if (!_tipView) { //提示view _tipView=[[UIView alloc] init]; [self.view addSubview:_tipView]; [_tipView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.view).offset(HDLEZ_APP_TOP_BAR_HEIGHT); make.left.bottom.right.equalTo(self.view); }]; _tipView.backgroundColor=HDLEZ_COLOR_VIEW_BACKGROUND; //步骤1指示图 _step1TipImgV=[[UIImageView alloc] init]; [_tipView addSubview:_step1TipImgV]; [_step1TipImgV mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(_tipView).offset(33); make.left.equalTo(_tipView).offset(HDLEZGetRealWidth(33)); make.width.mas_equalTo(130); make.height.mas_equalTo(120); }]; _step1TipImgV.image=[UIImage imageNamed:@"hdl_ez_wifi_connect_step1"]; //步骤1图 _step1ImgV=[[UIImageView alloc] init]; [_tipView addSubview:_step1ImgV]; [_step1ImgV mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(_step1TipImgV.mas_bottom).offset(13); make.left.equalTo(_step1TipImgV).offset(7); make.width.mas_equalTo(19); make.height.mas_equalTo(22); }]; _step1ImgV.image=[UIImage imageNamed:@"hdl_ez_wifi_connect_step_one"]; //步骤1描述lable _step1DescribeL=[[UILabel alloc] init]; [_tipView addSubview:_step1DescribeL]; [_step1DescribeL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(_step1ImgV.mas_bottom).offset(7); make.left.equalTo(_step1ImgV); make.right.equalTo(_step1TipImgV); make.height.mas_equalTo(22); }]; _step1DescribeL.font=HDLEZ_Get_FontBoldWithSize(HDLEZ_FontSize_16); _step1DescribeL.textColor=HDLEZ_COLOR_TEXT_TITLE_GRAY; _step1DescribeL.numberOfLines=2; _step1DescribeL.adjustsFontSizeToFitWidth=YES; _step1DescribeL.text=HDLEZLocallizedString(@"wifi_config_select_set_param"); //步骤2指示图 _step2TipImgV=[[UIImageView alloc] init]; [_tipView addSubview:_step2TipImgV]; [_step2TipImgV mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(_tipView).offset(33); make.right.equalTo(_tipView).offset(HDLEZGetRealWidth(-33)); make.width.mas_equalTo(130); make.height.mas_equalTo(120); }]; _step2TipImgV.image=[UIImage imageNamed:@"hdl_ez_wifi_connect_step2"]; //步骤2图 _step2ImgV=[[UIImageView alloc] init]; [_tipView addSubview:_step2ImgV]; [_step2ImgV mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(_step2TipImgV.mas_bottom).offset(13); make.left.equalTo(_step2TipImgV).offset(7); make.width.mas_equalTo(19); make.height.mas_equalTo(22); }]; _step2ImgV.image=[UIImage imageNamed:@"hdl_ez_wifi_connect_step_two"]; //步骤2描述lable _step2DescribeL=[[UILabel alloc] init]; [_tipView addSubview:_step2DescribeL]; [_step2DescribeL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(_step2ImgV.mas_bottom).offset(7); make.left.equalTo(_step2ImgV); make.right.equalTo(_step2TipImgV); make.height.mas_equalTo(22); }]; _step2DescribeL.font=HDLEZ_Get_FontBoldWithSize(HDLEZ_FontSize_16); _step2DescribeL.textColor=HDLEZ_COLOR_TEXT_TITLE_GRAY; _step2DescribeL.numberOfLines=2; _step2DescribeL.adjustsFontSizeToFitWidth=YES; _step2DescribeL.text=HDLEZLocallizedString(@"wifi_config_select_wifi"); //已连接按钮背景view _btnBackView=[[UIView alloc] init]; [_tipView addSubview:_btnBackView]; [_btnBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.bottom.right.equalTo(_tipView); make.height.mas_equalTo(76); }]; _btnBackView.backgroundColor=HDLEZ_COLOR_VIEW_FOREGROUND; _btnBackView.layer.cornerRadius = 16; _btnBackView.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner; //已连接按钮 _connectedBtn=[[UIButton alloc] init]; [_btnBackView addSubview:_connectedBtn]; [_connectedBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(_tipView).offset(78); make.right.equalTo(_tipView).offset(-78); make.top.equalTo(_btnBackView).offset(12); make.height.mas_equalTo(44); }]; _connectedBtn.layer.cornerRadius = 22; [_connectedBtn setBackgroundColor:HDLEZ_COLOR_BACKGROUND_BUTTON]; [_connectedBtn setTitle:HDLEZLocallizedString(@"wifi_config_connected") forState:UIControlStateNormal]; _connectedBtn.titleLabel.font=HDLEZ_Get_FontBoldWithSize(HDLEZ_FontSize_16); [_connectedBtn setTitleColor:HDLEZ_COLOR_TEXT_WHITE forState:UIControlStateNormal]; [_connectedBtn addTarget:self action:@selector(Connected) forControlEvents:UIControlEventTouchUpInside]; } return _tipView; } /*展示引导view（萤石部分设备不能通过该流程进行配网） */ -(void)showConnectWifiTipView{ self.title = HDLEZLocallizedString(@"wifi_config_net_work"); [self.tipView setHidden:NO]; } /*已连接 */ -(void)Connected{ self.title = HDLEZLocallizedString(@"ad_result_title"); //隐藏指示view [self.tipView setHidden:YES]; [self doSearchDevice]; } - (void)handleTheError:(ResponseData *)responseData { if (responseData.success) EZSDK/EZSDK/EZ/UIViewControllers/EZInputSerialViewController.m
@@ -36,6 +36,10 @@ self.verifyCodeTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 30)]; self.verifyCodeTextField.leftViewMode = UITextFieldViewModeAlways; [self.verifyCodeTextField dd_addSeparatorWithType:ViewSeparatorTypeVerticalSide]; self.serialTextField.placeholder=HDLEZLocallizedString(@"wifi_config_seria_num"); self.verifyCodeTextField.placeholder=HDLEZLocallizedString(@"wifi_config_verify_code"); [self.nextButton setTitle:HDLEZLocallizedString(@"wifi_config_step_2_next_step") forState:UIControlStateNormal]; } - (void)didReceiveMemoryWarning { EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
@@ -581,6 +581,23 @@ } ///** // * 收到的画面长宽值 // * // * @param player 播放器对象 // * @param height 高度 // * @param width 宽度 // */ //- (void)player:(EZPlayer *)player didReceivedDisplayHeight:(NSInteger)height displayWidth:(NSInteger)width{ // HDLEZLog(@"画面长：%ld，宽：%ld",(long)height,(long)width); // CGFloat playerVH=self.playerView.frame.size.height; // CGFloat playerVW=playerVH*(width/height); // self.playerView.frame=CGRectMake(0, 0, 50, 50); // HDLEZLog(@"playerView的frame：%f",self.playerView.frame.size.width); // //} - (void)player:(EZPlayer *)player didPlayFailed:(NSError *)error { NSLog(@"player: %@, didPlayFailed: %@", player, error); EZSDK/EZSDK/EZ/UIViewControllers/EZWifiInfoViewController.m
@@ -11,6 +11,7 @@ #import "DDKit.h" #import "EZWifiConfigViewController.h" #import "EZAPWiFiConfigViewController.h" #import "GlobalKit.h" #define WIFI_PREFROOT_URL @"prefs:root=WIFI" #define WIFI_IOS10_WIFI_URL @"App-Prefs:root=WIFI" @@ -49,6 +50,15 @@ [self.nameTextField dd_addCornerRadius:4.0f lineColor:[UIColor lightGrayColor]]; [self.passwordTextField dd_addCornerRadius:4.0f lineColor:[UIColor lightGrayColor]]; [self.nextButton dd_addCornerRadius:19.0 lineColor:[UIColor dd_hexStringToColor:@"0x1b9ee2"]]; self.tipsLabel.text=HDLEZLocallizedString(@"wifi_config_step_2_tips"); self.tipsLabel.adjustsFontSizeToFitWidth=YES; [self.nextButton setTitle:HDLEZLocallizedString(@"wifi_config_step_2_next_step") forState:UIControlStateNormal]; self.nameLabel.text=HDLEZLocallizedString(@"wifi_config_step_2_net"); self.passwordLabel.text=HDLEZLocallizedString(@"wifi_config_step_2_password"); } - (void) viewWillAppear:(BOOL)animated @@ -94,6 +104,7 @@ for (NSString *ifnam in interfaces) { NSDictionary *info = CFBridgingRelease(CNCopyCurrentNetworkInfo((__bridge CFStringRef)ifnam)); HDLEZLog(@"info：%@",info); self.nameTextField.text = info[@"SSID"]; break; } @@ -230,10 +241,14 @@ - (IBAction)nextAction:(id)sender { //热点配网 [self performSegueWithIdentifier:@"go2APWifiConfig" sender:nil]; if ([GlobalKit shareKit].deviceType==HDLEZDeviceType_Door) {//为门锁 //热点配网 [self performSegueWithIdentifier:@"go2APWifiConfig" sender:nil]; }else{ [self showModeSelect]; } // [self showModeSelect]; } @end EZSDK/EZSDK/EZ/UIViewControllers/EZWifiTipsViewController.m
@@ -134,7 +134,7 @@ if ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusDenied || [CLLocationManager authorizationStatus] == kCLAuthorizationStatusRestricted || [CLLocationManager authorizationStatus] == kCLAuthorizationStatusNotDetermined) { [self pushToLocationAlertVC]; } else { EZSDK/EZSDK/EZSDK.h
@@ -24,6 +24,8 @@ @property (nonatomic, weak) id<EZSDKDelegate> delegate;//代理 @property (nonatomic, strong) NSArray *connectTipModels;//需要配网提示的类型（不能通过app端配网的设备类型） ///sharedInstance + (instancetype)sharedInstance; EZSDK/EZSDK/SDK/libEZOpenSDK.aBinary files differ
