From bf7ec5fd27aac53760f699cb346a99b5503514c5 Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Thu, 2 Sep 2021 08:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=20Gradle=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=BA=207.0.2=EF=BC=8C=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E7=94=B1=E4=BA=8E=20Aliyun=20=E8=BF=98=E6=B2=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E6=8F=92=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=9B=BF=E6=8D=A2=E4=B8=BA=20Google=20?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcshou/gogogo/MainActivity.java  |  6 +--
 build.gradle                                  | 37 +++++++++++--------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/zcshou/gogogo/MainActivity.java b/app/src/main/java/com/zcshou/gogogo/MainActivity.java
index b2e9a96..7970d00 100644
--- a/app/src/main/java/com/zcshou/gogogo/MainActivity.java
+++ b/app/src/main/java/com/zcshou/gogogo/MainActivity.java
@@ -372,10 +372,10 @@ public class MainActivity extends BaseActivity
             }
         });
 
-        // 搜索框的清除按钮
-        ImageView closeButton = (ImageView)searchView.findViewById(R.id.search_close_btn);
+        // 搜索框的清除按钮(该按钮属于安卓系统图标)
+        ImageView closeButton = (ImageView)searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
         closeButton.setOnClickListener(v -> {
-            EditText et = (EditText) findViewById(R.id.search_src_text);
+            EditText et = (EditText) findViewById(androidx.appcompat.R.id.search_src_text);
             et.setText("");
             searchView.setQuery("", false);
             mSearchLayout.setVisibility(View.INVISIBLE);
diff --git a/build.gradle b/build.gradle
index 13dca5c..e026008 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,15 +3,17 @@
 buildscript {
     
     repositories {
-        maven {
-            url 'https://maven.aliyun.com/repository/jcenter'
-        }
-        maven {
-            url 'https://maven.aliyun.com/repository/google'
-        }
+//        maven {
+//            url 'https://maven.aliyun.com/repository/jcenter'
+//        }
+//        maven {
+//            url 'https://maven.aliyun.com/repository/google'
+//        }
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -21,15 +23,18 @@ buildscript {
 
 allprojects {
     repositories {
-        maven {
-            url 'https://maven.aliyun.com/repository/jcenter'
-        }
-        maven {
-            url 'https://maven.aliyun.com/repository/central'
-        }
-        maven {
-            url 'https://maven.aliyun.com/repository/google'
-        }
+//        maven {
+//            url 'https://maven.aliyun.com/repository/jcenter'
+//        }
+//        maven {
+//            url 'https://maven.aliyun.com/repository/central'
+//        }
+//        maven {
+//            url 'https://maven.aliyun.com/repository/google'
+//        }
+        google()
+        mavenCentral()
+
     }
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile) { // 用于显示过时 API 的详细信息