root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复消息页面部分bug

This commit is contained in:
wbzhan 2019-05-27 16:41:39 +08:00
parent 25c051d5f1
commit 8e027e82c9
16 changed files with 355 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Ifish.xcodeproj/project.pbxproj
View File

@ -1732,8 +1732,6 @@
886537481E24B70400E3C87F /* explore_new_label@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 886537421E24B70400E3C87F /* explore_new_label@3x.png */; }; 886537481E24B70400E3C87F /* explore_new_label@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 886537421E24B70400E3C87F /* explore_new_label@3x.png */; };
88653C9B1E76691E00FF973E /* IfishInformationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88653C9A1E76691E00FF973E /* IfishInformationViewController.m */; }; 88653C9B1E76691E00FF973E /* IfishInformationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88653C9A1E76691E00FF973E /* IfishInformationViewController.m */; };
88653C9E1E76697000FF973E /* IfishInformations.m in Sources */ = {isa = PBXBuildFile; fileRef = 88653C9D1E76697000FF973E /* IfishInformations.m */; }; 88653C9E1E76697000FF973E /* IfishInformations.m in Sources */ = {isa = PBXBuildFile; fileRef = 88653C9D1E76697000FF973E /* IfishInformations.m */; };
88653CA21E7671F900FF973E /* MineHeaderNewItemsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88653CA01E7671F900FF973E /* MineHeaderNewItemsCell.m */; };
88653CA31E7671F900FF973E /* MineHeaderNewItemsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 88653CA11E7671F900FF973E /* MineHeaderNewItemsCell.xib */; };
88673AFC1E1E57CB001D5F49 /* RuSunGuiDeng.m in Sources */ = {isa = PBXBuildFile; fileRef = 88673AFB1E1E57CB001D5F49 /* RuSunGuiDeng.m */; }; 88673AFC1E1E57CB001D5F49 /* RuSunGuiDeng.m in Sources */ = {isa = PBXBuildFile; fileRef = 88673AFB1E1E57CB001D5F49 /* RuSunGuiDeng.m */; };
88673B041E1F6A4F001D5F49 /* SongNuoBDProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 88673B031E1F6A4F001D5F49 /* SongNuoBDProtocol.m */; }; 88673B041E1F6A4F001D5F49 /* SongNuoBDProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 88673B031E1F6A4F001D5F49 /* SongNuoBDProtocol.m */; };
88673B071E1F71DC001D5F49 /* SongNuoDBCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88673B061E1F71DC001D5F49 /* SongNuoDBCenterViewController.m */; }; 88673B071E1F71DC001D5F49 /* SongNuoDBCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88673B061E1F71DC001D5F49 /* SongNuoDBCenterViewController.m */; };
@ -4864,9 +4862,6 @@
88653C9A1E76691E00FF973E /* IfishInformationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishInformationViewController.m; sourceTree = "<group>"; }; 88653C9A1E76691E00FF973E /* IfishInformationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishInformationViewController.m; sourceTree = "<group>"; };
88653C9C1E76697000FF973E /* IfishInformations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IfishInformations.h; sourceTree = "<group>"; }; 88653C9C1E76697000FF973E /* IfishInformations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IfishInformations.h; sourceTree = "<group>"; };
88653C9D1E76697000FF973E /* IfishInformations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishInformations.m; sourceTree = "<group>"; }; 88653C9D1E76697000FF973E /* IfishInformations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishInformations.m; sourceTree = "<group>"; };
88653C9F1E7671F900FF973E /* MineHeaderNewItemsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineHeaderNewItemsCell.h; sourceTree = "<group>"; };
88653CA01E7671F900FF973E /* MineHeaderNewItemsCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineHeaderNewItemsCell.m; sourceTree = "<group>"; };
88653CA11E7671F900FF973E /* MineHeaderNewItemsCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MineHeaderNewItemsCell.xib; sourceTree = "<group>"; };
88673AF91E1E1C20001D5F49 /* IfishDeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishDeviceInfo.h; sourceTree = "<group>"; }; 88673AF91E1E1C20001D5F49 /* IfishDeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishDeviceInfo.h; sourceTree = "<group>"; };
88673AFA1E1E57CB001D5F49 /* RuSunGuiDeng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuSunGuiDeng.h; sourceTree = "<group>"; }; 88673AFA1E1E57CB001D5F49 /* RuSunGuiDeng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuSunGuiDeng.h; sourceTree = "<group>"; };
88673AFB1E1E57CB001D5F49 /* RuSunGuiDeng.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RuSunGuiDeng.m; sourceTree = "<group>"; }; 88673AFB1E1E57CB001D5F49 /* RuSunGuiDeng.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RuSunGuiDeng.m; sourceTree = "<group>"; };
@ -9767,9 +9762,6 @@
883E77091D48A5E50030E075 /* leftCell.h */, 883E77091D48A5E50030E075 /* leftCell.h */,
883E770A1D48A5E50030E075 /* leftCell.m */, 883E770A1D48A5E50030E075 /* leftCell.m */,
883E770B1D48A5E50030E075 /* leftCell.xib */, 883E770B1D48A5E50030E075 /* leftCell.xib */,
88653C9F1E7671F900FF973E /* MineHeaderNewItemsCell.h */,
88653CA01E7671F900FF973E /* MineHeaderNewItemsCell.m */,
88653CA11E7671F900FF973E /* MineHeaderNewItemsCell.xib */,
887AD4731E7F95B100009BF2 /* WodeUserAssetCell.h */, 887AD4731E7F95B100009BF2 /* WodeUserAssetCell.h */,
887AD4741E7F95B100009BF2 /* WodeUserAssetCell.m */, 887AD4741E7F95B100009BF2 /* WodeUserAssetCell.m */,
); );
@ -13241,7 +13233,6 @@
8814783F1E71398800BFB79C /* signin_popup_obtain.png in Resources */, 8814783F1E71398800BFB79C /* signin_popup_obtain.png in Resources */,
88C1B21E1DCC5A1400C2C99A /* personal_iocn_scan@2x.png in Resources */, 88C1B21E1DCC5A1400C2C99A /* personal_iocn_scan@2x.png in Resources */,
883517F51E6664D200FCBE56 /* fishrank_dragonking.png in Resources */, 883517F51E6664D200FCBE56 /* fishrank_dragonking.png in Resources */,
88653CA31E7671F900FF973E /* MineHeaderNewItemsCell.xib in Resources */,
883E78841D48A5E50030E075 /* ChangeModelDoneController.xib in Resources */, 883E78841D48A5E50030E075 /* ChangeModelDoneController.xib in Resources */,
88C1B2241DCC5A1400C2C99A /* replace_iocn_code@2x.png in Resources */, 88C1B2241DCC5A1400C2C99A /* replace_iocn_code@2x.png in Resources */,
882955E31DBDA3A100E9DDD7 /* ic_ifish.png in Resources */, 882955E31DBDA3A100E9DDD7 /* ic_ifish.png in Resources */,
@ -15119,7 +15110,6 @@
FA0892F62270BED00084A609 /* XuanduoHuliModel.m in Sources */, FA0892F62270BED00084A609 /* XuanduoHuliModel.m in Sources */,
3D1C5106221A9EE00096AE43 /* CameraNoParyBackVideoView.m in Sources */, 3D1C5106221A9EE00096AE43 /* CameraNoParyBackVideoView.m in Sources */,
881671AD1EA5DE2B00BEBF23 /* UMComUserListDataController.m in Sources */, 881671AD1EA5DE2B00BEBF23 /* UMComUserListDataController.m in Sources */,
88653CA21E7671F900FF973E /* MineHeaderNewItemsCell.m in Sources */,
3D1C513E221A9EE10096AE43 /* FishControlSecondCell.m in Sources */, 3D1C513E221A9EE10096AE43 /* FishControlSecondCell.m in Sources */,
88597ABF1E56BAF1003D0E5C /* WFCollectionViewCell.m in Sources */, 88597ABF1E56BAF1003D0E5C /* WFCollectionViewCell.m in Sources */,
881671ED1EA5DE2B00BEBF23 /* UMComEditTextView.m in Sources */, 881671ED1EA5DE2B00BEBF23 /* UMComEditTextView.m in Sources */,
@ -15476,6 +15466,21 @@
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
WARNING_CFLAGS = (
"-Wno-implicit-retain-self",
"-Wno-objc-missing-super-calls",
"-Wno-shorten-64-to-32",
"-Wno-enum-conversion",
"-Wno-deprecated-declarations",
"-Wno-strict-prototypes",
"-Wno-incomplete-umbrella",
"-Wno-incomplete-implementation",
"-Wno-nonnull",
"-Wno-deprecated-implementations",
"-Wno-incompatible-pointer-types-discards-qualifiers",
"-Wno-nullability-completeness",
"-Wno-format",
);
}; };
name = Debug; name = Debug;
}; };
@ -15588,6 +15593,21 @@
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
WARNING_CFLAGS = (
"-Wno-implicit-retain-self",
"-Wno-objc-missing-super-calls",
"-Wno-shorten-64-to-32",
"-Wno-enum-conversion",
"-Wno-deprecated-declarations",
"-Wno-strict-prototypes",
"-Wno-incomplete-umbrella",
"-Wno-incomplete-implementation",
"-Wno-nonnull",
"-Wno-deprecated-implementations",
"-Wno-incompatible-pointer-types-discards-qualifiers",
"-Wno-nullability-completeness",
"-Wno-format",
);
}; };
name = Release; name = Release;
}; };

10
Ifish/AppDelegate.m
View File

@ -124,6 +124,9 @@
+(AppDelegate *)sharedDefault{ +(AppDelegate *)sharedDefault{
dispatch_async(dispatch_get_main_queue(), ^{
});
return (AppDelegate *)[UIApplication sharedApplication].delegate; return (AppDelegate *)[UIApplication sharedApplication].delegate;
} }
@ -170,8 +173,6 @@
//短信验证 //短信验证
[SMSSDK registerApp:SMSSDK_APPKey withSecret:SMSSDK_APPSec]; [SMSSDK registerApp:SMSSDK_APPKey withSecret:SMSSDK_APPSec];
[SMSSDK enableAppContactFriends:NO]; [SMSSDK enableAppContactFriends:NO];
/** /**
* 注册APNS * 注册APNS
*/ */
@ -244,10 +245,11 @@
[self setUpSVProgressHUD]; [self setUpSVProgressHUD];
//设置友盟社会化组件appkey //设置友盟社会化组件appkey
//打开调试日志 //打开调试日志
[[UMSocialManager defaultManager] openLog:YES]; // if (DEBUG) {
// [[UMSocialManager defaultManager] openLog:YES];
// }
//设置友盟appkey //设置友盟appkey
[[UMSocialManager defaultManager] setUmSocialAppkey:UMSocial_APPKEY]; [[UMSocialManager defaultManager] setUmSocialAppkey:UMSocial_APPKEY];
//设置微信AppId、appSecret，分享url //设置微信AppId、appSecret，分享url
//设置微信的appKey和appSecret //设置微信的appKey和appSecret
[[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:@"wxb3b27d653ec3e3cb" appSecret:@"79d35215d7ef369b927f7cb21a2b8ff6" redirectURL:@"http://mobile.umeng.com/social"]; [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:@"wxb3b27d653ec3e3cb" appSecret:@"79d35215d7ef369b927f7cb21a2b8ff6" redirectURL:@"http://mobile.umeng.com/social"];

20
Ifish/Categorys/UIButton+button.h
View File

@ -7,19 +7,19 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
typedef NS_ENUM(NSInteger, ImagePosition) { //typedef NS_ENUM(NSInteger, ImagePosition) {
ImagePositionLeft = 0, // 图片在左，文字在右，默认 // ImagePositionLeft = 0, // 图片在左，文字在右，默认
ImagePositionRight, // 图片在右，文字在左 // ImagePositionRight, // 图片在右，文字在左
ImagePositionTop, // 图片在上，文字在下 // ImagePositionTop, // 图片在上，文字在下
ImagePositionBottom, // 图片在下，文字在上 // ImagePositionBottom, // 图片在下，文字在上
}; //};
#define defaultInterval 0.01//默认时间间隔 //#define defaultInterval 0.01//默认时间间隔
@interface UIButton (button) @interface UIButton (button)
/** /**
* 为按钮添加点击间隔 eventTimeInterval秒 * 为按钮添加点击间隔 eventTimeInterval秒
*/ */
@property(nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;//响应范围负值为扩大，正值为缩小 //@property(nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;//响应范围负值为扩大，正值为缩小
@property (nonatomic, assign) NSTimeInterval timeInterval; //@property (nonatomic, assign) NSTimeInterval timeInterval;
- (void)setImagePosition:(ImagePosition)postion spacing:(CGFloat)spacing;//设置图片与文字具体位置与间距 //- (void)setImagePosition:(ImagePosition)postion spacing:(CGFloat)spacing;//设置图片与文字具体位置与间距
@end @end

286
Ifish/Categorys/UIButton+button.m
View File

@ -10,15 +10,15 @@
#import <objc/runtime.h> #import <objc/runtime.h>
@interface UIButton() @interface UIButton()
@property (nonatomic, assign) BOOL isIgnoreEvent; // @property (nonatomic, assign) BOOL isIgnoreEvent;
@end @end
@implementation UIButton (button) @implementation UIButton (button)
@dynamic hitTestEdgeInsets; //@dynamic hitTestEdgeInsets;
static const NSString *KEY_HIT_TEST_EDGE_INSETS = @"HitTestEdgeInsets"; //static const NSString *KEY_HIT_TEST_EDGE_INSETS = @"HitTestEdgeInsets";
static const char *UIControl_timeInterval = "UIControl_timeInterval"; //static const char *UIControl_timeInterval = "UIControl_timeInterval";
static const char *UIControl_enventIsIgnoreEvent = "UIControl_enventIsIgnoreEvent"; //static const char *UIControl_enventIsIgnoreEvent = "UIControl_enventIsIgnoreEvent";
-(instancetype)init{ -(instancetype)init{
self = [super init]; self = [super init];
@ -31,142 +31,142 @@ static const char *UIControl_enventIsIgnoreEvent = "UIControl_enventIsIgnoreEven
[super setHighlighted:NO]; [super setHighlighted:NO];
} }
// runtime 动态绑定 属性 //// runtime 动态绑定 属性
- (void)setIsIgnoreEvent:(BOOL)isIgnoreEvent //- (void)setIsIgnoreEvent:(BOOL)isIgnoreEvent
{ //{
objc_setAssociatedObject(self, UIControl_enventIsIgnoreEvent, @(isIgnoreEvent), OBJC_ASSOCIATION_RETAIN_NONATOMIC); // objc_setAssociatedObject(self, UIControl_enventIsIgnoreEvent, @(isIgnoreEvent), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} //}
- (BOOL)isIgnoreEvent{ //- (BOOL)isIgnoreEvent{
return [objc_getAssociatedObject(self, UIControl_enventIsIgnoreEvent) boolValue]; // return [objc_getAssociatedObject(self, UIControl_enventIsIgnoreEvent) boolValue];
} //}
//
- (NSTimeInterval)timeInterval //- (NSTimeInterval)timeInterval
{ //{
return [objc_getAssociatedObject(self, UIControl_timeInterval) doubleValue]; // return [objc_getAssociatedObject(self, UIControl_timeInterval) doubleValue];
} //}
//
- (void)setTimeInterval:(NSTimeInterval)timeInterval //- (void)setTimeInterval:(NSTimeInterval)timeInterval
{ //{
objc_setAssociatedObject(self, UIControl_timeInterval, @(timeInterval), OBJC_ASSOCIATION_RETAIN_NONATOMIC); // objc_setAssociatedObject(self, UIControl_timeInterval, @(timeInterval), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} //}
//
+ (void)load //+ (void)load
{ //{
// Method Swizzling // // Method Swizzling
static dispatch_once_t onceToken; // static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ // dispatch_once(&onceToken, ^{
SEL selA = @selector(sendAction:to:forEvent:); // SEL selA = @selector(sendAction:to:forEvent:);
SEL selB = @selector(after_sendAction:to:forEvent:); // SEL selB = @selector(after_sendAction:to:forEvent:);
Method methodA = class_getInstanceMethod(self,selA); // Method methodA = class_getInstanceMethod(self,selA);
Method methodB = class_getInstanceMethod(self, selB); // Method methodB = class_getInstanceMethod(self, selB);
//
BOOL isAdd = class_addMethod(self, selA, method_getImplementation(methodB), method_getTypeEncoding(methodB)); // BOOL isAdd = class_addMethod(self, selA, method_getImplementation(methodB), method_getTypeEncoding(methodB));
//
if (isAdd) { // if (isAdd) {
class_replaceMethod(self, selB, method_getImplementation(methodA), method_getTypeEncoding(methodA)); // class_replaceMethod(self, selB, method_getImplementation(methodA), method_getTypeEncoding(methodA));
}else{ // }else{
//添加失败了 说明本类中有methodB的实现，此时只需要将methodA和methodB的IMP互换一下即可。 // //添加失败了 说明本类中有methodB的实现，此时只需要将methodA和methodB的IMP互换一下即可。
method_exchangeImplementations(methodA, methodB); // method_exchangeImplementations(methodA, methodB);
} // }
}); // });
} //}
//
- (void)after_sendAction:(SEL)action to:(id)target forEvent:(UIEvent *)event //- (void)after_sendAction:(SEL)action to:(id)target forEvent:(UIEvent *)event
{ //{
self.timeInterval = self.timeInterval == 0 ? defaultInterval : self.timeInterval; // self.timeInterval = self.timeInterval == 0 ? defaultInterval : self.timeInterval;
if (self.isIgnoreEvent){ // if (self.isIgnoreEvent){
return; // return;
}else if (self.timeInterval > 0){ // }else if (self.timeInterval > 0){
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(self.timeInterval * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(self.timeInterval * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self setIsIgnoreEvent:NO]; // [self setIsIgnoreEvent:NO];
}); // });
} // }
//
self.isIgnoreEvent = YES; // self.isIgnoreEvent = YES;
// 这里看上去会陷入递归调用死循环，但在运行期此方法是和sendAction:to:forEvent:互换的，相当于执行sendAction:to:forEvent:方法，所以并不会陷入死循环。 // // 这里看上去会陷入递归调用死循环，但在运行期此方法是和sendAction:to:forEvent:互换的，相当于执行sendAction:to:forEvent:方法，所以并不会陷入死循环。
[self after_sendAction:action to:target forEvent:event]; // [self after_sendAction:action to:target forEvent:event];
} //}
#pragma mark --点击区域以及button按钮文字位置 //#pragma mark --点击区域以及button按钮文字位置
- (void)setImagePosition:(ImagePosition)postion spacing:(CGFloat)spacing //- (void)setImagePosition:(ImagePosition)postion spacing:(CGFloat)spacing
{ //{
// [self setTitle:self.currentTitle forState:UIControlStateNormal]; //// [self setTitle:self.currentTitle forState:UIControlStateNormal];
// [self setImage:self.currentImage forState:UIControlStateNormal]; //// [self setImage:self.currentImage forState:UIControlStateNormal];
//
CGFloat imageWidth = self.imageView.image.size.width; // CGFloat imageWidth = self.imageView.image.size.width;
CGFloat imageHeight = self.imageView.image.size.height; // CGFloat imageHeight = self.imageView.image.size.height;
CGFloat labelWidth = [self.titleLabel.text sizeWithAttributes:@{NSFontAttributeName:self.titleLabel.font}].width; // CGFloat labelWidth = [self.titleLabel.text sizeWithAttributes:@{NSFontAttributeName:self.titleLabel.font}].width;
//
if (postion == ImagePositionRight && labelWidth >= self.frame.size.width - imageWidth) { // if (postion == ImagePositionRight && labelWidth >= self.frame.size.width - imageWidth) {
labelWidth = self.frame.size.width - imageWidth; // labelWidth = self.frame.size.width - imageWidth;
} // }
//
CGFloat labelHeight = [self.titleLabel.text sizeWithAttributes:@{NSFontAttributeName:self.titleLabel.font}].height; // CGFloat labelHeight = [self.titleLabel.text sizeWithAttributes:@{NSFontAttributeName:self.titleLabel.font}].height;
//
CGFloat imageOffsetX = (imageWidth + labelWidth) / 2 - imageWidth / 2; //image中心移动的x距离 // CGFloat imageOffsetX = (imageWidth + labelWidth) / 2 - imageWidth / 2; //image中心移动的x距离
CGFloat imageOffsetY = imageHeight / 2 + spacing / 2; //image中心移动的y距离 // CGFloat imageOffsetY = imageHeight / 2 + spacing / 2; //image中心移动的y距离
CGFloat labelOffsetX = (imageWidth + labelWidth / 2) - (imageWidth + labelWidth) / 2; //label中心移动的x距离 // CGFloat labelOffsetX = (imageWidth + labelWidth / 2) - (imageWidth + labelWidth) / 2; //label中心移动的x距离
CGFloat labelOffsetY = labelHeight / 2 + spacing / 2; //label中心移动的y距离 // CGFloat labelOffsetY = labelHeight / 2 + spacing / 2; //label中心移动的y距离
//
CGFloat tempWidth = MAX(labelWidth, imageWidth); // CGFloat tempWidth = MAX(labelWidth, imageWidth);
CGFloat changedWidth = labelWidth + imageWidth - tempWidth; // CGFloat changedWidth = labelWidth + imageWidth - tempWidth;
CGFloat tempHeight = MAX(labelHeight, imageHeight); // CGFloat tempHeight = MAX(labelHeight, imageHeight);
CGFloat changedHeight = labelHeight + imageHeight + spacing - tempHeight; // CGFloat changedHeight = labelHeight + imageHeight + spacing - tempHeight;
//
switch (postion) { // switch (postion) {
case ImagePositionLeft: // case ImagePositionLeft:
self.imageEdgeInsets = UIEdgeInsetsMake(0, -spacing / 2, 0, spacing / 2); // self.imageEdgeInsets = UIEdgeInsetsMake(0, -spacing / 2, 0, spacing / 2);
self.titleEdgeInsets = UIEdgeInsetsMake(0, spacing / 2, 0, -spacing / 2); // self.titleEdgeInsets = UIEdgeInsetsMake(0, spacing / 2, 0, -spacing / 2);
self.contentEdgeInsets = UIEdgeInsetsMake(0, spacing / 2, 0, spacing / 2); // self.contentEdgeInsets = UIEdgeInsetsMake(0, spacing / 2, 0, spacing / 2);
break; // break;
//
case ImagePositionRight: // case ImagePositionRight:
self.imageEdgeInsets = UIEdgeInsetsMake(0, labelWidth + spacing / 2, 0, -(labelWidth + spacing / 2)); // self.imageEdgeInsets = UIEdgeInsetsMake(0, labelWidth + spacing / 2, 0, -(labelWidth + spacing / 2));
self.titleEdgeInsets = UIEdgeInsetsMake(0, -(imageWidth + spacing / 2), 0, imageWidth + spacing / 2); // self.titleEdgeInsets = UIEdgeInsetsMake(0, -(imageWidth + spacing / 2), 0, imageWidth + spacing / 2);
self.contentEdgeInsets = UIEdgeInsetsMake(0, spacing / 2, 0, spacing / 2); // self.contentEdgeInsets = UIEdgeInsetsMake(0, spacing / 2, 0, spacing / 2);
break; // break;
//
case ImagePositionTop: // case ImagePositionTop:
self.imageEdgeInsets = UIEdgeInsetsMake(-imageOffsetY, imageOffsetX, imageOffsetY, -imageOffsetX); // self.imageEdgeInsets = UIEdgeInsetsMake(-imageOffsetY, imageOffsetX, imageOffsetY, -imageOffsetX);
self.titleEdgeInsets = UIEdgeInsetsMake(labelOffsetY, -labelOffsetX, -labelOffsetY, labelOffsetX); // self.titleEdgeInsets = UIEdgeInsetsMake(labelOffsetY, -labelOffsetX, -labelOffsetY, labelOffsetX);
self.contentEdgeInsets = UIEdgeInsetsMake(imageOffsetY, -changedWidth / 2, changedHeight - imageOffsetY, -changedWidth / 2); // self.contentEdgeInsets = UIEdgeInsetsMake(imageOffsetY, -changedWidth / 2, changedHeight - imageOffsetY, -changedWidth / 2);
break; // break;
//
case ImagePositionBottom: // case ImagePositionBottom:
self.imageEdgeInsets = UIEdgeInsetsMake(imageOffsetY, imageOffsetX, -imageOffsetY, -imageOffsetX); // self.imageEdgeInsets = UIEdgeInsetsMake(imageOffsetY, imageOffsetX, -imageOffsetY, -imageOffsetX);
self.titleEdgeInsets = UIEdgeInsetsMake(-labelOffsetY, -labelOffsetX, labelOffsetY, labelOffsetX); // self.titleEdgeInsets = UIEdgeInsetsMake(-labelOffsetY, -labelOffsetX, labelOffsetY, labelOffsetX);
self.contentEdgeInsets = UIEdgeInsetsMake(changedHeight - imageOffsetY, -changedWidth / 2, imageOffsetY, -changedWidth / 2); // self.contentEdgeInsets = UIEdgeInsetsMake(changedHeight - imageOffsetY, -changedWidth / 2, imageOffsetY, -changedWidth / 2);
break; // break;
//
default: // default:
break; // break;
} // }
} //}
//
-(void)setHitTestEdgeInsets:(UIEdgeInsets)hitTestEdgeInsets //-(void)setHitTestEdgeInsets:(UIEdgeInsets)hitTestEdgeInsets
{ //{
NSValue *value = [NSValue value:&hitTestEdgeInsets withObjCType:@encode(UIEdgeInsets)]; // NSValue *value = [NSValue value:&hitTestEdgeInsets withObjCType:@encode(UIEdgeInsets)];
objc_setAssociatedObject(self, &KEY_HIT_TEST_EDGE_INSETS, value, OBJC_ASSOCIATION_RETAIN_NONATOMIC); // objc_setAssociatedObject(self, &KEY_HIT_TEST_EDGE_INSETS, value, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} //}
//
-(UIEdgeInsets)hitTestEdgeInsets //-(UIEdgeInsets)hitTestEdgeInsets
{ //{
NSValue *value = objc_getAssociatedObject(self, &KEY_HIT_TEST_EDGE_INSETS); // NSValue *value = objc_getAssociatedObject(self, &KEY_HIT_TEST_EDGE_INSETS);
if(value) { // if(value) {
UIEdgeInsets edgeInsets; [value getValue:&edgeInsets]; return edgeInsets; // UIEdgeInsets edgeInsets; [value getValue:&edgeInsets]; return edgeInsets;
}else { // }else {
return UIEdgeInsetsZero; // return UIEdgeInsetsZero;
} // }
} //}
//点击区域 ////点击区域
- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event //- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
{ //{
if(UIEdgeInsetsEqualToEdgeInsets(self.hitTestEdgeInsets, UIEdgeInsetsZero) || !self.enabled || self.hidden) { // if(UIEdgeInsetsEqualToEdgeInsets(self.hitTestEdgeInsets, UIEdgeInsetsZero) || !self.enabled || self.hidden) {
return [super pointInside:point withEvent:event]; // return [super pointInside:point withEvent:event];
} // }
//
CGRect relativeFrame = self.bounds; // CGRect relativeFrame = self.bounds;
CGRect hitFrame = UIEdgeInsetsInsetRect(relativeFrame, self.hitTestEdgeInsets); // CGRect hitFrame = UIEdgeInsetsInsetRect(relativeFrame, self.hitTestEdgeInsets);
//
return CGRectContainsPoint(hitFrame, point); // return CGRectContainsPoint(hitFrame, point);
} //}
@end @end

6
Ifish/Common/AppDelegate+AliPushConfig.m
View File

@ -190,8 +190,10 @@ static const void *NotificationCenterKey = &NotificationCenterKey;
#pragma mark SDK Init #pragma mark SDK Init
- (void)registerAliPush { - (void)registerAliPush {
// 正式上线关闭 // // 正式上线关闭
[CloudPushSDK turnOnDebug]; // if (DEBUG) {
// [CloudPushSDK turnOnDebug];
// }
// SDK初始化 // SDK初始化
[CloudPushSDK asyncInit:Ali_Push_APPKey appSecret:Ali_Push_APPSecret callback:^(CloudPushCallbackResult *res) { [CloudPushSDK asyncInit:Ali_Push_APPKey appSecret:Ali_Push_APPSecret callback:^(CloudPushCallbackResult *res) {
if (res.success) { if (res.success) {

2
Ifish/Info.plist
View File

@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>9.8</string> <string>9.8.2</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

5
Ifish/Networking/UrlAdress.h
View File

@ -33,10 +33,13 @@
@return <#return value description#> @return <#return value description#>
*/ */
#define Push_Message_Url Api_DomainName @"/api/pageList/pushListInf.do" #define Push_Message_Url Api_DomainName @"/api/pageList/pushListInf.do"
//删除消息 //删除消息
#define Push_Message_Delete_Url Api_DomainName @"/api/updateUser/deleteMessages.do" #define Push_Message_Delete_Url Api_DomainName @"/api/updateUser/deleteMessages.do"
//绑定设备 //绑定设备
#define Push_BindDevice_Url Api_DomainName @"/api/updateUser/bindDevice.do" #define Push_BindDevice_Url Api_DomainName @"/api/updateUser/bindDevice.do"
//用户消息已读
#define Push_Message_Readed Api_DomainName @"/api/updateUser/userMessageIsRead.do"
//用户未读消息个数
#define Push_Message_UnReadCount Api_DomainName @"/api/updateUser/userMessageNoReadCount.do"
#endif /* UrlAdress_h */ #endif /* UrlAdress_h */

1
Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m
View File

@ -44,7 +44,6 @@
#import "IfishUserObsever.h" #import "IfishUserObsever.h"
#import "QianDaoGiftView.h" #import "QianDaoGiftView.h"
#import "IfishGoldAndExpTostView.h" #import "IfishGoldAndExpTostView.h"
//#import "MineHeaderNewItemsCell.h"
#import "IfishMineGoldViewController.h" #import "IfishMineGoldViewController.h"
#import "IifshMineDJViewController.h" #import "IifshMineDJViewController.h"
#import "WoDeRenWuViewController.h" #import "WoDeRenWuViewController.h"

27
Ifish/controllers/IfishTabControllers/我的/mineViews/MineHeaderNewItemsCell.h
View File

@ -1,27 +0,0 @@
//
// MineHeaderNewItemsCell.h
// Ifish
//
// Created by imac on 17/3/13.
// Copyright © 2017年 lianlian. All rights reserved.
//
#import <UIKit/UIKit.h>
@protocol MineHeaderItemsDelegate <NSObject>
-(void)tapDengjiAction;
-(void)tapGoldAction;
-(void)tapRenWuAction;
@end
@interface MineHeaderNewItemsCell : UITableViewCell
@property (weak, nonatomic) IBOutlet UILabel *levlellabel;
@property (weak, nonatomic) IBOutlet UILabel *goldLabel;
@property (weak, nonatomic) IBOutlet UILabel *taskNumber;
@property (weak, nonatomic) IBOutlet UILabel *dengJi;
@property (weak, nonatomic) IBOutlet UILabel *jinBi;
@property (weak, nonatomic) IBOutlet UILabel *renWu;
@property (nonatomic,assign) id<MineHeaderItemsDelegate> itemsDelegate;
-(void)loadCellData;
@property (nonatomic,strong) UIView *redpontView;
@end

113
Ifish/controllers/IfishTabControllers/我的/mineViews/MineHeaderNewItemsCell.m
View File

@ -1,113 +0,0 @@
//
// MineHeaderNewItemsCell.m
// Ifish
//
// Created by imac on 17/3/13.
// Copyright © 2017年 lianlian. All rights reserved.
//
#import "MineHeaderNewItemsCell.h"
@implementation MineHeaderNewItemsCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
UITapGestureRecognizer *tapDengji=[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dengjiAction)];
UITapGestureRecognizer *tapDengji2=[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dengjiAction2)];
[self.dengJi addGestureRecognizer:tapDengji];
[self.levlellabel addGestureRecognizer:tapDengji2];
UITapGestureRecognizer *tapgold=[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGoldAction)];
[self.goldLabel addGestureRecognizer:tapgold];
UITapGestureRecognizer *tapgold2=[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGoldAction2)];
[self.jinBi addGestureRecognizer:tapgold2];
UITapGestureRecognizer *tapRenWu=[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapRenWuAction)];
UITapGestureRecognizer *tapRenWu2=[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapRenWuAction2)];
[self.renWu addGestureRecognizer:tapRenWu];
[self.taskNumber addGestureRecognizer:tapRenWu2];
}
-(void)layoutSubviews{
if (!self.redpontView) {
self.redpontView = [[UIView alloc] init];
NSString *renwu= @"我的任务";
CGSize size = [renwu sizeWithAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14]}];
self.redpontView.frame = CGRectMake(CGRectGetWidth(self.renWu.frame)/2 + size.width/2, 4, 8, 8);
self.redpontView.backgroundColor = RGB(252, 89, 89);
self.redpontView.layer.masksToBounds = YES;
self.redpontView.layer.cornerRadius = 4.0;
[self addSubview:self.redpontView];
[self.renWu bringSubviewToFront:self.redpontView];
}
}
-(void)loadCellData{
IfishUserAsset *userAsset =[dataContorl getAllIfishUserAsset];
self.levlellabel.text = [NSString stringWithFormat:@"LV%@",userAsset.gradeNum];
self.goldLabel.text = [NSString stringWithFormat:@"%ld",(long)userAsset.goldValue];
NSInteger undoneCount = [IfishHelperUtils getUnDoneTaskCount];
self.taskNumber.text = [NSString stringWithFormat:@"%ld",undoneCount];
self.redpontView.hidden = undoneCount ==0? YES : NO;
if (undoneCount==0) {
[[NSNotificationCenter defaultCenter] postNotificationName:IFISHTASK_HAVEDONEALL object:nil];
}
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
-(void)dengjiAction
{
if (self.itemsDelegate) {
[self.itemsDelegate tapDengjiAction];
}
}
-(void)dengjiAction2
{
if (self.itemsDelegate) {
[self.itemsDelegate tapDengjiAction];
}
}
-(void)tapGoldAction
{
if (self.itemsDelegate) {
[self.itemsDelegate tapGoldAction];
}
}
-(void)tapGoldAction2
{
if (self.itemsDelegate) {
[self.itemsDelegate tapGoldAction];
}
}
-(void)tapRenWuAction
{
if (self.itemsDelegate) {
[self.itemsDelegate tapRenWuAction];
}
}
-(void)tapRenWuAction2
{
if (self.itemsDelegate) {
[self.itemsDelegate tapRenWuAction];
}
}
@end

89
Ifish/controllers/IfishTabControllers/我的/mineViews/MineHeaderNewItemsCell.xib
View File

@ -1,89 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MineHeaderNewItemsCell" id="KGk-i7-Jjw" customClass="MineHeaderNewItemsCell">
<rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="等级" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O45-QR-cHa">
<rect key="frame" x="21" y="0.0" width="82" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9wv-Em-ymJ">
<rect key="frame" x="8" y="29" width="108" height="29"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.9882352941176471" green="0.85098039215686272" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="277777" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YNL-Tj-AKG">
<rect key="frame" x="134" y="29" width="105" height="29"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.98823529409999999" green="0.85098039219999999" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UFF-ah-s4k">
<rect key="frame" x="257" y="29" width="110" height="29"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.98823529409999999" green="0.85098039219999999" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lAB-ez-ZeT">
<rect key="frame" x="124" y="13" width="2" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.047058823529411764" green="0.46274509803921571" blue="0.85098039215686272" alpha="0.69555004222972971" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uhm-GO-5Ke">
<rect key="frame" x="247" y="13" width="2" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.047058823530000002" green="0.46274509800000002" blue="0.85098039219999999" alpha="0.69555004220000005" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="我的任务" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hah-cc-Hgz">
<rect key="frame" x="271" y="0.0" width="82" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.98823529409999999" green="0.85098039219999999" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="金币" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B6H-GU-HKz">
<rect key="frame" x="134" y="0.0" width="105" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
<color key="backgroundColor" red="0.039215686270000001" green="0.41960784309999999" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<connections>
<outlet property="dengJi" destination="O45-QR-cHa" id="LfW-VK-4g0"/>
<outlet property="goldLabel" destination="YNL-Tj-AKG" id="ogk-kt-ySC"/>
<outlet property="jinBi" destination="B6H-GU-HKz" id="CS2-5L-R8c"/>
<outlet property="levlellabel" destination="9wv-Em-ymJ" id="bTK-L1-Xe0"/>
<outlet property="renWu" destination="Hah-cc-Hgz" id="gtx-WH-xHK"/>
<outlet property="taskNumber" destination="UFF-ah-s4k" id="DPn-Bh-Vxz"/>
</connections>
<point key="canvasLocation" x="25.5" y="52"/>
</tableViewCell>
</objects>
</document>

3
Ifish/controllers/IfishTabControllers/消息/IfishMessageViewCell.m
View File

@ -17,6 +17,7 @@ Strong UIButton *bgBtn;
{ {
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
if (self) { if (self) {
self.selectionStyle = UITableViewCellSelectionStyleNone;
[self loadSubViews]; [self loadSubViews];
} }
return self; return self;
@ -159,6 +160,8 @@ Strong UIButton *bgBtn;
self.bgBtn.selected = YES; self.bgBtn.selected = YES;
}else }else
{ {
self.bgBtn.selected = NO;
self.deleteBtn.selected = NO;
self.deleteBtn.hidden = !isShowDelte; self.deleteBtn.hidden = !isShowDelte;
self.bgBtn.hidden = !isShowDelte; self.bgBtn.hidden = !isShowDelte;
} }

224
Ifish/controllers/IfishTabControllers/消息/IfishMessageViewController.m
View File

@ -55,7 +55,9 @@ Assign BOOL isShowDelete;//是否显示删除按钮
Strong MessageAlertView *comboxView; Strong MessageAlertView *comboxView;
Strong UIView *deleteView; Strong UIView *deleteView;
Strong UIButton *deleteBtn; Strong UIButton *deleteBtn;
Strong UIAlertController *alertController;
Strong UIAlertAction *okAction;
Strong UIAlertAction *cancelAction;
@end @end
extern BOOL launchedByNotification; extern BOOL launchedByNotification;
@implementation IfishMessageViewController @implementation IfishMessageViewController
@ -157,23 +159,24 @@ extern BOOL launchedByNotification;
[self.deleteBtn setTitleColor:RGB(178, 178, 178) forState:UIControlStateNormal]; [self.deleteBtn setTitleColor:RGB(178, 178, 178) forState:UIControlStateNormal];
[self.deleteBtn setTitleColor:[UIColor redColor] forState:UIControlStateSelected]; [self.deleteBtn setTitleColor:[UIColor redColor] forState:UIControlStateSelected];
[self.deleteBtn addTarget:self action:@selector(deleBtnClick:) forControlEvents:UIControlEventTouchUpInside]; [self.deleteBtn addTarget:self action:@selector(deleBtnClick:) forControlEvents:UIControlEventTouchUpInside];
[_deleteView addSubview:self.deleteBtn]; [self.deleteView addSubview:self.deleteBtn];
UIButton *allDeleteBtn = InitObject(UIButton); UIButton *allDeleteBtn = InitObject(UIButton);
[allDeleteBtn setTitle:@"全选" forState:UIControlStateNormal]; [allDeleteBtn setTitle:@"全选" forState:UIControlStateNormal];
[allDeleteBtn setTitle:@"取消" forState:UIControlStateSelected];
[allDeleteBtn.titleLabel setFont:SYSTEMSIZE(34)]; [allDeleteBtn.titleLabel setFont:SYSTEMSIZE(34)];
[allDeleteBtn setTitleColor:RGB(4, 99, 201) forState:UIControlStateNormal]; [allDeleteBtn setTitleColor:RGB(4, 99, 201) forState:UIControlStateNormal];
[allDeleteBtn addTarget:self action:@selector(allDeleteBtnClick:) forControlEvents:UIControlEventTouchUpInside]; [allDeleteBtn addTarget:self action:@selector(allDeleteBtnClick:) forControlEvents:UIControlEventTouchUpInside];
[_deleteView addSubview:allDeleteBtn]; [self.deleteView addSubview:allDeleteBtn];
[self.deleteBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.deleteBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.deleteView); make.centerY.mas_equalTo(self.deleteView);
make.left.mas_equalTo(0); make.left.mas_equalTo(0);
make.width.mas_equalTo(screen_width/2); make.width.mas_equalTo(screen_width/2);
make.height.mas_equalTo(self.deleteView); make.top.height.mas_equalTo(self.deleteView);
}]; }];
[allDeleteBtn mas_makeConstraints:^(MASConstraintMaker *make) { [allDeleteBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(self.deleteBtn); make.top.width.height.mas_equalTo(self.deleteBtn);
make.left.mas_equalTo(self.deleteBtn.mas_right); make.left.mas_equalTo(self.deleteBtn.mas_right);
}]; }];
@ -185,9 +188,7 @@ extern BOOL launchedByNotification;
make.left.mas_equalTo(kSizeFrom750(30)); make.left.mas_equalTo(kSizeFrom750(30));
make.right.mas_equalTo(-kSizeFrom750(30)); make.right.mas_equalTo(-kSizeFrom750(30));
make.height.mas_equalTo(ONE_PIXEL_SIZE); make.height.mas_equalTo(ONE_PIXEL_SIZE);
}]; }];
} }
#pragma mark --buttonClick #pragma mark --buttonClick
-(void)deleBtnClick:(UIButton *)sender{ -(void)deleBtnClick:(UIButton *)sender{
@ -196,7 +197,7 @@ extern BOOL launchedByNotification;
[SVProgressHUD showInfoWithStatus:@"请先选择要删除的消息"]; [SVProgressHUD showInfoWithStatus:@"请先选择要删除的消息"];
}else{ }else{
//调用删除接口，删除选中的消息内容 //调用删除接口，删除选中的消息内容
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"确认删除选中消息么" preferredStyle:UIAlertControllerStyleAlert]; UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"确认删除所有选中消息么" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
NSLog(@"cancel Action"); NSLog(@"cancel Action");
}]; }];
@ -210,16 +211,22 @@ extern BOOL launchedByNotification;
} }
} }
-(void)allDeleteBtnClick:(UIButton *)sender{ -(void)allDeleteBtnClick:(UIButton *)sender{
if (!sender.selected) {//全选
//全部为选中状态 //全部为选中状态
self.isDelteAll = YES; self.isDelteAll = YES;
self.deleteBtn.selected = YES; self.deleteBtn.selected = YES;
[self.deleteArray removeAllObjects]; [self.deleteArray removeAllObjects];
for (NSArray *arr in self.dataSource) { for (NSArray *arr in self.dataSource) {
for (PushmessageModel *model in arr) { for (PushmessageModel *model in arr) {
[self.deleteArray addObject:model.pushId]; [self.deleteArray addObject:model.pushId];
}
} }
}else{//取消全选
[self.deleteArray removeAllObjects];
self.isDelteAll = NO;
self.deleteBtn.selected = NO;
} }
sender.selected = !sender.selected;
[self.tableView reloadData]; [self.tableView reloadData];
} }
#pragma mark --comboxView显示与隐藏 #pragma mark --comboxView显示与隐藏
@ -259,20 +266,7 @@ extern BOOL launchedByNotification;
-(void)getRequest -(void)getRequest
{ {
[SVProgressHUD show]; [SVProgressHUD show];
NSDictionary *resalutDic = [CommonUtils getCacheDataWithKey:Cache_Message]; self.pushId = @"";
if (resalutDic==nil) {
self.pushId = @"";
}else{
NSArray *dataArray = [resalutDic objectForKey:@"data"];
PushmessageModel *model = [PushmessageModel yy_modelWithJSON:dataArray.firstObject];
self.pushId = model.pushId;
for (int i=0; i<dataArray.count; i++) {
PushmessageModel *cacheModel = [PushmessageModel yy_modelWithJSON:[dataArray objectAtIndex:i]];
[cacheModel getCellHeight];
[self.oldMessageArr addObject:cacheModel];
}
}
UserModel*userModel=[dataContorl getUserInfo]; UserModel*userModel=[dataContorl getUserInfo];
NSDictionary *reqDic = @{@"pushId":self.pushId, NSDictionary *reqDic = @{@"pushId":self.pushId,
@"userId":userModel.userId, @"userId":userModel.userId,
@ -284,28 +278,21 @@ extern BOOL launchedByNotification;
NSString *totalCount = [successDic objectForKey:@"total"]; NSString *totalCount = [successDic objectForKey:@"total"];
NSArray *dataArray = [successDic objectForKey:@"data"]; NSArray *dataArray = [successDic objectForKey:@"data"];
if ([totalCount integerValue]>0) { if ([totalCount integerValue]>0) {
//判断是否已经有缓存 NSMutableArray *newMessageArray = InitObject(NSMutableArray);
NSDictionary *resalutDic = [CommonUtils getCacheDataWithKey:Cache_Message]; NSMutableArray *oldMessageArray = InitObject(NSMutableArray);
if (resalutDic!=nil) {
//原有缓存中的数据
NSArray *cacheDataArray = [resalutDic objectForKey:@"data"];
//新消息列表
NSMutableArray *newDataArray = [NSMutableArray arrayWithArray:dataArray];
[newDataArray addObjectsFromArray:cacheDataArray];
NSMutableDictionary *newDic = InitObject(NSMutableDictionary);
[newDic setObject:newDataArray forKey:@"data"];
[CommonUtils SetCacheDataWithObject:newDic WithPathName:Cache_Message];
}else{
[CommonUtils SetCacheDataWithObject:successDic WithPathName:Cache_Message];
}
for (int i=0; i<dataArray.count; i++) { for (int i=0; i<dataArray.count; i++) {
PushmessageModel *cacheModel = [PushmessageModel yy_modelWithJSON:[dataArray objectAtIndex:i]]; PushmessageModel *messageModel = [PushmessageModel yy_modelWithJSON:[dataArray objectAtIndex:i]];
[cacheModel getCellHeight]; [messageModel getCellHeight];
[self.messageArray addObject:cacheModel];
if ([messageModel.isRead integerValue]==1) {//未读消息
[newMessageArray addObject:messageModel];
}else{
[oldMessageArray addObject:messageModel];
}
} }
[self.dataSource addObject:newMessageArray];
[self.dataSource addObject:oldMessageArray];
} }
[self.dataSource addObject:self.messageArray];
[self.dataSource addObject:self.oldMessageArr];
[self.tableView reloadData]; [self.tableView reloadData];
@ -314,7 +301,63 @@ extern BOOL launchedByNotification;
}]; }];
} }
//删除接口 //发送已读记录
-(void)postReadMessageRequestWithIndexPath:(NSIndexPath *)indexPath{
UserModel*userModel=[dataContorl getUserInfo];
PushmessageModel *model = [[self.dataSource objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
if([model.isRead integerValue]==1)//未读消息
{
NSMutableDictionary *deleteDic = InitObject(NSMutableDictionary);
[deleteDic setValue:model.pushId forKey:@"pushId"];
NSDictionary *reqDic = @{@"userId":userModel.userId,
@"pushId":model.pushId
};
[[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Readed params:reqDic success:^(NSDictionary *successDic) {
NSString *result = [successDic objectForKey:RESPONSE_CODE];
if ([result integerValue]==kReqSuccess) {
//已读
}else{
}
} failure:^(NSDictionary *errorDic) {
}];
}
}
//单独删除某一条消息
-(void)deleteSingleMessageWithIndex:(NSIndexPath *)indexPath{
UserModel*userModel=[dataContorl getUserInfo];
PushmessageModel *model = [[self.dataSource objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
NSMutableDictionary *deleteDic = InitObject(NSMutableDictionary);
[deleteDic setValue:model.pushId forKey:@"pushId"];
NSDictionary *reqDic = @{@"userId":userModel.userId,
@"pushIds":[CommonUtils arrayToJSONString:@[deleteDic]]
};
[SVProgressHUD show];
[[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Delete_Url params:reqDic success:^(NSDictionary *successDic) {
NSString *result = [successDic objectForKey:RESPONSE_CODE];
if ([result integerValue]==kReqSuccess) {
[[self.dataSource objectAtIndex:indexPath.section] removeObjectAtIndex:indexPath.row];
[self.tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
// //刷新页面
// [self.tableView reloadData];
// [self.tableView scrollsToTop];
}else{
[SVProgressHUD showInfoWithStatus:@"删除失败"];
}
} failure:^(NSDictionary *errorDic) {
[SVProgressHUD showInfoWithStatus:@"删除失败"];
// self.deleteBtn.selected = NO;
// [self.deleteView setHidden:YES];
// [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) {
// make.bottom.mas_equalTo(self.view);
// }];
}];
}
//删除接口(多选删除)
-(void)deleteMessage{ -(void)deleteMessage{
UserModel*userModel=[dataContorl getUserInfo]; UserModel*userModel=[dataContorl getUserInfo];
NSMutableArray *deleteArray = InitObject(NSMutableArray); NSMutableArray *deleteArray = InitObject(NSMutableArray);
@ -333,43 +376,19 @@ extern BOOL launchedByNotification;
NSString *result = [successDic objectForKey:RESPONSE_CODE]; NSString *result = [successDic objectForKey:RESPONSE_CODE];
if ([result integerValue]==kReqSuccess) { if ([result integerValue]==kReqSuccess) {
self.deleteBtn.selected = NO; self.deleteBtn.selected = NO;
NSDictionary *cacheDic = [CommonUtils getCacheDataWithKey:Cache_Message]; for (int i=0;i< self.dataSource.count;i++) {
NSArray *cacheArray = [cacheDic objectForKey:@"data"]; NSArray *arr = [self.dataSource objectAtIndex:i];
NSMutableArray *newCacheArray = InitObject(NSMutableArray); NSMutableArray *newArray = InitObject(NSMutableArray);
//从缓存中删除已经删除的消息 for (int j=0; j<arr.count; j++) {
for (int i=0; i<cacheArray.count; i++) { PushmessageModel *model = [arr objectAtIndex:j];
NSDictionary *dic = [cacheArray objectAtIndex:i]; if ([self.deleteArray containsObject:model.pushId]) {
NSString *cachePushId =[NSString stringWithFormat:@"%@",[dic objectForKey:@"pushId"]];
if ([self.deleteArray containsObject:cachePushId]) {
}else{ }else{
[newCacheArray addObject:dic]; [newArray addObject:model];
}
} }
[self.dataSource setObject:newArray atIndexedSubscript:i];
} }
[self.dataSource removeAllObjects];
NSMutableArray *newArray = InitObject(NSMutableArray);
NSMutableArray *oldArray = InitObject(NSMutableArray);
//从新消息列表中剔除
for (int i=0; i<self.messageArray.count; i++) {
PushmessageModel *model = [self.messageArray objectAtIndex:i];
if ([self.deleteArray containsObject:model.pushId]) {
}else{
[newArray addObject:model];
}
}
//从旧消息列表中剔除
for (int i=0; i<self.oldMessageArr.count; i++) {
PushmessageModel *model = [self.oldMessageArr objectAtIndex:i];
if ([self.deleteArray containsObject:model.pushId]) {
}else{
[oldArray addObject:model];
}
}
[self.dataSource addObject:newArray];
[self.dataSource addObject:oldArray];
[CommonUtils SetCacheDataWithObject:[NSDictionary dictionaryWithObjectsAndKeys:newCacheArray,@"data", nil] WithPathName:Cache_Message];
//走删除接口之后，清空删除内容数组 //走删除接口之后，清空删除内容数组
[self.deleteArray removeAllObjects]; [self.deleteArray removeAllObjects];
self.isDelteAll = NO; self.isDelteAll = NO;
@ -498,25 +517,24 @@ extern BOOL launchedByNotification;
// //
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
// [tableView deselectRowAtIndexPath:indexPath animated:YES];
[self.deleteArray removeAllObjects]; dispatch_async(dispatch_get_main_queue(), ^{
[self.deleteView setHidden:YES];
[self.tableView mas_updateConstraints:^(MASConstraintMaker *make) { [self postReadMessageRequestWithIndexPath:indexPath];
make.bottom.mas_equalTo(self.view); UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"确认删除该消息么" preferredStyle:UIAlertControllerStyleAlert];
}]; UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
PushmessageModel *model = [[self.dataSource objectAtIndex:indexPath.section] objectAtIndex:indexPath.row]; NSLog(@"cancel Action");
[self.deleteArray addObject:model.pushId]; }];
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"确认删除该消息么" preferredStyle:UIAlertControllerStyleAlert]; WEAK_SELF;
UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { UIAlertAction *delteActicon = [UIAlertAction actionWithTitle:@"删除" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
NSLog(@"cancel Action"); [weakSelf deleteSingleMessageWithIndex:indexPath];
}]; }];
UIAlertAction *delteActicon = [UIAlertAction actionWithTitle:@"删除" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { [alertController addAction:cancelAction];
NSLog(@"delete Action"); [alertController addAction:delteActicon];
[self deleteMessage]; [weakSelf presentViewController:alertController animated:YES completion:nil];
}];
[alertController addAction:cancelAction]; });
[alertController addAction:delteActicon];
[self presentViewController:alertController animated:YES completion:nil];
} }
-(void)viewWillAppear:(BOOL)animated{ -(void)viewWillAppear:(BOOL)animated{

2
Ifish/controllers/IfishTabControllers/消息/pushmassgaeModel/PushmessageModel.h
View File

@ -21,6 +21,8 @@
Copy NSString *phoneType; Copy NSString *phoneType;
//推送类型 //推送类型
Copy NSString *jpushStatus; Copy NSString *jpushStatus;
Copy NSString *isRead;//1、未读 0 已读
//创建时间 //创建时间
@property(nonatomic,copy) NSString *createTime; @property(nonatomic,copy) NSString *createTime;
//设备id //设备id

64
Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
View File

@ -118,7 +118,6 @@ Assign NSInteger messageCount;//消息个数
//dispatch_queue_t queue = dispatch_queue_create("com.privateQueue",NULL); //dispatch_queue_t queue = dispatch_queue_create("com.privateQueue",NULL);
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[self getMessageData];
[self getMoreUserData]; [self getMoreUserData];
[self initBannerData]; [self initBannerData];
[self loadGoodsData]; [self loadGoodsData];
@ -136,33 +135,22 @@ Assign NSInteger messageCount;//消息个数
} }
//获取未读消息个数
-(void)getMessageCount{
-(void)getMessageData{
NSDictionary *resalutDic = [CommonUtils getCacheDataWithKey:Cache_Message];
NSString *pushId = @"";
if (resalutDic==nil) {
pushId = @"";
}else{
NSArray *dataArray = [resalutDic objectForKey:@"data"];
PushmessageModel *model = [PushmessageModel yy_modelWithJSON:dataArray.firstObject];
pushId = model.pushId;
}
UserModel*userModel=[dataContorl getUserInfo]; UserModel*userModel=[dataContorl getUserInfo];
NSDictionary *reqDic = @{@"pushId":pushId, NSDictionary *reqDic = @{@"userId":userModel.userId
@"userId":userModel.userId,
@"firstResult":@(0),
@"pageSize":@(999)
}; };
[[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_Url params:reqDic success:^(NSDictionary *successDic) { [[AFNOHeaderHttpTool sharedInstance] postRequestWihtUrl:Push_Message_UnReadCount params:reqDic success:^(NSDictionary *successDic) {
NSString *totalCount = [successDic objectForKey:@"total"]; NSString *result = [successDic objectForKey:RESPONSE_CODE];
if ([totalCount integerValue]>0) { NSDictionary *dic = [successDic objectForKey:RESPONSE_DATA];
//有新消息 if ([result integerValue]==kReqSuccess) {
self.messageCount = [totalCount integerValue];
[self setRedViewData]; NSString *count = [dic objectForKey:@"messageNoReadCount"];
}else{ self.messageCount = [count integerValue];
} }
[self setRedViewData];
} failure:^(NSDictionary *errorDic) { } failure:^(NSDictionary *errorDic) {
@ -605,7 +593,7 @@ Assign NSInteger messageCount;//消息个数
_mesglabel.textAlignment = NSTextAlignmentCenter; _mesglabel.textAlignment = NSTextAlignmentCenter;
_mesglabel.backgroundColor = [UIColor redColor]; _mesglabel.backgroundColor = [UIColor redColor];
[navMeaasageBtn addSubview:_mesglabel]; [navMeaasageBtn addSubview:_mesglabel];
_mesglabel.font = [UIFont boldSystemFontOfSize:10]; _mesglabel.font = [UIFont systemFontOfSize:10];
// [self setRedViewData]; // [self setRedViewData];
UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil]; UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
@ -623,8 +611,10 @@ Assign NSInteger messageCount;//消息个数
-(void)setRedViewData{ -(void)setRedViewData{
// NSInteger count = [[[NIMSDK sharedSDK] conversationManager] allUnreadCount];
if (self.messageCount> 0) { if (self.messageCount> 0) {
if(self.messageCount>=100){
_mesglabel.frame = RECT(self.mesglabel.frame.origin.x, self.mesglabel.frame.origin.y, 24, 16);
}
_mesglabel.text = [NSString stringWithFormat:@"%ld",(long)self.messageCount]; _mesglabel.text = [NSString stringWithFormat:@"%ld",(long)self.messageCount];
_mesglabel.hidden = NO; _mesglabel.hidden = NO;
}else{ }else{
@ -723,14 +713,15 @@ Assign NSInteger messageCount;//消息个数
[super viewWillAppear:animated]; [super viewWillAppear:animated];
self.navigationController.navigationBar.translucent = YES; self.navigationController.navigationBar.translucent = YES;
//设置透明导航栏 //设置透明导航栏
[self.navigationController [self.navigationController.navigationBar setClearNav];
.navigationBar setClearNav];
[self scrollViewDidScroll:self.tableView]; [self scrollViewDidScroll:self.tableView];
//内容置顶 //内容置顶
//[self.tableView setContentOffset:CGPointMake(0,0) animated:NO]; //[self.tableView setContentOffset:CGPointMake(0,0) animated:NO];
[self refreshUI]; [self refreshUI];
//刷新消息数
[self setRedViewData]; [self setRedViewData];
[self getMessageCount];
} }
-(void)refreshUI{ -(void)refreshUI{
@ -1067,6 +1058,7 @@ Assign NSInteger messageCount;//消息个数
CGFloat rowH=TabContentHeaght*0.068; CGFloat rowH=TabContentHeaght*0.068;
UIView*view=[[UIView alloc] initWithFrame:CGRectMake(0,0, kScreenSize.width, rowH)]; UIView*view=[[UIView alloc] initWithFrame:CGRectMake(0,0, kScreenSize.width, rowH)];
view.userInteractionEnabled = YES;
view.backgroundColor = [UIColor whiteColor]; view.backgroundColor = [UIColor whiteColor];
CGFloat Space =kScreenSize.width*0.063; CGFloat Space =kScreenSize.width*0.063;
CGFloat ImgW =kScreenSize.width*0.056; CGFloat ImgW =kScreenSize.width*0.056;
@ -1079,18 +1071,12 @@ Assign NSInteger messageCount;//消息个数
UIButton *addbtn =[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *addbtn =[UIButton buttonWithType:UIButtonTypeCustom];
CGFloat Space2 =kScreenSize.width*0.031; CGFloat Space2 =kScreenSize.width*0.031;
addbtn.frame = CGRectMake(CGRectGetMaxX(headImg.frame) + Space2 -3,1,200,rowH -2); addbtn.frame = CGRectMake(CGRectGetMaxX(headImg.frame) + Space2 -3,1,200,rowH -2);
[addbtn setTitleColor:RGB(153, 153, 153) forState:UIControlStateNormal];
NSDictionary *attributes=@{ NSFontAttributeName:[UIFont systemFontOfSize:15], [addbtn.titleLabel setFont:[UIFont systemFontOfSize:15]];
NSForegroundColorAttributeName:[UIColor colorWithRed:153.0/255.0 green:153.0/255.0 blue:153.0/255.0 alpha:1] , [addbtn setTitle:@"添加设备" forState:UIControlStateNormal];
};
NSAttributedString *str= [[NSAttributedString alloc] initWithString:@"添加设备" attributes:attributes];
[addbtn setAttributedTitle:str forState:UIControlStateNormal];
addbtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; addbtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
//[addbtn setBackgroundColor:[UIColor redColor]];
[addbtn addTarget:self action:@selector(addBtnAction) forControlEvents:UIControlEventTouchUpInside]; [addbtn addTarget:self action:@selector(addBtnAction:) forControlEvents:UIControlEventTouchUpInside];
[view addSubview:addbtn]; [view addSubview:addbtn];
return view; return view;
@ -1111,7 +1097,7 @@ Assign NSInteger messageCount;//消息个数
#pragma mark- 添加设备 #pragma mark- 添加设备
-(void)addBtnAction{ -(void)addBtnAction:(UIButton *)sender{
[self pushWiFiConnectVC]; [self pushWiFiConnectVC];

5
Ifish/models/ifishUserModel/UserModel.m
View File

@ -23,6 +23,7 @@
[aCoder encodeObject:self forKey:@"shopsUserId"]; [aCoder encodeObject:self forKey:@"shopsUserId"];
[aCoder encodeObject:self forKey:@"userType"]; [aCoder encodeObject:self forKey:@"userType"];
[aCoder encodeObject:self forKey:@"neteaseToken"]; [aCoder encodeObject:self forKey:@"neteaseToken"];
[aCoder encodeObject:self forKey:@"messageIsRead"];
} }
//解挡时调用 //解挡时调用
@ -41,6 +42,8 @@
self.shopsUserId = [aDecoder decodeObjectForKey:@"shopsUserId"]; self.shopsUserId = [aDecoder decodeObjectForKey:@"shopsUserId"];
self.userType = [aDecoder decodeObjectForKey:@"userType"]; self.userType = [aDecoder decodeObjectForKey:@"userType"];
self.neteaseToken = [aDecoder decodeObjectForKey:@"neteaseToken"]; self.neteaseToken = [aDecoder decodeObjectForKey:@"neteaseToken"];
self.messageIsRead = [aDecoder decodeObjectForKey:@"messageIsRead"];
} }
return self; return self;
} }
@ -60,7 +63,7 @@
_shopsUserId = [dict objectForKey:@"shopsUserId"]; _shopsUserId = [dict objectForKey:@"shopsUserId"];
_userType = [dict objectForKey:@"userType"]; _userType = [dict objectForKey:@"userType"];
_neteaseToken = [dict objectForKey:@"neteaseToken"]; _neteaseToken = [dict objectForKey:@"neteaseToken"];
_messageIsRead = [dict objectForKey:@"messageIsRead"];
} }
return self; return self;
} }