From d73374bc4efe8766eca6a1fc9f296a8ebe97385b Mon Sep 17 00:00:00 2001
From: renjianbo0118 <18133922183>
Date: Wed, 21 Jul 2021 22:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=8A=E6=97=A5=E5=A4=B4?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E5=B1=8F=E5=B9=95=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations.xml                    |  1 +
 app/build.gradle                               |  1 +
 app/src/main/AndroidManifest.xml               |  7 +++++++
 .../layout/activity_entranceguard_control2.xml | 18 ------------------
 build.gradle                                   |  2 +-
 gradle/wrapper/gradle-wrapper.properties       |  6 +++---
 技术文档                                       |  2 ++
 7 files changed, 15 insertions(+), 22 deletions(-)
 create mode 100644 技术文档

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/build.gradle b/app/build.gradle
index 9094524..a3f1be3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -158,6 +158,7 @@ android {
         implementation 'cn.jiguang.sdk:jcore:2.3.8'
         implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
         api 'io.reactivex.rxjava2:rxjava:2.1.5'
+        implementation 'me.jessyan:autosize:1.1.2'
     }
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c09f84..380501d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -413,6 +413,13 @@
             android:theme="@style/wxPayTheme"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <activity android:name=".discovery.LikeActivity" />
+        <!-- 如果您项目中的所有页面都只需要以高或宽中的一个作为基准进行适配的话, 那就只需要填写高或宽中的一个设计图尺寸即可 -->
+        <meta-data
+            android:name="design_width_in_dp"
+            android:value="360"/>
+        <meta-data
+            android:name="design_height_in_dp"
+            android:value="640"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_entranceguard_control2.xml b/app/src/main/res/layout/activity_entranceguard_control2.xml
index b4113b2..269b5b1 100644
--- a/app/src/main/res/layout/activity_entranceguard_control2.xml
+++ b/app/src/main/res/layout/activity_entranceguard_control2.xml
@@ -105,25 +105,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="0.5dip"
                             android:background="@color/lightlittleGrey" />
-                        <!--                        <LinearLayout-->
-                        <!--                            android:layout_width="match_parent"-->
-                        <!--                            android:orientation="vertical"-->
-                        <!--                            android:layout_height="wrap_content">-->
-                        <!--                            <TextView-->
-                        <!--                                android:layout_width="wrap_content"-->
-                        <!--                                android:text="地址"-->
-                        <!--                                android:layout_marginLeft="20dip"-->
-                        <!--                                android:layout_marginRight="20dp"-->
-                        <!--                                android:layout_marginTop="20dp"-->
-                        <!--                                android:layout_height="wrap_content" />-->
-                        <!--                            <RadioGroup-->
-                        <!--                                android:layout_width="match_parent"-->
-                        <!--                                android:id="@+id/myradio"-->
-                        <!--                                android:layout_margin="18dip"-->
-                        <!--                                android:layout_height="match_parent">-->
 
-                        <!--                            </RadioGroup>-->
-                        <!--                        </LinearLayout>-->
                         <LinearLayout
                             android:visibility="gone"
                             android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index 620fd49..18158bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e827c09..f56dfcf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 03 09:06:55 CST 2020
+#Wed Jul 21 22:05:06 CST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/技术文档 b/技术文档
new file mode 100644
index 0000000..b6855f2
--- /dev/null
+++ b/技术文档
@@ -0,0 +1,2 @@
+1.今日头条适配：https://github.com/JessYanCoding/AndroidAutoSize
+  使用方法：https://blog.csdn.net/taowuhua0505/article/details/88239803
\ No newline at end of file