1、变更推送为阿里云推,清除云信IM以及推送内容;
2、消息页面全新改版; 3、部分微小Bug修复
This commit is contained in:
@@ -15,7 +15,33 @@
|
||||
# define DLog(...)
|
||||
#endif
|
||||
|
||||
#define SECOND (1)
|
||||
#define MINUTE (60 * SECOND)
|
||||
#define HOUR (60 * MINUTE)
|
||||
#define DAY (24 * HOUR)
|
||||
#define MONTH (30 * DAY)
|
||||
#define YEAR (12 * MONTH)
|
||||
|
||||
//** 简单的property 定义
|
||||
#define Strong @property(nonatomic, strong)
|
||||
#define Weak @property(nonatomic, weak)
|
||||
#define Retain @property(nonatomic, retain)
|
||||
#define Copy @property(nonatomic, copy)
|
||||
#define Assign @property(nonatomic, assign)
|
||||
|
||||
#define APP_VERSION @"00.46.02.03"
|
||||
#define BundleVersion @"bundleVersion"//系统版本号3.0
|
||||
#define kDeviceToken @"device_token"
|
||||
#define is_Bind_DeviceToken @"is_Bind_DeviceToken"
|
||||
#define kToken @"user_token"
|
||||
#define kVersion @"version"
|
||||
#define kUsername @"user_name"//用户名
|
||||
#define kNikename @"nike_name"//昵称
|
||||
#define Cache_Message @"Cache_Message"
|
||||
//当前版本号
|
||||
#define Version_Code [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]
|
||||
//当前bundle版本号
|
||||
#define Bundle_Code [[[NSBundle mainBundle]infoDictionary] objectForKey:@"CFBundleVersion"]
|
||||
|
||||
#define XBgColor [UIColor colorWithRed:224.0/255.0 green:224.0/255.0 blue:224.0/255.0 alpha:1.0]
|
||||
|
||||
@@ -26,7 +52,20 @@
|
||||
|
||||
#define customRedCorlor [UIColor colorWithRed:217.0/255.0 green:80.0/255.0 blue:80.0/255.0 alpha:1]
|
||||
|
||||
#define WEAK_SELF __weak typeof(self) weakSelf = self
|
||||
// 4.屏幕大小尺寸
|
||||
#define screen_width [UIScreen mainScreen].bounds.size.width
|
||||
#define screen_height [UIScreen mainScreen].bounds.size.height
|
||||
//UI设计尺寸,在开发过程中需要用此方法转换
|
||||
#define kSizeFrom750(x) ((x) * ([UIScreen mainScreen].bounds.size.width/750.f))
|
||||
|
||||
#define SYSTEMSIZE(x) [UIFont systemFontOfSize:kSizeFrom750(x)]
|
||||
//设置图片
|
||||
#define IMAGEBYENAME(name) [UIImage imageNamed:name]
|
||||
//alloc
|
||||
#define InitObject(vc) [[vc alloc]init]
|
||||
|
||||
#define RECT( a, b, c, d) CGRectMake(a, b, c, d)
|
||||
//#define UIColorFromRGB(rgbValue) [UIColor \
|
||||
colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \
|
||||
green:((float)((rgbValue & 0xFF00) >> 8))/255.0 \
|
||||
@@ -66,6 +105,7 @@ alpha:((float)(rgbValue & 0xFF))/255.0]
|
||||
#define NAVIGATION_BAR_HEIGHT ([[[UIDevice currentDevice] systemVersion] floatValue] < 7.0 ? (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 44:44):(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 64:64))
|
||||
//#define NAVIGATION_BAR_HEIGHT ([[[UIDevice currentDevice] systemVersion] floatValue] < 7.0 ? (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 64:44):(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 64:64))
|
||||
|
||||
#define NavigationBarHeight (self.navigationController.navigationBar.frame.size.height+[[UIApplication sharedApplication] statusBarFrame].size.height)
|
||||
//TABLE TEXTFIELD
|
||||
#define BAR_BUTTON_HEIGHT (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 68:46)
|
||||
#define BAR_BUTTON_LEFT_ICON_WIDTH_AND_HEIGHT (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 36:24)
|
||||
@@ -81,6 +121,7 @@ alpha:((float)(rgbValue & 0xFF))/255.0]
|
||||
#define SDCARD 16
|
||||
#define USB 0
|
||||
|
||||
|
||||
/*
|
||||
*1. 设计要大小为20*20像素的view;
|
||||
*2. view的大小为(20/SCREEN_SCALE)*(20/SCREEN_SCALE)点的view。
|
||||
@@ -94,6 +135,10 @@ alpha:((float)(rgbValue & 0xFF))/255.0]
|
||||
*/
|
||||
#define FondSizeWithPxValue(PxValue) ((PxValue/96.0)*72.0)
|
||||
|
||||
/**
|
||||
校验字符串是否为空
|
||||
*/
|
||||
#define IsEmptyStr(str) (str==nil||[str isEqualToString:@""]||[str isEqualToString:@"<null>"]||[str isEqualToString:@"nil"]||[str isEqualToString:@"(null)"])
|
||||
//国际化字体定义
|
||||
#define InternationalizationFondSize(FondSizeString) [UIFont systemFontOfSize:[FondSizeString floatValue]]
|
||||
#define InternationalizationBoldFondSize(FondSizeString) [UIFont boldSystemFontOfSize:[FondSizeString floatValue]]
|
||||
@@ -138,6 +183,8 @@ typedef enum{
|
||||
}TipsType; //16.10.18
|
||||
|
||||
|
||||
#define Ali_Push_APPKey @"26007228"
|
||||
#define Ali_Push_APPSecret @"87c9206424399968ba11a56a9a979cfe"
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user