diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index def8a53..e885a08 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* 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 */; }; 3D1C17452171BB0700A159A8 /* PNPieChartDataItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C17222171BB0600A159A8 /* PNPieChartDataItem.m */; }; 3D1C17462171BB0700A159A8 /* PNChartLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C17272171BB0600A159A8 /* PNChartLabel.m */; }; @@ -230,7 +229,6 @@ 3D1C5148221A9EE10096AE43 /* IFISHYooseeImg.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5034221A9EDD0096AE43 /* IFISHYooseeImg.bundle */; }; 3D1C5149221A9EE10096AE43 /* Common-Configuration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5035221A9EDD0096AE43 /* Common-Configuration.plist */; }; 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 */; }; @@ -2115,7 +2113,6 @@ 88C1B2D41DD1ADB600C2C99A /* live_navicon_look@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 88C1B2D11DD1ADB600C2C99A /* live_navicon_look@2x.png */; }; 88C1B2D51DD1ADB600C2C99A /* live_navicon_look@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 88C1B2D21DD1ADB600C2C99A /* live_navicon_look@3x.png */; }; 88C1B2D71DD1AEEA00C2C99A /* kankan_listbanner.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 88C1B2D61DD1AEEA00C2C99A /* kankan_listbanner.jpg */; }; - 88C49B4B1EA6270B002BA5A8 /* Bugly.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88C49B4A1EA6270B002BA5A8 /* Bugly.framework */; }; 88C598921E9F4E5D00BDC812 /* ShopUserDatailData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C598911E9F4E5D00BDC812 /* ShopUserDatailData.m */; }; 88C598951EA0605600BDC812 /* KebordExternAddTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C598941EA0605600BDC812 /* KebordExternAddTextInputView.m */; }; 88C598971EA0608200BDC812 /* KebordExternAddTextInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 88C598961EA0608200BDC812 /* KebordExternAddTextInputView.xib */; }; @@ -2399,6 +2396,9 @@ CB7D6AF22296A6910014E5C7 /* UTDID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AEF2296A68E0014E5C7 /* UTDID.framework */; }; CB7D6AF32296A6910014E5C7 /* AlicloudUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF02296A6900014E5C7 /* AlicloudUtils.framework */; }; CB7D6AF42296A6910014E5C7 /* UTMini.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF12296A6910014E5C7 /* UTMini.framework */; }; + CB8B6468230F7F980032EB24 /* IfishMainInfoCell.h in Headers */ = {isa = PBXBuildFile; fileRef = CB8B6466230F7F980032EB24 /* IfishMainInfoCell.h */; }; + CB8B6469230F7F980032EB24 /* IfishMainInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CB8B6467230F7F980032EB24 /* IfishMainInfoCell.m */; }; + CB8B646C230FAD340032EB24 /* Bugly.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8B646B230FAD340032EB24 /* Bugly.framework */; }; CBA615FC228E8E5A00ED380D /* MyMessageViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = CBA615FA228E8E5A00ED380D /* MyMessageViewController.h */; }; CBA615FD228E8E5A00ED380D /* MyMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBA615FB228E8E5A00ED380D /* MyMessageViewController.m */; }; CBA6164C228F993B00ED380D /* BaseYYModel.h in Headers */ = {isa = PBXBuildFile; fileRef = CBA6164A228F993B00ED380D /* BaseYYModel.h */; }; @@ -2547,7 +2547,6 @@ /* 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 = ""; }; 3D1C17202171BB0600A159A8 /* PNChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNChart.h; sourceTree = ""; }; @@ -2792,7 +2791,6 @@ 3D1C5069215CB6F600A2E5D6 /* IfishHotBarHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarHeader.m; 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 = ""; }; @@ -5418,7 +5416,6 @@ 88C1B2D11DD1ADB600C2C99A /* live_navicon_look@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "live_navicon_look@2x.png"; sourceTree = ""; }; 88C1B2D21DD1ADB600C2C99A /* live_navicon_look@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "live_navicon_look@3x.png"; sourceTree = ""; }; 88C1B2D61DD1AEEA00C2C99A /* kankan_listbanner.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = kankan_listbanner.jpg; sourceTree = ""; }; - 88C49B4A1EA6270B002BA5A8 /* Bugly.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bugly.framework; sourceTree = ""; }; 88C598901E9F4E5D00BDC812 /* ShopUserDatailData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopUserDatailData.h; sourceTree = ""; }; 88C598911E9F4E5D00BDC812 /* ShopUserDatailData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopUserDatailData.m; sourceTree = ""; }; 88C598931EA0605600BDC812 /* KebordExternAddTextInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KebordExternAddTextInputView.h; sourceTree = ""; }; @@ -5796,6 +5793,9 @@ CB7D6AF02296A6900014E5C7 /* AlicloudUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlicloudUtils.framework; sourceTree = ""; }; CB7D6AF12296A6910014E5C7 /* UTMini.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UTMini.framework; sourceTree = ""; }; CB7D6AF52296A6FF0014E5C7 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; + CB8B6466230F7F980032EB24 /* IfishMainInfoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IfishMainInfoCell.h; path = ../../IfishDeviceSelectList/IfishMainInfoCell.h; sourceTree = ""; }; + CB8B6467230F7F980032EB24 /* IfishMainInfoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = IfishMainInfoCell.m; path = ../../IfishDeviceSelectList/IfishMainInfoCell.m; sourceTree = ""; }; + CB8B646B230FAD340032EB24 /* Bugly.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bugly.framework; sourceTree = ""; }; CBA615FA228E8E5A00ED380D /* MyMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyMessageViewController.h; sourceTree = ""; }; CBA615FB228E8E5A00ED380D /* MyMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyMessageViewController.m; sourceTree = ""; }; CBA6164A228F993B00ED380D /* BaseYYModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseYYModel.h; sourceTree = ""; }; @@ -5995,10 +5995,10 @@ 88C6861A1EA60FD6004CDFD9 /* VideoToolbox.framework in Frameworks */, 3D1C50B5221A9EDF0096AE43 /* YSlider.a in Frameworks */, 88C686181EA60EDA004CDFD9 /* MessageUI.framework in Frameworks */, - 88C49B4B1EA6270B002BA5A8 /* Bugly.framework in Frameworks */, 88C686161EA60EB3004CDFD9 /* CoreText.framework in Frameworks */, 88C686141EA60EA9004CDFD9 /* WebKit.framework in Frameworks */, CB7D6AF32296A6910014E5C7 /* AlicloudUtils.framework in Frameworks */, + CB8B646C230FAD340032EB24 /* Bugly.framework in Frameworks */, 88C686011EA603A8004CDFD9 /* UShareUI.framework in Frameworks */, 88C685F91EA603A8004CDFD9 /* libSocialWeChat.a in Frameworks */, CB484E4522B8CF9B0075F050 /* UTMini.framework in Frameworks */, @@ -6485,7 +6485,6 @@ 3D34479C212D111900CF3941 /* Views */, 3D344797212CF71C00CF3941 /* IfishHotBarVc.h */, 3D344798212CF71C00CF3941 /* IfishHotBarVc.m */, - 3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */, 3D8F649821571D7C00F04BD3 /* HitbarWifeVc.h */, 3D8F649921571D7C00F04BD3 /* HitbarWifeVc.m */, 3D8F64C22157791D00F04BD3 /* IfishBaseVc.h */, @@ -6505,7 +6504,6 @@ 3D34479F212D113D00CF3941 /* IFishHotBarCell.xib */, 3D13F833212FE2C200D725F7 /* IFishWaterChangeView.h */, 3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */, - 3D13F836212FE2D100D725F7 /* IFishWaterChangeView.xib */, 3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */, 3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */, 3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */, @@ -10480,6 +10478,8 @@ 88653C971E7640CA00FF973E /* View */ = { isa = PBXGroup; children = ( + CB8B6466230F7F980032EB24 /* IfishMainInfoCell.h */, + CB8B6467230F7F980032EB24 /* IfishMainInfoCell.m */, 887491F01E7921E400CDA284 /* IfishInformationListViewCell.h */, 887491F11E7921E400CDA284 /* IfishInformationListViewCell.m */, 887491F21E7921E400CDA284 /* IfishInformationListViewCell.xib */, @@ -11638,14 +11638,6 @@ path = MineKankan; sourceTree = ""; }; - 88C49B491EA6270B002BA5A8 /* Bugly-v2.4.7 */ = { - isa = PBXGroup; - children = ( - 88C49B4A1EA6270B002BA5A8 /* Bugly.framework */, - ); - path = "Bugly-v2.4.7"; - sourceTree = ""; - }; 88C598981EA0965B00BDC812 /* LBLaunchImageAd */ = { isa = PBXGroup; children = ( @@ -11840,8 +11832,8 @@ 88F5ECA41D48C9C400CC7CAF /* ThirdPartUnity */ = { isa = PBXGroup; children = ( + CB8B646A230FAD250032EB24 /* Bugly */, CB484E2022B8CF9A0075F050 /* AlibcTradeSDK-3.1.1.96 */, - 88C49B491EA6270B002BA5A8 /* Bugly-v2.4.7 */, 88C6860D1EA60A40004CDFD9 /* TalkingDataV2.2.88 */, 88C685C81EA603A8004CDFD9 /* UMSocial */, 883E7BC81EA5FA1A00ED5D89 /* SMS_SDK */, @@ -12382,6 +12374,14 @@ path = AliPush; sourceTree = ""; }; + CB8B646A230FAD250032EB24 /* Bugly */ = { + isa = PBXGroup; + children = ( + CB8B646B230FAD340032EB24 /* Bugly.framework */, + ); + path = Bugly; + sourceTree = ""; + }; CBA615F6228E526C00ED380D /* message */ = { isa = PBXGroup; children = ( @@ -12563,6 +12563,7 @@ 3D1C5116221A9EE00096AE43 /* KTPhotoView+SDWebImage.h in Headers */, 3D1C50BB221A9EE00096AE43 /* RegisterResult.h in Headers */, CBA6167F228F9AB100ED380D /* MASViewConstraint.h in Headers */, + CB8B6468230F7F980032EB24 /* IfishMainInfoCell.h in Headers */, CB484E1122B8C8C90075F050 /* version.h in Headers */, 3D1C5122221A9EE00096AE43 /* IfishRecVideoViewCell.h in Headers */, CB484DFD22B8C8C80075F050 /* old_pix_fmts.h in Headers */, @@ -14112,7 +14113,6 @@ 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 */, @@ -14130,7 +14130,6 @@ 882956031DBDA3A100E9DDD7 /* neves0006.png in Resources */, 88C1B2111DCC5A1400C2C99A /* personal_iocn_about.png in Resources */, 883283A11EAF4C7300A47157 /* record_label_default@2x.png 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 */, @@ -15069,6 +15068,7 @@ 886EAC5C1E2DC87E00A4DF27 /* IfishShopInfo.m in Sources */, 3D1C50C8221A9EE00096AE43 /* Alarm.m in Sources */, 881671A61EA5DE2B00BEBF23 /* UMComLocationListDataController.m in Sources */, + CB8B6469230F7F980032EB24 /* IfishMainInfoCell.m in Sources */, FA0892F62270BED00084A609 /* XuanduoHuliModel.m in Sources */, 3D1C5106221A9EE00096AE43 /* CameraNoParyBackVideoView.m in Sources */, 881671AD1EA5DE2B00BEBF23 /* UMComUserListDataController.m in Sources */, @@ -15355,6 +15355,7 @@ "$(PROJECT_DIR)/Ifish/AliPush", "$(PROJECT_DIR)/Ifish/GWP2PSDK", "$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks", + "$(PROJECT_DIR)/Ifish/Bugly", ); GCC_PREFIX_HEADER = "Ifish/Ifish-Prefix.pch"; HEADER_SEARCH_PATHS = ""; @@ -15468,6 +15469,7 @@ "$(PROJECT_DIR)/Ifish/AliPush", "$(PROJECT_DIR)/Ifish/GWP2PSDK", "$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks", + "$(PROJECT_DIR)/Ifish/Bugly", ); GCC_PREFIX_HEADER = "Ifish/Ifish-Prefix.pch"; HEADER_SEARCH_PATHS = ""; diff --git a/Ifish/.DS_Store b/Ifish/.DS_Store index 2b507dd..687fae2 100644 Binary files a/Ifish/.DS_Store and b/Ifish/.DS_Store differ diff --git a/Ifish/Assets.xcassets/.DS_Store b/Ifish/Assets.xcassets/.DS_Store index 482a3b7..507938a 100644 Binary files a/Ifish/Assets.xcassets/.DS_Store and b/Ifish/Assets.xcassets/.DS_Store differ diff --git a/Ifish/Assets.xcassets/HotBar/change_tep_bottom.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/change_tep_bottom.imageset/Contents.json new file mode 100644 index 0000000..fd50571 --- /dev/null +++ b/Ifish/Assets.xcassets/HotBar/change_tep_bottom.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "change_tep_bottom@2x.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/change_tep_bottom.imageset/change_tep_bottom@2x.png b/Ifish/Assets.xcassets/HotBar/change_tep_bottom.imageset/change_tep_bottom@2x.png new file mode 100644 index 0000000..8b6e8a8 Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/change_tep_bottom.imageset/change_tep_bottom@2x.png differ diff --git a/Ifish/Assets.xcassets/HotBar/change_tep_title.imageset/Contents.json b/Ifish/Assets.xcassets/HotBar/change_tep_title.imageset/Contents.json new file mode 100644 index 0000000..a68930c --- /dev/null +++ b/Ifish/Assets.xcassets/HotBar/change_tep_title.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "change_tep_title@2x.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/change_tep_title.imageset/change_tep_title@2x.png b/Ifish/Assets.xcassets/HotBar/change_tep_title.imageset/change_tep_title@2x.png new file mode 100644 index 0000000..147346b Binary files /dev/null and b/Ifish/Assets.xcassets/HotBar/change_tep_title.imageset/change_tep_title@2x.png differ diff --git a/Ifish/Assets.xcassets/LaunchImage-1.launchimage/ Retina5.5-1.png b/Ifish/Assets.xcassets/LaunchImage-1.launchimage/ Retina5.5-1.png deleted file mode 100644 index a6c8d7c..0000000 Binary files a/Ifish/Assets.xcassets/LaunchImage-1.launchimage/ Retina5.5-1.png and /dev/null differ diff --git a/Ifish/Assets.xcassets/LaunchImage-1.launchimage/Contents.json b/Ifish/Assets.xcassets/LaunchImage-1.launchimage/Contents.json index cc35cdc..c92a8bc 100644 --- a/Ifish/Assets.xcassets/LaunchImage-1.launchimage/Contents.json +++ b/Ifish/Assets.xcassets/LaunchImage-1.launchimage/Contents.json @@ -1,27 +1,5 @@ { "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default-1.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x-1.png", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x-2.png", - "extent" : "full-screen", - "subtype" : "retina4", - "scale" : "2x" - }, { "extent" : "full-screen", "idiom" : "iphone", @@ -32,12 +10,11 @@ "scale" : "3x" }, { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : " Retina5.5-1.png", - "minimum-system-version" : "8.0", "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", "scale" : "3x" }, { @@ -65,6 +42,28 @@ "minimum-system-version" : "7.0", "orientation" : "portrait", "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-1.png", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x-1.png", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x-2.png", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" } ], "info" : { diff --git a/Ifish/Assets.xcassets/history_bg.imageset/Contents.json b/Ifish/Assets.xcassets/history_bg.imageset/Contents.json new file mode 100644 index 0000000..0919b96 --- /dev/null +++ b/Ifish/Assets.xcassets/history_bg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "history_bg@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/Assets.xcassets/history_bg.imageset/history_bg@2x.png b/Ifish/Assets.xcassets/history_bg.imageset/history_bg@2x.png new file mode 100644 index 0000000..65f9aed Binary files /dev/null and b/Ifish/Assets.xcassets/history_bg.imageset/history_bg@2x.png differ diff --git a/Ifish/Assets.xcassets/走势图.imageset/Contents.json b/Ifish/Assets.xcassets/history_bg_old.imageset/Contents.json similarity index 100% rename from Ifish/Assets.xcassets/走势图.imageset/Contents.json rename to Ifish/Assets.xcassets/history_bg_old.imageset/Contents.json diff --git a/Ifish/Assets.xcassets/走势图.imageset/走势图.png b/Ifish/Assets.xcassets/history_bg_old.imageset/走势图.png similarity index 100% rename from Ifish/Assets.xcassets/走势图.imageset/走势图.png rename to Ifish/Assets.xcassets/history_bg_old.imageset/走势图.png diff --git a/Ifish/Bugly-v2.4.7/.DS_Store b/Ifish/Bugly-v2.4.7/.DS_Store deleted file mode 100644 index 83261ed..0000000 Binary files a/Ifish/Bugly-v2.4.7/.DS_Store and /dev/null differ diff --git a/Ifish/Bugly-v2.4.7/Bugly.framework/Bugly b/Ifish/Bugly-v2.5.0/Bugly.framework/Bugly similarity index 100% rename from Ifish/Bugly-v2.4.7/Bugly.framework/Bugly rename to Ifish/Bugly-v2.5.0/Bugly.framework/Bugly diff --git a/Ifish/Bugly-v2.4.7/Bugly.framework/Headers/Bugly.h b/Ifish/Bugly-v2.5.0/Bugly.framework/Headers/Bugly.h similarity index 100% rename from Ifish/Bugly-v2.4.7/Bugly.framework/Headers/Bugly.h rename to Ifish/Bugly-v2.5.0/Bugly.framework/Headers/Bugly.h diff --git a/Ifish/Bugly-v2.4.7/Bugly.framework/Headers/BuglyConfig.h b/Ifish/Bugly-v2.5.0/Bugly.framework/Headers/BuglyConfig.h similarity index 100% rename from Ifish/Bugly-v2.4.7/Bugly.framework/Headers/BuglyConfig.h rename to Ifish/Bugly-v2.5.0/Bugly.framework/Headers/BuglyConfig.h diff --git a/Ifish/Bugly-v2.4.7/Bugly.framework/Headers/BuglyLog.h b/Ifish/Bugly-v2.5.0/Bugly.framework/Headers/BuglyLog.h similarity index 100% rename from Ifish/Bugly-v2.4.7/Bugly.framework/Headers/BuglyLog.h rename to Ifish/Bugly-v2.5.0/Bugly.framework/Headers/BuglyLog.h diff --git a/Ifish/Bugly/Bugly.framework/Bugly b/Ifish/Bugly/Bugly.framework/Bugly new file mode 100644 index 0000000..05dd8e6 Binary files /dev/null and b/Ifish/Bugly/Bugly.framework/Bugly differ diff --git a/Ifish/Bugly/Bugly.framework/Headers/Bugly.h b/Ifish/Bugly/Bugly.framework/Headers/Bugly.h new file mode 100644 index 0000000..ba33306 --- /dev/null +++ b/Ifish/Bugly/Bugly.framework/Headers/Bugly.h @@ -0,0 +1,144 @@ +// +// Bugly.h +// +// Version: 2.5(0) +// +// Copyright (c) 2017年 Tencent. All rights reserved. +// + +#import + +#import "BuglyConfig.h" +#import "BuglyLog.h" + +BLY_START_NONNULL + +@interface Bugly : NSObject + +/** + * 初始化Bugly,使用默认BuglyConfig + * + * @param appId 注册Bugly分配的应用唯一标识 + */ ++ (void)startWithAppId:(NSString * BLY_NULLABLE)appId; + +/** + * 使用指定配置初始化Bugly + * + * @param appId 注册Bugly分配的应用唯一标识 + * @param config 传入配置的 BuglyConfig + */ ++ (void)startWithAppId:(NSString * BLY_NULLABLE)appId + config:(BuglyConfig * BLY_NULLABLE)config; + +/** + * 使用指定配置初始化Bugly + * + * @param appId 注册Bugly分配的应用唯一标识 + * @param development 是否开发设备 + * @param config 传入配置的 BuglyConfig + */ ++ (void)startWithAppId:(NSString * BLY_NULLABLE)appId + developmentDevice:(BOOL)development + config:(BuglyConfig * BLY_NULLABLE)config; + +/** + * 设置用户标识 + * + * @param userId 用户标识 + */ ++ (void)setUserIdentifier:(NSString *)userId; + +/** + * 更新版本信息 + * + * @param version 应用版本信息 + */ ++ (void)updateAppVersion:(NSString *)version; + +/** + * 设置关键数据，随崩溃信息上报 + * + * @param value KEY + * @param key VALUE + */ ++ (void)setUserValue:(NSString *)value + forKey:(NSString *)key; + +/** + * 获取关键数据 + * + * @return 关键数据 + */ ++ (NSDictionary * BLY_NULLABLE)allUserValues; + +/** + * 设置标签 + * + * @param tag 标签ID，可在网站生成 + */ ++ (void)setTag:(NSUInteger)tag; + +/** + * 获取当前设置标签 + * + * @return 当前标签ID + */ ++ (NSUInteger)currentTag; + +/** + * 获取设备ID + * + * @return 设备ID + */ ++ (NSString *)buglyDeviceId; + +/** + * 上报自定义Objective-C异常 + * + * @param exception 异常信息 + */ ++ (void)reportException:(NSException *)exception; + +/** + * 上报错误 + * + * @param error 错误信息 + */ ++ (void)reportError:(NSError *)error; + +/** + * @brief 上报自定义错误 + * + * @param category 类型(Cocoa=3,CSharp=4,JS=5,Lua=6) + * @param aName 名称 + * @param aReason 错误原因 + * @param aStackArray 堆栈 + * @param info 附加数据 + * @param terminate 上报后是否退出应用进程 + */ ++ (void)reportExceptionWithCategory:(NSUInteger)category + name:(NSString *)aName + reason:(NSString *)aReason + callStack:(NSArray *)aStackArray + extraInfo:(NSDictionary *)info + terminateApp:(BOOL)terminate; + +/** + * SDK 版本信息 + * + * @return SDK版本号 + */ ++ (NSString *)sdkVersion; + +/** + * App 是否发生了连续闪退 + * 如果 启动SDK 且 5秒内 闪退，且次数达到 3次 则判定为连续闪退 + * + * @return 是否连续闪退 + */ ++ (BOOL)isAppCrashedOnStartUpExceedTheLimit; + +BLY_END_NONNULL + +@end diff --git a/Ifish/Bugly/Bugly.framework/Headers/BuglyConfig.h b/Ifish/Bugly/Bugly.framework/Headers/BuglyConfig.h new file mode 100644 index 0000000..0e0fea1 --- /dev/null +++ b/Ifish/Bugly/Bugly.framework/Headers/BuglyConfig.h @@ -0,0 +1,126 @@ +// +// BuglyConfig.h +// Bugly +// +// Copyright (c) 2016年 Tencent. All rights reserved. +// + +#pragma once + +#define BLY_UNAVAILABLE(x) __attribute__((unavailable(x))) + +#if __has_feature(nullability) +#define BLY_NONNULL __nonnull +#define BLY_NULLABLE __nullable +#define BLY_START_NONNULL _Pragma("clang assume_nonnull begin") +#define BLY_END_NONNULL _Pragma("clang assume_nonnull end") +#else +#define BLY_NONNULL +#define BLY_NULLABLE +#define BLY_START_NONNULL +#define BLY_END_NONNULL +#endif + +#import + +#import "BuglyLog.h" + +BLY_START_NONNULL + +@protocol BuglyDelegate + +@optional +/** + * 发生异常时回调 + * + * @param exception 异常信息 + * + * @return 返回需上报记录，随异常上报一起上报 + */ +- (NSString * BLY_NULLABLE)attachmentForException:(NSException * BLY_NULLABLE)exception; + +@end + +@interface BuglyConfig : NSObject + +/** + * SDK Debug信息开关, 默认关闭 + */ +@property (nonatomic, assign) BOOL debugMode; + +/** + * 设置自定义渠道标识 + */ +@property (nonatomic, copy) NSString *channel; + +/** + * 设置自定义版本号 + */ +@property (nonatomic, copy) NSString *version; + +/** + * 设置自定义设备唯一标识 + */ +@property (nonatomic, copy) NSString *deviceIdentifier; + +/** + * 卡顿监控开关，默认关闭 + */ +@property (nonatomic) BOOL blockMonitorEnable; + +/** + * 卡顿监控判断间隔，单位为秒 + */ +@property (nonatomic) NSTimeInterval blockMonitorTimeout; + +/** + * 设置 App Groups Id (如有使用 Bugly iOS Extension SDK，请设置该值) + */ +@property (nonatomic, copy) NSString *applicationGroupIdentifier; + +/** + * 进程内还原开关，默认开启 + */ +@property (nonatomic) BOOL symbolicateInProcessEnable; + +/** + * 非正常退出事件记录开关，默认关闭 + */ +@property (nonatomic) BOOL unexpectedTerminatingDetectionEnable; + +/** + * 页面信息记录开关，默认开启 + */ +@property (nonatomic) BOOL viewControllerTrackingEnable; + +/** + * Bugly Delegate + */ +@property (nonatomic, assign) id delegate; + +/** + * 控制自定义日志上报，默认值为BuglyLogLevelSilent，即关闭日志记录功能。 + * 如果设置为BuglyLogLevelWarn，则在崩溃时会上报Warn、Error接口打印的日志 + */ +@property (nonatomic, assign) BuglyLogLevel reportLogLevel; + +/** + * 崩溃数据过滤器，如果崩溃堆栈的模块名包含过滤器中设置的关键字，则崩溃数据不会进行上报 + * 例如，过滤崩溃堆栈中包含搜狗输入法的数据，可以添加过滤器关键字SogouInputIPhone.dylib等 + */ +@property (nonatomic, copy) NSArray *excludeModuleFilter; + +/** + * 控制台日志上报开关，默认开启 + */ +@property (nonatomic, assign) BOOL consolelogEnable; + +/** + * 崩溃退出超时，如果监听到崩溃后，App一直没有退出，则到达超时时间后会自动abort进程退出 + * 默认值 5s， 单位 秒 + * 当赋值为0时，则不会自动abort进程退出 + */ +@property (nonatomic, assign) NSUInteger crashAbortTimeout; + +@end +BLY_END_NONNULL diff --git a/Ifish/Bugly/Bugly.framework/Headers/BuglyLog.h b/Ifish/Bugly/Bugly.framework/Headers/BuglyLog.h new file mode 100644 index 0000000..2768e14 --- /dev/null +++ b/Ifish/Bugly/Bugly.framework/Headers/BuglyLog.h @@ -0,0 +1,78 @@ +// +// BuglyLog.h +// Bugly +// +// Copyright (c) 2017年 Tencent. All rights reserved. +// + +#import + +// Log level for Bugly Log +typedef NS_ENUM(NSUInteger, BuglyLogLevel) { + BuglyLogLevelSilent = 0, + BuglyLogLevelError = 1, + BuglyLogLevelWarn = 2, + BuglyLogLevelInfo = 3, + BuglyLogLevelDebug = 4, + BuglyLogLevelVerbose = 5, +}; +#pragma mark - + +OBJC_EXTERN void BLYLog(BuglyLogLevel level, NSString *format, ...) NS_FORMAT_FUNCTION(2, 3); + +OBJC_EXTERN void BLYLogv(BuglyLogLevel level, NSString *format, va_list args) NS_FORMAT_FUNCTION(2, 0); + +#pragma mark - +#define BUGLY_LOG_MACRO(_level, fmt, ...) [BuglyLog level:_level tag:nil log:fmt, ##__VA_ARGS__] + +#define BLYLogError(fmt, ...) BUGLY_LOG_MACRO(BuglyLogLevelError, fmt, ##__VA_ARGS__) +#define BLYLogWarn(fmt, ...) BUGLY_LOG_MACRO(BuglyLogLevelWarn, fmt, ##__VA_ARGS__) +#define BLYLogInfo(fmt, ...) BUGLY_LOG_MACRO(BuglyLogLevelInfo, fmt, ##__VA_ARGS__) +#define BLYLogDebug(fmt, ...) BUGLY_LOG_MACRO(BuglyLogLevelDebug, fmt, ##__VA_ARGS__) +#define BLYLogVerbose(fmt, ...) BUGLY_LOG_MACRO(BuglyLogLevelVerbose, fmt, ##__VA_ARGS__) + +#pragma mark - Interface +@interface BuglyLog : NSObject + +/** + * @brief 初始化日志模块 + * + * @param level 设置默认日志级别，默认BLYLogLevelSilent + * + * @param printConsole 是否打印到控制台，默认NO + */ ++ (void)initLogger:(BuglyLogLevel) level consolePrint:(BOOL)printConsole; + +/** + * @brief 打印BLYLogLevelInfo日志 + * + * @param format 日志内容 总日志大小限制为：字符串长度30k，条数200 + */ ++ (void)log:(NSString *)format, ... NS_FORMAT_FUNCTION(1, 2); + +/** + * @brief 打印日志 + * + * @param level 日志级别 + * @param message 日志内容 总日志大小限制为：字符串长度30k，条数200 + */ ++ (void)level:(BuglyLogLevel) level logs:(NSString *)message; + +/** + * @brief 打印日志 + * + * @param level 日志级别 + * @param format 日志内容 总日志大小限制为：字符串长度30k，条数200 + */ ++ (void)level:(BuglyLogLevel) level log:(NSString *)format, ... NS_FORMAT_FUNCTION(2, 3); + +/** + * @brief 打印日志 + * + * @param level 日志级别 + * @param tag 日志模块分类 + * @param format 日志内容 总日志大小限制为：字符串长度30k，条数200 + */ ++ (void)level:(BuglyLogLevel) level tag:(NSString *) tag log:(NSString *)format, ... NS_FORMAT_FUNCTION(3, 4); + +@end diff --git a/Ifish/Bugly/Bugly.framework/Modules/module.modulemap b/Ifish/Bugly/Bugly.framework/Modules/module.modulemap new file mode 100644 index 0000000..c536705 --- /dev/null +++ b/Ifish/Bugly/Bugly.framework/Modules/module.modulemap @@ -0,0 +1,12 @@ +framework module Bugly { + umbrella header "Bugly.h" + + export * + module * { export * } + + link framework "Foundation" + link framework "Security" + link framework "SystemConfiguration" + link "c++" + link "z" +} diff --git a/Ifish/Info.plist b/Ifish/Info.plist index f0090ef..009f9e9 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.9.9 + 5.0.0 CFBundleSignature ???? CFBundleURLTypes @@ -70,7 +70,7 @@ CFBundleVersion - 9.9.14 + 10.0.1 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m b/Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m index 4e75a5c..c76fa48 100644 --- a/Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m +++ b/Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m @@ -156,16 +156,12 @@ }else if ([devicemodel.type isEqualToString:DECICE_TYPE_hotBar]) { - IfishHotBarVc*barVc=[[IfishHotBarVc alloc]initWithNibName:@"IfishHotBarVc" bundle:nil]; + IfishHotBarVc*barVc=InitObject(IfishHotBarVc); barVc.devicemodel = devicemodel; barVc.hidesBottomBarWhenPushed=YES; UIApplication*app=[UIApplication sharedApplication]; AppDelegate*app1=(AppDelegate*)app.delegate; -// UINavigationController*nav=[[UINavigationController alloc]initWithRootViewController:barVc]; -// [nav.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; -// app1.window.rootViewController=nav; - // [((UINavigationController*)app1.window.rootViewController) pushViewController:barVc animated:YES]; UITabBarController*tabVc= (UITabBarController*)app1.window.rootViewController; tabVc.selectedIndex=0; UINavigationController*navVc=(UINavigationController*)tabVc.childViewControllers[tabVc.selectedIndex]; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToCenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToCenterViewController.m index 820d225..e1e5ca9 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToCenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToCenterViewController.m @@ -561,10 +561,9 @@ NSLog(@"点击绚多的设置的大响应按钮"); } - +//水族箱设置 -(void)pushSetTimeVC{ _xuToSetVC=[[XuToSetViewController alloc] init]; - _xuToSetVC.currentdevice=self.currentDevice; [self.navigationController pushViewController:_xuToSetVC animated:YES]; //self.navigationBarHidden=NO; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.h index 65f125f..ee61c8b 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.h +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.h @@ -8,6 +8,11 @@ #import "FatherController.h" #import "Socketsingleton.h" + + +/** + 绚多水族箱设置 + */ @interface XuToSetViewController : FatherController { @@ -25,5 +30,4 @@ @property(nonatomic)int percent; @property(nonatomic,strong) DeviceModel* currentdevice; - @end diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.m index 097edf2..77cf4ab 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSetViewController.m @@ -37,7 +37,8 @@ #import "BrightnessModel.h" #import "CreatErWeiMaController.h" #import "UINavigationBar+Background.h" - +#import "XuToControlName.h" +#import "UserExtendataArchaver.h" @interface XuToSetViewController () { @@ -61,6 +62,8 @@ @property(nonatomic,strong)setRemindWaterModel*waterInfmodel; @property(nonatomic) NSInteger tian; + +Strong XuToControlName *xutoName;//水族箱内各种名字 @end @implementation XuToSetViewController @@ -74,7 +77,7 @@ self.navigationController.navigationBar.backItem.title=@""; [self addTitleViewWithTitle:@"设置"]; [self initData]; - + self.xutoName = [UserExtendataArchaver currentXuToControlName:self.currentdevice.macAddress]; [self creatIndicatorView]; self.tableView.backgroundColor=COLOR_MIAN; @@ -447,8 +450,8 @@ } } - - [cell setTuToSetCellBackAtIndex:indexPath]; + + [cell setTuToSetCellBackAtIndex:indexPath andName1:self.xutoName.airPump andName2:self.xutoName.light1 andName3:self.xutoName.light2]; //cell 选中效果 diff --git a/Ifish/controllers/HotBar/IfishBaseVc.h b/Ifish/controllers/HotBar/IfishBaseVc.h index 6dc6152..4bc0ebb 100644 --- a/Ifish/controllers/HotBar/IfishBaseVc.h +++ b/Ifish/controllers/HotBar/IfishBaseVc.h @@ -7,8 +7,9 @@ // #import - +#import "MessageAlertView.h" @interface IfishBaseVc : UIViewController +Strong MessageAlertView *popView; -(void)socketDidGetBackmsgData:(NSData *)data onsoket:(AsyncSocket *)sock; //已断开连接 diff --git a/Ifish/controllers/HotBar/IfishBaseVc.m b/Ifish/controllers/HotBar/IfishBaseVc.m index 32891c4..879ed0b 100644 --- a/Ifish/controllers/HotBar/IfishBaseVc.m +++ b/Ifish/controllers/HotBar/IfishBaseVc.m @@ -7,15 +7,12 @@ // #import "IfishBaseVc.h" -#import "LXPopView.h" -#import "DXPopover.h" #import "CreatErWeiMaController.h" #import "JHRefreshAmazingAniView.h" #import "UIScrollView+JHRefresh.h" -@interface IfishBaseVc () -@property(nonatomic,strong)DXPopover *popover; +@interface IfishBaseVc () @end @@ -27,6 +24,8 @@ [Socketsingleton sharedInstance].communiteDelegate=self; // Do any additional setup after loading the view. + //右侧下拉菜单 + [self initPopOver]; } - (void)didReceiveMemoryWarning { @@ -138,76 +137,57 @@ return [str copy]; } } - - - +#pragma mark- 下拉菜单 +-(MessageAlertView *)popView{ + if (!_popView) { + _popView = [[MessageAlertView alloc]initWithFrame:RECT(screen_width - kSizeFrom750(220), 0, kSizeFrom750(220), kSizeFrom750(270))]; + WEAK_SELF; + //点击 + _popView.comboxBlock = ^(NSInteger tag) { + if (tag == 0) { + //修改名称 + [weakSelf shezhiMingCheng]; + }else if (tag == 1){ + //删除设备 + [weakSelf deletDevice]; + + }else if (tag == 2){ + //分享设备 + [weakSelf fenXiangSheBei]; + } + [weakSelf presentPopView];//隐藏弹出框 + }; + } + return _popView; +} +//弹出分享框 -(void)presentPopView{ - - UIImage *image = [UIImage imageNamed:@"popover_background_image_notrangle"]; - NSArray *titleImgs = nil; - + BOOL isHidden = self.popView.hidden; + if (isHidden) { + self.popView.hidden = NO; + } + [UIView animateWithDuration:0.3 animations:^{ + self.popView.transform = CGAffineTransformScale(self.popView.transform,isHidden?100:0.01,isHidden?100:0.01); + + } completion:^(BOOL finished) { + self.popView.hidden = !isHidden; + }]; +} +-(void)initPopOver{ + [self.view addSubview:self.popView]; + NSArray *titleImgs =nil; NSArray *titles=nil; - LXPopView *pop=[[LXPopView alloc] init]; - CGFloat popRowH=160*(image.size.height/image.size.width); if ([self.devicemodel.isMaster isEqualToString:@"1"]) { //主控 - pop.frame = CGRectMake(0, 0, 160, 160*(image.size.height/image.size.width) + (popRowH -12)/2); titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device",@"Ifish_share_device"]; - titles=@[@"修改名称",@"删除设备",@"分享设备"]; - }else{ - pop.frame = CGRectMake(0,0, 160, 160*(image.size.height/image.size.width)); titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device"]; - titles=@[@"修改名称",@"删除设备"]; - } - - pop.delegate = self; - - pop.backgroundImage =image - ; - pop.titles = titles; - - pop.titleImgs =titleImgs; - - DXPopover *popover = [DXPopover popover]; - - self.popover = popover; - - popover.arrowSize = CGSizeMake(0.0,0.0); - - [popover showAtView:self.navigationItem.rightBarButtonItem.customView withContentView:pop]; - - NSLog(@"设备右侧pop"); - + [self.popView loadInfoWithTitle:titles Icons:titleImgs]; } -#pragma mark - PopViewDelagate - --(void)disSelectedPopViewIndex:(NSIndexPath *)Index{ - - [self.popover dismiss]; - - if (Index.row == 0) { - //修改名称 - [self shezhiMingCheng]; - - - }else if (Index.row == 1){ - //删除设备 - - [self deletDevice]; - - }else if (Index.row == 2){ - //分享设备 - - [self fenXiangSheBei]; - - } - -} #pragma mark - 修改设备名 diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.h b/Ifish/controllers/HotBar/IfishHotBarVc.h index 80d5ed9..189db62 100644 --- a/Ifish/controllers/HotBar/IfishHotBarVc.h +++ b/Ifish/controllers/HotBar/IfishHotBarVc.h @@ -11,6 +11,9 @@ #import "CenterViewController.h" #import "IfishBaseVc.h" +/** + 热流器页面详情 + */ @interface IfishHotBarVc :IfishBaseVc @end diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.m b/Ifish/controllers/HotBar/IfishHotBarVc.m index 82085c3..489a40f 100644 --- a/Ifish/controllers/HotBar/IfishHotBarVc.m +++ b/Ifish/controllers/HotBar/IfishHotBarVc.m @@ -28,14 +28,15 @@ @interface IfishHotBarVc () -@property (weak, nonatomic) IBOutlet UITableView *mainTableView; + +@property (strong, nonatomic) UITableView *mainTableView; @property(nonatomic,strong)NSMutableArray*datas; @property(nonatomic,strong)IFishWaterChangeView*changeWaterView; @property(nonatomic,strong)IfishHistoryView*historyView; -@property (weak, nonatomic) IBOutlet UILabel *templetrueLable; @property(nonatomic,strong)IfishHotBarVo*vo; @property(nonatomic,strong)IfishHotBarHeader*header; @property(nonatomic,assign)NSInteger curDay; +Assign BOOL isInitHostoryView; @end @implementation IfishHotBarVc @@ -52,9 +53,6 @@ return _header; } --(void)initUI{ -} - -(void)wenduRequest{// 查询设备状态信息 searchDeviceModel*xinxiModel=[[searchDeviceModel alloc]init]; @@ -67,38 +65,23 @@ [[Socketsingleton sharedInstance].clientSocket readDataWithTimeout:-1 tag:0]; [self getHotBarInfo]; + } -(IfishHistoryView *)historyView{ - if (_historyView==nil) { - _historyView=[IfishHistoryView getView]; - _historyView.frame=self.view.bounds; + if (!_historyView) { + _historyView=InitObject(IfishHistoryView); _historyView.myDeleget=self; [self.view addSubview:_historyView]; + [_historyView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self.view); + }]; } -// _historyView.hidden=NO; return _historyView; } - --(void)clickBottomBarWithIdx:(NSInteger)idx{ - if (idx==10) { - self.curDay++; - if (self.curDay>7) { - [SVProgressHUD showInfoWithStatus:@"只能查询前七天数据！"]; - self.curDay=7; - return; - } - - }else{ - self.curDay--; - if(self.curDay<0){ - [SVProgressHUD showInfoWithStatus:@"只能查询前七天数据！"]; - self.curDay=0; - return; - } - - } - +//获取历史流量数据 +-(void)getHistoryDataRequest{ + self.isInitHostoryView = YES; NSDate *curDate = [NSDate dateWithTimeInterval:self.curDay*60*60*-24 sinceDate:[NSDate date]]; NSDateFormatter *dateFormatter=[[NSDateFormatter alloc]init];//创建一个日期格式化器 @@ -106,7 +89,7 @@ NSLog(@"%@",[dateFormatter stringFromDate:curDate]);//2015-11-20 08:24:04 NSString*curDateStr=[dateFormatter stringFromDate:curDate]; -// __block NSString*b_dateStr=curDateStr; + // __block NSString*b_dateStr=curDateStr; [SVProgressHUD showWithMaskType:SVProgressHUDMaskTypeBlack]; NSDictionary*para=@{@"heaterMacAddress":self.devicemodel.macAddress,@"date":curDateStr};//yyyy-mm-dd self.historyView.curdateStr=curDateStr; @@ -130,15 +113,37 @@ [SVProgressHUD showInfoWithStatus:@"网络在开小差，请稍后！"]; }]; } +-(void)clickBottomBarWithIdx:(NSInteger)idx{ + if (idx==10) { + self.curDay++; + if (self.curDay>7) { + [SVProgressHUD showInfoWithStatus:@"只能查询前七天数据！"]; + self.curDay=7; + return; + } + + }else{ + self.curDay--; + if(self.curDay<0){ + [SVProgressHUD showInfoWithStatus:@"只能查询前七天数据！"]; + self.curDay=0; + return; + } + + } + [self getHistoryDataRequest]; + +} #pragma mark----设置参数代理--- -(IFishWaterChangeView *)changeWaterView{ if(_changeWaterView==nil){ - _changeWaterView=[IFishWaterChangeView getView]; - _changeWaterView.frame=self.view.bounds; + _changeWaterView=[[IFishWaterChangeView alloc]init]; [self.view addSubview:_changeWaterView]; - // [_changeWaterView.picker reloadAllComponents]; + [self.changeWaterView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self.view); + }]; _changeWaterView.myDelegate=self; } _changeWaterView.hidden=NO; @@ -216,8 +221,9 @@ vo.subTitle=@""; [_datas addObject:vo]; + //预警温度 add V5.0.0 IfishHotBarVo*vo1=[[IfishHotBarVo alloc]init]; - vo1.title=@"鱼缸容量 "; + vo1.title=@"预警温度 "; vo1.iconUrl=@"容积图标"; vo1.isShowArrow=YES; vo1.subTitle=@""; @@ -226,7 +232,7 @@ vo2.title=@"水泵流量"; vo2.iconUrl=@"流量标"; vo2.isShowArrow=NO; - vo2.subTitle=@""; + vo2.subTitle=@"无水"; [_datas addObject:vo2]; IfishHotBarVo*vo3=[[IfishHotBarVo alloc]init]; vo3.title=@"历史趋势"; @@ -250,11 +256,17 @@ - (void)viewDidLoad { [super viewDidLoad]; + self.isInitHostoryView = NO; // Do any additional setup after loading the view from its nib. + self.mainTableView = [[UITableView alloc]initWithFrame:CGRectZero style:UITableViewStylePlain]; [self.mainTableView registerNib:[UINib nibWithNibName:@"IFishHotBarCell" bundle:nil] forCellReuseIdentifier:HOTBARCELL]; self.mainTableView.rowHeight=70; self.mainTableView.dataSource=self; self.mainTableView.delegate=self; + [self.view addSubview:self.mainTableView]; + [self.mainTableView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self.view); + }]; [self.mainTableView reloadData]; [self getHotBarInfo]; self.tableView=self.mainTableView; @@ -273,28 +285,15 @@ self.navigationItem.leftBarButtonItem=backItem; self.navigationItem.rightBarButtonItem=[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ifishnav_dropview_list"] style:0 target:self action:@selector(clickMoreBtn)]; + [self.view bringSubviewToFront:self.popView]; + } -//-(void)updateNameInLocal{ -// NSArray* deviceArr =[dataContorl getallDevices]; -// for (DeviceModel *device in deviceArr) { -// if (device.deviceId==self.devicemodel.deviceId) { -// device.defaultShowName=self.title; -// [[DataCenter defaultDtacenter]setValue:deviceArr forKey:@"deviceInfo"]; -// break; -// } -// } -// -// -//} - -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; - NSString*dTitle=[[NSUserDefaults standardUserDefaults] valueForKey:@"dTitle"]; self.title=self.devicemodel.showName; -// [self updateNameInLocal]; } @@ -457,12 +456,8 @@ self.historyView.datas=self.vo.phs; self.historyView.hidden=YES; } - - IfishHotBarVo*vo=self.datas[1]; - if (self.vo.heater.heaterVolume.length) { - vo.title=[NSString stringWithFormat:@"鱼缸容量 %@L",self.vo.heater.heaterVolume]; - vo.subTitle=[NSString stringWithFormat:@"推荐流量：%.1fL--%.1fL",[self.vo.heater.heaterVolume intValue]*1.5,[self.vo.heater.heaterVolume intValue]*2.0]; - } + //去除鱼缸容积，改为设置预警温度 + IfishHotBarVo*vo1=self.datas[4]; if (self.vo.heater.heaterCycle.length) { if (self.vo.heater.heaterReminderTime.length) { @@ -497,13 +492,15 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ if (indexPath.row==3) { + if (!self.isInitHostoryView) { + [self getHistoryDataRequest]; + } self.historyView.hidden=NO; -// self.historyView.datas=self.vo.phs; + }else if (indexPath.row==2){ } else{ -// [self wenduRequest]; [self changeWaterView]; self.changeWaterView.hotVo=self.vo; self.changeWaterView.viewType=indexPath.row; @@ -541,10 +538,8 @@ -(void)updateUiWithInfo:(NSString*)info{ NSString*templeture=[info substringWithRange:NSMakeRange(36, 4)]; - // templeture=[NSString stringWithFormat:@"0x%@",templeture]; UInt64 temp=[dataContorl hexToTen:templeture]; float tempFloat=temp*0.1; -// self.templetrueLable.text=[NSString stringWithFormat:@"%llu°c",temp]; self.header.degreeLable.text=[NSString stringWithFormat:@"%0.1f°c",tempFloat]; //流量 46 NSString*ph=[info substringWithRange:NSMakeRange(46, 4)]; @@ -552,11 +547,11 @@ IfishHotBarVo*vo2=self.datas[2]; // phV=0; vo2.phv=phV; - vo2.title=[NSString stringWithFormat:@"水循环 %lluL",phV]; - if (phV<=120) { - vo2.subTitle=@"流量警告：加热器停止加热，进入保护状态"; + //phV给499，则为正常，其余的都是无水-V5.0.0 + if (phV==499) { + vo2.subTitle=@"正常"; }else{ - vo2.subTitle=@""; + vo2.subTitle=@"无水"; } self.vo.heaterNum=[info substringWithRange:NSMakeRange(40, 4)]; diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.xib b/Ifish/controllers/HotBar/IfishHotBarVc.xib deleted file mode 100644 index fe66d71..0000000 --- a/Ifish/controllers/HotBar/IfishHotBarVc.xib +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ifish/controllers/HotBar/Views/IFishHotBarCell.m b/Ifish/controllers/HotBar/Views/IFishHotBarCell.m index 8223ce3..a8fce39 100644 --- a/Ifish/controllers/HotBar/Views/IFishHotBarCell.m +++ b/Ifish/controllers/HotBar/Views/IFishHotBarCell.m @@ -20,6 +20,11 @@ - (void)awakeFromNib { [super awakeFromNib]; + [self.subTitleLable mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.titleLbale.mas_right).offset(20); + make.centerY.height.mas_equalTo(self.titleLbale); + }]; + [self.subTitleLable setTextColor:[UIColor colorWithRed:109/255.0 green:109/255.0 blue:109/255.0 alpha:1.0]]; // Initialization code } @@ -35,9 +40,9 @@ self.subTitleLable.text=vo.subTitle; self.iconImgV.image=[UIImage imageNamed:vo.iconUrl]; self.arrowImgV.hidden=!vo.isShowArrow; - if (vo.phv<120&&[vo.title containsString:@"水循环"]) { + if (vo.phv!=499) {//无水 [self.subTitleLable setTextColor:[UIColor redColor]]; - }else{ + }else{//正常 [self.subTitleLable setTextColor:[UIColor colorWithRed:109/255.0 green:109/255.0 blue:109/255.0 alpha:1.0]]; } diff --git a/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib b/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib index 590a1e2..ac3fe02 100644 --- a/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib +++ b/Ifish/controllers/HotBar/Views/IFishHotBarCell.xib @@ -1,11 +1,11 @@ - + - + @@ -34,8 +34,9 @@ - - - + + diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h index 6127f9b..fe5774c 100644 --- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h +++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h @@ -17,9 +17,13 @@ -(void)clickWormCode:(NSString*)code; @end +/** + 设置水温和设置预警温度分开显示 + */ @interface IFishWaterChangeView : UIView @property (weak, nonatomic) IBOutlet UIPickerView *picker; @property(nonatomic,weak)id myDelegate; @property(nonatomic,assign)NSInteger viewType; @property(nonatomic,strong)IfishHotBarVo*hotVo; + @end diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m index 8582fca..c7dbaef 100644 --- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m +++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m @@ -10,7 +10,6 @@ @interface IFishWaterChangeView() -@property (weak, nonatomic) IBOutlet NSLayoutConstraint *pickerBottom; @property(nonatomic,strong)NSMutableArray*data1; @property(nonatomic,strong)NSMutableArray*data2; @property(nonatomic,strong)NSMutableArray*templetrueArr; @@ -20,28 +19,174 @@ @property(nonatomic,copy)NSString*selectVaule2; @property(nonatomic,copy)NSString*selectVaule3; @property(nonatomic,copy)NSString*warnCode; -@property (weak, nonatomic) IBOutlet UIView *topTempPicker; -@property (weak, nonatomic) IBOutlet UIView *bottomPicker; -@property (weak, nonatomic) IBOutlet UIView *heightView; -@property (weak, nonatomic) IBOutlet UITextField *longTextF; -@property (weak, nonatomic) IBOutlet UITextField *widthTextF; -@property (weak, nonatomic) IBOutlet UITextField *heightTextF; -@property (weak, nonatomic) IBOutlet UIPickerView *topUiPick; -@property (weak, nonatomic) IBOutlet UIPickerView *bottomUiPicker; -@property (weak, nonatomic) IBOutlet UIButton *openBtn; -@property (weak, nonatomic) IBOutlet UILabel *bottomTextF; +//@property (weak, nonatomic) IBOutlet UIButton *bgButton; +//@property (weak, nonatomic) IBOutlet UIPickerView *topUiPick; +//@property (weak, nonatomic) IBOutlet UIPickerView *bottomUiPicker; +//@property (weak, nonatomic) IBOutlet UIImageView *titleImageView; +//@property (weak, nonatomic) IBOutlet UILabel *titleLabel; +//@property (weak, nonatomic) IBOutlet UIButton *openBtn;//开关 +//@property (weak, nonatomic) IBOutlet UIButton *sureBtn; +//@property (weak, nonatomic) IBOutlet UIImageView *sepImage; +Strong UIButton *bgButton; +Strong UIPickerView *topUiPick; +Strong UIPickerView *bottomUiPicker; +Strong UIImageView *titleImageView; +Strong UILabel *titleLabel; +Strong UIButton *openBtn;//开关 +Strong UIButton *sureBtn; +Strong UIImageView *sepImage; @end @implementation IFishWaterChangeView - +-(instancetype)init{ + self = [super init]; + if (self) { + [self addSubview:self.bgButton]; + + [self addSubview:self.topUiPick]; + + [self addSubview:self.bottomUiPicker]; + + [self addSubview:self.sepImage]; + + [self addSubview:self.titleImageView]; + + [self.titleImageView addSubview:self.titleLabel]; + + [self addSubview:self.openBtn]; + + [self addSubview:self.sureBtn]; + + [self loadLayout]; + } + return self; +} +#pragma mark --lazyLoading +- (UIButton *)bgButton{ + if (!_bgButton) { + _bgButton = InitObject(UIButton); + [_bgButton addTarget:self action:@selector(bgButtonClick:) forControlEvents:UIControlEventTouchUpInside]; + [_bgButton setBackgroundColor:RGBA(0, 0, 0, 0.3)]; + } + return _bgButton; +} +- (UIPickerView *)topUiPick{ + if (!_topUiPick) { + _topUiPick = [[UIPickerView alloc]init]; + _topUiPick.delegate = self; + _topUiPick.backgroundColor = [UIColor whiteColor]; + } + return _topUiPick; +} +- (UIPickerView *)bottomUiPicker{ + if (!_bottomUiPicker) { + _bottomUiPicker = InitObject(UIPickerView); + _bottomUiPicker.delegate = self; + _bottomUiPicker.backgroundColor = [UIColor whiteColor]; + } + return _bottomUiPicker; +} +- (UIImageView *)sepImage{ + if (!_sepImage) { + _sepImage = InitObject(UIImageView); + [_sepImage setImage:IMAGEBYENAME(@"虚线")]; + } + return _sepImage; +} +- (UIButton *)openBtn{ + if (!_openBtn) { + _openBtn = InitObject(UIButton); + [_openBtn setBackgroundImage:IMAGEBYENAME(@"graybtn_big") forState:UIControlStateNormal]; + [_openBtn setBackgroundImage:IMAGEBYENAME(@"greenbtn_big") forState:UIControlStateSelected]; + [_openBtn addTarget:self action:@selector(openBtnClick:) forControlEvents:UIControlEventTouchUpInside]; + } + return _openBtn; +} +- (UIImageView *)titleImageView{ + if (!_titleImageView) { + _titleImageView = InitObject(UIImageView); + [_titleImageView setImage:IMAGEBYENAME(@"change_tep_title")]; + } + return _titleImageView; +} +- (UIButton *)sureBtn{ + if (!_sureBtn) { + _sureBtn = InitObject(UIButton); + [_sureBtn setBackgroundImage:IMAGEBYENAME(@"change_tep_bottom") forState:UIControlStateNormal]; + [_sureBtn.titleLabel setFont:[UIFont systemFontOfSize:13]]; + [_sureBtn setTitleColor:XWhite forState:UIControlStateNormal]; + [_sureBtn setTitle:@"确 定" forState:UIControlStateNormal]; + [_sureBtn addTarget:self action:@selector(sureBtnClick:) forControlEvents:UIControlEventTouchUpInside]; + } + return _sureBtn; +} +- (UILabel *)titleLabel{ + if (!_titleLabel) { + _titleLabel = InitObject(UILabel); + _titleLabel.textColor = XWhite; + _titleLabel.font = [UIFont systemFontOfSize:13]; + _titleLabel.text = @"设置水温"; + } + return _titleLabel; +} +//masonry +-(void)loadLayout{ + [self.bgButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self); + }]; + + [self.topUiPick mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kSizeFrom750(690)); + make.height.mas_equalTo(kSizeFrom750(280)); + make.centerY.centerX.mas_equalTo(self); + }]; + + [self.titleImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.width.mas_equalTo(self.topUiPick); + make.bottom.mas_equalTo(self.topUiPick.mas_top); + make.height.mas_equalTo(kSizeFrom750(60)); + }]; + + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.height.mas_equalTo(self.titleImageView); + make.left.mas_equalTo(kSizeFrom750(30)); + }]; + + [self.openBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kSizeFrom750(86)); + make.height.mas_equalTo(kSizeFrom750(50)); + make.right.mas_equalTo(self.titleImageView.mas_right).offset(-kSizeFrom750(40)); + make.centerY.mas_equalTo(self.titleImageView); + }]; + + [self.bottomUiPicker mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.width.height.centerX.mas_equalTo(self.topUiPick); + }]; + + [self.sepImage mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerX.centerY.mas_equalTo(self.bottomUiPicker); + make.width.mas_equalTo(kSizeFrom750(24)); + make.height.mas_equalTo(kSizeFrom750(264)); + }]; + + [self.sureBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.width.height.mas_equalTo(self.titleImageView); + make.top.mas_equalTo(self.bottomUiPicker.mas_bottom); + }]; + +} -(NSMutableArray *)data1{ - if (_data1==nil) { - _data1=[NSMutableArray array]; - _data2=[NSMutableArray array]; + if (!_data1) { + _data1=InitObject(NSMutableArray); } return _data1; } - +-(NSMutableArray *)data2{ + if (!_data2) { + _data2=InitObject(NSMutableArray); + } + return _data2; +} -(NSMutableArray *)timeArr{ if (_timeArr==nil) { _timeArr=[NSMutableArray array]; @@ -78,34 +223,36 @@ -(void)setViewType:(NSInteger)viewType{ _viewType=viewType; - self.topTempPicker.hidden=YES; - self.heightView.hidden=YES; - self.bottomPicker.hidden=YES; + self.topUiPick.hidden=YES; + self.bottomUiPicker.hidden=YES; + self.sepImage.hidden = YES; + self.openBtn.hidden = YES; [self.data1 removeAllObjects]; [self.data2 removeAllObjects]; if (viewType==0) {// 设置水温 - self.topTempPicker.hidden=NO; - self.bottomPicker.hidden=NO; - self.bottomTextF.text=@"请输设置预警温度"; + self.topUiPick.hidden=NO; [self.data1 addObjectsFromArray:self.templetrueArr]; [self.data2 addObjectsFromArray:self.templetrueArr]; [self.topUiPick reloadAllComponents]; - [self.bottomUiPicker reloadAllComponents]; - self.openBtn.hidden=NO; - self.pickerBottom.constant=240.0; - if ([self.hotVo.wornCode isEqualToString:@"01"]) { - self.openBtn.selected=YES; - }else{ - self.openBtn.selected=NO; - } if ( self.hotVo.heaterNum) { self.hotVo.heaterNum=[self.hotVo.heaterNum stringByReplacingOccurrencesOfString:@"°c" withString:@""]; NSInteger heaterNum=round([self.hotVo.heaterNum integerValue]-20) ; [self.topUiPick selectRow:heaterNum inComponent:0 animated:NO]; self.selectVaule1=self.hotVo.heaterNum; + } + }else if(viewType==1){//设置预警温度 + [self.data1 addObjectsFromArray:self.templetrueArr]; + [self.data2 addObjectsFromArray:self.templetrueArr]; + self.bottomUiPicker.hidden=NO; + self.sepImage.hidden = NO; + self.openBtn.hidden = NO; + self.titleLabel.text=@"请设置预警温度："; + [self.bottomUiPicker reloadAllComponents]; + if ([self.hotVo.wornCode isEqualToString:@"01"]) { + self.openBtn.selected=YES; + }else{ + self.openBtn.selected=NO; } - - if (self.hotVo.downTeamp) { self.hotVo.downTeamp=[self.hotVo.downTeamp stringByReplacingOccurrencesOfString:@"°c" withString:@""]; NSInteger downTeamp=round([self.hotVo.downTeamp integerValue]-20); @@ -113,7 +260,6 @@ [self.bottomUiPicker selectRow:downTeamp inComponent:0 animated:NO]; self.selectVaule2=self.hotVo.downTeamp; } - if (self.hotVo.upTeamp) { self.hotVo.upTeamp=[self.hotVo.upTeamp stringByReplacingOccurrencesOfString:@"°c" withString:@""]; NSInteger upTeamp=round([self.hotVo.upTeamp integerValue]-20) ; @@ -121,37 +267,17 @@ [self.bottomUiPicker selectRow:upTeamp inComponent:1 animated:NO]; self.selectVaule3=self.hotVo.upTeamp; } - - - }else if(viewType==1){//容器大小 - self.bottomTextF.text=@"请输入水体部分尺寸："; - self.heightView.hidden=NO; - self.bottomPicker.hidden=NO; - self.openBtn.hidden=YES; - [self.longTextF becomeFirstResponder]; - self.pickerBottom.constant=340.0; - if (self.hotVo.heater) { - if(self.hotVo.heater.heaterLong.length){ - self.longTextF.text=self.hotVo.heater.heaterLong; - } - if(self.hotVo.heater.heaterWidth.length){ - self.widthTextF.text=self.hotVo.heater.heaterWidth; - } - if(self.hotVo.heater.heaterHeight.length){ - self.heightTextF.text=self.hotVo.heater.heaterHeight; - } - } - }else if (viewType==2){//流量 - self.bottomPicker.hidden=NO; +// self.bottomUiPicker.hidden=NO; }else if (viewType==4){//换水周期 - self.bottomPicker.hidden=NO; + self.bottomUiPicker.hidden=NO; + self.openBtn.hidden = NO; + self.sepImage.hidden = NO; [self.data1 addObjectsFromArray:self.dayArr]; [self.data2 addObjectsFromArray:self.timeArr]; [self.topUiPick reloadAllComponents]; [self.bottomUiPicker reloadAllComponents]; - self.bottomTextF.text=@"换水周期选择："; - self.openBtn.hidden=NO; + self.titleLabel.text=@"换水周期选择："; self.selectVaule2=self.data1[0]; if (self.hotVo.heater.heaterCycle!=nil) { @@ -169,21 +295,22 @@ self.openBtn.selected=NO; self.selectVaule3=@"5"; } - - } - -// if(self.data1.count>0){ -// self.selectVaule1=self.data1[0]; -// self.selectVaule2=self.data1[0]; -// } -// if (self.data2.count>0) { -// self.selectVaule3=self.data2[0]; -// } } - - -- (IBAction)clickSubmit:(id)sender { +//点击open按钮 +- (void)openBtnClick:(UIButton *)sender { + sender.selected=!sender.selected; + if(self.viewType==0){ + self.hotVo.wornCode=sender.selected?@"01":@"00"; + [self.myDelegate clickWormCode:self.hotVo.wornCode]; + } +} +//点击背景按钮 +- (void)bgButtonClick:(UIButton *)sender { + self.hidden=YES; +} +//点击确定按钮 +- (void)sureBtnClick:(UIButton *)sender{ self.hidden=YES; if(_viewType==5){ [self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3]; @@ -192,8 +319,6 @@ NSString*code=self.openBtn.selected?@"01":@"00"; [self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andT:self.selectVaule1 andWarnCode:code]; - }else if (_viewType==1){ - [self.myDelegate submitText:self.widthTextF.text andh:self.heightTextF.text andV:self.longTextF.text]; }else if(_viewType==4){ // [self.myDelegate didSelectRemindTime:self.selectVaule2]; if(self.openBtn.selected==NO){ @@ -205,13 +330,6 @@ } --(void)awakeFromNib{ - [super awakeFromNib]; -} -- (IBAction)clickBg:(id)sender { - self.hidden=YES; -} - //返回多少列 -(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{ if (pickerView==self.topUiPick) { @@ -239,7 +357,6 @@ //选中时的效果 -(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{ -// self.selectValue = self.data[row]; if (pickerView==self.topUiPick) { self.selectVaule1=self.data1[row]; }else{ @@ -254,29 +371,10 @@ //返回高度 -(CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component{ - return 35.0f; + return kSizeFrom750(50); } -//返回宽度 -//-(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; -//} -- (IBAction)clickOpenBtn:(UIButton *)sender { - sender.selected=!sender.selected; - if(self.viewType==0){ - self.hotVo.wornCode=sender.selected?@"01":@"00"; - [self.myDelegate clickWormCode:self.hotVo.wornCode]; - } -} @end diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib index 21f1c09..8da8d3b 100644 --- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib +++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.xib @@ -1,11 +1,11 @@ - + - + @@ -15,261 +15,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - - - - + + + + - - + - + - - diff --git a/Ifish/controllers/HotBar/Views/IfishChatView.h b/Ifish/controllers/HotBar/Views/IfishChatView.h index 4db1acd..39ee179 100644 --- a/Ifish/controllers/HotBar/Views/IfishChatView.h +++ b/Ifish/controllers/HotBar/Views/IfishChatView.h @@ -10,4 +10,5 @@ @interface IfishChatView : UIView @property(nonatomic,strong)NSArray*datas; +-(void)reloadHeater;//刷新流量状态 @end diff --git a/Ifish/controllers/HotBar/Views/IfishChatView.m b/Ifish/controllers/HotBar/Views/IfishChatView.m index 1c36847..59c89b5 100644 --- a/Ifish/controllers/HotBar/Views/IfishChatView.m +++ b/Ifish/controllers/HotBar/Views/IfishChatView.m @@ -9,13 +9,13 @@ #import "IfishChatView.h" #import "IfishHistroyVo.h" - - +#define Normal_heaterPh 499 //只有499才是正常流量 +#define Rect_Width 248.f @interface IfishChatView() @property(nonatomic,strong)NSMutableArray*line1; -@property(nonatomic,strong)NSMutableArray*line2; @property(nonatomic,strong)UIView *lablesView; @property(nonatomic,strong)UILabel*numLable; +Strong NSMutableArray * heaterPhArray;//流量走势 @end @@ -29,35 +29,24 @@ return _numLable; } --(UIView *)lablesView{ - if (_lablesView==nil) { - _lablesView=[[UIView alloc]init]; - _lablesView.frame=CGRectMake(290, 0, 28, 190); - _lablesView.backgroundColor=[UIColor clearColor]; - [self addSubview:_lablesView]; - } - return _lablesView; -} - -(NSArray *)line1{ if (_line1==nil) { _line1=[NSMutableArray array]; } [_line1 removeAllObjects]; if (_datas.count) { - NSSortDescriptor *ageSD = [NSSortDescriptor sortDescriptorWithKey:@"heaterGatheringTime_int" ascending:YES]; - self.datas = [self.datas sortedArrayUsingDescriptors:@[ageSD]]; + // CGFloat gapW= 357*scale*0.1; for (int i=0; i350){ vo.heaterWaterTemperature=@"350"; }else if(vo.heaterWaterTemperature.integerValue<250){ continue; } - CGFloat y=188*(1-((vo.heaterWaterTemperature.integerValue*0.1-25)/10))+36.5;//*-1*+158; + CGFloat y=80*(1-((vo.heaterWaterTemperature.integerValue*0.1-25)/10))+19;//*-1*+158; CGPoint p1=CGPointMake(x, y); // NSLog(@"%f-------%f--%f-",y,vo.heaterWaterTemperature.integerValue*0.1,x); [_line1 addObject:NSStringFromCGPoint(p1)]; @@ -66,74 +55,53 @@ return _line1; } - --(NSArray *)line2{ - if (_line2==nil) { - _line2=[NSMutableArray array]; - } - if (_datas.count) { - NSSortDescriptor *PhSD = [NSSortDescriptor sortDescriptorWithKey:@"heaterPh_int" ascending:YES]; - NSMutableArray*arr = [[self.datas sortedArrayUsingDescriptors:@[PhSD]] mutableCopy]; - - IfishHistroyVo*vo=arr[0]; - NSInteger miniPh=vo.heaterPh_int-50; - - IfishHistroyVo*vo1=arr[arr.count-1]; - NSInteger maxPh=vo1.heaterPh_int+50; - - NSInteger range=maxPh-miniPh; - - - [_line2 removeAllObjects]; - for (int i=0; i1) { + for (int i=[vo.heaterGatheringTime intValue]; i<[nextVo.heaterGatheringTime intValue]; i++) { + UIView *emptyView = [self viewWithTag:i+1000]; + [self drawDashLine:emptyView lineLength:2 lineSpacing:1 lineColor:[UIColor redColor]]; + } + }else{ + UIView *lineView = [self viewWithTag:[vo.heaterGatheringTime integerValue]+1000]; + if([vo.heaterPh integerValue]==Normal_heaterPh&&[nextVo.heaterPh integerValue]==Normal_heaterPh){//正常流量 + lineView.layer.backgroundColor = [UIColor greenColor].CGColor; + + }else{ + [self drawDashLine:lineView lineLength:2 lineSpacing:1 lineColor:[UIColor redColor]]; + } + } + } +} -(void)drawLine{ UIColor *color = [UIColor redColor]; [color set]; //设置线条颜色 @@ -143,9 +111,6 @@ path.lineCapStyle = kCGLineCapRound; //线条拐角 path.lineJoinStyle = kCGLineJoinRound; //终点处理 - - - // Draw the lines for (int i=0; i - + - + @@ -21,7 +21,7 @@ - + - - + + - + - + diff --git a/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m b/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m index c305a45..aba61c9 100644 --- a/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m +++ b/Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m @@ -79,11 +79,9 @@ //[weakSelf.view addSubview:imgAdView]; //防止透明导航遮挡 跳过按钮 [[UIApplication sharedApplication].delegate.window addSubview:imgAdView]; - //设置广告的类型 - imgAdView.getLBlaunchImageAdViewType(LogoAdType); + imgAdView.getLBlaunchImageAdViewType(FullScreenAdType); //设置本地启动图片 - //imgAdView.localAdImgName = @"Ifishlaunch_adView.jpg"; imgAdView.imgUrl = weakSelf.imgUrl; //自定义跳过按钮 diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishMainInfoCell.h b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishMainInfoCell.h new file mode 100644 index 0000000..2dfe166 --- /dev/null +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishMainInfoCell.h @@ -0,0 +1,17 @@ +// +// IfishMainInfoCell.h +// Ifish +// +// Created by wbzhan on 2019/8/23. +// Copyright © 2019 lianlian. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface IfishMainInfoCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishMainInfoCell.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishMainInfoCell.m new file mode 100644 index 0000000..2920318 --- /dev/null +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishMainInfoCell.m @@ -0,0 +1,175 @@ +// +// IfishMainInfoCell.m +// Ifish +// +// Created by wbzhan on 2019/8/23. +// Copyright © 2019 lianlian. All rights reserved. +// + +#import "IfishMainInfoCell.h" +@interface IfishMainInfoCell() +Strong UIImageView *iconImage; +Strong UILabel *titleLabel; +Strong UILabel *subTitle; +Strong UIImageView *watchImage;//查看数 +Strong UILabel *watchLabel; +Strong UIImageView *favImage;//收藏数 +Strong UILabel *favLabel; +Strong UIView *sepLine; +@end +@implementation IfishMainInfoCell +-(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; + if (self) { + + [self.contentView addSubview:self.sepLine]; + + [self.contentView addSubview:self.iconImage]; + + [self.contentView addSubview:self.titleLabel]; + + [self.contentView addSubview:self.subTitle]; + + [self.contentView addSubview:self.watchImage]; + + [self.contentView addSubview:self.watchLabel]; + + [self.contentView addSubview:self.favImage]; + + [self.contentView addSubview:self.favLabel]; + + [self.contentView addSubview:self.sepLine]; + } + return self; +} +- (UIView *)sepLine{ + if (!_sepLine) { + _sepLine = InitObject(UIView); + _sepLine.backgroundColor = RGB(222, 222, 222); + } + return _sepLine; +} +-(UIImageView *)iconImage{ + if (!_iconImage) { + _iconImage = InitObject(UIImageView); + _iconImage.contentMode = UIViewContentModeScaleAspectFill; + _iconImage.clipsToBounds = YES; + } + return _iconImage; +} +-(UILabel *)titleLabel{ + if (!_titleLabel) { + _titleLabel= InitObject(UILabel); + _titleLabel.font = FontSize(15); + _titleLabel.textColor=RGB(51, 51, 51); + } + return _titleLabel; +} +-(UIImageView *)watchImage{ + if (!_watchImage) { + _watchImage = InitObject(UIImageView); + [_watchImage setImage:IMAGEBYENAME(@"icons_watch")]; + } + return _watchImage; +} +-(UILabel *)watchLabel{ + if (!_watchLabel) { + _watchLabel= InitObject(UILabel); + _watchLabel.font = FontSize(11); + _watchLabel.textColor=RGB(153, 153, 153); + _watchLabel.textAlignment = NSTextAlignmentCenter; + } + return _watchLabel; +} +-(UIImageView *)favImage{ + if (!_favImage) { + _favImage = InitObject(UIImageView); + [_favImage setImage:IMAGEBYENAME(@"icons_fav")]; + + } + return _favImage; +} +-(UILabel *)favLabel{ + if (!_favLabel) { + _favLabel= InitObject(UILabel); + _favLabel.font = FontSize(11); + _favLabel.textColor=RGB(153, 153, 153); + _favLabel.textAlignment = NSTextAlignmentCenter; + } + return _favLabel; +} +-(void)loadLayout{ + + [self.sepLine mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.width.mas_equalTo(self.contentView); + make.height.mas_equalTo(ONE_PIXEL_SIZE); + }]; + + [self.iconImage mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(15); + make.height.mas_equalTo(75); + make.left.mas_equalTo(23); + make.width.mas_equalTo(89); + }]; + + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.iconImage.mas_right).offset(9); + make.top.mas_equalTo(self.iconImage); + make.right.mas_equalTo(15); + }]; + + + [self.watchImage mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.mas_equalTo(self.mas_bottom); + make.right.mas_equalTo(self.favImage.mas_left).offset(-kSizeFrom750(30)); + make.width.mas_equalTo(kSizeFrom750(24)); + make.height.mas_equalTo(kSizeFrom750(14)); + }]; + + [self.watchLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.mas_equalTo(self.watchImage.mas_centerY); + make.height.mas_equalTo(kSizeFrom750(14)); + make.left.mas_equalTo(self.watchImage.mas_centerX); + make.width.mas_greaterThanOrEqualTo(kSizeFrom750(14)); + }]; + + [self.favImage mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.mas_equalTo(self.watchImage); + make.width.mas_equalTo(kSizeFrom750(22)); + make.height.mas_equalTo(kSizeFrom750(20)); + make.right.mas_equalTo(-kSizeFrom750(35)); + }]; + + [self.favLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.height.mas_equalTo(self.watchLabel); + make.left.mas_equalTo(self.favImage.mas_centerX); + make.width.mas_greaterThanOrEqualTo(kSizeFrom750(14)); + }]; + +} +// +//-(void)loadInfoWithModel:(GoodsModel *)model{ +// +// NSString *soldTxt = [NSString stringWithFormat:@"已销售%@件",model.sales_num]; +// +// NSMutableAttributedString *priceAttr = [CommonUtils diffierentFontWithString:soldTxt rang:[soldTxt rangeOfString:model.sales_num] font:self.soldLabel.font color:Color_Pink spacingBeforeValue:0 lineSpace:0]; +// [self.soldLabel setAttributedText:priceAttr]; +// if ([model.collection_num integerValue]>1000) { +// model.collection_num = @"999+"; +// } +// if ([model.click integerValue]>1000) { +// model.click = @"999+"; +// } +// self.favLabel.text = [NSString stringWithFormat:@" %@ ",model.collection_num]; +// self.watchLabel.text = [NSString stringWithFormat:@" %@ ",model.click]; +// self.titleLabel.text = model.title; +// [self.iconImage setImageWithString:model.img_url]; +//} +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +@end diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index 3f08838..2781990 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -41,6 +41,8 @@ #import "RunSunChangeNameViewController.h" #import "IfishMessageViewController.h" #import "PushMessageModel.h" +#import "IfishInformationListViewCell.h"//资讯 +#import "JHRefresh.h"//refresh @interface IfishDeviceViewController () @property(nonatomic,strong)UITableView *tableView; @@ -56,9 +58,6 @@ @property(nonatomic,strong) UIView *tabHeaderImgView; @property(nonatomic,strong) UIImageView *userImgView; @property(nonatomic,strong) UILabel *userNameLabel; -@property(nonatomic,strong) UIButton *newsButton; -@property(nonatomic,strong) UIView *newsRedPoint; -@property(nonatomic,strong) UILabel *newsLabel; @property(nonatomic,strong) UIView *orangeView; @property(nonatomic,strong) UIButton *qianDaoBtn; @property(nonatomic,strong) UIView *qianDaoRedPoint; @@ -78,6 +77,12 @@ @property (nonatomic,strong) UILabel *mesglabel; @property(nonatomic,assign)NSInteger curDeviceIdx; Assign NSInteger messageCount;//消息个数 +Assign BOOL isLoadMore; +Assign BOOL isPush; +@property (nonatomic,strong) NSMutableArray *listDataArr; +@property(nonatomic,copy) NSString* total; +@property(nonatomic) int page; +@property(nonatomic) NSIndexPath *didSelectIndexPath; //@property (nonatomic,strong) UIView *redView; @end @@ -85,8 +90,9 @@ Assign NSInteger messageCount;//消息个数 - (void)viewDidLoad { - [super viewDidLoad]; - self.messageCount = 0; + [super viewDidLoad]; + self.messageCount = 0; + self.isPush = NO; // Do any additional setup after loading the view. //self.view.backgroundColor = []; _adViewData = [[NSMutableArray alloc] init]; @@ -99,6 +105,7 @@ Assign NSInteger messageCount;//消息个数 [self showProgress]; [self addDataRequestQueue]; [self checkNotification]; + [self creatReatRefreshView];//上拉加载更多 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(deleteCurDevice) name:@"DeleteCurDevice" object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateDevice) name:@"updateDevice" object:nil]; } @@ -121,7 +128,7 @@ Assign NSInteger messageCount;//消息个数 dispatch_async(dispatch_get_main_queue(), ^{ [self getMoreUserData]; [self initBannerData]; - [self loadGoodsData]; + [self loadDataWith:0 pageSize:10 isRefres:NO]; }); } @@ -196,7 +203,74 @@ Assign NSInteger messageCount;//消息个数 }]; } - +#pragma mark --资讯相关 +//获取资讯列表数据 +-(void)loadDataWith:(NSInteger)firstResult pageSize:(NSInteger)pageSize isRefres:(BOOL)isRefresh +{ + + __weak typeof (self)weakSelf = self; + NSString *userId= [dataContorl dataControlGetUserIdInfo]; + [AFHttpTool ifishGetInformations:firstResult pageSize:pageSize userId:userId success:^(id response) { + NSDictionary *reDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; + NSString *result=reDic[@"result"]; + _total = reDic[@"total"]; + if ([result isEqualToString:@"100"]) { + NSArray *dataarr =reDic[@"data"]; + for (NSDictionary *dic in dataarr) { + IfishInformations *info =[[IfishInformations alloc] initWithDict:dic]; + [self.listDataArr addObject:info]; + //[[IfishDatabaseManager sharedManager] insertIfishInformations:model]; + } + NSIndexSet *indexSet=[[NSIndexSet alloc]initWithIndex:2]; + [weakSelf.tableView reloadSections:indexSet withRowAnimation:UITableViewRowAnimationNone]; + } + [weakSelf endRefreshing]; + } failure:^(NSError *err) { + [weakSelf endRefreshing]; + }]; + +} +-(void)creatReatRefreshView{ + __weak typeof (self)weakSelf=self; + //上拉加载更多 + [weakSelf.tableView addRefreshFooterViewWithAniViewClass:[JHRefreshCommonAniView class] beginRefresh:^{ + if (weakSelf.isLoadMore) { + return ; + } + weakSelf.isLoadMore=YES; + NSInteger pagecount =[self.total integerValue]/10+1; + if (weakSelf.page= oldId.intValue) { + [IfishUserDefaultHelper saveinfoId:infoIdstr]; + } + + self.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:webVC animated:YES]; + self.hidesBottomBarWhenPushed = NO; }else if (indexPath.section == 1) { @@ -1326,10 +1354,7 @@ Assign NSInteger messageCount;//消息个数 #pragma mark - 删除设备 -(void)delectTankWith:(FormatTankAddCamera*)deviceListModel AtIndexPath:(NSIndexPath *)indexPath - { - - AFHTTPRequestOperationManager*mannager=[AFHTTPRequestOperationManager manager]; mannager.responseSerializer=[AFHTTPResponseSerializer serializer]; NSMutableDictionary * para = [NSMutableDictionary dictionary]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index 9b7c53c..f2f618a 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -294,18 +294,20 @@ Strong UIImage *screenShotImage;//截图 _isconnecting = YES;//正在连接中 [[GWP2PClient sharedClient] getMultipleDeviceStatusWithDeviceID:self.contact.cameraId password:self.contact.cameraPass completionBlock:^(GWP2PClient *client, BOOL success, NSDictionary *dataDictionary) { _isconnecting = NO; - //获取成功，打印设备信息，之后连接设备 + //获取设备信息，无论是否成功，都直接连接摄像头add V5.0.0 if (success) { _isConnectCamera = YES; [self monitorP2PCall]; NSLog(@"当前连接设备信息：%@",dataDictionary); }else{ - _isConnectCamera = NO; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.view makeToast:@"连接设备失败"]; - [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:NO]; - }); - return; + _isConnectCamera = YES; + [self monitorP2PCall]; +// _isConnectCamera = NO; +// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ +// [self.view makeToast:@"连接设备失败"]; +// [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:NO]; +// }); +// return; } }]; }else{ diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h index 2332867..eecb704 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h @@ -60,6 +60,9 @@ #define kSizeFrom750(x) ((x) * ([UIScreen mainScreen].bounds.size.width/750.f)) #define SYSTEMSIZE(x) [UIFont systemFontOfSize:kSizeFrom750(x)] + +#define FontSize(x) [UIFont systemFontOfSize:x] + //设置图片 #define IMAGEBYENAME(name) [UIImage imageNamed:name] //alloc diff --git a/Ifish/views/setViewCell/SetTimeCell.h b/Ifish/views/setViewCell/SetTimeCell.h index 7f89f54..8882777 100644 --- a/Ifish/views/setViewCell/SetTimeCell.h +++ b/Ifish/views/setViewCell/SetTimeCell.h @@ -22,8 +22,7 @@ -(void)setSixTimercellBackAtIndext:(NSIndexPath *)indexPath; //炫多 - --(void)setTuToSetCellBackAtIndex:(NSIndexPath *)indexPath; +-(void)setTuToSetCellBackAtIndex:(NSIndexPath *)indexPath andName1:(NSString *)name1 andName2:(NSString *)name2 andName3:(NSString *)name3; //四定时器 -(void)SetFourTimerBackAtIndex:(NSIndexPath *)indexPath; diff --git a/Ifish/views/setViewCell/SetTimeCell.m b/Ifish/views/setViewCell/SetTimeCell.m index ad0ef59..2a8dda1 100644 --- a/Ifish/views/setViewCell/SetTimeCell.m +++ b/Ifish/views/setViewCell/SetTimeCell.m @@ -56,15 +56,11 @@ }else if (indexPath.section ==3 && indexPath.row ==1){ [self.setHeaderBtn setImage:[UIImage imageNamed:@""] forState:UIControlStateNormal]; [self.setHeaderBtn setTitle:@"UV/冲浪" forState:UIControlStateNormal]; - } - - - } //绚多 设置界面 cell --(void)setTuToSetCellBackAtIndex:(NSIndexPath *)indexPath{ +-(void)setTuToSetCellBackAtIndex:(NSIndexPath *)indexPath andName1:(NSString *)name1 andName2:(NSString *)name2 andName3:(NSString *)name3{ if (indexPath.row ==0) { //每区第一个cell背景图片 @@ -82,7 +78,7 @@ [self.setHeaderBtn setTitle:@"" forState:UIControlStateNormal]; }else if (indexPath.section ==1 && indexPath.row ==1){ [self.setHeaderBtn setImage:[UIImage imageNamed:@""] forState:UIControlStateNormal]; - [self.setHeaderBtn setTitle:@"气泵" forState:UIControlStateNormal]; + [self.setHeaderBtn setTitle:IsEmptyStr(name1)?@"气泵":name1 forState:UIControlStateNormal]; }else if (indexPath.section ==2 && indexPath.row ==0){ [self.setHeaderBtn setBackgroundImage:[UIImage imageNamed:@"set_lightoff"] forState:UIControlStateNormal]; [self.setHeaderBtn setTitle:@"" forState:UIControlStateNormal]; @@ -91,7 +87,7 @@ [self .setHeaderBtn setImage:[UIImage imageNamed:@""] forState:UIControlStateNormal]; - [self.setHeaderBtn setTitle:@"灯1" forState:UIControlStateNormal]; + [self.setHeaderBtn setTitle:IsEmptyStr(name2)?@"灯1":name2 forState:UIControlStateNormal]; }else if (indexPath.section ==3 && indexPath.row ==0){ @@ -100,7 +96,7 @@ }else if (indexPath.section ==3 && indexPath.row ==1){ [self.setHeaderBtn setImage:[UIImage imageNamed:@""] forState:UIControlStateNormal]; - [self.setHeaderBtn setTitle:@"灯2" forState:UIControlStateNormal]; + [self.setHeaderBtn setTitle:IsEmptyStr(name1)?@"灯2":name3 forState:UIControlStateNormal]; }