Merge branch 'master' into dev_proguard

2023-06-05 16:42:18 +08:00
parent 34c569ecb5 cd2e176f0a
commit c8c4352284
158 changed files with 6013 additions and 788 deletions
--- a/config.gradle
+++ b/config.gradle
@@ -4,8 +4,8 @@ ext {
            buildToolsVersion: "29.0.2",
            minSdkVersion    : 21,
            targetSdkVersion : 31,
-            versionCode      : 420,
-            versionName      : "6.5.1"
+            versionCode      : 423,
+            versionName      : "6.5.2"
    ]
    manifestPlaceholders = [
            //正式、
@@ -26,7 +26,7 @@ ext {
 //            true表示谷歌支付 false
            isGooglePlay     :  false,
            //是否上报异常日志
-            isUploadLog      :  true
+            isUploadLog      :  false
    ]
 }
 //7664 1