From 77016f37a4b3dafc4987fce78732b9916755295b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Sat, 13 Aug 2022 13:52:48 +0800 Subject: [PATCH] =?UTF-8?q?UI=E8=B0=83=E6=95=B4=EF=BC=8C=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E5=85=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XuTo/XuanduoSettingController.h | 2 +- .../XuTo/XuanduofishFeedViewController.m | 4 +++ .../IfishP2PMonitorController.m | 25 ++++++++++++++---- .../BootomViewSoketBackMasgConreol.m | 2 +- .../yooseFishTankView/MonitorBootmView.m | 20 +++++++------- Ifish/ifishImgSouce/XuToImg/bottomRound.png | Bin 3697 -> 3697 bytes Ifish/ifishImgSouce/XuToImg/centerrect.png | Bin 2994 -> 2992 bytes Ifish/ifishImgSouce/XuToImg/topround.png | Bin 3640 -> 3633 bytes 8 files changed, 36 insertions(+), 17 deletions(-) diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h index 12f4930..a56ae5a 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h @@ -8,7 +8,7 @@ #import "FatherController.h" #import "IfishDeviceInfo.h" -#include "xuanduo3fModel.h" +//#include "xuanduo3fModel.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m index 7bfc0d2..bae49f8 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m @@ -539,6 +539,10 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell"; } [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; + if (section==7) + { + headerView.backImageView.image=[UIImage imageNamed:@"bottomRound"]; + } return headerView; } diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index 1785966..bb0bc1a 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -7,6 +7,7 @@ // #import "IfishP2PMonitorController.h" +#import "XuanduoSettingController.h" #import #import #import @@ -4073,11 +4074,25 @@ GWP2PCallErrorNotSupport, -(void)didselectXuanduo2SetttngWithData:(DeviceModel *)dmodel andBackModel:(Xuanduo2Model *)backmodel { - Xuanduo2SettingController *setVC = [[Xuanduo2SettingController alloc] init]; - setVC.currentdevice = dmodel; - setVC.dataModel = backmodel; - usleep(50*1000); - [self.navigationController pushViewController:setVC animated:YES]; + if ([dmodel.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[dmodel.type isEqualToString:DECICE_TYPE_XUANDUO5F]) + { + XuanduoSettingController *setVC = [[XuanduoSettingController alloc] init]; + setVC.currentdevice = dmodel; + setVC.dataModel = backmodel; + usleep(50*1000); + [self.navigationController pushViewController:setVC animated:YES]; + + } + else + { + Xuanduo2SettingController *setVC = [[Xuanduo2SettingController alloc] init]; + setVC.currentdevice = dmodel; + setVC.dataModel = backmodel; + usleep(50*1000); + [self.navigationController pushViewController:setVC animated:YES]; + + } + } //炫多 diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/BootomViewSoketBackMasgConreol.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/BootomViewSoketBackMasgConreol.m index 6b0a4ed..b3daf02 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/BootomViewSoketBackMasgConreol.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/BootomViewSoketBackMasgConreol.m @@ -90,7 +90,7 @@ //瑞美 str=[str substringWithRange:NSMakeRange(148,IFISH_TEMPERATURE_BYTE2)]; - }else if ([type isEqualToString:DECICE_TYPE_XUANDUO2F]){ + }else if ([type isEqualToString:DECICE_TYPE_XUANDUO2F]||[type isEqualToString:DECICE_TYPE_XUANDUO4F]||[type isEqualToString:DECICE_TYPE_XUANDUO5F]){ str=[str substringWithRange:NSMakeRange(60,IFISH_TEMPERATURE_BYTE2)]; } else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]){ diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m index c8e2fbc..a7c567a 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m @@ -618,7 +618,7 @@ } else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]) { return 3 + 5; - } else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ + } else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){ return 3 + self.device.controlAmount.integerValue + 1; } else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ @@ -704,7 +704,7 @@ withData:self.device addMassglength:self.dataLength]; - }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ + }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){ if (!_xuanduoBack) { [self makeToast:@"暂未连接"]; return; @@ -956,13 +956,13 @@ } [self makeToastActivity:CSToastPositionCenter]; - }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ + }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){ // 新绚多 if (!_xuanduoBack) { [self makeToast:@"暂未连接"]; return; } - if (indexPath.row == 10 || (indexPath.row == 3&&[self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F])) { + if (indexPath.row == 10 || (indexPath.row == 3&&([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]))) { //点击加热棒 [self.MonitorBottomDelegate selectXuanduo2Index:indexPath withBackModel:_xuanduoBack]; }else{ @@ -1151,7 +1151,7 @@ } UInt64 mac = 0; NSLog(@"%llu",mac); - if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]) { + if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]) { Xuanduo2Model*model=(Xuanduo2Model*)_xuanduoBack; mac=[dataContorl hexToTen:model.waterTemperature]; } @@ -1281,7 +1281,7 @@ [cell setSongNuoBDControBtnImg:self.btnImgArr addArr:self.btnOnImgArr atIndex:indexPath addBackModel:_songNuoBDBack]; - }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ + }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){ if (!_xuanduoBack) { cell.controBtnImg.image = self.btnImgArr[indexPath.row - 3]; [self makeToast:@"连接设备中..."]; @@ -1505,7 +1505,7 @@ LXImageWithImageName(@"bootview_co2_on"), LXImageWithImageName(@"bootview_heat_on")]; - }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ + }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){ self.btnNameArr = @[@"循环泵",@"增氧泵",@"灯光1",@"灯光2",@"造浪泵",@"杀菌灯",@"护理灯",@"加热棒"]; self.btnImgArr = @[[UIImage imageNamed:@"xunhuan_noraml"], @@ -1865,13 +1865,13 @@ addMassglength:string1.length]; - }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ + }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){ // 新绚多 if (!_xuanduoBack) { _xuanduoBack = [[Xuanduo2Model alloc] init]; } - [Xuanduo2DataUtility readSocketDataWithBackMsgModel:_xuanduoBack addWithBackData:data type:DECICE_TYPE_XUANDUO2F]; - self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_XUANDUO2F]; + [Xuanduo2DataUtility readSocketDataWithBackMsgModel:_xuanduoBack addWithBackData:data type:self.device.type]; + self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:self.device.type]; [self.collectionView reloadData]; }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ // 新绚多 diff --git a/Ifish/ifishImgSouce/XuToImg/bottomRound.png b/Ifish/ifishImgSouce/XuToImg/bottomRound.png index 45d0e0a08b96286275564f696b617fb3d02f0bb3..8f459a1fd27ee49dc63f15113d734a53e5f226fd 100644 GIT binary patch literal 3697 zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ7jQ5E$uth{r$CCaILO_JVcj{Imq3n7YJ_K+ zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DLx17BIuu3=2RCpLbqv0a|+7 z)5S5Qg7NKLd+%wv630Itch|~Vtq?VDVaI}nQj0P&FPLAv_nIRsBTrW<=bNfaz1Yfw znp2II_{QYR9Fi7%Z0T8`$<_Dy*UIg+bI#cGz20M|SGV)Og{iUeXaBE{@9r+Y8d%K2 zA)w&Uz`)4F!XZ=Kc=P7XPqP1_=b3mwgurr*6B+_I4@P+-gdAcWR$O`OBLveapdcV5 zprsg*%?US5U!bxkLDhH*emw^ra#BTZWe|TnYaPU}QEVj!j)kd!U-6`Zof?5_#I z?Ql5VBF1gIdbd+*b#--V>DK3;(vX@@7IjRz!cjV3?u3W0*ut%^qw^)^o(|kjMyBKb z3+#ofoS(kEy?yuY-N*f}$qFJo5Fnh3x*(ps};&+hK-{{6bf2@xg-;`J^t zElhP%cgkO}<@EXU=gZ{|Ss_5S&`J@7tR#{PK1&Kr0TlayQFgcS4jLEPZ_rtEaT{%jf0h^42YR=)6?6 zu)6y9+1cj0AvWweALM7WA{@}y;ZS|-`s3sM!c#Bh83<|R=2yo&{rmg-+Y8(C?#`Mu z%SvfVpCckF9rio?&fUMaYTsVHrL~v#znv}}v~W}T#&5TN>BsN8v$y*DlarJ8@7be| z)PgpMWP1C4sZG_Fj2qv7{EAeN)_Pm@*0%e$vlA$YYJPq?KmEHXlIztx7W{qt^V^~+ z>*Mz?J8uK*m`vVx?B2iG=J|FN9~SIA@h?H|xfa3$96TBuHf=I8H{ZTxi^+p?_t#kM z2)Jo|q*vPf-TnRb&(F<$`SRs`nbY-13AR9lrL4SMTwMJ5^XJp2Pv`$+!!D~;{k`nl z8(>%GX7%@XvAfIO9_bWjuROfY72)>-@~mZLWntmr;$mXAiuanCoB#jux4HiC!HqB0Kk3h#WXDnf>h5{E`njxgN@xNA8?X`% literal 3697 zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ7jQ5E$uth{r$CCaILO_JVcj{Imq3n7YJ_K+ zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DLx17BIuu3=2RCpLbqv0a|+7 z)5S5Qg7NKL+w7}1rH(y(EGWAr*fGa%VMoG3u|+o`RN@caJFl3Ln7caSh?Tr!O=gqW zN}ndTBYru~T%H_?MPkY=%*H%V?)^U3d2*_jmEHOJwc2O@oVa&#)-x;{Py#Ff9%Z4oV6kLZ-$L+rbJ$SX;cNUN3?= z2qYxLxNy>nnTl|W92RIPgsj>#O&DSK1P+d=E@yd=oEOTtFzD&lIY@T9IIK{~N&|Zn zBD#W$W2)Brr$~0IFgd9P8apF7FVta0NTsei!fpjY0j-ia%6^7F&{Q<2*??G6fj?FJ!cW@dbi zv$PQn8ifGSj>C#PQ_r3~`>Iw4sa5bmfaAzRfwoh(ZrxH0C}u@z9TZx$Ec^s)X<^Z! z5W;sb{JtonO(GM}_?K_0e*8X}0M6q|h*rmg10eJ3+*4CiRsT6Av$LIbL}(Jw;Oa?{ zcsRjUfoJO4wQH|lz4~V2G9+mWE+%D3H;WW=UguPsoWw-M>Lr>;F6?VMpmK6T`>EOH z`DJBgeNF4Fg%Ay^4dIP~+{%*QthWAs|2ZHsK0ZDs=1%MrVI=(=Z@79QBu;MleSB}- zr1n!4m;U_u6F2|)eWd1Dfe4FQPiv=BYGtKmo%sL2AGdZW!`o_&i!}|55|12GDW9(q za;!OiPle&h$7hk;Q1FB0*|TSAd#)^5`03%{cF%iC#t&ciA{&2!#Z5s+SJ$^KS=oqD)jSnILIe7o9R z1rHBBJw1JSk&ZV~1pL^`61T7B=bxXSGv`)v>HocDdup<}zg^v*9lzb@Bc-ka7Zx{; z9+?@BQkQ>|om#l;W7n4N@9)R&E_(~q8f>#D6sf5ylhPQd$uDPfGImWh(zAXVASr$Pd+5Er)#iLvpP!vg zKHeuA5x}mDNNx#2jUVg(J-++-ajoX#$)4Z-ynXY<`RVoKW7V(i>;Kg}KQ|ZX{(oTNC^z_c1Kd-N^?_c=Ve$B1@ z0Y6JSjMLAZId=}||L?D^u2%P(^P_$8Pk$tv{?xN>+rB+KJX~B%>{#~RYuB%T|7`GE zR%>_p@5lZ2$GQ)$i`n^UzPSU3a}92yuH znONfV3f`Z!|MPUIB9H?Ybz^c$WqGZGBoyngqQu&JRLN+#08`CqVgO~G(M$p^LPitA sXkviZ9HWV0G%<`OhS7%7;Hn$z7nQOySGxZ;1GSbtUHx3vIVCg!0K(WMqyPW_ literal 2994 zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ7jQ5E$uth{r$CCaILO_JVcj{Imq3n7YJ_K+ zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DLx17BIuu3=2RCpLbqvVPN2v z@pN$vsbGA2eIxH-0|6Gt+j9e3SDRg5z^Zr2U_ZOX&ARiJ^Pj)p_x`yuHxmnofPzB< z10xeloO(fQ_>a%}IX-Y9Aj3dZKr1-zI44XMhkyo?)6x|;5&TglpwJr)7jPhqCWg_( z04+~O3lB)SI$AP}mJFlS=V+T@v@Hd0W)5s|_=9=1E-N!j!AxOLd)d>~&t;ucLK6W0 C&rOQ} diff --git a/Ifish/ifishImgSouce/XuToImg/topround.png b/Ifish/ifishImgSouce/XuToImg/topround.png index f0cbc9b923ad9bc8502676559b638f963c3e4ea8..a9873934e8fc0760db88331b017814cbff2e271e 100644 GIT binary patch literal 3633 zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ7jQ5E$uth{r$CCaILO_JVcj{Imq3n7YJ_K+ zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DLx17BIuu3=2RCpLbqv0a`lS z)5S5Qg7NL$jagG8C0H+XDz>p4oZyrbq#?wUB;t5bsdd@r={K^J?HX?UU^3fQ_HAEt z*rL|CTwG086STtw1ylLN!o&_)*1!AvZB2-A^StVBw=~lxSO3?E*;({-{>@rlef{~i z)n&!S#gDIF|MlzFsZ*z3y?S-&(xo?gPp5JUC^$4QFfy@l{OM=eSO0(C{{8>IzP^5b zzWx8-uU{W-=g+^t@9(#_w|PXx(u_i`UAtCRUS3{Swr$(CoJo?`-Y-ScAGl!c^zZNQ z+t>g5b8~Zg{Jxr>kLS<)VlVe4;O4!1_io?bUGnnMqeqXH9F*~c*a))PVgG@CdHcA% zRbQW+oNS(d@5}se-_>RA1Xu!1IXm0@w)EbA|BC*pfE);QX|d9UdpzHMe0+R;eZ2gc zTE3(eTm0wU*;%}N@AcOSN|mArl`LvP8Sh!Dzq|`G32zk4HL%_y14rs?T`; zsp`jvhc7QLUv6<{CfsZm4w)qfPEJ-|AG`b8$H&M0=iB-I+I5+4>g((4@9!>OZ+k2I z5)Yp`G{AuFd2oP*Pu{NP>#M8ZrfevGf6w>(qF~;s-*ndR26A>3CMPB)?z(L~6CA!^ z=QlQsXZ)XB|MAh$$H)7(pTGJ4&(Gp6ZXctNJ~`W84-Ph;p04j-n4B&IixdF`1AeCE zesgyfJUj%HTmGY0`*FM1??|s`&Gd6~X0ltCBUCyhST!ae@7wzPmtF0zk{{`={r}EA*7I|7Z{NKuTdMvX8sQ*k z1q3eWZ8GC+yHj%}U}x#;YZGo;v>=7*C8ov84mK>@w0G~_d2?f;E4 zcFe7wK^-ZGCa41?c&6^j=j?=K6&8*&aS79$Q)_E$zcJ(?l5N9*Kb$3ft?TBmShHr$ z8Tk%rB=Zfb8_#V7Iy@{qJe~gm8*-YM@9;e0g_PDjUz_^-{CO^L_a^AESRHq|9x#)e zVLHO04hnt;0yf8$lRJq#N^vgPEweY2N+ ztqZrcs0hpIqhV{5lurHIupw@r{pY7=elOW{qo(-Y^N2T!GYend+M4~}=i}B*n~MJZ z`MGxO+OziY($dnaSFg^_&OUwmbnuanvsgF;6dW2D7@1hSxc~h5`T4!LatrE{{7pxvhwon+qdUV^3?ji2%-Joa))SrdHcGW zpP!y~i|g;J{r$~;fA)m`Id#sd>FMe9_5V*z)!uwFXTl3PC$N2Bix1SW)cyVS_1W3k z>F4L|t^S^8x89-yZ*E)_KpkR*>r;&TO2>a!bG2w)WSTx3{+|+x~x_ zd|X!R?OgTm@9t*rfBp6Q*FTL&ic1>5%}(&2XOsCpP4fMOn=6BtyH!>F)?I(RUw*!A zb=i{V)jDvK8JQ+?%(1Keb*xub~Qf?+zwP_Y z|Ns70-|%4Op9&0I`>HQ5UR_;%c-a>dm`8!`;#+=Trg6Gn>@JWkiT{sIRRmfP=@qT{ z{M=mYIZZ)=(0Buej6vIhPGR+1>3{6%|J59rznaG~ zP&foQL^BpI@NITH#BUICYyYbsA08f7c4w=&qM%;M0k;kmqFVwlEOV6R_#0o_PqD`@Z%+;zXnxjwRe%GB2<>{n!4*H**6y{j#-6Y*b7(jPMteOjT>nbG0PdG~C_+;xBZQ8YKRT9BfSFxNxaAmozNu7;KFINjDZxlqlGWHkQ}X*AQkC=R@eU- YH!NIg7cXw~4Ag7$boFyt=akR{06dK$nE(I)