From d199b354a389512d12a4b50c90d2cd8dc5febb1d Mon Sep 17 00:00:00 2001
From: xwenliang <wenliang.web@gmail.com>
Date: Mon, 24 Oct 2016 19:41:04 +0800
Subject: [PATCH] fix: ios second wheel bugs #82

---
 .../UserInterfaceState.xcuserstate            | Bin 0 -> 5536 bytes
 .../xcschemes/RCTBEEPickerManager.xcscheme    |   2 +-
 .../xcschemes/xcschememanagement.plist        |   0
 ios/RCTBEEPickerManager/BzwPicker.m           |  52 ++++++++++++------
 package.json                                  |   2 +-
 5 files changed, 36 insertions(+), 20 deletions(-)
 create mode 100644 ios/RCTBEEPickerManager.xcodeproj/project.xcworkspace/xcuserdata/zooble.xcuserdatad/UserInterfaceState.xcuserstate
 rename ios/RCTBEEPickerManager.xcodeproj/xcuserdata/{mfhj-dz-001-417.xcuserdatad => zooble.xcuserdatad}/xcschemes/RCTBEEPickerManager.xcscheme (98%)
 rename ios/RCTBEEPickerManager.xcodeproj/xcuserdata/{mfhj-dz-001-417.xcuserdatad => zooble.xcuserdatad}/xcschemes/xcschememanagement.plist (100%)

diff --git a/ios/RCTBEEPickerManager.xcodeproj/project.xcworkspace/xcuserdata/zooble.xcuserdatad/UserInterfaceState.xcuserstate b/ios/RCTBEEPickerManager.xcodeproj/project.xcworkspace/xcuserdata/zooble.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000000000000000000000000000000000000..d18e392f229da23951ff4b9718dd46406b826c62
GIT binary patch
literal 5536
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

literal 0
HcmV?d00001

diff --git a/ios/RCTBEEPickerManager.xcodeproj/xcuserdata/mfhj-dz-001-417.xcuserdatad/xcschemes/RCTBEEPickerManager.xcscheme b/ios/RCTBEEPickerManager.xcodeproj/xcuserdata/zooble.xcuserdatad/xcschemes/RCTBEEPickerManager.xcscheme
similarity index 98%
rename from ios/RCTBEEPickerManager.xcodeproj/xcuserdata/mfhj-dz-001-417.xcuserdatad/xcschemes/RCTBEEPickerManager.xcscheme
rename to ios/RCTBEEPickerManager.xcodeproj/xcuserdata/zooble.xcuserdatad/xcschemes/RCTBEEPickerManager.xcscheme
index b3bafaf..6b01c3a 100644
--- a/ios/RCTBEEPickerManager.xcodeproj/xcuserdata/mfhj-dz-001-417.xcuserdatad/xcschemes/RCTBEEPickerManager.xcscheme
+++ b/ios/RCTBEEPickerManager.xcodeproj/xcuserdata/zooble.xcuserdatad/xcschemes/RCTBEEPickerManager.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ios/RCTBEEPickerManager.xcodeproj/xcuserdata/mfhj-dz-001-417.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/RCTBEEPickerManager.xcodeproj/xcuserdata/zooble.xcuserdatad/xcschemes/xcschememanagement.plist
similarity index 100%
rename from ios/RCTBEEPickerManager.xcodeproj/xcuserdata/mfhj-dz-001-417.xcuserdatad/xcschemes/xcschememanagement.plist
rename to ios/RCTBEEPickerManager.xcodeproj/xcuserdata/zooble.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/ios/RCTBEEPickerManager/BzwPicker.m b/ios/RCTBEEPickerManager/BzwPicker.m
index 02005cc..1ce29c2 100755
--- a/ios/RCTBEEPickerManager/BzwPicker.m
+++ b/ios/RCTBEEPickerManager/BzwPicker.m
@@ -133,7 +133,7 @@
      }
     }
     
-    NSLog(@"%@",[self.noCorreArry objectAtIndex:component]);
+    //NSLog(@"%@",[self.noCorreArry objectAtIndex:component]);
     
     if (self.noCorreArry.count==1) {
         
@@ -366,7 +366,7 @@
                     
                     self.selectthreeAry =[[self.dataDry objectAtIndex:setline]objectForKey:[self.provinceArray objectAtIndex:setline]];
                     
-                    NSLog(@"%@",_selectthreeAry);
+                    //NSLog(@"%@",_selectthreeAry);
                     self.townArray=[[self.selectthreeAry  objectAtIndex:row]objectForKey:[self.cityArray objectAtIndex:row]];
                     
                 }else{
@@ -402,7 +402,12 @@
                 }
             }
             [pickerView reloadComponent:1];
-            [pickerView selectRow:0 inComponent:1 animated:YES];
+            if (component==1) {
+                [pickerView selectRow:row inComponent:1 animated:YES];
+                
+            }else{
+                [pickerView selectRow:0 inComponent:1 animated:YES];
+            }
         }
     }
     //返回选择的值就可以了
@@ -642,7 +647,7 @@
         if ([selectStr isEqualToString:str]) {
             _num=i;
             [_pick reloadAllComponents];
-
+            
             [_pick selectRow:i  inComponent:0 animated:NO];
             break;
         }
@@ -661,12 +666,13 @@
             NSArray *ary=[dic allKeys];
             
             [self.cityArray addObject:[ary firstObject]];
-            
         }
     }
+    
     NSString *selectStrTwo;
     
     if (self.selectValueArry.count>1) {
+        
         selectStrTwo=[NSString stringWithFormat:@"%@",self.selectValueArry[1]];
     }
     for (NSInteger i=0; i<self.cityArray.count; i++) {
@@ -677,7 +683,7 @@
             _threenum=i;
             
             [_pick reloadAllComponents];
-
+            
             [_pick selectRow:i  inComponent:1 animated:NO];
             
             break;
@@ -690,28 +696,38 @@
             
             NSArray *arry =[[selecityAry objectAtIndex:_threenum] objectForKey:[self.selectValueArry objectAtIndex:1]];
             
-            if (arry.count>0) {
-                self.townArray=arry;
-                
-            }
+            self.townArray=arry;
+            
         }
     }
     
     NSString *selectStrThree;
     
+    
     if (self.selectValueArry.count>2) {
         selectStrThree=[NSString stringWithFormat:@"%@",self.selectValueArry[2]];
     }
-    for (NSInteger i=0; i<self.townArray.count; i++) {
+    
+    if (self.townArray.count>0) {
         
-        NSString *str=[NSString stringWithFormat:@"%@",[self.townArray objectAtIndex:i]];
-        if ([selectStrThree isEqualToString:str]) {
-            [_pick reloadAllComponents];
-
-            [_pick selectRow:i  inComponent:2 animated:NO];
-            break;
+        for (NSInteger i=0; i<self.townArray.count; i++) {
+            
+            NSString *str=[NSString stringWithFormat:@"%@",[self.townArray objectAtIndex:i]];
+            if ([selectStrThree isEqualToString:str]) {
+                
+                [_pick reloadAllComponents];
+                
+                [_pick selectRow:i  inComponent:2 animated:NO];
+                
+                break;
+            }
         }
+    }else
+    {
+        NSArray *threekey=[[selecityAry objectAtIndex:0]allKeys];
+        self.townArray=[[selecityAry objectAtIndex:0]objectForKey:[threekey firstObject]];
     }
+    [_pick reloadAllComponents];
 }
 //两行时候的选择哪个的逻辑
 -(void)selectValueTwo
@@ -840,7 +856,7 @@
             
             NSString *a=[self.provinceArray objectAtIndex:[self.pick selectedRowInComponent:0]];
             NSString *b=[self.cityArray objectAtIndex:[self.pick selectedRowInComponent:1]];
-            NSLog(@"%@---%@",a,b);
+            //NSLog(@"%@---%@",a,b);
             [self.backArry addObject:a];
             [self.backArry addObject:b];
         }
diff --git a/package.json b/package.json
index 8bdfd43..2875d4f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-picker",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "description": "",
   "main": "index.js",
   "scripts": {
-- 
2.26.2