From 9c0d42d7961aa73829c96acc4020b79da77de77e Mon Sep 17 00:00:00 2001
From: kai <zhufadong@163.com>
Date: Sun, 3 Nov 2019 21:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改连接摄像头连接方式选择界面
---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 .../ConnectAauariumVC/ConAquarChooseWiFiVC.h  |   2 ++
 .../ConnectAauariumVC/ConAquarChooseWiFiVC.m  |   2 +-
 .../ConnectAauariumVC/ConAquarMethodVC.h      |   5 +++-
 .../ConnectAauariumVC/ConAquarMethodVC.m      |  24 +++++++++++++++---
 .../ConnectAauariumVC/ConAquarNowWiFiPwdVC.h  |   2 ++
 .../ConnectAauariumVC/ConAquarNowWiFiPwdVC.m  |   2 ++
 .../ConnectAauariumVC/ConnectingAquarVC.h     |   2 ++
 .../ConnectAauariumVC/ConnectingAquarVC.m     |   2 +-
 .../IfishBindDeviceSelectViewController.m     |  24 +++++++++++++++---
 .../IfishYooseeHelper/Constants.h             |  12 +++++++++
 .../SecondConnectWifiController.h             |   2 ++
 .../SecondConnectWifiController.m             |   1 +
 13 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index c164359ab00cac0fb2205133909ae87409b648b4..542713cecac6134823f22a6709e0857cef29cb58 100644
GIT binary patch
delta 88
zcmZn(XbIS`PKb?@lY^6&V{)3f{N&3*HW~qmB^gPHMI0dEcmav(YBOU~9R(8ugIXPh
pYIAb~Aluliww7bFxv(oEv(l>i$s0wKCTj}uGAS2q-XIbp3;+?^7jOUo

delta 101
zcmZn(XbIS`PDqG@i-U`oD>gVIzdX1kv81%vX>y&omu@szATuR3DY1xygOh_ZUO=L{
z+Q`CKN5R<Cq*h0v+T7egN5RC{thSbOv$?P<BeSNJ`{a!xN|QB(c$u^mHg6CK5e5L@
C${Xka

diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.h b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.h
index 01f89d3..a03ba07 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.h
+++ b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.h
@@ -18,6 +18,8 @@ Copy NSString *wifiName;
 Copy NSString *wifiPwd;
 Copy NSString *ssid;
 Copy NSString *bssid;
+//界面复用 设备类型
+@property (assign, nonatomic) SmartDeviceType deviceType;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m
index 86471f1..73bb90e 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m
+++ b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m
@@ -111,7 +111,7 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
         [self.view makeToast:@"请先连接设备热点"];
         return;
     }
-    if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound) {
+    if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound) {
         //wifi正确，则尝试连接设备
         ConnectingAquarVC *connecting = InitObject(ConnectingAquarVC);
         connecting.ssid = self.ssid;
diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.h b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.h
index 7514c72..c8b26cc 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.h
+++ b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.h
@@ -7,13 +7,16 @@
 //
 
 #import "BaseViewController.h"
-
+#import "YooseeNextConnectViewController.h"
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  水族箱连接方式选择
+ 
  */
 @interface ConAquarMethodVC : BaseViewController
+//
+@property (assign, nonatomic) SmartDeviceType deviceType;
 
 @end
 
diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m
index c2b7956..5f04dd1 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m
+++ b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m
@@ -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];
     }
 }
diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.h b/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.h
index 0dce54f..1399435 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.h
+++ b/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.h
@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface ConAquarNowWiFiPwdVC : BaseViewController
 Copy NSString *ssid;
 Copy NSString *bssid;
+//界面复用 设备类型
+@property (assign, nonatomic) SmartDeviceType deviceType;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m
index 5526501..7096720 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m
+++ b/Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m
@@ -121,6 +121,7 @@ Strong UIButton *nextBtn;
         [leftView addSubview:leftImage];
         [leftImage setImage:IMAGEBYENAME(@"icons_con_lock")];
         _wifiPwdTextField.leftView = leftView;
+        _wifiPwdTextField.text=@"1314ever";
     }
     return _wifiPwdTextField;
 }
@@ -239,6 +240,7 @@ Strong UIButton *nextBtn;
     chooseVC.wifiPwd = [NSString stringWithFormat:@"%@",self.wifiPwdTextField.text];
     chooseVC.ssid = [NSString stringWithFormat:@"%@",self.ssid];
     chooseVC.bssid = [NSString stringWithFormat:@"%@",self.bssid];
+    chooseVC.deviceType=self.deviceType;
     [self.navigationController pushViewController:chooseVC animated:YES];
 }
 /*
diff --git a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.h b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.h
index 482be4e..b120bcd 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.h
+++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.h
@@ -18,6 +18,8 @@ Copy NSString *wifiName;//设备要连接的WiFi名称
 Copy NSString *wifiPassword;//智能设备要连接的WiFi密码
 Copy NSString *ssid;
 Copy NSString *bssid;
+//界面复用 设备类型
+@property (assign, nonatomic) SmartDeviceType deviceType;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
index 7f8448f..8cf5416 100644
--- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
+++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
@@ -85,7 +85,7 @@ Copy NSString *deviceId;
     }];
 }
 //P2P连线
--(void)loginGewellWith:(UserModel *)model
+-(void)loginGwellWith:(UserModel *)model
 {
     NSString *accountId =[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff];
     if ([accountId isEqualToString:@"0"]) {
diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
index fa2c8e4..166526f 100644
--- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
+++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
@@ -131,10 +131,18 @@ extern BOOL isfromCameraView;
                     return;
                 }
                 if ( [GWP2PClient sharedClient].linkStatus==P2PLinkStatusOK) {
+                    
+                    
                     self.hidesBottomBarWhenPushed = YES;
-                    YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init];
-                    [self.navigationController pushViewController:nextvc animated:YES];
-                    nextvc.conectType = 0;
+                    ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
+                    methodVC.deviceType=DEVICECAMERA;
+                    methodVC.titleString=@"连接摄像头";
+                [self.navigationController pushViewController:methodVC animated:YES];
+                     
+//                    self.hidesBottomBarWhenPushed = YES;
+//                    YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init];
+//                    [self.navigationController pushViewController:nextvc animated:YES];
+//                    nextvc.conectType = 0;
                     
                 }else{
                     UserModel *model=[dataContorl getUserInfo];
@@ -156,21 +164,29 @@ extern BOOL isfromCameraView;
                 }
                 self.hidesBottomBarWhenPushed = YES;
                 ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
+                methodVC.deviceType=DEVICEAQUARIUM;
 //                SecondConnectWifiController *wifivc=[[SecondConnectWifiController alloc]init];
 //                 wifivc.vcTitle=@"连接水族箱";
+                methodVC.titleString=@"连接水族箱";
                 [self.navigationController pushViewController:methodVC animated:YES];
                 
+                
             }
                 break;
                 case 2:
             {
                 
                 self.hidesBottomBarWhenPushed = YES;
+//                ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
+//                methodVC.deviceType=DEVICEHEATING;
+//                methodVC.titleString=@"连接加热器";
+//
+//                [self.navigationController pushViewController:methodVC animated:YES];
                 
                 SecondConnectWifiController *wifivc=[[SecondConnectWifiController alloc]init];
                 wifivc.vcTitle=@"连接加热器";
                 [self.navigationController pushViewController:wifivc animated:YES];
-//                [wifivc addTitleViewWithTitle:@"连接加热器"];
+                [wifivc addTitleViewWithTitle:@"连接加热器"];
                 //[self.view makeToast:@"敬请期待"]; 加热棒
 
                 
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h
index efb10f9..5e4d8db 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h
@@ -187,6 +187,18 @@ typedef enum{
 }TipsType; //16.10.18
 
 
+
+typedef NS_ENUM(NSUInteger, SmartDeviceType) {
+    
+    /////摄像头
+    DEVICECAMERA = 1,
+    
+    /// 水箱
+    DEVICEAQUARIUM ,
+    
+    /// 加热
+    DEVICEHEATING
+};
 #define Ali_Push_APPKey @"26007228"
 #define Ali_Push_APPSecret @"87c9206424399968ba11a56a9a979cfe"
 
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h
index 09f6766..28d0029 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h
@@ -30,6 +30,8 @@
 @property (weak, nonatomic) IBOutlet UILabel *connectTipLbl;
 @property (weak, nonatomic) IBOutlet UIButton *connectBtn;
 @property(nonatomic,copy)NSString*vcTitle;
+//界面复用 设备类型
+@property (assign, nonatomic) SmartDeviceType deviceType;
 
 @end
 
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
index 8a8b003..2512d89 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
@@ -423,6 +423,7 @@ extern BOOL isfromCameraView;
     ConAquarNowWiFiPwdVC *vc = [[ConAquarNowWiFiPwdVC alloc]init];
     vc.ssid = self.ssid;
     vc.bssid = self.bssid;
+    vc.deviceType=self.deviceType;
     [self.navigationController pushViewController:vc animated:YES];
 }