Commit 99e66eeb authored by xwenliang's avatar xwenliang

Fix scroll two wheels crash

parent efed693d
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
[self addSubview:view]; [self addSubview:view];
self.leftBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.leftBtn.frame = CGRectMake(10, 5, 90, 30); self.leftBtn.frame = CGRectMake(10, 5, 90, 30);
[self.leftBtn setTitle:self.leftStr forState:UIControlStateNormal]; [self.leftBtn setTitle:self.leftStr forState:UIControlStateNormal];
...@@ -67,12 +66,10 @@ ...@@ -67,12 +66,10 @@
[self.rightBtn setTitleColor:[self colorWith:rightbtnbgColor] forState:UIControlStateNormal]; [self.rightBtn setTitleColor:[self colorWith:rightbtnbgColor] forState:UIControlStateNormal];
[view addSubview:self.rightBtn]; [view addSubview:self.rightBtn];
[self.rightBtn setFont:[UIFont systemFontOfSize:[_pickerToolBarFontSize integerValue]]]; [self.rightBtn setFont:[UIFont systemFontOfSize:[_pickerToolBarFontSize integerValue]]];
[self.rightBtn addTarget:self action:@selector(cfirmAction) forControlEvents:UIControlEventTouchUpInside]; [self.rightBtn addTarget:self action:@selector(cfirmAction) forControlEvents:UIControlEventTouchUpInside];
UILabel *cenLabel=[[UILabel alloc]initWithFrame:CGRectMake(90, 5, SCREEN_WIDTH-180, 30)]; UILabel *cenLabel=[[UILabel alloc]initWithFrame:CGRectMake(90, 5, SCREEN_WIDTH-180, 30)];
cenLabel.textAlignment=NSTextAlignmentCenter; cenLabel.textAlignment=NSTextAlignmentCenter;
...@@ -86,7 +83,6 @@ ...@@ -86,7 +83,6 @@
[view addSubview:cenLabel]; [view addSubview:cenLabel];
self.pick = [[UIPickerView alloc] initWithFrame:CGRectMake(0, 40, self.frame.size.width, self.frame.size.height - 40)]; self.pick = [[UIPickerView alloc] initWithFrame:CGRectMake(0, 40, self.frame.size.width, self.frame.size.height - 40)];
self.pick.delegate = self; self.pick.delegate = self;
self.pick.dataSource = self; self.pick.dataSource = self;
self.pick.showsSelectionIndicator=YES; self.pick.showsSelectionIndicator=YES;
...@@ -100,7 +96,6 @@ ...@@ -100,7 +96,6 @@
if (_Correlation) { if (_Correlation) {
//这里是关联的 //这里是关联的
if ([_numberCorrela isEqualToString:@"three"]) { if ([_numberCorrela isEqualToString:@"three"]) {
return 3; return 3;
}else if ([_numberCorrela isEqualToString:@"two"]){ }else if ([_numberCorrela isEqualToString:@"two"]){
...@@ -192,6 +187,7 @@ ...@@ -192,6 +187,7 @@
if (_Correlation) { if (_Correlation) {
if ([_numberCorrela isEqualToString:@"three"]) { if ([_numberCorrela isEqualToString:@"three"]) {
_lineWith=SCREEN_WIDTH-2*linSpace; _lineWith=SCREEN_WIDTH-2*linSpace;
if (self.weightArry.count>=3) { if (self.weightArry.count>=3) {
...@@ -376,8 +372,9 @@ ...@@ -376,8 +372,9 @@
self.selectthreeAry =[[self.dataDry objectAtIndex:setline]objectForKey:[self.provinceArray objectAtIndex:setline]]; self.selectthreeAry =[[self.dataDry objectAtIndex:setline]objectForKey:[self.provinceArray objectAtIndex:setline]];
//NSLog(@"%@",_selectthreeAry); //NSLog(@"%@",_selectthreeAry);
if (row<self.selectthreeAry.count) {
self.townArray=[[self.selectthreeAry objectAtIndex:row]objectForKey:[self.cityArray objectAtIndex:row]]; self.townArray=[[self.selectthreeAry objectAtIndex:row]objectForKey:[self.cityArray objectAtIndex:row]];
}
}else{ }else{
setline=0; setline=0;
...@@ -385,7 +382,7 @@ ...@@ -385,7 +382,7 @@
self.selectthreeAry =[[self.dataDry objectAtIndex:0] objectForKey:[self.provinceArray objectAtIndex:0]]; self.selectthreeAry =[[self.dataDry objectAtIndex:0] objectForKey:[self.provinceArray objectAtIndex:0]];
//NSLog(@"%ld",(long)row); //NSLog(@"%ld",(long)row);
self.townArray=[[self.selectthreeAry objectAtIndex:row]objectForKey:[self.cityArray objectAtIndex:row]]; self.townArray=[[self.selectthreeAry objectAtIndex:0]objectForKey:[self.cityArray objectAtIndex:0]];
} }
[pickerView reloadAllComponents]; [pickerView reloadAllComponents];
...@@ -429,18 +426,22 @@ ...@@ -429,18 +426,22 @@
NSString *b=[self.cityArray objectAtIndex:[self.pick selectedRowInComponent:1]]; NSString *b=[self.cityArray objectAtIndex:[self.pick selectedRowInComponent:1]];
NSString *c=[self.townArray objectAtIndex:[self.pick selectedRowInComponent:2]]; NSString *c=[self.townArray objectAtIndex:[self.pick selectedRowInComponent:2]];
if (a&&b&&c) {
[self.backArry addObject:a]; [self.backArry addObject:a];
[self.backArry addObject:b]; [self.backArry addObject:b];
[self.backArry addObject:c]; [self.backArry addObject:c];
}
}else if ([_numberCorrela isEqualToString:@"two"]){ }else if ([_numberCorrela isEqualToString:@"two"]){
NSString *a=[self.provinceArray objectAtIndex:[self.pick selectedRowInComponent:0]]; NSString *a=[self.provinceArray objectAtIndex:[self.pick selectedRowInComponent:0]];
NSString *b=[self.cityArray objectAtIndex:[self.pick selectedRowInComponent:1]]; NSString *b=[self.cityArray objectAtIndex:[self.pick selectedRowInComponent:1]];
// NSLog(@"%@---%@",a,b); // NSLog(@"%@---%@",a,b);
if (a&&b) {
[self.backArry addObject:a]; [self.backArry addObject:a];
[self.backArry addObject:b]; [self.backArry addObject:b];
} }
}
}else }else
{ {
...@@ -468,8 +469,9 @@ ...@@ -468,8 +469,9 @@
[dic setValue:@"select" forKey:@"type"]; [dic setValue:@"select" forKey:@"type"];
[dic setValue:[self getselectIndexArry] forKey:@"selectedIndex"]; [dic setValue:[self getselectIndexArry] forKey:@"selectedIndex"];
if (self.backArry.count>0) {
self.bolock(dic); self.bolock(dic);
}
} }
//判断进来的类型是那种 //判断进来的类型是那种
-(void)getStyle -(void)getStyle
......
{ {
"name": "react-native-picker", "name": "react-native-picker",
"version": "4.0.13", "version": "4.0.14",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment