From d9ba689117b7b89300bed5f82b83f17abd296931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E8=BE=B0?= Date: Tue, 9 Apr 2019 12:02:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=20google()?= =?UTF-8?q?=20=E7=9A=84=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=AF=B9=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=9B=B4=E5=8F=8B=E5=A5=BD=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 2721b498..e91957f5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,8 @@ buildscript { repositories { - maven { - url 'https://maven.google.com/' - name 'Google' - } jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.0.1' @@ -20,10 +17,7 @@ buildscript { allprojects { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } } From 30a97f2d04d8c43f13c93398c27268b130fc8094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E8=BE=B0?= Date: Tue, 9 Apr 2019 12:12:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20#690=20=E5=BA=95=E9=83=A8=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E9=81=AE=E7=9B=96=E8=99=9A=E6=8B=9F=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bigkoo/pickerview/view/BasePickerView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java b/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java index 23879455..5ccfbf6b 100644 --- a/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java +++ b/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java @@ -81,7 +81,7 @@ public void onClick(View view) { //如果只是要显示在屏幕的下方 //decorView是activity的根View,包含 contentView 和 titleView if (mPickerOptions.decorView == null) { - mPickerOptions.decorView = (ViewGroup) ((Activity) context).getWindow().getDecorView(); + mPickerOptions.decorView = (ViewGroup) ((Activity) context).getWindow().getDecorView().findViewById(android.R.id.content); } //将控件添加到decorView中 rootView = (ViewGroup) layoutInflater.inflate(R.layout.layout_basepickerview, mPickerOptions.decorView, false);