1、变更推送为阿里云推,清除云信IM以及推送内容;
2、消息页面全新改版; 3、部分微小Bug修复
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
//
|
||||
// PushmassageModel.m
|
||||
// Ifish
|
||||
//
|
||||
// Created by imac on 16/3/30.
|
||||
// Copyright © 2016年 imac. All rights reserved.
|
||||
//
|
||||
|
||||
#import "PushmassageModel.h"
|
||||
|
||||
@implementation PushmassageModel
|
||||
|
||||
@end
|
||||
+18
-20
@@ -1,43 +1,41 @@
|
||||
//
|
||||
// PushmassageModel.h
|
||||
// PushmessageModel.h
|
||||
// Ifish
|
||||
//
|
||||
// Created by imac on 16/3/30.
|
||||
// Copyright © 2016年 imac. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "BaseYYModel.h"
|
||||
|
||||
@interface PushmassageModel : NSObject
|
||||
@interface PushmessageModel : BaseYYModel
|
||||
//消息类型
|
||||
|
||||
@property(nonatomic,copy) NSString *massageType;
|
||||
|
||||
@property(nonatomic,copy) NSString *pushType;
|
||||
//推送消息(body)消息详情
|
||||
|
||||
@property(nonatomic,copy) NSString *massageBody;
|
||||
|
||||
@property(nonatomic,copy) NSString *pushContext;
|
||||
//消息title
|
||||
|
||||
@property(nonatomic,copy) NSString *massageTitle;
|
||||
|
||||
@property(nonatomic,copy) NSString *pushTitle;
|
||||
//消息Id
|
||||
@property(nonatomic,copy) NSString *pushId;
|
||||
|
||||
|
||||
|
||||
//推送手机类型
|
||||
Copy NSString *phoneType;
|
||||
//推送类型
|
||||
Copy NSString *jpushStatus;
|
||||
//创建时间
|
||||
@property(nonatomic,copy) NSString *createTime;
|
||||
|
||||
//设备id
|
||||
@property(nonatomic,copy) NSString *deviceId;
|
||||
|
||||
//显示名称
|
||||
@property(nonatomic,copy) NSString *showName;
|
||||
|
||||
//用户id
|
||||
@property(nonatomic,copy) NSString *userId;
|
||||
|
||||
|
||||
@property(nonatomic,copy) NSString *url;
|
||||
|
||||
//看护报告id
|
||||
@property(nonatomic,copy) NSString *reportId;
|
||||
|
||||
@property(nonatomic,assign)CGFloat cellHeight;
|
||||
|
||||
-(void)getCellHeight;
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,33 @@
|
||||
//
|
||||
// PushmessageModel.m
|
||||
// Ifish
|
||||
//
|
||||
// Created by imac on 16/3/30.
|
||||
// Copyright © 2016年 imac. All rights reserved.
|
||||
//
|
||||
|
||||
#import "PushmessageModel.h"
|
||||
|
||||
@implementation PushmessageModel
|
||||
//获取cell高度
|
||||
-(void)getCellHeight{
|
||||
|
||||
NSString *contentStr = self.pushContext;
|
||||
|
||||
NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
|
||||
paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
|
||||
paraStyle.alignment = NSTextAlignmentLeft;
|
||||
//获得带有行间距为2的高度
|
||||
paraStyle.lineSpacing = kSizeFrom750(8);
|
||||
paraStyle.hyphenationFactor = 1.0;
|
||||
paraStyle.firstLineHeadIndent = 0.0;
|
||||
paraStyle.paragraphSpacingBefore = 0.0;
|
||||
paraStyle.headIndent = 0;
|
||||
paraStyle.tailIndent = 0;
|
||||
//字间距为0
|
||||
NSDictionary *dic = @{NSFontAttributeName:SYSTEMSIZE(28), NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@0.f
|
||||
};
|
||||
CGSize size = [contentStr boundingRectWithSize:CGSizeMake(kSizeFrom750(576), 999.f) options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading|NSStringDrawingTruncatesLastVisibleLine attributes:dic context:nil].size;
|
||||
self.cellHeight = size.height+kSizeFrom750(120);
|
||||
}
|
||||
@end
|
||||
Reference in New Issue
Block a user