测试环境切换 添加一键喂鱼

Ifish/Utinitys/Define.h

@@ -144,13 +144,13 @@ alpha:1.0]
 
  static NSString* DOMAIN_NAME =@"app.ifish7.cn";
 //正式环境
-#define SOCKETPORT  [Define sharedDefine].server
-#define JIEKOUPORT [[Define sharedDefine] getRealSever]
-#define JIEKOUPORTHTTP [[Define sharedDefine] getRealSever]
+//#define SOCKETPORT  [Define sharedDefine].server
+//#define JIEKOUPORT [[Define sharedDefine] getRealSever]
+//#define JIEKOUPORTHTTP [[Define sharedDefine] getRealSever]
 //测试环境
-//#define SOCKETPORT  @"test.ifish7.com:9955"
-//#define JIEKOUPORT @"http://139.196.24.156:7080"
-//#define JIEKOUPORTHTTP @"https://app.ifish7.com"
+#define SOCKETPORT  @"139.196.24.156"
+#define JIEKOUPORT @"http://139.196.24.156:7080"
+#define JIEKOUPORTHTTP @"https://app.ifish7.com"
 //云 @"https://app.ifish7.com"
 //云图片头像等地址 @"http://app.ifish7.com"
 //#define JIEKOUPORTHTTP @"https://app.ifish7.com"

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m

@@ -174,6 +174,15 @@
         self.heartCount=0;
                 
     }
+    else if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F])
+    {
+        self.imageView.image=[UIImage imageNamed:@"pet"];
+        
+        self.controlBtn.hidden=NO;
+        self.cameraBtn.hidden=NO;
+        self.heartCount=0;
+                
+    }
 }
 
 - (void)connect {

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.m

@@ -7,6 +7,7 @@
 //
 
 #import "XuanduoSettingController.h"
+#import "XuanduofishFeedViewController.h"
 #import "UINavigationBar+Background.h"
 #import "TemperatureSetCell.h"
 #import "ChangeWaterCell.h"
@@ -523,10 +524,23 @@ static NSString *setTimerflag = @"SetTimerCell";
 #pragma mark - cell的折叠
 - (void)foldAction:(UIButton *)btn
 {
-    XuanduoTimerListViewController *_settingVC = [[XuanduoTimerListViewController alloc] init];
-     _settingVC.currentdevice = self.currentdevice;
-     _settingVC.dataModel = self.dataModel;
-     [self.navigationController pushViewController:_settingVC animated:YES];
+    NSInteger current = btn.tag - kBtnTag-2;
+    if (current==0)
+    {
+        XuanduoTimerListViewController *_settingVC = [[XuanduoTimerListViewController alloc] init];
+         _settingVC.currentdevice = self.currentdevice;
+         _settingVC.dataModel = self.dataModel;
+         [self.navigationController pushViewController:_settingVC animated:YES];
+    }
+    else if (current==1)
+    {
+        XuanduofishFeedViewController *_settingVC = [[XuanduofishFeedViewController alloc] init];
+         _settingVC.currentdevice = self.currentdevice;
+         _settingVC.dataModel = self.dataModel;
+         [self.navigationController pushViewController:_settingVC animated:YES];
+    }
+    
+    
 }
 
 - (void)switchAction:(UIButton *)btn {

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.h

@@ -0,0 +1,28 @@
+//
+//  Xuanduo2SettingController.h
+//  Ifish
+//
+//  Created by Alex on 2019/4/28.
+//  Copyright © 2019 lianlian. All rights reserved.
+//
+
+#import "FatherController.h"
+#import "IfishDeviceInfo.h"
+#import "xuanduo3fModel.h"
+#import "ReadTimerModel.h"
+#import "XuanduoTimerSettingViewController.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@class Xuanduo2Model;
+
+@interface XuanduofishFeedViewController : FatherController
+
+@property (nonatomic,strong) UIActivityIndicatorView*indicatorView;
+@property (nonatomic ,strong)  id dataModel;
+@property(nonatomic,strong) DeviceModel* currentdevice;
+@property (nonatomic, strong) ReadTimerModel *readMode;
+- (void)refreshWithData:(id)model;
+
+@end
+
+NS_ASSUME_NONNULL_END