新配置界面

2018-09-22 21:40:37 +08:00 · 2018-09-22 21:40:37 +08:00 · 8a43861303
parent ae72c0eaeb
commit 8a43861303
59 changed files with 1428 additions and 20 deletions
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@ -7,6 +7,17 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		3D13F835212FE2C200D725F7 /* IFishWaterChangeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */; };
+		3D13F837212FE2D100D725F7 /* IFishWaterChangeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */; };
+		3D13F83B212FE48000D725F7 /* UIView+GetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D13F839212FE47F00D725F7 /* UIView+GetView.m */; };
+		3D34479A212CF71C00CF3941 /* IfishHotBarVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D344798212CF71C00CF3941 /* IfishHotBarVc.m */; };
+		3D34479B212CF71C00CF3941 /* IfishHotBarVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */; };
+		3D3447A0212D113D00CF3941 /* IFishHotBarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D34479E212D113D00CF3941 /* IFishHotBarCell.m */; };
+		3D3447A1212D113D00CF3941 /* IFishHotBarCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */; };
+		3D3447A5212D1C3800CF3941 /* IfishHotBarVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3447A4212D1C3800CF3941 /* IfishHotBarVo.m */; };
+		3D5C436E21339E9D00E15B66 /* IfishHistoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */; };
+		3D5C437021339EAB00E15B66 /* IfishHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */; };
+		3D5C437321339F8F00E15B66 /* IfishChatView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5C437221339F8F00E15B66 /* IfishChatView.m */; };
 		880707451DDD3EF50076F65A /* P2PShareView1Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 880707431DDD3EF50076F65A /* P2PShareView1Cell.m */; };
 		880707461DDD3EF50076F65A /* P2PShareView1Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 880707441DDD3EF50076F65A /* P2PShareView1Cell.xib */; };
 		8807074A1DDD40B40076F65A /* P2PShareViewsec2Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 880707481DDD40B40076F65A /* P2PShareViewsec2Cell.m */; };
@ -2473,6 +2484,24 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
+		3D13F833212FE2C200D725F7 /* IFishWaterChangeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IFishWaterChangeView.h; sourceTree = "<group>"; };
+		3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishWaterChangeView.m; sourceTree = "<group>"; };
+		3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IFishWaterChangeView.xib; sourceTree = "<group>"; };
+		3D13F839212FE47F00D725F7 /* UIView+GetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+GetView.m"; sourceTree = "<group>"; };
+		3D13F83A212FE47F00D725F7 /* UIView+GetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+GetView.h"; sourceTree = "<group>"; };
+		3D344797212CF71C00CF3941 /* IfishHotBarVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHotBarVc.h; sourceTree = "<group>"; };
+		3D344798212CF71C00CF3941 /* IfishHotBarVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarVc.m; sourceTree = "<group>"; };
+		3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHotBarVc.xib; sourceTree = "<group>"; };
+		3D34479D212D113D00CF3941 /* IFishHotBarCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IFishHotBarCell.h; sourceTree = "<group>"; };
+		3D34479E212D113D00CF3941 /* IFishHotBarCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishHotBarCell.m; sourceTree = "<group>"; };
+		3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IFishHotBarCell.xib; sourceTree = "<group>"; };
+		3D3447A3212D1C3800CF3941 /* IfishHotBarVo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHotBarVo.h; sourceTree = "<group>"; };
+		3D3447A4212D1C3800CF3941 /* IfishHotBarVo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarVo.m; sourceTree = "<group>"; };
+		3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHistoryView.h; sourceTree = "<group>"; };
+		3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHistoryView.m; sourceTree = "<group>"; };
+		3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHistoryView.xib; sourceTree = "<group>"; };
+		3D5C437121339F8F00E15B66 /* IfishChatView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishChatView.h; sourceTree = "<group>"; };
+		3D5C437221339F8F00E15B66 /* IfishChatView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishChatView.m; sourceTree = "<group>"; };
 		880707421DDD3EF50076F65A /* P2PShareView1Cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PShareView1Cell.h; sourceTree = "<group>"; };
 		880707431DDD3EF50076F65A /* P2PShareView1Cell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = P2PShareView1Cell.m; sourceTree = "<group>"; };
 		880707441DDD3EF50076F65A /* P2PShareView1Cell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = P2PShareView1Cell.xib; sourceTree = "<group>"; };
@ -6341,6 +6370,55 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		3D13F838212FE46B00D725F7 /* categry */ = {
+			isa = PBXGroup;
+			children = (
+				3D13F83A212FE47F00D725F7 /* UIView+GetView.h */,
+				3D13F839212FE47F00D725F7 /* UIView+GetView.m */,
+			);
+			path = categry;
+			sourceTree = "<group>";
+		};
+		3D344796212CF49300CF3941 /* HotBar */ = {
+			isa = PBXGroup;
+			children = (
+				3D13F838212FE46B00D725F7 /* categry */,
+				3D3447A2212D1C1700CF3941 /* models */,
+				3D34479C212D111900CF3941 /* Views */,
+				3D344797212CF71C00CF3941 /* IfishHotBarVc.h */,
+				3D344798212CF71C00CF3941 /* IfishHotBarVc.m */,
+				3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */,
+			);
+			path = HotBar;
+			sourceTree = "<group>";
+		};
+		3D34479C212D111900CF3941 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				3D34479D212D113D00CF3941 /* IFishHotBarCell.h */,
+				3D34479E212D113D00CF3941 /* IFishHotBarCell.m */,
+				3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */,
+				3D13F833212FE2C200D725F7 /* IFishWaterChangeView.h */,
+				3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */,
+				3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */,
+				3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */,
+				3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */,
+				3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */,
+				3D5C437121339F8F00E15B66 /* IfishChatView.h */,
+				3D5C437221339F8F00E15B66 /* IfishChatView.m */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		3D3447A2212D1C1700CF3941 /* models */ = {
+			isa = PBXGroup;
+			children = (
+				3D3447A3212D1C3800CF3941 /* IfishHotBarVo.h */,
+				3D3447A4212D1C3800CF3941 /* IfishHotBarVo.m */,
+			);
+			path = models;
+			sourceTree = "<group>";
+		};
 		880707411DDD3DAC0076F65A /* ifishP2PShareVIew */ = {
 			isa = PBXGroup;
 			children = (
@ -8795,6 +8873,7 @@
 		883E76461D48A5E50030E075 /* controllers */ = {
 			isa = PBXGroup;
 			children = (
+				3D344796212CF49300CF3941 /* HotBar */,
 				883E79001D48A74F0030E075 /* erweima */,
 				883E76471D48A5E50030E075 /* BaseVIewContorller */,
 				883E764C1D48A5E50030E075 /* FishTinkController */,
@ -14234,6 +14313,7 @@
 				8849EFC01EB883840096CAD7 /* enter_tablet@2x.png in Resources */,
 				8829579F1DBDA3A400E9DDD7 /* xutobtn4_off@3x.png in Resources */,
 				880707501DDD42E60076F65A /* P2PShareViewTh3Cell.xib in Resources */,
+				3D3447A1212D113D00CF3941 /* IFishHotBarCell.xib in Resources */,
 				88C1B1ED1DC9AF3700C2C99A /* home_iocnmydevice.png in Resources */,
 				887069541D4EE8A600BCF675 /* PopCell.xib in Resources */,
 				887492411E7A90D000CDA284 /* fishdoctor_iocn_optimization.png in Resources */,
@ -14891,6 +14971,7 @@
 				8815D1E51E02662500BEA2DA /* FullPlay_Play.png in Resources */,
 				882956261DBDA3A100E9DDD7 /* neves0041.png in Resources */,
 				88A7EFAA1EA5EF0D00D43E8C /* NTESVideoChatViewController.xib in Resources */,
+				3D5C437021339EAB00E15B66 /* IfishHistoryView.xib in Resources */,
 				88742C3E1D63FA270074F1F8 /* CertifyListFourthCell.xib in Resources */,
 				8864844A1EE171D30046C3BD /* redact_line@3x.png in Resources */,
 				8869B3A71E6967DF0010F099 /* levelUp_totoise@3x.png in Resources */,
@ -15052,6 +15133,7 @@
 				8856B0E91DEC15F5009D384A /* home_popup_cancel@3x.png in Resources */,
 				882955E01DBDA3A100E9DDD7 /* delete_device.png in Resources */,
 				8891332A1ECE99B900F52EBC /* recording_iocn_back@3x.png in Resources */,
+				3D34479B212CF71C00CF3941 /* IfishHotBarVc.xib in Resources */,
 				881A1D461DD41A1A00BA1AF4 /* MineKanEditSec1firstCell.xib in Resources */,
 				8856B0E11DEC15F5009D384A /* home_popup_back.png in Resources */,
 				883518021E6664D200FCBE56 /* fishrank_yaksha@2x.png in Resources */,
@ -15069,6 +15151,7 @@
 				88C1B2111DCC5A1400C2C99A /* personal_iocn_about.png in Resources */,
 				883283A11EAF4C7300A47157 /* record_label_default@2x.png in Resources */,
 				88602F961E12002600F3DB5D /* NTESGalleryViewController.xib in Resources */,
+				3D13F837212FE2D100D725F7 /* IFishWaterChangeView.xib in Resources */,
 				883283471EAEE60500A47157 /* ifish_look_off@3x.png in Resources */,
 				8849EFBC1EB883840096CAD7 /* enter_padlock.png in Resources */,
 				885606B21E320AAF0002C17C /* home_care_popup@3x.png in Resources */,
@ -15234,6 +15317,7 @@
 				8871C4411E6D223F000AA49F /* QianDaoBannerViewCell.m in Sources */,
 				883E79391D48ACFF0030E075 /* DataCenter.m in Sources */,
 				88597ABA1E56BAF1003D0E5C /* UIView+EXTENSION.m in Sources */,
+				3D13F83B212FE48000D725F7 /* UIView+GetView.m in Sources */,
 				88A7EFAD1EA5EF0D00D43E8C /* NTESVideoChatNetStatusView.m in Sources */,
 				883E78D01D48A5E50030E075 /* ModifyLoginPasswordResult.m in Sources */,
 				88602A261E10BC3500F3DB5D /* NIMInputEmoticonManager.m in Sources */,
@ -15352,6 +15436,7 @@
 				883E78A81D48A5E50030E075 /* MonitorBootmView.m in Sources */,
 				88F5EFBF1D48D08100CC7CAF /* FMDatabaseAdditions.m in Sources */,
 				881672031EA5DE2B00BEBF23 /* UMComRefreshView.m in Sources */,
+				3D34479A212CF71C00CF3941 /* IfishHotBarVc.m in Sources */,
 				881672211EA5DE2B00BEBF23 /* UMComBriefEditView.m in Sources */,
 				88602F4A1E12002600F3DB5D /* NTESContactDataMember.m in Sources */,
 				881A1D4F1DD41AB000BA1AF4 /* MineKanEditSec1ThredCell.m in Sources */,
@ -15575,6 +15660,7 @@
 				88602F291E12002500F3DB5D /* NTESSessionCardViewController.m in Sources */,
 				883E78631D48A5E50030E075 /* CameraViewCell.m in Sources */,
 				883E78AE1D48A5E50030E075 /* Alarm.m in Sources */,
+				3D5C437321339F8F00E15B66 /* IfishChatView.m in Sources */,
 				881671FB1EA5DE2B00BEBF23 /* UMAssetsCollectionCell.m in Sources */,
 				88678C771E8C9E7F0043DA55 /* ifishLiveListAdViewCell.m in Sources */,
 				88F5EE571D48CA2800CC7CAF /* ESPGuideCode.m in Sources */,
@ -15934,6 +16020,7 @@
 				881671F01EA5DE2B00BEBF23 /* UMComProgressView.m in Sources */,
 				886028751E10BB1100F3DB5D /* UICollectionView+CTAssetsPickerController.m in Sources */,
 				88602F4D1E12002600F3DB5D /* NTESGroupedUsrInfo.m in Sources */,
+				3D13F835212FE2C200D725F7 /* IFishWaterChangeView.m in Sources */,
 				88F5EFAB1D48D08100CC7CAF /* AFHTTPSessionManager.m in Sources */,
 				886EAC581E2DC5BE00A4DF27 /* IFishShopsViewCell.m in Sources */,
 				88F5EFD21D48D08100CC7CAF /* MMProgressHUD+Class.m in Sources */,
@ -15945,6 +16032,7 @@
 				88602DB01E10D97E00F3DB5D /* MKAnnotationView+WebCache.m in Sources */,
 				8871C4461E6D2819000AA49F /* QianDaoWayTitleViewCell.m in Sources */,
 				883E78401D48A5E50030E075 /* FourControlDataUnity.m in Sources */,
+				3D5C436E21339E9D00E15B66 /* IfishHistoryView.m in Sources */,
 				885928C71E67C20600E0011E /* MineDengJi.m in Sources */,
 				881478371E712E3A00BFB79C /* TaskKindViewCell.m in Sources */,
 				8829582B1DC18CD100E9DDD7 /* AFNOHeaderHttpTool.m in Sources */,
@ -16007,6 +16095,7 @@
 				88602F481E12002600F3DB5D /* NTESChatroomTextContentView.m in Sources */,
 				887491CF1E77DA8A00CDA284 /* IfishMineGoldViewController.m in Sources */,
 				887B73381E235BDA00CECB73 /* JuNengProtocol.m in Sources */,
+				3D3447A5212D1C3800CF3941 /* IfishHotBarVo.m in Sources */,
 				881672191EA5DE2B00BEBF23 /* UMComSimpleHorizonMenuView.m in Sources */,
 				88696FFB1E9CC07F005D4AFB /* IfishAiLiShopGoodsViewCell.m in Sources */,
 				8860D78B1D6D7A94001E544C /* WorkbechViewController.m in Sources */,
@ -16073,6 +16162,7 @@
 				881671A21EA5DE2B00BEBF23 /* UMComNoticeListDataController..m in Sources */,
 				883E78431D48A5E50030E075 /* KeLiAiBackMassage.m in Sources */,
 				886028891E10BB1100F3DB5D /* CTAssetsPickerController.m in Sources */,
+				3D3447A0212D113D00CF3941 /* IFishHotBarCell.m in Sources */,
 				88602F8E1E12002600F3DB5D /* NTESPageView.m in Sources */,
 				88602F7B1E12002600F3DB5D /* NTESBundleSetting.m in Sources */,
 				88F5EFBA1D48D08100CC7CAF /* GCDAsyncSocket.m in Sources */,
@ -16432,8 +16522,9 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: guowu ouyang (Q5YLXZSN4A)";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@ -16515,8 +16606,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "05fbf8da-562c-4344-ade4-ae990d722f7a";
-				PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution;
+				PROVISIONING_PROFILE = "021476df-adac-4be4-96b1-0f75baa00008";
+				PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDevelopment;
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
@ -16530,8 +16621,9 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@ -16613,7 +16705,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "05fbf8da-562c-4344-ade4-ae990d722f7a";
+				PROVISIONING_PROFILE = "2d8401d7-0890-4ce2-bcc4-95d1e0ad2f53";
 				PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution;
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "";
--- a/Ifish/Assets.xcassets/.DS_Store
+++ b/Ifish/Assets.xcassets/.DS_Store
--- a/Ifish/Assets.xcassets/AppIcon-1.appiconset/Contents.json
+++ b/Ifish/Assets.xcassets/AppIcon-1.appiconset/Contents.json
@ -63,6 +63,11 @@
      "idiom" : "iphone",
      "filename" : "icon-60@3x.png",
      "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
    }
  ],
  "info" : {
--- a/Ifish/Assets.xcassets/HotBar/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/加热系统.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/加热系统.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "加热系统.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/加热系统.imageset/加热系统.png
+++ b/Ifish/Assets.xcassets/HotBar/加热系统.imageset/加热系统.png
--- a/Ifish/Assets.xcassets/HotBar/容积图标.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/容积图标.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "容积图标.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/容积图标.imageset/容积图标.png
+++ b/Ifish/Assets.xcassets/HotBar/容积图标.imageset/容积图标.png
--- a/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "开关按钮.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/开关按钮.png
+++ b/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/开关按钮.png
--- a/Ifish/Assets.xcassets/HotBar/换水图标.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/换水图标.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "换水图标.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/换水图标.imageset/换水图标.png
+++ b/Ifish/Assets.xcassets/HotBar/换水图标.imageset/换水图标.png
--- a/Ifish/Assets.xcassets/HotBar/摄像头.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/摄像头.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "摄像头.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/摄像头.imageset/摄像头.png
+++ b/Ifish/Assets.xcassets/HotBar/摄像头.imageset/摄像头.png
--- a/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "敬请期待.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/敬请期待.png
+++ b/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/敬请期待.png
--- a/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "水族控制系统.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/水族控制系统.png
+++ b/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/水族控制系统.png
--- a/Ifish/Assets.xcassets/HotBar/流量标.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/流量标.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "流量标.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/流量标.imageset/流量标.png
+++ b/Ifish/Assets.xcassets/HotBar/流量标.imageset/流量标.png
--- a/Ifish/Assets.xcassets/HotBar/温度图标.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/温度图标.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "温度图标.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/温度图标.imageset/温度图标.png
+++ b/Ifish/Assets.xcassets/HotBar/温度图标.imageset/温度图标.png
--- a/Ifish/Assets.xcassets/HotBar/确定.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/确定.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "确定.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/确定.imageset/确定.png
+++ b/Ifish/Assets.xcassets/HotBar/确定.imageset/确定.png
--- a/Ifish/Assets.xcassets/HotBar/箭头.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/箭头.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "箭头.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/箭头.imageset/箭头.png
+++ b/Ifish/Assets.xcassets/HotBar/箭头.imageset/箭头.png
--- a/Ifish/Assets.xcassets/HotBar/虚线.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/虚线.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "虚线.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/虚线.imageset/虚线.png
+++ b/Ifish/Assets.xcassets/HotBar/虚线.imageset/虚线.png
--- a/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "请设置加热温度.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/请设置加热温度.png
+++ b/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/请设置加热温度.png
--- a/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "请设置预警温度.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/请设置预警温度.png
+++ b/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/请设置预警温度.png
--- a/Ifish/Assets.xcassets/HotBar/走势图标.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/走势图标.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "走势图标.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/走势图标.imageset/走势图标.png
+++ b/Ifish/Assets.xcassets/HotBar/走势图标.imageset/走势图标.png
--- a/Ifish/Assets.xcassets/HotBar/长宽.imageset/Contents.json
+++ b/Ifish/Assets.xcassets/HotBar/长宽.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "长宽.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Ifish/Assets.xcassets/HotBar/长宽.imageset/长宽.png
+++ b/Ifish/Assets.xcassets/HotBar/长宽.imageset/长宽.png
--- a/Ifish/Base.lproj/Main.storyboard
+++ b/Ifish/Base.lproj/Main.storyboard
@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
    <device id="retina4_7" orientation="portrait">
        <adaptation id="fullscreen"/>
    </device>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
--- a/Ifish/controllers/HotBar/IfishHotBarVc.h
+++ b/Ifish/controllers/HotBar/IfishHotBarVc.h
@ -0,0 +1,13 @@
+//
+//  IfishHotBarVc.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/22.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface IfishHotBarVc : UIViewController
+
+@end
--- a/Ifish/controllers/HotBar/IfishHotBarVc.m
+++ b/Ifish/controllers/HotBar/IfishHotBarVc.m
@ -0,0 +1,127 @@
+//
+//  IfishHotBarVc.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/22.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishHotBarVc.h"
+#import "IFishHotBarCell.h"
+#import "IfishHotBarVo.h"
+#import "IFishWaterChangeView.h"
+#import "UIView+GetView.h"
+#import "IfishHistoryView.h"
+
+#define HOTBARCELL @"hotBarCell"
+
+
+@interface IfishHotBarVc ()<UITableViewDelegate,UITableViewDataSource,ChangeWaterDelegate>
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property(nonatomic,strong)NSMutableArray*datas;
+@property(nonatomic,strong)IFishWaterChangeView*changeWaterView;
+@property(nonatomic,strong)IfishHistoryView*historyView;
+@end
+
+@implementation IfishHotBarVc
+
+-(IfishHistoryView *)historyView{
+    if (_historyView==nil) {
+        _historyView=[IfishHistoryView getView];
+        _historyView.frame=self.view.bounds;
+        [self.view addSubview:_historyView];
+    }
+    _historyView.hidden=NO;
+    return _historyView;
+}
+
+-(IFishWaterChangeView *)changeWaterView{
+    if(_changeWaterView==nil){
+        _changeWaterView=[IFishWaterChangeView getView];
+        _changeWaterView.frame=self.view.bounds;
+        [self.view addSubview:_changeWaterView];
+       // [_changeWaterView.picker reloadAllComponents];
+        _changeWaterView.myDelegate=self;
+    }
+    _changeWaterView.hidden=NO;
+    return _changeWaterView;
+}
+
+-(void)didSelectRow1:(NSString *)v andRow2:(NSString *)v2{
+    NSString*str=[NSString stringWithFormat:@"换水周期 %@ 天  %@",v,v2];
+    IfishHotBarVo*vo=self.datas[4];
+    vo.title=str;
+    [self.tableView reloadData];
+}
+
+
+-(NSMutableArray *)datas{
+    if (_datas==nil) {
+        _datas=[NSMutableArray array];
+        IfishHotBarVo*vo=[[IfishHotBarVo alloc]init];
+        vo.title=@"设置水温";
+        vo.iconUrl=@"温度图标";
+        vo.isShowArrow=YES;
+        vo.subTitle=@"";
+        [_datas addObject:vo];
+        
+        IfishHotBarVo*vo1=[[IfishHotBarVo alloc]init];
+        vo1.title=@"鱼缸容量 1000L";
+        vo1.iconUrl=@"容积图标";
+        vo1.isShowArrow=YES;
+        vo1.subTitle=@"";
+        [_datas addObject:vo1];
+        IfishHotBarVo*vo2=[[IfishHotBarVo alloc]init];
+        vo2.title=@"水泵流量";
+        vo2.iconUrl=@"流量标";
+        vo2.isShowArrow=NO;
+        vo2.subTitle=@"流量：合适";
+        [_datas addObject:vo2];
+        IfishHotBarVo*vo3=[[IfishHotBarVo alloc]init];
+        vo3.title=@"历史趋势";
+        vo3.iconUrl=@"趋势图标";
+        vo3.isShowArrow=YES;
+        vo3.subTitle=@"";
+        [_datas addObject:vo3];
+        IfishHotBarVo*vo4=[[IfishHotBarVo alloc]init];
+        vo4.title=@"换水周期 5 天 7：00";
+        vo4.iconUrl=@"换水图标";
+        vo4.isShowArrow=YES;
+        vo4.subTitle=@"";
+        [_datas addObject:vo4];
+        
+        
+    }
+    return _datas;
+}
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+    [self.tableView registerNib:[UINib nibWithNibName:@"IFishHotBarCell" bundle:nil] forCellReuseIdentifier:HOTBARCELL];
+    self.tableView.rowHeight=70;
+}
+
+
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    return self.datas.count;
+}
+
+-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    IFishHotBarCell*cell=[tableView dequeueReusableCellWithIdentifier:HOTBARCELL];
+    cell.vo=self.datas[indexPath.row];
+    return cell;
+}
+
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    if (indexPath.row==3) {
+        self.historyView.hidden=NO;
+    }else{
+        [self changeWaterView];
+        self.changeWaterView.viewType=indexPath.row;
+    }
+   
+}
+
+@end
--- a/Ifish/controllers/HotBar/IfishHotBarVc.xib
+++ b/Ifish/controllers/HotBar/IfishHotBarVc.xib
@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="IfishHotBarVc">
+            <connections>
+                <outlet property="tableView" destination="EfA-oe-WKg" id="pTI-mW-gNc"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HotBarBg" translatesAutoresizingMaskIntoConstraints="NO" id="YCx-GT-bE4">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="207"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="207" id="5md-1P-baH"/>
+                    </constraints>
+                </imageView>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EfA-oe-WKg">
+                    <rect key="frame" x="0.0" y="207" width="375" height="460"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="mNc-E0-2kb"/>
+                        <outlet property="delegate" destination="-1" id="P0T-ge-whs"/>
+                    </connections>
+                </tableView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="33.5" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rnv-MK-lkn">
+                    <rect key="frame" x="145.5" y="78" width="84.5" height="49"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="41"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="rnv-MK-lkn" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Axv-3t-IXc"/>
+                <constraint firstItem="EfA-oe-WKg" firstAttribute="top" secondItem="YCx-GT-bE4" secondAttribute="bottom" id="KzP-mr-hZD"/>
+                <constraint firstAttribute="trailing" secondItem="YCx-GT-bE4" secondAttribute="trailing" id="Y8E-js-iBa"/>
+                <constraint firstItem="YCx-GT-bE4" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="Yu4-JD-wD5"/>
+                <constraint firstItem="EfA-oe-WKg" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="m7y-9w-hC6"/>
+                <constraint firstAttribute="trailing" secondItem="EfA-oe-WKg" secondAttribute="trailing" id="mvQ-gh-J4w"/>
+                <constraint firstItem="rnv-MK-lkn" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="78" id="rSs-Ny-eZP"/>
+                <constraint firstAttribute="bottom" secondItem="EfA-oe-WKg" secondAttribute="bottom" id="sEy-3b-Ses"/>
+                <constraint firstItem="YCx-GT-bE4" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="vTD-ky-yCC"/>
+            </constraints>
+        </view>
+    </objects>
+    <resources>
+        <image name="HotBarBg" width="375" height="206"/>
+    </resources>
+</document>
--- a/Ifish/controllers/HotBar/Views/IFishHotBarCell.h
+++ b/Ifish/controllers/HotBar/Views/IFishHotBarCell.h
@ -0,0 +1,14 @@
+//
+//  IFishHotBarCell.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/22.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "IfishHotBarVo.h"
+
+@interface IFishHotBarCell : UITableViewCell
+@property(nonatomic,strong)IfishHotBarVo*vo;
+@end
--- a/Ifish/controllers/HotBar/Views/IFishHotBarCell.m
+++ b/Ifish/controllers/HotBar/Views/IFishHotBarCell.m
@ -0,0 +1,41 @@
+//
+//  IFishHotBarCell.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/22.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IFishHotBarCell.h"
+
+@interface IFishHotBarCell()
+@property (weak, nonatomic) IBOutlet UILabel *titleLbale;
+@property (weak, nonatomic) IBOutlet UILabel *subTitleLable;
+@property (weak, nonatomic) IBOutlet UIImageView *iconImgV;
+
+@property (weak, nonatomic) IBOutlet UIImageView *arrowImgV;
+@end
+
+@implementation IFishHotBarCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+-(void)setVo:(IfishHotBarVo *)vo{
+    _vo=vo;
+    self.titleLbale.text=vo.title;
+    self.subTitleLable.text=vo.subTitle;
+    self.iconImgV.image=[UIImage imageNamed:vo.iconUrl];
+    self.arrowImgV.hidden=!vo.isShowArrow;
+    
+}
+
+@end
--- a/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib
+++ b/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib
@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="70" id="KGk-i7-Jjw" customClass="IFishHotBarCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="70"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="69.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="温度图标" translatesAutoresizingMaskIntoConstraints="NO" id="4bv-OB-vC4">
+                        <rect key="frame" x="10" y="22" width="21" height="26"/>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设置水温" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JXp-mV-pUz">
+                        <rect key="frame" x="41" y="26" width="61.5" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" red="0.42745098039215684" green="0.42745098039215684" blue="0.42745098039215684" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="箭头" translatesAutoresizingMaskIntoConstraints="NO" id="MDc-Sh-69Z">
+                        <rect key="frame" x="294" y="30" width="16" height="10"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="16" id="Ydb-4s-wh8"/>
+                            <constraint firstAttribute="height" constant="10" id="ht2-GT-W7M"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bqk-eu-G7V">
+                        <rect key="frame" x="41" y="46" width="0.0" height="0.0"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" red="0.42745098039215684" green="0.42745098039215684" blue="0.42745098039215684" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="MDc-Sh-69Z" secondAttribute="trailing" constant="10" id="1u9-YP-oIE"/>
+                    <constraint firstItem="bqk-eu-G7V" firstAttribute="leading" secondItem="JXp-mV-pUz" secondAttribute="leading" id="IHa-is-G3q"/>
+                    <constraint firstItem="bqk-eu-G7V" firstAttribute="top" secondItem="JXp-mV-pUz" secondAttribute="bottom" constant="2" id="KaT-d3-W2s"/>
+                    <constraint firstItem="4bv-OB-vC4" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="QSY-Vc-NAV"/>
+                    <constraint firstItem="JXp-mV-pUz" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="fai-hr-fRt"/>
+                    <constraint firstItem="JXp-mV-pUz" firstAttribute="leading" secondItem="4bv-OB-vC4" secondAttribute="trailing" constant="10" id="ffc-E4-hTy"/>
+                    <constraint firstItem="MDc-Sh-69Z" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="jjq-1c-NNB"/>
+                    <constraint firstItem="4bv-OB-vC4" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="mGQ-Zf-dGD"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="arrowImgV" destination="MDc-Sh-69Z" id="llc-Y5-NSt"/>
+                <outlet property="iconImgV" destination="4bv-OB-vC4" id="1sz-dr-7UL"/>
+                <outlet property="subTitleLable" destination="bqk-eu-G7V" id="ESJ-og-s97"/>
+                <outlet property="titleLbale" destination="JXp-mV-pUz" id="Pia-pV-hKb"/>
+            </connections>
+            <point key="canvasLocation" x="243" y="106"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="温度图标" width="21" height="26"/>
+        <image name="箭头" width="21" height="15"/>
+    </resources>
+</document>
--- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h
+++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h
@ -0,0 +1,19 @@
+//
+//  IFishWaterChangeView.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+@protocol ChangeWaterDelegate <NSObject>
+@optional
+-(void)didSelectRow1:(NSString*)v andRow2:(NSString*)v2;
+@end
+
+@interface IFishWaterChangeView : UIView
+@property (weak, nonatomic) IBOutlet UIPickerView *picker;
+@property(nonatomic,weak)id<ChangeWaterDelegate> myDelegate;
+@property(nonatomic,assign)NSInteger viewType;
+@end
--- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m
+++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m
@ -0,0 +1,114 @@
+//
+//  IFishWaterChangeView.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IFishWaterChangeView.h"
+
+@interface IFishWaterChangeView()<UIPickerViewDelegate,UIPickerViewDataSource>
+
+@property(nonatomic,strong)NSArray*data1;
+@property(nonatomic,strong)NSArray*data2;
+@property(nonatomic,copy)NSString*selectVaule1;
+@property(nonatomic,copy)NSString*selectVaule2;
+@property (weak, nonatomic) IBOutlet UIView *topTempPicker;
+@property (weak, nonatomic) IBOutlet UIView *bottomPicker;
+@property (weak, nonatomic) IBOutlet UIView *heightView;
+@end
+
+@implementation IFishWaterChangeView
+
+-(NSArray *)data1{
+    if (_data1==nil) {
+        _data1=@[@"1",@"2",@"3",@"4"];
+        _data2=@[@"1:00",@"2:00",@"3:00",@"4:00"];
+    }
+    return _data1;
+}
+
+-(void)setViewType:(NSInteger)viewType{
+    _viewType=viewType;
+    self.topTempPicker.hidden=YES;
+    self.heightView.hidden=YES;
+    self.bottomPicker.hidden=YES;
+    if (viewType==0) {// 设置水温
+        self.topTempPicker.hidden=NO;
+        self.bottomPicker.hidden=NO;
+    }else if(viewType==1){//容器大小
+        self.heightView.hidden=NO;
+        self.bottomPicker.hidden=NO;
+    }else if (viewType==2){//流量
+        self.bottomPicker.hidden=NO;
+    }else if (viewType==4){//换水周期
+        self.bottomPicker.hidden=NO;
+    }
+}
+
+
+- (IBAction)clickSubmit:(id)sender {
+    self.hidden=YES;
+    if(_viewType==5){
+        [self.myDelegate didSelectRow1:self.selectVaule1 andRow2:self.selectVaule2];
+    }
+}
+
+-(void)awakeFromNib{
+    [super awakeFromNib];
+}
+- (IBAction)clickBg:(id)sender {
+    self.hidden=YES;
+}
+
+//返回多少列
+-(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{
+    return 2;
+}
+
+//返回多少行
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component{
+    return self.data1.count;
+}
+
+//每一行的数据
+-(NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component{
+    if(component==0){
+        return self.data1[row];
+    }
+    return self.data2[row];
+}
+
+//选中时的效果
+-(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{
+//    self.selectValue = self.data[row];
+    if (component==0) {
+        self.selectVaule1=self.data1[row];
+    }else{
+       self.selectVaule2=self.data2[row];
+    }
+}
+
+
+//返回高度
+-(CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component{
+    return 35.0f;
+}
+
+//返回宽度
+//-(CGFloat)pickerView:(UIPickerView *)pickerView widthForComponent:(NSInteger)component{
+//    return ZYAppWidth;
+//}
+
+//-(UIView*)pickerView:(UIPickerView*)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView*)view {
+//    UIView *cellView = view;
+//    if (!cellView) {
+//        cellView = [[UIView alloc] init];
+//    }
+//    cellView.backgroundColor = [UIColor redColor];
+//    return cellView;
+//}
+
+
+@end
--- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib
+++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib
@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="IFishWaterChangeView">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sS3-bH-IDb">
+                    <rect key="frame" x="12" y="379" width="351" height="188"/>
+                    <subviews>
+                        <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RVp-L7-2i4">
+                            <rect key="frame" x="2" y="30" width="347" height="121"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="121" id="IpS-8R-glg"/>
+                            </constraints>
+                            <connections>
+                                <outlet property="dataSource" destination="iN0-l3-epB" id="bpf-F0-O6b"/>
+                                <outlet property="delegate" destination="iN0-l3-epB" id="Iu9-eg-yXC"/>
+                            </connections>
+                        </pickerView>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C1u-7E-RB7">
+                            <rect key="frame" x="0.0" y="0.0" width="351" height="32"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="请设置预警温度" translatesAutoresizingMaskIntoConstraints="NO" id="xAc-ty-lpS">
+                                    <rect key="frame" x="0.0" y="0.0" width="351" height="32"/>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="换水周期选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4pR-AW-f8n">
+                                    <rect key="frame" x="23" y="7.5" width="92" height="18"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S6l-x3-P2c">
+                                    <rect key="frame" x="295" y="1" width="52" height="30"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <state key="normal" backgroundImage="开关按钮">
+                                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </state>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="4pR-AW-f8n" firstAttribute="centerY" secondItem="C1u-7E-RB7" secondAttribute="centerY" id="CRt-1B-fzV"/>
+                                <constraint firstAttribute="bottom" secondItem="xAc-ty-lpS" secondAttribute="bottom" id="K6j-dv-bHW"/>
+                                <constraint firstAttribute="trailing" secondItem="xAc-ty-lpS" secondAttribute="trailing" id="M5l-nx-wBd"/>
+                                <constraint firstItem="4pR-AW-f8n" firstAttribute="leading" secondItem="C1u-7E-RB7" secondAttribute="leading" constant="23" id="QDK-TY-a4v"/>
+                                <constraint firstItem="xAc-ty-lpS" firstAttribute="top" secondItem="C1u-7E-RB7" secondAttribute="top" id="iLT-E1-Khh"/>
+                                <constraint firstAttribute="height" constant="32" id="sdG-zg-Ubs"/>
+                                <constraint firstItem="xAc-ty-lpS" firstAttribute="leading" secondItem="C1u-7E-RB7" secondAttribute="leading" id="uv8-Vh-cfq"/>
+                            </constraints>
+                        </view>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="确定" translatesAutoresizingMaskIntoConstraints="NO" id="uSM-gf-3du">
+                            <rect key="frame" x="0.0" y="149" width="351" height="39"/>
+                        </imageView>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DFn-St-4KQ">
+                            <rect key="frame" x="0.0" y="149" width="351" height="39"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <state key="normal" title="确定">
+                                <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </state>
+                            <connections>
+                                <action selector="clickSubmit:" destination="iN0-l3-epB" eventType="touchUpInside" id="OjP-Px-OoZ"/>
+                            </connections>
+                        </button>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="虚线" translatesAutoresizingMaskIntoConstraints="NO" id="QsD-Cm-E7o">
+                            <rect key="frame" x="169" y="38" width="12" height="112"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="112" id="Jgo-Kw-3Zi"/>
+                                <constraint firstAttribute="width" constant="12" id="rvZ-WU-Mep"/>
+                            </constraints>
+                        </imageView>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="uSM-gf-3du" firstAttribute="top" secondItem="DFn-St-4KQ" secondAttribute="top" id="2Mm-TX-Ho8"/>
+                        <constraint firstItem="QsD-Cm-E7o" firstAttribute="centerY" secondItem="sS3-bH-IDb" secondAttribute="centerY" id="3Jk-ON-XOc"/>
+                        <constraint firstItem="DFn-St-4KQ" firstAttribute="top" secondItem="RVp-L7-2i4" secondAttribute="bottom" constant="-2" id="72H-6i-OnZ"/>
+                        <constraint firstAttribute="trailing" secondItem="RVp-L7-2i4" secondAttribute="trailing" constant="2" id="BSX-ha-MSF"/>
+                        <constraint firstItem="RVp-L7-2i4" firstAttribute="leading" secondItem="sS3-bH-IDb" secondAttribute="leading" constant="2" id="Duh-mE-cF7"/>
+                        <constraint firstItem="DFn-St-4KQ" firstAttribute="leading" secondItem="sS3-bH-IDb" secondAttribute="leading" id="KP6-ro-VqG"/>
+                        <constraint firstAttribute="height" constant="188" id="QO6-Fn-SJj"/>
+                        <constraint firstAttribute="trailing" secondItem="uSM-gf-3du" secondAttribute="trailing" id="RRq-Hk-N77"/>
+                        <constraint firstAttribute="trailing" secondItem="C1u-7E-RB7" secondAttribute="trailing" id="cG9-V3-y7h"/>
+                        <constraint firstAttribute="bottom" secondItem="DFn-St-4KQ" secondAttribute="bottom" id="dMR-sN-atJ"/>
+                        <constraint firstAttribute="bottom" secondItem="uSM-gf-3du" secondAttribute="bottom" id="fMd-o1-a2o"/>
+                        <constraint firstItem="RVp-L7-2i4" firstAttribute="top" secondItem="C1u-7E-RB7" secondAttribute="bottom" constant="-2" id="jUy-wH-ERt"/>
+                        <constraint firstAttribute="trailing" secondItem="DFn-St-4KQ" secondAttribute="trailing" id="ltS-Cj-2lG"/>
+                        <constraint firstItem="C1u-7E-RB7" firstAttribute="top" secondItem="sS3-bH-IDb" secondAttribute="top" id="nWv-t9-wGe"/>
+                        <constraint firstItem="QsD-Cm-E7o" firstAttribute="centerX" secondItem="sS3-bH-IDb" secondAttribute="centerX" id="zBn-X6-4WK"/>
+                        <constraint firstItem="C1u-7E-RB7" firstAttribute="leading" secondItem="sS3-bH-IDb" secondAttribute="leading" id="zFi-SE-D7e"/>
+                        <constraint firstItem="uSM-gf-3du" firstAttribute="leading" secondItem="sS3-bH-IDb" secondAttribute="leading" id="zwB-mw-2xl"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <integer key="value" value="10"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UWW-Ib-xQ3" userLabel="设置容器高度">
+                    <rect key="frame" x="14" y="414" width="347" height="118"/>
+                    <subviews>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="长宽" translatesAutoresizingMaskIntoConstraints="NO" id="VGT-Vs-9H2">
+                            <rect key="frame" x="0.0" y="0.0" width="347" height="118"/>
+                        </imageView>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-O7-A7z">
+                            <rect key="frame" x="58" y="57" width="49" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="49" id="ITT-cl-rS3"/>
+                                <constraint firstAttribute="height" constant="30" id="SZ5-OH-yXi"/>
+                            </constraints>
+                            <nil key="textColor"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AC4-7c-ujI">
+                            <rect key="frame" x="221" y="20" width="48" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="B1X-7U-tcD"/>
+                                <constraint firstAttribute="width" constant="48" id="LVS-he-GHZ"/>
+                            </constraints>
+                            <nil key="textColor"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2LO-Mp-im1">
+                            <rect key="frame" x="58" y="20" width="49" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="2yd-7Q-Ykb"/>
+                                <constraint firstAttribute="width" constant="49" id="ynt-rK-riP"/>
+                            </constraints>
+                            <nil key="textColor"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="VGT-Vs-9H2" secondAttribute="bottom" id="9TD-pz-c2u"/>
+                        <constraint firstItem="2LO-Mp-im1" firstAttribute="top" secondItem="UWW-Ib-xQ3" secondAttribute="top" constant="20" id="9r2-wR-fa1"/>
+                        <constraint firstItem="8cR-O7-A7z" firstAttribute="top" secondItem="2LO-Mp-im1" secondAttribute="bottom" constant="7" id="FoN-Ym-ygh"/>
+                        <constraint firstItem="2LO-Mp-im1" firstAttribute="leading" secondItem="UWW-Ib-xQ3" secondAttribute="leading" constant="58" id="LeA-cK-gXT"/>
+                        <constraint firstItem="VGT-Vs-9H2" firstAttribute="top" secondItem="UWW-Ib-xQ3" secondAttribute="top" id="ZMR-fp-1b0"/>
+                        <constraint firstItem="AC4-7c-ujI" firstAttribute="top" secondItem="UWW-Ib-xQ3" secondAttribute="top" constant="20" id="eBB-wB-pPq"/>
+                        <constraint firstAttribute="trailing" secondItem="VGT-Vs-9H2" secondAttribute="trailing" id="fwJ-As-qhZ"/>
+                        <constraint firstItem="8cR-O7-A7z" firstAttribute="centerX" secondItem="2LO-Mp-im1" secondAttribute="centerX" id="iST-gw-MgC"/>
+                        <constraint firstItem="VGT-Vs-9H2" firstAttribute="leading" secondItem="UWW-Ib-xQ3" secondAttribute="leading" id="rHT-K0-Jjm"/>
+                        <constraint firstAttribute="trailing" secondItem="AC4-7c-ujI" secondAttribute="trailing" constant="78" id="tVe-FM-oCk"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GUi-mC-ZWy" userLabel="设置加热器">
+                    <rect key="frame" x="12" y="229" width="351" height="150"/>
+                    <subviews>
+                        <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QZi-AX-KLU">
+                            <rect key="frame" x="2" y="32" width="347" height="121"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="121" id="2En-mk-g0A"/>
+                            </constraints>
+                            <connections>
+                                <outlet property="dataSource" destination="iN0-l3-epB" id="zHJ-Xe-CPh"/>
+                                <outlet property="delegate" destination="iN0-l3-epB" id="aDE-0l-Fdd"/>
+                            </connections>
+                        </pickerView>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4IT-77-VkG">
+                            <rect key="frame" x="0.0" y="0.0" width="351" height="32"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="请设置加热温度" translatesAutoresizingMaskIntoConstraints="NO" id="F6q-ri-gcL">
+                                    <rect key="frame" x="0.0" y="0.0" width="351" height="32"/>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设置加热温度" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SXA-fW-bql" userLabel="设置加热温度">
+                                    <rect key="frame" x="23" y="7.5" width="92" height="18"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="F6q-ri-gcL" firstAttribute="top" secondItem="4IT-77-VkG" secondAttribute="top" id="8WV-X9-ZJM"/>
+                                <constraint firstItem="SXA-fW-bql" firstAttribute="centerY" secondItem="4IT-77-VkG" secondAttribute="centerY" id="LIY-Xa-PVU"/>
+                                <constraint firstItem="F6q-ri-gcL" firstAttribute="leading" secondItem="4IT-77-VkG" secondAttribute="leading" id="PSm-cp-l4I"/>
+                                <constraint firstItem="SXA-fW-bql" firstAttribute="leading" secondItem="4IT-77-VkG" secondAttribute="leading" constant="23" id="Q12-gY-Hxf"/>
+                                <constraint firstAttribute="trailing" secondItem="F6q-ri-gcL" secondAttribute="trailing" id="fzk-zq-gy8"/>
+                                <constraint firstAttribute="height" constant="32" id="tQQ-CZ-UJn"/>
+                                <constraint firstAttribute="bottom" secondItem="F6q-ri-gcL" secondAttribute="bottom" id="xCl-An-0fg"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="4IT-77-VkG" firstAttribute="top" secondItem="GUi-mC-ZWy" secondAttribute="top" id="3cb-gI-b1F"/>
+                        <constraint firstAttribute="height" constant="150" id="5dQ-pp-J3A"/>
+                        <constraint firstItem="QZi-AX-KLU" firstAttribute="top" secondItem="4IT-77-VkG" secondAttribute="bottom" id="C0u-k6-ihz"/>
+                        <constraint firstItem="4IT-77-VkG" firstAttribute="leading" secondItem="GUi-mC-ZWy" secondAttribute="leading" id="Mqi-2O-6Gj"/>
+                        <constraint firstItem="QZi-AX-KLU" firstAttribute="leading" secondItem="GUi-mC-ZWy" secondAttribute="leading" constant="2" id="NYh-fM-kU2"/>
+                        <constraint firstAttribute="trailing" secondItem="QZi-AX-KLU" secondAttribute="trailing" constant="2" id="kEl-iA-pC4"/>
+                        <constraint firstAttribute="trailing" secondItem="4IT-77-VkG" secondAttribute="trailing" id="zq2-39-h2m"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <integer key="value" value="10"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.1347388698630137" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="sS3-bH-IDb" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="47Y-la-C7u"/>
+                <constraint firstItem="sS3-bH-IDb" firstAttribute="top" secondItem="GUi-mC-ZWy" secondAttribute="bottom" id="51h-Fe-bOX"/>
+                <constraint firstItem="UWW-Ib-xQ3" firstAttribute="top" secondItem="sS3-bH-IDb" secondAttribute="top" constant="35" id="C3d-Jz-gnZ"/>
+                <constraint firstItem="UWW-Ib-xQ3" firstAttribute="bottom" secondItem="sS3-bH-IDb" secondAttribute="bottom" constant="-35" id="N6X-0h-OQp"/>
+                <constraint firstAttribute="bottom" secondItem="sS3-bH-IDb" secondAttribute="bottom" constant="100" id="Wvv-fr-my6"/>
+                <constraint firstAttribute="trailing" secondItem="sS3-bH-IDb" secondAttribute="trailing" constant="12" id="dTS-pW-dyJ"/>
+                <constraint firstItem="GUi-mC-ZWy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="fUb-aa-feS"/>
+                <constraint firstAttribute="trailing" secondItem="UWW-Ib-xQ3" secondAttribute="trailing" constant="14" id="qxd-yx-0wN"/>
+                <constraint firstItem="UWW-Ib-xQ3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="vEs-Cc-e6u"/>
+                <constraint firstAttribute="trailing" secondItem="GUi-mC-ZWy" secondAttribute="trailing" constant="12" id="xnk-A8-mY0"/>
+            </constraints>
+            <connections>
+                <outlet property="bottomPicker" destination="sS3-bH-IDb" id="dA5-DG-v9K"/>
+                <outlet property="heightView" destination="UWW-Ib-xQ3" id="cBM-Tc-aUU"/>
+                <outlet property="picker" destination="RVp-L7-2i4" id="kaf-wt-kXj"/>
+                <outlet property="topTempPicker" destination="GUi-mC-ZWy" id="wou-bx-Jr6"/>
+            </connections>
+            <point key="canvasLocation" x="33.5" y="103.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="开关按钮" width="52" height="30"/>
+        <image name="确定" width="375" height="55"/>
+        <image name="虚线" width="12" height="111"/>
+        <image name="请设置加热温度" width="375" height="48"/>
+        <image name="请设置预警温度" width="375" height="52"/>
+        <image name="长宽" width="347" height="120"/>
+    </resources>
+</document>
--- a/Ifish/controllers/HotBar/Views/IfishChatView.h
+++ b/Ifish/controllers/HotBar/Views/IfishChatView.h
@ -0,0 +1,13 @@
+//
+//  IfishChatView.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/27.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface IfishChatView : UIView
+
+@end
--- a/Ifish/controllers/HotBar/Views/IfishChatView.m
+++ b/Ifish/controllers/HotBar/Views/IfishChatView.m
@ -0,0 +1,104 @@
+//
+//  IfishChatView.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/27.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishChatView.h"
+
+@interface IfishChatView()
+@property(nonatomic,strong)NSMutableArray*line1;
+@property(nonatomic,strong)NSMutableArray*line2;
+@end
+
+
+@implementation IfishChatView
+
+-(NSArray *)line1{
+    if (_line1==nil) {
+        _line1=[NSMutableArray array];
+        
+        for (int i=0; i<50; i++) {
+            CGFloat x=10*(i+1);
+            CGPoint p1=CGPointMake(x, x);
+            [_line1 addObject:NSStringFromCGPoint(p1)];
+        }
+    }
+    return _line1;
+}
+
+-(NSArray *)line2{
+    if (_line2==nil) {
+        _line2=[NSMutableArray array];
+        
+        for (int i=0; i<50; i++) {
+            CGFloat x=10*(i+1);
+            CGFloat y=sin(x)*10+5;
+            CGPoint p1=CGPointMake(x, y);
+            [_line2 addObject:NSStringFromCGPoint(p1)];
+        }
+    }
+    return _line2;
+}
+
+
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    UIColor *color = [UIColor redColor];
+    [color set]; //设置线条颜色
+    
+    UIBezierPath* path = [UIBezierPath bezierPath];
+    path.lineWidth = 1.0;
+    
+    path.lineCapStyle = kCGLineCapRound; //线条拐角
+    path.lineJoinStyle = kCGLineJoinRound; //终点处理
+    
+    [path moveToPoint:CGPointMake(0.0, 0.0)];//起点
+    
+    // Draw the lines
+    for (int i=0; i<self.line1.count; i++) {
+        NSString* p=self.line1[i];
+        [path addLineToPoint:CGPointFromString(p)];
+    }
+    
+//    [path closePath];//第五条线通过调用closePath方法得到的
+    
+    //    [path stroke];//Draws line 根据坐标点连线
+    [path stroke];//颜色填充
+    
+    
+    UIColor *color1 = [UIColor blueColor];
+    [color1 set]; //设置线条颜色
+    
+    UIBezierPath* path1 = [UIBezierPath bezierPath];
+    path1.lineWidth = 1.0;
+    
+
+    path1.lineCapStyle = kCGLineCapRound; //线条拐角
+    path1.lineJoinStyle = kCGLineJoinRound; //终点处理
+    
+    [path1 moveToPoint:CGPointMake(0.0, 100.0)];//起点
+    
+    // Draw the lines
+    for (int i=0; i<self.line2.count; i++) {
+        NSString* p=self.line2[i];
+        [path1 addLineToPoint:CGPointFromString(p)];
+    }
+    
+    //    [path closePath];//第五条线通过调用closePath方法得到的
+    
+    //    [path stroke];//Draws line 根据坐标点连线
+    CGFloat dashPattern[] = {3,1};// 3实线，1空白
+    
+    [path1 setLineDash:dashPattern count:1 phase:1];
+    [path1 stroke];//颜色填充
+    
+    
+    
+}
+
+
+@end
--- a/Ifish/controllers/HotBar/Views/IfishHistoryView.h
+++ b/Ifish/controllers/HotBar/Views/IfishHistoryView.h
@ -0,0 +1,13 @@
+//
+//  IfishHistoryView.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/27.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface IfishHistoryView : UIView
+
+@end
--- a/Ifish/controllers/HotBar/Views/IfishHistoryView.m
+++ b/Ifish/controllers/HotBar/Views/IfishHistoryView.m
@ -0,0 +1,24 @@
+//
+//  IfishHistoryView.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/27.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishHistoryView.h"
+
+@implementation IfishHistoryView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+- (IBAction)clickBg:(id)sender {
+    self.hidden=YES;
+}
+
+@end
--- a/Ifish/controllers/HotBar/Views/IfishHistoryView.xib
+++ b/Ifish/controllers/HotBar/Views/IfishHistoryView.xib
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="IfishHistoryView">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="69h-Z5-zDB">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <connections>
+                        <action selector="clickBg:" destination="iN0-l3-epB" eventType="touchUpInside" id="d08-z9-v9h"/>
+                    </connections>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O2o-sf-tcG" customClass="IfishChatView">
+                    <rect key="frame" x="12" y="378" width="351" height="177"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="177" id="gnS-mM-h2g"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.20994755993150685" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="69h-Z5-zDB" secondAttribute="bottom" id="8ZV-V1-tgA"/>
+                <constraint firstItem="69h-Z5-zDB" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="OcJ-PS-bmM"/>
+                <constraint firstAttribute="bottom" secondItem="O2o-sf-tcG" secondAttribute="bottom" constant="112" id="Sbm-6h-9S9"/>
+                <constraint firstAttribute="trailing" secondItem="69h-Z5-zDB" secondAttribute="trailing" id="TYK-Fj-3Kv"/>
+                <constraint firstAttribute="trailing" secondItem="O2o-sf-tcG" secondAttribute="trailing" constant="12" id="U2T-xW-ZTi"/>
+                <constraint firstItem="69h-Z5-zDB" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="lLw-5d-kFj"/>
+                <constraint firstItem="O2o-sf-tcG" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="sN7-SB-aaH"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
--- a/Ifish/controllers/HotBar/categry/UIView+GetView.h
+++ b/Ifish/controllers/HotBar/categry/UIView+GetView.h
@ -0,0 +1,13 @@
+//
+//  UIView+GetView.h
+//  HaiNingApp
+//
+//  Created by 罗艺 on 2017/8/17.
+//  Copyright © 2017年 罗艺. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIView (GetView)
+(instancetype)getView;
+@end
--- a/Ifish/controllers/HotBar/categry/UIView+GetView.m
+++ b/Ifish/controllers/HotBar/categry/UIView+GetView.m
@ -0,0 +1,15 @@
+//
+//  UIView+GetView.m
+//  HaiNingApp
+//
+//  Created by 罗艺 on 2017/8/17.
+//  Copyright © 2017年 罗艺. All rights reserved.
+//
+
+#import "UIView+GetView.h"
+
+@implementation UIView (GetView)
+(instancetype)getView{
+    return [[NSBundle mainBundle] loadNibNamed:NSStringFromClass([self class]) owner:nil options:nil].lastObject;
+}
+@end
--- a/Ifish/controllers/HotBar/models/IfishHotBarVo.h
+++ b/Ifish/controllers/HotBar/models/IfishHotBarVo.h
@ -0,0 +1,16 @@
+//
+//  IfishHotBarVo.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/22.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface IfishHotBarVo : NSObject
+@property(nonatomic,copy)NSString*title;
+@property(nonatomic,copy)NSString*subTitle;
+@property(nonatomic,assign)BOOL isShowArrow;
+@property(nonatomic,copy)NSString*iconUrl;
+@end
--- a/Ifish/controllers/HotBar/models/IfishHotBarVo.m
+++ b/Ifish/controllers/HotBar/models/IfishHotBarVo.m
@ -0,0 +1,13 @@
+//
+//  IfishHotBarVo.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/8/22.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishHotBarVo.h"
+
+@implementation IfishHotBarVo
+
+@end
--- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.m
+++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.m
@ -18,12 +18,15 @@
 -(void)initCellImgsAt:(NSIndexPath *)indexPath
 {
    if (indexPath.row==0) {
-        self.deviceImg.image = [UIImage imageNamed:@"select_camera"];
+        self.deviceImg.image = [UIImage imageNamed:@"摄像头"];
        
    }else if (indexPath.row==1){
-        self.deviceImg.image = [UIImage imageNamed:@"select_aquarium"];
-    }else if (indexPath.row ==2){
-        self.deviceImg.image = [UIImage imageNamed:@"select_waiting"];
+        self.deviceImg.image = [UIImage imageNamed:@"水族控制系统"];
+    }else if (indexPath.row==2){
+        self.deviceImg.image = [UIImage imageNamed:@"加热系统"];
+    }
+    else if (indexPath.row ==3){
+        self.deviceImg.image = [UIImage imageNamed:@"敬请期待"];
    }
    
 }
--- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib
+++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
    <device id="retina4_7" orientation="portrait">
        <adaptation id="fullscreen"/>
    </device>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
@ -15,10 +15,10 @@
            <rect key="frame" x="0.0" y="0.0" width="371" height="259"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="371" height="258"/>
+                <rect key="frame" x="0.0" y="0.0" width="371" height="258.5"/>
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bYx-Sh-9R0">
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bYx-Sh-9R0">
                        <rect key="frame" x="0.0" y="0.0" width="371" height="259"/>
                    </imageView>
                </subviews>
--- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
+++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
@ -12,6 +12,9 @@
 #import "UDPManager.h"
 #import "YooseeNextConnectViewController.h"
 #import "SecondConnectWifiController.h"
+#import "IfishHotBarVc.h"
+
+
@interface IfishBindDeviceSelectViewController ()<UITableViewDelegate,UITableViewDataSource>
@property (nonatomic,strong) UITableView *tableView;
@property(nonatomic)BOOL islogInGewell;
@ -110,7 +113,7 @@ extern BOOL isfromCameraView;

 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
    
-    return 3;
+    return 4;
 }

 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@ -127,7 +130,7 @@ extern BOOL isfromCameraView;

 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
    
-    return  self.view.frame.size.width*0.698;
+    return  self.view.frame.size.width*0.504;
    
 }

@ -211,7 +214,11 @@ extern BOOL isfromCameraView;
                break;
                case 2:
            {
-                //[self.view makeToast:@"敬请期待"];
+                //[self.view makeToast:@"敬请期待"]; 加热棒
+                IfishHotBarVc*barVc=[[IfishHotBarVc alloc]init];
+                barVc.hidesBottomBarWhenPushed=YES;
+                [self.navigationController pushViewController:barVc animated:YES];
+                
            }
                break;
                
--- a/Ifish/ifishImgSouce/.DS_Store
+++ b/Ifish/ifishImgSouce/.DS_Store