diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index d6df8fd..d8b19fb 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2255,6 +2255,9 @@ 88F740C01ECC28E800876AED /* ShopAddGoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */; }; C017B1E2245ED2D4003151DF /* UIImage+WaterMark.h in Headers */ = {isa = PBXBuildFile; fileRef = C017B1E0245ED2D3003151DF /* UIImage+WaterMark.h */; }; C017B1E3245ED2D4003151DF /* UIImage+WaterMark.m in Sources */ = {isa = PBXBuildFile; fileRef = C017B1E1245ED2D4003151DF /* UIImage+WaterMark.m */; }; + C01B9888282F50E8004FF42D /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = C01B9886282F50E8004FF42D /* UIView+Frame.m */; }; + C01B9889282F50E8004FF42D /* UIView+Frame.h in Headers */ = {isa = PBXBuildFile; fileRef = C01B9887282F50E8004FF42D /* UIView+Frame.h */; }; + C01B988B282F802E004FF42D /* arrow_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C01B988A282F802E004FF42D /* arrow_right@2x.png */; }; C024B79E2379668B00509424 /* NSArray+AvoidCrash.m in Sources */ = {isa = PBXBuildFile; fileRef = C024B78A2379668B00509424 /* NSArray+AvoidCrash.m */; }; C024B79F2379668B00509424 /* AvoidCrash.h in Headers */ = {isa = PBXBuildFile; fileRef = C024B78B2379668B00509424 /* AvoidCrash.h */; }; C024B7A02379668B00509424 /* NSString+AvoidCrash.m in Sources */ = {isa = PBXBuildFile; fileRef = C024B78C2379668B00509424 /* NSString+AvoidCrash.m */; }; @@ -2299,7 +2302,6 @@ C0837A57244FF5510034FEC5 /* EGOCache.m in Sources */ = {isa = PBXBuildFile; fileRef = C0837A55244FF5500034FEC5 /* EGOCache.m */; }; C0837A58244FF5510034FEC5 /* EGOCache.h in Headers */ = {isa = PBXBuildFile; fileRef = C0837A56244FF5500034FEC5 /* EGOCache.h */; }; C089767E281BCB3A0098B5FA /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C089767D281BCB3A0098B5FA /* NetworkExtension.framework */; }; - C08976AC282110280098B5FA /* arrow_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AB282110280098B5FA /* arrow_right@2x.png */; }; C08976B0282117930098B5FA /* 矩形.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AD282117920098B5FA /* 矩形.png */; }; C08976B1282117930098B5FA /* 矩形@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AE282117920098B5FA /* 矩形@2x.png */; }; C08976B2282117930098B5FA /* 矩形@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AF282117930098B5FA /* 矩形@3x.png */; }; @@ -5753,6 +5755,9 @@ 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopAddGoodsViewController.m; sourceTree = ""; }; C017B1E0245ED2D3003151DF /* UIImage+WaterMark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+WaterMark.h"; sourceTree = ""; }; C017B1E1245ED2D4003151DF /* UIImage+WaterMark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+WaterMark.m"; sourceTree = ""; }; + C01B9886282F50E8004FF42D /* UIView+Frame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Frame.m"; sourceTree = ""; }; + C01B9887282F50E8004FF42D /* UIView+Frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Frame.h"; sourceTree = ""; }; + C01B988A282F802E004FF42D /* arrow_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arrow_right@2x.png"; sourceTree = ""; }; C024B78A2379668B00509424 /* NSArray+AvoidCrash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+AvoidCrash.m"; sourceTree = ""; }; C024B78B2379668B00509424 /* AvoidCrash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AvoidCrash.h; sourceTree = ""; }; C024B78C2379668B00509424 /* NSString+AvoidCrash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+AvoidCrash.m"; sourceTree = ""; }; @@ -5797,7 +5802,6 @@ C0837A55244FF5500034FEC5 /* EGOCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EGOCache.m; sourceTree = ""; }; C0837A56244FF5500034FEC5 /* EGOCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EGOCache.h; sourceTree = ""; }; C089767D281BCB3A0098B5FA /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; }; - C08976AB282110280098B5FA /* arrow_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrow_right@2x.png"; path = "../../../../../arrow_right@2x.png"; sourceTree = ""; }; C08976AD282117920098B5FA /* 矩形.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "矩形.png"; sourceTree = ""; }; C08976AE282117920098B5FA /* 矩形@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "矩形@2x.png"; sourceTree = ""; }; C08976AF282117930098B5FA /* 矩形@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "矩形@3x.png"; sourceTree = ""; }; @@ -9022,9 +9026,9 @@ 882955A01DBDA3A100E9DDD7 /* ifishSetCell_back.png */, FA08931D2275FCF10084A609 /* light_big@2x.png */, FA0893092275DD770084A609 /* shajun_big@2x.png */, - C08976AB282110280098B5FA /* arrow_right@2x.png */, 882955A11DBDA3A100E9DDD7 /* secondSetCell.png */, 882955A21DBDA3A100E9DDD7 /* set_cellBack.png */, + C01B988A282F802E004FF42D /* arrow_right@2x.png */, C08976AD282117920098B5FA /* 矩形.png */, C08976AE282117920098B5FA /* 矩形@2x.png */, C08976AF282117930098B5FA /* 矩形@3x.png */, @@ -12413,6 +12417,8 @@ C0C4CCFE272CDF4A00574BE8 /* UIViewController+Navgation.h */, C0C4CCFD272CDF4A00574BE8 /* UIViewController+Navgation.m */, C017B1E0245ED2D3003151DF /* UIImage+WaterMark.h */, + C01B9887282F50E8004FF42D /* UIView+Frame.h */, + C01B9886282F50E8004FF42D /* UIView+Frame.m */, C017B1E1245ED2D4003151DF /* UIImage+WaterMark.m */, C057166A282376CC004F113A /* UIButton+ImageTitleStyle.h */, C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */, @@ -13107,6 +13113,7 @@ CB484E0A22B8C8C80075F050 /* avstring.h in Headers */, 3D1C50DD221A9EE00096AE43 /* RecommendInfoDAO.h in Headers */, CB0F4E8722951A130091C76D /* SVIndefiniteAnimatedView.h in Headers */, + C01B9889282F50E8004FF42D /* UIView+Frame.h in Headers */, 3D1C5090221A9EDF0096AE43 /* AccountResult.h in Headers */, CB484E1822B8C8C90075F050 /* old_codec_ids.h in Headers */, 2AC8750D26874F7500B6161C /* ESPTouchGenerator.h in Headers */, @@ -13639,7 +13646,6 @@ FAB3721322619DB70051E107 /* Xuanduo2fController.xib in Resources */, CB4820892334E99700A50C92 /* IQKeyboardManager.bundle in Resources */, 889C14F31EA7397B00470F50 /* personal_iocn_set.png in Resources */, - C08976AC282110280098B5FA /* arrow_right@2x.png in Resources */, 883E78ED1D48A5E50030E075 /* ConnectWifiViewController.xib in Resources */, 8807074B1DDD40B40076F65A /* P2PShareViewsec2Cell.xib in Resources */, 8869B3AD1E6967DF0010F099 /* levelUp_yashark@3x.png in Resources */, @@ -13819,6 +13825,7 @@ 883E788E1D48A5E50030E075 /* InfoViewNiChengCell.xib in Resources */, 886B80741D63112000E1B9B3 /* CertificationViewSecondCell.xib in Resources */, 882955EE1DBDA3A100E9DDD7 /* lightclose.png in Resources */, + C01B988B282F802E004FF42D /* arrow_right@2x.png in Resources */, 88C1B2D51DD1ADB600C2C99A /* live_navicon_look@3x.png in Resources */, 882957621DBDA3A300E9DDD7 /* ifisharrow_r@1x.png in Resources */, 886B80791D63114500E1B9B3 /* CertificationViewThirdCell.xib in Resources */, @@ -15155,6 +15162,7 @@ 88597ABC1E56BAF1003D0E5C /* PopView.m in Sources */, 3D8F64C12157530000F04BD3 /* IfishHistroyVo.m in Sources */, 880707F91DE3DF540076F65A /* MineKanKanRoomInfo.m in Sources */, + C01B9888282F50E8004FF42D /* UIView+Frame.m in Sources */, 881672221EA5DE2B00BEBF23 /* UMComBriefEditViewController.m in Sources */, 3D1C511C221A9EE00096AE43 /* IfishCameraModel.m in Sources */, 881672341EA5DE2B00BEBF23 /* UMComLikeButtonTableViewCell.m in Sources */, diff --git a/Ifish/Utinitys/.DS_Store b/Ifish/Utinitys/.DS_Store index 8510546..d79554d 100644 Binary files a/Ifish/Utinitys/.DS_Store and b/Ifish/Utinitys/.DS_Store differ diff --git a/Ifish/Utinitys/Category/UIView+Frame.h b/Ifish/Utinitys/Category/UIView+Frame.h new file mode 100644 index 0000000..58586a1 --- /dev/null +++ b/Ifish/Utinitys/Category/UIView+Frame.h @@ -0,0 +1,37 @@ +// +// UIView+Frame.h +// FWChat +// +// Created by Yang on 16/1/25. +// Copyright © 2016年 Yang. All rights reserved. +// + +#import + +@interface UIView (Frame) + +@property (nonatomic, assign) CGFloat x; +@property (nonatomic, assign) CGFloat y; + +@property (nonatomic, assign) CGPoint origin; +@property (nonatomic, assign) CGSize size; + +@property (nonatomic) CGFloat centerX; +@property (nonatomic) CGFloat centerY; + +@property (nonatomic) CGFloat top; +@property (nonatomic) CGFloat bottom; +@property (nonatomic) CGFloat right; +@property (nonatomic) CGFloat left; + +@property (nonatomic) CGFloat width; +@property (nonatomic) CGFloat height; + ++ (instancetype)viewFromXib; + +/** 设置锚点 */ +- (void)setAnchorPoint:(CGPoint)anchorPoint; +/** 设回默认锚点 */ +- (void)setDefaultAnchorPoint; + +@end diff --git a/Ifish/Utinitys/Category/UIView+Frame.m b/Ifish/Utinitys/Category/UIView+Frame.m new file mode 100644 index 0000000..863e345 --- /dev/null +++ b/Ifish/Utinitys/Category/UIView+Frame.m @@ -0,0 +1,173 @@ +// +// UIView+Frame.m +// FWChat +// +// Created by Yang on 16/1/25. +// Copyright © 2016年 Yang. All rights reserved. +// + +#import "UIView+Frame.h" + +@implementation UIView (Frame) + +- (CGFloat)x +{ + return self.frame.origin.x; +} + +- (void)setX:(CGFloat)x +{ + CGRect frame = self.frame; + frame.origin.x = x; + self.frame = frame; +} + +- (CGFloat)y +{ + return self.frame.origin.y; +} + +- (void)setY:(CGFloat)y +{ + CGRect frame = self.frame; + frame.origin.y = y; + self.frame = frame; +} + +#pragma mark - Shortcuts for the coords +- (CGFloat)top +{ + return self.frame.origin.y; +} + +- (void)setTop:(CGFloat)y +{ + CGRect frame = self.frame; + frame.origin.y = y; + self.frame = frame; +} + +- (CGFloat)right +{ + return self.frame.origin.x + self.frame.size.width; +} + +- (void)setRight:(CGFloat)right +{ + CGRect frame = self.frame; + frame.origin.x = right - self.frame.size.width; + self.frame = frame; +} + +- (CGFloat)bottom +{ + return self.frame.origin.y + self.frame.size.height; +} + +- (void)setBottom:(CGFloat)bottom +{ + CGRect frame = self.frame; + frame.origin.y = bottom - self.frame.size.height; + self.frame = frame; +} + +- (CGFloat)left +{ + return self.frame.origin.x; +} + +- (void)setLeft:(CGFloat)x +{ + CGRect frame = self.frame; + frame.origin.x = x; + self.frame = frame; +} + +- (CGFloat)width +{ + return self.frame.size.width; +} + +- (void)setWidth:(CGFloat)width +{ + CGRect frame = self.frame; + frame.size.width = width; + self.frame = frame; +} + +- (CGFloat)height +{ + return self.frame.size.height; +} + +- (void)setHeight:(CGFloat)height +{ + CGRect frame = self.frame; + frame.size.height = height; + self.frame = frame; +} + +#pragma mark - Shortcuts for frame properties +- (CGPoint)origin { + return self.frame.origin; +} + +- (void)setOrigin:(CGPoint)origin { + CGRect frame = self.frame; + frame.origin = origin; + self.frame = frame; +} + +- (CGSize)size { + return self.frame.size; +} + +- (void)setSize:(CGSize)size { + CGRect frame = self.frame; + frame.size = size; + self.frame = frame; +} + +#pragma mark - Shortcuts for positions +- (CGFloat)centerX { + return self.center.x; +} + +- (void)setCenterX:(CGFloat)centerX { + self.center = CGPointMake(centerX, self.center.y); +} + +- (CGFloat)centerY { + return self.center.y; +} + +- (void)setCenterY:(CGFloat)centerY { + self.center = CGPointMake(self.center.x, centerY); +} + ++ (instancetype)viewFromXib +{ + return [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self) owner:nil options:nil] lastObject]; +} + +- (void)setAnchorPoint:(CGPoint)anchorPoint +{ + CGPoint oldOrigin = self.frame.origin; + self.layer.anchorPoint = anchorPoint; + CGPoint newOrigin = self.frame.origin; + + CGPoint transition; + transition.x = newOrigin.x - oldOrigin.x; + transition.y = newOrigin.y - oldOrigin.y; + + self.center = CGPointMake (self.center.x - transition.x, self.center.y - transition.y); +} + +- (void)setDefaultAnchorPoint +{ + [self setAnchorPoint:CGPointMake(0.5f, 0.5f)]; +} + + + +@end diff --git a/Ifish/Utinitys/SocketSingleton/Socketsingleton.m b/Ifish/Utinitys/SocketSingleton/Socketsingleton.m index e63ebe7..cc4c0c2 100644 --- a/Ifish/Utinitys/SocketSingleton/Socketsingleton.m +++ b/Ifish/Utinitys/SocketSingleton/Socketsingleton.m @@ -104,7 +104,7 @@ #pragma mark soket错误断开 -(void)onSocket:(AsyncSocket *)sock willDisconnectWithError:(NSError *)err{ - NSLog(@"soket错误断开"); + NSLog(@"soket错误断开:%@",err); NSLog(@"存留数据%@",[sock unreadData]); if (self.communiteDelegate&&[self.communiteDelegate respondsToSelector:@selector(ifishSocket:willDisconnectWithError:)]) { [self.communiteDelegate ifishSocket:sock willDisconnectWithError:err]; @@ -135,7 +135,7 @@ [self.communiteDelegate ifishSocket:sock ifishSocketdidConnectToHost:host port:port]; } - NSLog(@"comm已经与服务器建立连接%d macAddress%@", self.clientSocket.isConnected,self.macAddress); + NSLog(@"服务器建立连接%d macAddress%@", self.clientSocket.isConnected,self.macAddress); @@ -172,7 +172,7 @@ NSString*string1=[dataContorl dataToHexString:data]; NSString*string2=[string1 substringWithRange:NSMakeRange(30, 2)]; if ([string2 isEqualToString:@"01"]&&string1.length==52) { - NSLog(@"app登录成功"); + // 查询 // AppDelegate*delegate=[[UIApplication sharedApplication]delegate]; @@ -180,6 +180,7 @@ [self getDeviceInfo]; if (self.communiteDelegate) { + NSLog(@"登录"); [self.communiteDelegate ifishDeviceLogInSuccees]; } @@ -190,6 +191,7 @@ // [delegate.window makeToast:@"设备已离线"]; if (self.communiteDelegate) { + NSLog(@"离线"); [self.communiteDelegate ifishDeviceLogInFail]; } @@ -203,7 +205,7 @@ } - NSLog(@"登陆成功后收到服务器的回执--->%@",data); + NSLog(@"readData--->%@",data); } @@ -252,7 +254,7 @@ -(void)soketWriteData:(NSData *)data{ [ self.clientSocket writeData:data withTimeout:-1 tag:0]; - NSLog(@"manulData:%@",data); + NSLog(@"sendData:%@",data); [self.clientSocket readDataWithTimeout:-1 tag:0];// 会出现接受服务器心跳包粘包问题 //[ self.singletonSocket.clientSocket readDataToLength:99 withTimeout:-1 tag:0];// 防止心跳包粘包 diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib index 601e14d..6e3d0a8 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib @@ -1,9 +1,9 @@ - + - + diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/TimerTypeTableViewCell.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/TimerTypeTableViewCell.h index 8ffae0a..c1c2abb 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/TimerTypeTableViewCell.h +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/TimerTypeTableViewCell.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @class TimerTypeTableViewCell; @protocol TimerTypeTableViewCellDelegate --(void)clickCell:(TimerTypeTableViewCell*)cell button:(UIButton*)button timerType:(NSInteger*)type; +-(void)clickCell:(TimerTypeTableViewCell*)cell button:(UIButton*)button timerType:(NSInteger)type; @end @interface TimerTypeTableViewCell : UITableViewCell diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m index 20db4fb..3ed49c1 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m @@ -55,11 +55,12 @@ xuanduoModel.waterTemperature = [dataString substringWithRange:NSMakeRange(60, 4)]; xuanduoModel.heatingTemperature = [dataString substringWithRange:NSMakeRange(64, 4)]; xuanduoModel.huliLight = [dataString substringWithRange:NSMakeRange(68, 2)]; - xuanduoModel.fishFeed = [dataString substringWithRange:NSMakeRange(70, 2)]; + xuanduoModel.fishFeedOrder = [dataString substringWithRange:NSMakeRange(70, 2)]; xuanduoModel.powerRating = [dataString substringWithRange:NSMakeRange(72, 4)]; xuanduoModel.alarmSwitch = [dataString substringWithRange:NSMakeRange(76, 2)]; xuanduoModel.miniTemp = [dataString substringWithRange:NSMakeRange(78, 4)]; xuanduoModel.maxTemp = [dataString substringWithRange:NSMakeRange(82, 4)]; + xuanduoModel.fishFeedStatus = [dataString substringWithRange:NSMakeRange(86, 2)]; } else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]&&[model isKindOfClass:[Xuanduo3fModel class]]&&dataString.length>67) diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2Model.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2Model.h index 09ef9ce..c764454 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2Model.h +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2Model.h @@ -67,13 +67,18 @@ bfec crc16校验码 /// 最高温 @property (nonatomic, strong) NSString *maxTemp; @property (nonatomic, strong) NSString *waterLevel;//水位报警开关 -/// 一键喂鱼 4 5 f有 -@property (nonatomic, strong) NSString *fishFeed; +/// 一键喂鱼 4 5 f有 一键喂鱼0 关，1开（背光）手机到设备 +/// 设置值 发送指令 打开或者关闭 注意发送指定和接受状态不是一个字段 +@property (nonatomic, strong) NSString *fishFeedOrder; +/// 4 5 f有 一键喂鱼0 关，1开（湿度）设备到手机 +/// 接受值 这个值会变化，喂鱼结束则为0 开启1 只接受状态 +@property (nonatomic, strong) NSString *fishFeedStatus; /// 功率 4 5 f有 @property (nonatomic, strong) NSString *powerRating; + @end NS_ASSUME_NONNULL_END diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.m index 9c1683b..2c34ab7 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.m @@ -25,7 +25,7 @@ self.userInteractionEnabled=YES; [self.statusBtn setTitle:@"关闭" forState:UIControlStateNormal]; - [self.statusBtn setTitle:@"打开" forState:UIControlStateNormal]; + [self.statusBtn setTitle:@"打开" forState:UIControlStateSelected]; } - (void)configWithImageName:(NSString *)name labelName:(NSString *)labelName { diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.xib index f913ecd..7680351 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.xib +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.xib @@ -24,7 +24,7 @@