From 011b95b9849c9f29048649c1c0143b1659924494 Mon Sep 17 00:00:00 2001 From: yongqian Date: Thu, 15 Aug 2019 11:50:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?iOS=EF=BC=9A=E7=BB=9F=E4=B8=80picker?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=9A=84=E5=8A=A8=E7=94=BB=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=BA0.3s=EF=BC=9B=E4=BF=AE=E5=A4=8D=E9=9A=90=E8=97=8Fpicke?= =?UTF-8?q?r=E6=97=B6=E6=B2=A1=E6=9C=89=E5=8A=A8=E7=94=BB=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/RCTBEEPickerManager/BzwPicker.m | 6 ++++-- ios/RCTBEEPickerManager/RCTBEEPickerManager.m | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ios/RCTBEEPickerManager/BzwPicker.m b/ios/RCTBEEPickerManager/BzwPicker.m index 41aea4b99..b87d30ee3 100755 --- a/ios/RCTBEEPickerManager/BzwPicker.m +++ b/ios/RCTBEEPickerManager/BzwPicker.m @@ -601,14 +601,16 @@ -(void)cancleAction dispatch_async(dispatch_get_main_queue(), ^{ - [UIView animateWithDuration:.2f animations:^{ + [UIView animateWithDuration:.3f animations:^{ [self setFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, 250)]; }]; }); - self.pick.hidden=YES; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + self.pick.hidden=YES; + }); } //按了确定按钮 -(void)cfirmAction diff --git a/ios/RCTBEEPickerManager/RCTBEEPickerManager.m b/ios/RCTBEEPickerManager/RCTBEEPickerManager.m index 0215d49e2..ccdb1e6a0 100644 --- a/ios/RCTBEEPickerManager/RCTBEEPickerManager.m +++ b/ios/RCTBEEPickerManager/RCTBEEPickerManager.m @@ -120,7 +120,9 @@ + (BOOL)requiresMainQueueSetup }); } - self.pick.hidden=YES; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + self.pick.hidden=YES; + }); return; } From cabef01146bcd935ed211310b4d7719f49235fc5 Mon Sep 17 00:00:00 2001 From: yongqian Date: Thu, 15 Aug 2019 12:31:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?remove=20warning=20:=201=E3=80=81replace=20?= =?UTF-8?q?compile=20with=20implementation=20=202=E3=80=81buildToolsVersio?= =?UTF-8?q?n=20"23.0.1"=20->=20"28.0.3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 40f4f265c..440e813b7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 27 - buildToolsVersion "23.0.1" + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 16 @@ -22,6 +22,6 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.facebook.react:react-native:+' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.facebook.react:react-native:+' } From 827b76a2d12707496a48a4d13c3e6085d1884a6a Mon Sep 17 00:00:00 2001 From: yongqian Date: Wed, 28 Aug 2019 12:30:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=95=E5=85=A5safeExtGet=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E8=8E=B7=E5=8F=96=E4=B8=BB=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?build.gradle=E4=B8=AD=E7=9A=84=E5=90=84=E7=A7=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 440e813b7..4092c0847 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,15 @@ apply plugin: 'com.android.library' +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} android { - compileSdkVersion 27 - buildToolsVersion "28.0.3" + compileSdkVersion safeExtGet('compileSdkVersion', 27) + buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3') defaultConfig { - minSdkVersion 16 - targetSdkVersion 27 + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 27) versionCode 1 versionName "1.0"