You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/12 09:14:27 UTC
[1/2] incubator-weex git commit: + [ios] fix bug picker
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev b92bf6fec -> 68acd19da
+ [ios] fix bug picker
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/26200834
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/26200834
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/26200834
Branch: refs/heads/0.12-dev
Commit: 262008346f171a4cb31845a92306bc27ca78c063
Parents: c22d8e4
Author: \u9f50\u5c71 <su...@163.com>
Authored: Wed Apr 12 15:45:38 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Wed Apr 12 15:45:38 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 32 +++++++++++++-------
1 file changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/26200834/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m b/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
index ac4ae53..41ec9cc 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
@@ -66,6 +66,11 @@ WX_EXPORT_METHOD(@selector(pickTime:callback:))
#pragma mark -
#pragma mark Single Picker
+-(void)dealloc
+{
+ [NSObject cancelPreviousPerformRequestsWithTarget:self];
+}
+
-(void)pick:(NSDictionary *)options callback:(WXModuleCallback)callback
{
NSArray *items = @[];
@@ -117,6 +122,14 @@ WX_EXPORT_METHOD(@selector(pickTime:callback:))
}
}
+-(void)SetColorDelay:(NSNumber *)number
+{
+ if(self.selectionColor) {
+ UILabel *labelSelected = (UILabel*)[self.picker viewForRow:[number integerValue] forComponent:0.3];
+ [labelSelected setBackgroundColor:self.selectionColor];
+ }
+}
+
-(void)createPicker:(NSArray *)items index:(NSInteger)index
{
[self configPickerView];
@@ -124,8 +137,12 @@ WX_EXPORT_METHOD(@selector(pickTime:callback:))
self.index = index;
if (items && index < [items count]) {
[self.picker selectRow:index inComponent:0 animated:NO];
+ [self performSelector:@selector(SetColorDelay:) withObject:[NSNumber numberWithInteger:self.index] afterDelay:0.3];
+
} else if(items && [items count]>0) {
[self.picker selectRow:0 inComponent:0 animated:NO];
+ [self performSelector:@selector(SetColorDelay:) withObject:[NSNumber numberWithInteger:0] afterDelay:0.3];
+
}
[self show];
}
@@ -244,7 +261,7 @@ WX_EXPORT_METHOD(@selector(pickTime:callback:))
titleLabel.center = toolBar.center;
titleLabel.textAlignment = NSTextAlignmentCenter;
if(self.titleColor){
- titleLabel.textColor = self.textColor;
+ titleLabel.textColor = self.titleColor;
}
if(self.title.length>0){
titleLabel.text = self.title;
@@ -310,15 +327,6 @@ WX_EXPORT_METHOD(@selector(pickTime:callback:))
}
}
-- (NSAttributedString *)pickerView:(UIPickerView *)pickerView attributedTitleForRow:(NSInteger)row forComponent:(NSInteger)component{
- NSString * reStr = self.items[row];
- NSMutableAttributedString * attriStr = [[NSMutableAttributedString alloc] initWithString:reStr];
- UIColor *color = self.textColor?self.textColor:[UIColor blackColor];
- [attriStr addAttribute:NSForegroundColorAttributeName value:color range:NSMakeRange(0, reStr.length)];
-
- return attriStr;
-}
-
-(UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view
{
@@ -329,7 +337,9 @@ WX_EXPORT_METHOD(@selector(pickTime:callback:))
label= [[UILabel alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [pickerView rowSizeForComponent:component].width, [pickerView rowSizeForComponent:component].height)];
label.textAlignment = NSTextAlignmentCenter;
- label.text = self.items[row];
+ UIColor *color = self.textColor?self.textColor:[UIColor blackColor];
+ label.textColor = color;
+ label.text = [self convertItem:self.items[row]];
}
return label;
[2/2] incubator-weex git commit: Merge branch
'ios-bugfix-picker-0.12-dev' of https://github.com/kfeagle/incubator-weex
into 0.12-dev
Posted by cx...@apache.org.
Merge branch 'ios-bugfix-picker-0.12-dev' of https://github.com/kfeagle/incubator-weex into 0.12-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/68acd19d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/68acd19d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/68acd19d
Branch: refs/heads/0.12-dev
Commit: 68acd19daaaae0edfb312d7eb0b4d8ce89c97cea
Parents: b92bf6f 2620083
Author: cxfeng <cx...@apache.org>
Authored: Wed Apr 12 17:14:19 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Wed Apr 12 17:14:19 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 32 +++++++++++++-------
1 file changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------