局域网观看:接入预览新接口后UI调整和测试

Tapd: http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192869350657

Change-Id: If33b10ea48caf9cd38f0cf54632fb0f9038f2755

Author: ccharlesren

Source/LinkSDKDemo/Video/LocalAreaNetwork/Controller/TIoTAreaNetworkPreviewVC.h

@@ -3,12 +3,14 @@
 //  LinkSDKDemo
 
 #import <UIKit/UIKit.h>
+#import "TIoTAreaNetDetectionModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 /// 局域网探测设备 预览控制器
 @interface TIoTAreaNetworkPreviewVC : UIViewController
-@property (nonatomic, strong) NSString *deviceName;
+@property (nonatomic, strong) TIoTAreaNetDetectionModel *model;
+@property (nonatomic, strong) NSString *productID;
 @end
 
 NS_ASSUME_NONNULL_END

Source/LinkSDKDemo/Video/LocalAreaNetwork/Controller/TIoTAreaNetworkPreviewVC.m

@@ -8,6 +8,8 @@
 #import "TIoTLocalNetDetch.h"
 #import <YYModel.h>
 #import "TIoTAreaNetDetectionModel.h"
+#import "TIoTCoreUserManage.h"
+#import "NSString+Extension.h"
 
 static NSString * kAreaNetworkDeviceCellID = @"kAreaNetworkDeviceCellID";
 
@@ -135,6 +137,25 @@ - (void)setupUI {
         make.top.equalTo(detectDeviceBtn.mas_bottom).offset(30);
         make.left.right.bottom.equalTo(self.view);
     }];
+    
+    [self judgeAutoFillInputInfo];
+}
+
+- (void)judgeAutoFillInputInfo {
+    
+    self.productID.text = [TIoTCoreUserManage shared].demoAreaNetProductID?:@"";
+    self.clientToken.text =  [TIoTCoreUserManage shared].demoAreaNetClientToken?:@"";
+}
+
+- (void)saveInputInfo {
+    
+    if (![NSString isNullOrNilWithObject:self.productIDString]&&![NSString isFullSpaceEmpty:self.productIDString]) {
+        [TIoTCoreUserManage shared].demoAreaNetProductID = self.productIDString?:@"";
+    }
+    
+    if (![NSString isNullOrNilWithObject:self.clientTokenString]&&![NSString isFullSpaceEmpty:self.clientTokenString]) {
+        [TIoTCoreUserManage shared].demoAreaNetClientToken = self.clientTokenString?:@"";
+    }
 }
 
 - (void)initVariable {
@@ -147,6 +168,7 @@ - (void)initVariable {
 - (void)detectEquipment {
     [self.localDetch sendUDPData:self.productIDString?:@"" clientToken:self.clientTokenString?:@""];
     [self hideKeyBoard];
+    [self saveInputInfo];
 }
 
 #pragma mark - 探测代理回调
@@ -191,8 +213,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 #pragma mark - cell delegate
-- (void)previewAreaNetworkDetectDevice  {
+- (void)previewAreaNetworkDetectDevice:(TIoTAreaNetDetectionModel *)model  {
     TIoTAreaNetworkPreviewVC *liveVC = [[TIoTAreaNetworkPreviewVC alloc]init];
+    liveVC.model = model;
+    liveVC.productID = self.productIDString;
     [self.navigationController pushViewController:liveVC animated:YES];
 }
 

Source/LinkSDKDemo/Video/Login/Controller/TIoTAreaNetworkConfigVC.m

@@ -95,16 +95,16 @@ - (void)initVideoUI {
         make.top.equalTo(consumerVersionBtn.mas_bottom).offset(20);
     }];
 
-//        UIButton *localAreaNetworkBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//        [localAreaNetworkBtn setButtonFormateWithTitlt:@"IoT Video（局域网）" titleColorHexString:kVideoDemoMainThemeColor font:[UIFont wcPfRegularFontOfSize:17]];
-//        localAreaNetworkBtn.layer.borderColor = [UIColor colorWithHexString:kVideoDemoMainThemeColor].CGColor;
-//        localAreaNetworkBtn.layer.borderWidth = 1;
-//        [localAreaNetworkBtn addTarget:self action:@selector(jumpLocalAreaNetwork) forControlEvents:UIControlEventTouchUpInside];
-//        [self.view addSubview:localAreaNetworkBtn];
-//        [localAreaNetworkBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.left.right.equalTo(consumerVersionBtn);
-//            make.top.equalTo(industryVersionBtn.mas_bottom).offset(20);
-//        }];
+        UIButton *localAreaNetworkBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [localAreaNetworkBtn setButtonFormateWithTitlt:@"IoT Video（局域网）" titleColorHexString:kVideoDemoMainThemeColor font:[UIFont wcPfRegularFontOfSize:17]];
+        localAreaNetworkBtn.layer.borderColor = [UIColor colorWithHexString:kVideoDemoMainThemeColor].CGColor;
+        localAreaNetworkBtn.layer.borderWidth = 1;
+        [localAreaNetworkBtn addTarget:self action:@selector(jumpLocalAreaNetwork) forControlEvents:UIControlEventTouchUpInside];
+        [self.view addSubview:localAreaNetworkBtn];
+        [localAreaNetworkBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.equalTo(consumerVersionBtn);
+            make.top.equalTo(industryVersionBtn.mas_bottom).offset(20);
+        }];
 }
 
 - (void)jumpPlaying {

Source/LinkSDKDemo/Video/Login/Controller/TIoTDemoVideoVC.m

@@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol TIoTAreaNetworkDeviceCellDelegate <NSObject>
 
-- (void)previewAreaNetworkDetectDevice;
+- (void)previewAreaNetworkDetectDevice:(TIoTAreaNetDetectionModel *)model;
 
 @end
 /// 局域网 设备列表cell

Source/LinkSDKDemo/Video/Login/View/LoginView/TIoTAreaNetworkDeviceCell.h

@@ -53,8 +53,8 @@ - (void)setupUISunViews {
 }
 
 - (void)previewAreaNetWorkLive {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(previewAreaNetworkDetectDevice)]) {
-        [self.delegate previewAreaNetworkDetectDevice];
+    if (self.delegate && [self.delegate respondsToSelector:@selector(previewAreaNetworkDetectDevice:)]) {
+        [self.delegate previewAreaNetworkDetectDevice:_rspDetectionDeviceModel];
     }
 }
 

Source/LinkSDKDemo/Video/Login/View/LoginView/TIoTAreaNetworkDeviceCell.m

@@ -114,6 +114,8 @@ NS_ASSUME_NONNULL_BEGIN
  SDKDemo
  */
 @property (nonatomic, copy, nullable) NSString *demoAccessID;
+@property (nonatomic, copy, nullable) NSString *demoAreaNetProductID;
+@property (nonatomic, copy, nullable) NSString *demoAreaNetClientToken;
 
 //保存accessToken 和 有效期
 - (void)saveAccessToken:(NSString *)accessToken expireAt:(NSString *)expireAt;

Source/SDK/LinkCore/QCFoundation/Other/TIoTCoreUserManage.h

@@ -54,6 +54,8 @@ @implementation TIoTCoreUserManage
 @synthesize demoAccessID = _demoAccessID;
 @synthesize firmwareUpdate = _firmwareUpdate;
 @synthesize isRreshDeviceList = _isRreshDeviceList;
+@synthesize demoAreaNetProductID = _demoAreaNetProductID;
+@synthesize demoAreaNetClientToken = _demoAreaNetClientToken;
 
 +(instancetype)shared{
     static TIoTCoreUserManage *_instance = nil;
@@ -584,6 +586,30 @@ - (void)setDemoAccessID:(NSString *)demoAccessID {
     [[NSUserDefaults standardUserDefaults] setValue:demoAccessID forKey:@"demoAccessID"];
 }
 
+- (NSString *)demoAreaNetProductID {
+    if (!_demoAreaNetProductID) {
+        _demoAreaNetProductID = [[NSUserDefaults standardUserDefaults] valueForKey:@"demoAreaNetProductID"];
+    }
+    return _demoAreaNetProductID;
+}
+
+- (void)setDemoAreaNetProductID:(NSString *)demoAreaNetProductID {
+    _demoAreaNetProductID = demoAreaNetProductID;
+    [[NSUserDefaults standardUserDefaults] setValue:demoAreaNetProductID forKey:@"demoAreaNetProductID"];
+}
+
+- (NSString *)demoAreaNetClientToken {
+    if (!_demoAreaNetClientToken) {
+        _demoAreaNetClientToken = [[NSUserDefaults standardUserDefaults] valueForKey:@"demoAreaNetClientToken"];
+    }
+    return _demoAreaNetClientToken;
+}
+
+- (void)setDemoAreaNetClientToken:(NSString *)demoAreaNetClientToken {
+    _demoAreaNetClientToken = demoAreaNetClientToken;
+    [[NSUserDefaults standardUserDefaults] setValue:demoAreaNetClientToken forKey:@"demoAreaNetClientToken"];
+}
+
 //保存用户信息
 - (void)saveUserInfo:(NSDictionary *)userInfo{
 
@@ -653,13 +679,17 @@ - (void)clear{
     self.countryTitleEN = @"";
     self.FamilyType = 0;
     self.firmwareUpdate = @"";
+    self.demoAreaNetProductID = @"";
+    self.demoAreaNetClientToken = @"";
 }
 
 - (void)signInClear {
     self.signIn_countryCode = @"";
     self.signIn_Title = @"";
     self.signIn_Phone_Numner = @"";
     self.signIn_Email_Address = @"";
+    self.demoAreaNetProductID = @"";
+    self.demoAreaNetClientToken = @"";
 }
 
 @end