diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index acdae45..94f15c6 100644 --- 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 = ""; }; + 3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishWaterChangeView.m; sourceTree = ""; }; + 3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IFishWaterChangeView.xib; sourceTree = ""; }; + 3D13F839212FE47F00D725F7 /* UIView+GetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+GetView.m"; sourceTree = ""; }; + 3D13F83A212FE47F00D725F7 /* UIView+GetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+GetView.h"; sourceTree = ""; }; + 3D344797212CF71C00CF3941 /* IfishHotBarVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHotBarVc.h; sourceTree = ""; }; + 3D344798212CF71C00CF3941 /* IfishHotBarVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarVc.m; sourceTree = ""; }; + 3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHotBarVc.xib; sourceTree = ""; }; + 3D34479D212D113D00CF3941 /* IFishHotBarCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IFishHotBarCell.h; sourceTree = ""; }; + 3D34479E212D113D00CF3941 /* IFishHotBarCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishHotBarCell.m; sourceTree = ""; }; + 3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IFishHotBarCell.xib; sourceTree = ""; }; + 3D3447A3212D1C3800CF3941 /* IfishHotBarVo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHotBarVo.h; sourceTree = ""; }; + 3D3447A4212D1C3800CF3941 /* IfishHotBarVo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarVo.m; sourceTree = ""; }; + 3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHistoryView.h; sourceTree = ""; }; + 3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHistoryView.m; sourceTree = ""; }; + 3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHistoryView.xib; sourceTree = ""; }; + 3D5C437121339F8F00E15B66 /* IfishChatView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishChatView.h; sourceTree = ""; }; + 3D5C437221339F8F00E15B66 /* IfishChatView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishChatView.m; sourceTree = ""; }; 880707421DDD3EF50076F65A /* P2PShareView1Cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PShareView1Cell.h; sourceTree = ""; }; 880707431DDD3EF50076F65A /* P2PShareView1Cell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = P2PShareView1Cell.m; sourceTree = ""; }; 880707441DDD3EF50076F65A /* P2PShareView1Cell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = P2PShareView1Cell.xib; sourceTree = ""; }; @@ -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 = ""; + }; + 3D344796212CF49300CF3941 /* HotBar */ = { + isa = PBXGroup; + children = ( + 3D13F838212FE46B00D725F7 /* categry */, + 3D3447A2212D1C1700CF3941 /* models */, + 3D34479C212D111900CF3941 /* Views */, + 3D344797212CF71C00CF3941 /* IfishHotBarVc.h */, + 3D344798212CF71C00CF3941 /* IfishHotBarVc.m */, + 3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */, + ); + path = HotBar; + sourceTree = ""; + }; + 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 = ""; + }; + 3D3447A2212D1C1700CF3941 /* models */ = { + isa = PBXGroup; + children = ( + 3D3447A3212D1C3800CF3941 /* IfishHotBarVo.h */, + 3D3447A4212D1C3800CF3941 /* IfishHotBarVo.m */, + ); + path = models; + sourceTree = ""; + }; 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 = ""; diff --git a/Ifish/Assets.xcassets/.DS_Store b/Ifish/Assets.xcassets/.DS_Store index e04c30f..5964b9e 100644 Binary files a/Ifish/Assets.xcassets/.DS_Store and b/Ifish/Assets.xcassets/.DS_Store differ diff --git a/Ifish/Assets.xcassets/AppIcon-1.appiconset/Contents.json b/Ifish/Assets.xcassets/AppIcon-1.appiconset/Contents.json index 97f5c06..124bd98 100644 --- 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" : { diff --git a/Ifish/Assets.xcassets/HotBar/Contents.json b/Ifish/Assets.xcassets/HotBar/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Ifish/Assets.xcassets/HotBar/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/加热系统.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/加热系统.imageset/Contents.json new file mode 100644 index 0000000..c7fe0ae --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/加热系统.imageset/加热系统.png b/Ifish/Assets.xcassets/HotBar/加热系统.imageset/加热系统.png new file mode 100644 index 0000000..10cde86 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/加热系统.imageset/加热系统.png differ diff --git a/Ifish/Assets.xcassets/HotBar/容积图标.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/容积图标.imageset/Contents.json new file mode 100644 index 0000000..99bbc05 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/容积图标.imageset/容积图标.png b/Ifish/Assets.xcassets/HotBar/容积图标.imageset/容积图标.png new file mode 100644 index 0000000..3814d60 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/容积图标.imageset/容积图标.png differ diff --git a/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/Contents.json new file mode 100644 index 0000000..3ad6106 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/开关按钮.png b/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/开关按钮.png new file mode 100644 index 0000000..98431e1 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/开关按钮.imageset/开关按钮.png differ diff --git a/Ifish/Assets.xcassets/HotBar/换水图标.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/换水图标.imageset/Contents.json new file mode 100644 index 0000000..f206661 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/换水图标.imageset/换水图标.png b/Ifish/Assets.xcassets/HotBar/换水图标.imageset/换水图标.png new file mode 100644 index 0000000..93d7420 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/换水图标.imageset/换水图标.png differ diff --git a/Ifish/Assets.xcassets/HotBar/摄像头.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/摄像头.imageset/Contents.json new file mode 100644 index 0000000..34164c1 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/摄像头.imageset/摄像头.png b/Ifish/Assets.xcassets/HotBar/摄像头.imageset/摄像头.png new file mode 100644 index 0000000..4048bd3 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/摄像头.imageset/摄像头.png differ diff --git a/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/Contents.json new file mode 100644 index 0000000..3b2b8e4 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/敬请期待.png b/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/敬请期待.png new file mode 100644 index 0000000..361fef9 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/敬请期待.imageset/敬请期待.png differ diff --git a/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/Contents.json new file mode 100644 index 0000000..f3f4974 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/水族控制系统.png b/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/水族控制系统.png new file mode 100644 index 0000000..9f2ae2c Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/水族控制系统.imageset/水族控制系统.png differ diff --git a/Ifish/Assets.xcassets/HotBar/流量标.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/流量标.imageset/Contents.json new file mode 100644 index 0000000..06632b2 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/流量标.imageset/流量标.png b/Ifish/Assets.xcassets/HotBar/流量标.imageset/流量标.png new file mode 100644 index 0000000..0f67049 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/流量标.imageset/流量标.png differ diff --git a/Ifish/Assets.xcassets/HotBar/温度图标.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/温度图标.imageset/Contents.json new file mode 100644 index 0000000..2d01cdf --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/温度图标.imageset/温度图标.png b/Ifish/Assets.xcassets/HotBar/温度图标.imageset/温度图标.png new file mode 100644 index 0000000..a4d6558 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/温度图标.imageset/温度图标.png differ diff --git a/Ifish/Assets.xcassets/HotBar/确定.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/确定.imageset/Contents.json new file mode 100644 index 0000000..d084bd5 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/确定.imageset/确定.png b/Ifish/Assets.xcassets/HotBar/确定.imageset/确定.png new file mode 100644 index 0000000..0b10fad Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/确定.imageset/确定.png differ diff --git a/Ifish/Assets.xcassets/HotBar/箭头.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/箭头.imageset/Contents.json new file mode 100644 index 0000000..46353be --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/箭头.imageset/箭头.png b/Ifish/Assets.xcassets/HotBar/箭头.imageset/箭头.png new file mode 100644 index 0000000..92ce36b Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/箭头.imageset/箭头.png differ diff --git a/Ifish/Assets.xcassets/HotBar/虚线.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/虚线.imageset/Contents.json new file mode 100644 index 0000000..c4c1039 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/虚线.imageset/虚线.png b/Ifish/Assets.xcassets/HotBar/虚线.imageset/虚线.png new file mode 100644 index 0000000..3338a9d Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/虚线.imageset/虚线.png differ diff --git a/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/Contents.json new file mode 100644 index 0000000..b246f64 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/请设置加热温度.png b/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/请设置加热温度.png new file mode 100644 index 0000000..1c5ff22 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/请设置加热温度.imageset/请设置加热温度.png differ diff --git a/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/Contents.json new file mode 100644 index 0000000..91c9fe8 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/请设置预警温度.png b/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/请设置预警温度.png new file mode 100644 index 0000000..bdda1ac Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/请设置预警温度.imageset/请设置预警温度.png differ diff --git a/Ifish/Assets.xcassets/HotBar/走势图标.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/走势图标.imageset/Contents.json new file mode 100644 index 0000000..86b346c --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/走势图标.imageset/走势图标.png b/Ifish/Assets.xcassets/HotBar/走势图标.imageset/走势图标.png new file mode 100644 index 0000000..5b86c2d Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/走势图标.imageset/走势图标.png differ diff --git a/Ifish/Assets.xcassets/HotBar/长宽.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/长宽.imageset/Contents.json new file mode 100644 index 0000000..b5025f1 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/HotBar/长宽.imageset/长宽.png b/Ifish/Assets.xcassets/HotBar/长宽.imageset/长宽.png new file mode 100644 index 0000000..9f5e584 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/长宽.imageset/长宽.png differ diff --git a/Ifish/Base.lproj/Main.storyboard b/Ifish/Base.lproj/Main.storyboard index 9035e51..37534a8 100644 --- a/Ifish/Base.lproj/Main.storyboard +++ b/Ifish/Base.lproj/Main.storyboard @@ -1,11 +1,11 @@ - - + + - + diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.h b/Ifish/controllers/HotBar/IfishHotBarVc.h new file mode 100644 index 0000000..2acae3e --- /dev/null +++ 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 + +@interface IfishHotBarVc : UIViewController + +@end diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.m b/Ifish/controllers/HotBar/IfishHotBarVc.m new file mode 100644 index 0000000..58f5432 --- /dev/null +++ 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 () +@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 diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.xib b/Ifish/controllers/HotBar/IfishHotBarVc.xib new file mode 100644 index 0000000..4977a9c --- /dev/null +++ b/Ifish/controllers/HotBar/IfishHotBarVc.xib @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ifish/controllers/HotBar/Views/IFishHotBarCell.h b/Ifish/controllers/HotBar/Views/IFishHotBarCell.h new file mode 100644 index 0000000..beb8702 --- /dev/null +++ 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 +#import "IfishHotBarVo.h" + +@interface IFishHotBarCell : UITableViewCell +@property(nonatomic,strong)IfishHotBarVo*vo; +@end diff --git a/Ifish/controllers/HotBar/Views/IFishHotBarCell.m b/Ifish/controllers/HotBar/Views/IFishHotBarCell.m new file mode 100644 index 0000000..6116ee6 --- /dev/null +++ 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 diff --git a/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib b/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib new file mode 100644 index 0000000..5cfcbd0 --- /dev/null +++ b/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h new file mode 100644 index 0000000..2f08b05 --- /dev/null +++ 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 +@protocol ChangeWaterDelegate +@optional +-(void)didSelectRow1:(NSString*)v andRow2:(NSString*)v2; +@end + +@interface IFishWaterChangeView : UIView +@property (weak, nonatomic) IBOutlet UIPickerView *picker; +@property(nonatomic,weak)id myDelegate; +@property(nonatomic,assign)NSInteger viewType; +@end diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m new file mode 100644 index 0000000..bd22e66 --- /dev/null +++ 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() + +@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 diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib new file mode 100644 index 0000000..f08b178 --- /dev/null +++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ifish/controllers/HotBar/Views/IfishChatView.h b/Ifish/controllers/HotBar/Views/IfishChatView.h new file mode 100644 index 0000000..e629d51 --- /dev/null +++ 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 + +@interface IfishChatView : UIView + +@end diff --git a/Ifish/controllers/HotBar/Views/IfishChatView.m b/Ifish/controllers/HotBar/Views/IfishChatView.m new file mode 100644 index 0000000..661567b --- /dev/null +++ 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 + +@interface IfishHistoryView : UIView + +@end diff --git a/Ifish/controllers/HotBar/Views/IfishHistoryView.m b/Ifish/controllers/HotBar/Views/IfishHistoryView.m new file mode 100644 index 0000000..ef55ff4 --- /dev/null +++ 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 diff --git a/Ifish/controllers/HotBar/Views/IfishHistoryView.xib b/Ifish/controllers/HotBar/Views/IfishHistoryView.xib new file mode 100644 index 0000000..5b84f52 --- /dev/null +++ b/Ifish/controllers/HotBar/Views/IfishHistoryView.xib @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ifish/controllers/HotBar/categry/UIView+GetView.h b/Ifish/controllers/HotBar/categry/UIView+GetView.h new file mode 100644 index 0000000..5e73219 --- /dev/null +++ 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 + +@interface UIView (GetView) ++(instancetype)getView; +@end diff --git a/Ifish/controllers/HotBar/categry/UIView+GetView.m b/Ifish/controllers/HotBar/categry/UIView+GetView.m new file mode 100644 index 0000000..365dc1a --- /dev/null +++ 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 diff --git a/Ifish/controllers/HotBar/models/IfishHotBarVo.h b/Ifish/controllers/HotBar/models/IfishHotBarVo.h new file mode 100644 index 0000000..53efc08 --- /dev/null +++ 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 + +@interface IfishHotBarVo : NSObject +@property(nonatomic,copy)NSString*title; +@property(nonatomic,copy)NSString*subTitle; +@property(nonatomic,assign)BOOL isShowArrow; +@property(nonatomic,copy)NSString*iconUrl; +@end diff --git a/Ifish/controllers/HotBar/models/IfishHotBarVo.m b/Ifish/controllers/HotBar/models/IfishHotBarVo.m new file mode 100644 index 0000000..f0c67fd --- /dev/null +++ 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 diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.m index 638cfe6..a4ff878 100644 --- 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:@"敬请期待"]; } } diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib index 4faef29..f87818a 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib @@ -1,11 +1,11 @@ - + - + @@ -15,10 +15,10 @@ - + - + diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m index c158b0f..6afb064 100644 --- 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 () @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; diff --git a/Ifish/ifishImgSouce/.DS_Store b/Ifish/ifishImgSouce/.DS_Store index cf70c9b..eb6412c 100644 Binary files a/Ifish/ifishImgSouce/.DS_Store and b/Ifish/ifishImgSouce/.DS_Store differ