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

Ifish.xcodeproj/project.pbxproj

@@ -2288,6 +2288,8 @@
 		C057166D282376CC004F113A /* UIButton+ImageTitleStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */; };
 		C05716702823D653004F113A /* XuanduoTimerListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C057166E2823D652004F113A /* XuanduoTimerListViewController.h */; };
 		C05716712823D653004F113A /* XuanduoTimerListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C057166F2823D652004F113A /* XuanduoTimerListViewController.m */; };
+		C0571674282674A4004F113A /* XuanduofishFeedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C0571672282674A3004F113A /* XuanduofishFeedViewController.m */; };
+		C0571675282674A4004F113A /* XuanduofishFeedViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C0571673282674A3004F113A /* XuanduofishFeedViewController.h */; };
 		C072196A253AE2290065CF17 /* IfishP2PPlayBackListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0721969253AE2290065CF17 /* IfishP2PPlayBackListViewController.xib */; };
 		C072196D253B1F4F0065CF17 /* DatePickerCustomView.h in Headers */ = {isa = PBXBuildFile; fileRef = C072196B253B1F4F0065CF17 /* DatePickerCustomView.h */; };
 		C072196E253B1F4F0065CF17 /* DatePickerCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = C072196C253B1F4F0065CF17 /* DatePickerCustomView.m */; };
@@ -5784,6 +5786,8 @@
 		C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+ImageTitleStyle.m"; sourceTree = "<group>"; };
 		C057166E2823D652004F113A /* XuanduoTimerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoTimerListViewController.h; sourceTree = "<group>"; };
 		C057166F2823D652004F113A /* XuanduoTimerListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XuanduoTimerListViewController.m; sourceTree = "<group>"; };
+		C0571672282674A3004F113A /* XuanduofishFeedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XuanduofishFeedViewController.m; sourceTree = "<group>"; };
+		C0571673282674A3004F113A /* XuanduofishFeedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduofishFeedViewController.h; sourceTree = "<group>"; };
 		C0721969253AE2290065CF17 /* IfishP2PPlayBackListViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishP2PPlayBackListViewController.xib; sourceTree = "<group>"; };
 		C072196B253B1F4F0065CF17 /* DatePickerCustomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatePickerCustomView.h; sourceTree = "<group>"; };
 		C072196C253B1F4F0065CF17 /* DatePickerCustomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatePickerCustomView.m; sourceTree = "<group>"; };
@@ -9726,6 +9730,8 @@
 				883E76A81D48A5E50030E075 /* XuToSetViewController.h */,
 				883E76A91D48A5E50030E075 /* XuToSetViewController.m */,
 				C0CCEF69280D08C600604601 /* XuanduoSettingController.h */,
+				C0571673282674A3004F113A /* XuanduofishFeedViewController.h */,
+				C0571672282674A3004F113A /* XuanduofishFeedViewController.m */,
 				C057166E2823D652004F113A /* XuanduoTimerListViewController.h */,
 				C057166F2823D652004F113A /* XuanduoTimerListViewController.m */,
 				C08976B3282119300098B5FA /* XuanduoTimerSettingViewController.h */,
@@ -13192,6 +13198,7 @@
 				3D1C50B9221A9EDF0096AE43 /* CheckNewMessageResult.h in Headers */,
 				CB4820932334E99700A50C92 /* IQUIScrollView+Additions.h in Headers */,
 				CB48208E2334E99700A50C92 /* IQUIViewController+Additions.h in Headers */,
+				C0571675282674A4004F113A /* XuanduofishFeedViewController.h in Headers */,
 				C0EA8A1C23AF74F4003DC53B /* UIButton+WebCache.h in Headers */,
 				C024B7AC2379668B00509424 /* NSArray+AvoidCrash.h in Headers */,
 				CB48207D2334E99700A50C92 /* IQUIView+IQKeyboardToolbar.h in Headers */,
@@ -15231,6 +15238,7 @@
 				881671B91EA5DE2B00BEBF23 /* UMComShareManager.m in Sources */,
 				3D1C5113221A9EE00096AE43 /* IfishP2PMonitorController.m in Sources */,
 				3D1C50F4221A9EE00096AE43 /* UDPManager.m in Sources */,
+				C0571674282674A4004F113A /* XuanduofishFeedViewController.m in Sources */,
 				883E78881D48A5E50030E075 /* LeftCellmodel.m in Sources */,
 				883E78651D48A5E50030E075 /* CollectionReusableView.m in Sources */,
 				88F5EFB01D48D08100CC7CAF /* AFURLResponseSerialization.m in Sources */,

Ifish/Utinitys/Define.h

@@ -144,13 +144,13 @@ alpha:1.0]
 
  static NSString* DOMAIN_NAME =@"app.ifish7.cn";
 //正式环境
-#define SOCKETPORT  [Define sharedDefine].server
+//#define SOCKETPORT  [Define sharedDefine].server
-#define JIEKOUPORT [[Define sharedDefine] getRealSever]
+//#define JIEKOUPORT [[Define sharedDefine] getRealSever]
-#define JIEKOUPORTHTTP [[Define sharedDefine] getRealSever]
+//#define JIEKOUPORTHTTP [[Define sharedDefine] getRealSever]
 //测试环境
-//#define SOCKETPORT  @"test.ifish7.com:9955"
+#define SOCKETPORT  @"139.196.24.156"
-//#define JIEKOUPORT @"http://139.196.24.156:7080"
+#define JIEKOUPORT @"http://139.196.24.156:7080"
-//#define JIEKOUPORTHTTP @"https://app.ifish7.com"
+#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];
+    NSInteger current = btn.tag - kBtnTag-2;
-     _settingVC.currentdevice = self.currentdevice;
+    if (current==0)
-     _settingVC.dataModel = self.dataModel;
+    {
-     [self.navigationController pushViewController:_settingVC animated:YES];
+        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