连接界面修改

修改连接摄像头连接方式选择界面
2019-11-03 21:39:23 +08:00
parent b2ad110ed2
commit 9c0d42d796
13 changed files with 69 additions and 11 deletions
@@ -19,7 +19,7 @@ Strong UILabel *subTitleLabel;
 - (void)viewDidLoad {
    [super viewDidLoad];
    
-    [self addTitleViewWithTitle:@"连接水族箱"];
+    [self addTitleViewWithTitle:self.titleString];
    
    [self.view addSubview:self.subTitleLabel];
    
@@ -79,11 +79,27 @@ Strong UILabel *subTitleLabel;
 -(void)buttonClick:(UIButton *)sender{
    self.hidesBottomBarWhenPushed = YES;
    if (sender.tag==0) {
-        SecondConnectWifiController *wifivc=[[SecondConnectWifiController alloc]init];
-        wifivc.vcTitle=@"连接水族箱";
-        [self.navigationController pushViewController:wifivc animated:YES];
+        
+        if (self.deviceType==DEVICECAMERA)
+        {
+        YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init];
+            nextvc.conectType = 0;
+        [self.navigationController pushViewController:nextvc animated:YES];
+        
+        }
+        else
+        {
+            SecondConnectWifiController *wifivc=[[SecondConnectWifiController alloc]init];
+            wifivc.deviceType=self.deviceType;
+            wifivc.vcTitle=@"连接水族箱";
+            [self.navigationController pushViewController:wifivc animated:YES];
+        }
+        
+       
    }else{
        ConAquarNowWiFiPwdVC *vc = InitObject(ConAquarNowWiFiPwdVC);
+        vc.deviceType=self.deviceType;
+        
        [self.navigationController pushViewController:vc animated:YES];
    }
 }