Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
f43b3cb
修复CSS中设置color属性时用十六进制时alpha参数无效的bug
mylonly Jul 7, 2015
98400c1
提交dev分支新内容
mylonly Jul 7, 2015
4337792
回复BeeUIButton的title处理方式,在CSS中设置title-insets无效,需要在.m文件中手动设置setTitleIns…
mylonly Jul 7, 2015
04e3395
增加UPYun上传功能
venking1130 Jul 8, 2015
92ddd03
删除不需要的JSHhttpHelper库
venking1130 Jul 8, 2015
2fad25d
Merge pull request #2 from venking1130/dev
mylonly Jul 8, 2015
d3bfce7
20150708--数据队列(Bee_Queue)新增操作类型字段
venking1130 Jul 8, 2015
86f8ccd
上传测试更新
venking1130 Jul 21, 2015
e1baf87
队列修正
venking1130 Jul 21, 2015
6c6d26f
Merge pull request #3 from venking1130/dev
mylonly Jul 21, 2015
074ea88
打开BEE_LOG日志,单元测试EXPECTED条件判断修改
mylonly Jul 21, 2015
194f29a
上传模块模型支持二进制
venking1130 Jul 22, 2015
41a5076
Merge pull request #4 from venking1130/dev
mylonly Jul 22, 2015
a437a6a
提供上传二进制时的初始化方法
venking1130 Jul 22, 2015
91b7402
Merge pull request #5 from venking1130/dev
mylonly Jul 22, 2015
4b7a721
上传整块调试
venking1130 Jul 22, 2015
7697c24
Merge pull request #6 from venking1130/dev
mylonly Jul 22, 2015
330e04b
修复上传过程中实际失败显示成功的问题
venking1130 Jul 22, 2015
3eacf9e
Merge pull request #7 from venking1130/dev
mylonly Jul 22, 2015
63f5ebe
初步分块上传
venking1130 Jul 22, 2015
6166138
分块上传进度
venking1130 Jul 22, 2015
7ac95f4
Merge pull request #8 from venking1130/dev
mylonly Jul 22, 2015
74c5f08
上传以服务器地址做缓存索引
venking1130 Jul 23, 2015
380f05d
Merge pull request #9 from venking1130/dev
mylonly Jul 23, 2015
1607f7f
未指定上传地址时,默认为UPYun空间
venking1130 Jul 23, 2015
f7b35a5
服务路径为空只显示后台告警信息
venking1130 Jul 23, 2015
c517ccc
Merge pull request #10 from venking1130/dev
mylonly Jul 23, 2015
e0d5655
BeeUICell增加触摸响应
mylonly Jul 23, 2015
2725bca
关闭所有调试开关
mylonly Jul 29, 2015
3ee0931
修改service.push 使之支持IOS8系统
mylonly Jul 31, 2015
45d7535
修复alertView bug ,增加IOS8下推送设置
mylonly Aug 6, 2015
1e75571
上传对了以目标地址初始化
venking1130 Aug 6, 2015
6a17e82
reslove conflict
mylonly Aug 6, 2015
00b999b
关闭AVCapture
mylonly Aug 12, 2015
e7812e8
UPYun 空间名、验证信息设置
venking1130 Aug 19, 2015
138dadc
Merge pull request #12 from venking1130/dev
mylonly Aug 19, 2015
62d54d6
上传文件修改
mylonly Aug 19, 2015
84baacd
上传UPYun的验证信息
venking1130 Aug 20, 2015
434522a
Merge remote-tracking branch 'mylonly/master' into dev
venking1130 Aug 20, 2015
7461884
Merge pull request #13 from venking1130/dev
mylonly Aug 20, 2015
bf40fca
增加默认全局的defaultImage
mylonly Aug 20, 2015
b82dd4e
defaultImage
mylonly Aug 21, 2015
70dddad
只有整体上传失败才调用失败处理,多次重试不调用失败处理
venking1130 Sep 6, 2015
c74b65f
Merge pull request #14 from venking1130/dev
mylonly Sep 6, 2015
fafe901
Revert "Dev"
mylonly Sep 6, 2015
f2eeb8a
Merge pull request #15 from mylonly/revert-14-dev
mylonly Sep 6, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions framework/mvc/view/common/extension/UIColor+BeeExtension.m
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ + (UIColor *)colorWithString:(NSString *)string
if ( color.length == 8 )
{
NSUInteger hexRGB = strtol(color.UTF8String , nil, 16);
return [UIColor fromHexValue:hexRGB];
return [UIColor fromHexValue:hexRGB alpha:alpha];
}
else if ( color.length == 6 )
{
NSUInteger hexRGB = strtol(color.UTF8String , nil, 16);
return [UIColor fromHexValue:hexRGB alpha:1.0f];
return [UIColor fromHexValue:hexRGB alpha:alpha];
}
}
else
Expand Down
11 changes: 9 additions & 2 deletions services/bee.services.push/source/ServicePush.m
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,15 @@ - (void)powerOn

#else // #if TARGET_IPHONE_SIMULATOR && __BEE_DEVELOPMENT__

UIRemoteNotificationType types = UIRemoteNotificationTypeBadge|UIRemoteNotificationTypeSound|UIRemoteNotificationTypeAlert;
[[UIApplication sharedApplication] registerForRemoteNotificationTypes:types];
if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0) {
UIUserNotificationType myTypes = UIUserNotificationTypeBadge | UIUserNotificationTypeSound | UIUserNotificationTypeAlert;

UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:myTypes categories:nil];
[[UIApplication sharedApplication] registerUserNotificationSettings:settings];
}else {
UIRemoteNotificationType myTypes = UIRemoteNotificationTypeBadge|UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound;
[[UIApplication sharedApplication] registerForRemoteNotificationTypes:myTypes];
}

#endif // #if TARGET_IPHONE_SIMULATOR && __BEE_DEVELOPMENT__
}
Expand Down