Merge branch 'master' into dev_share

# Conflicts:
#	app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java
#	config.gradle
#	main/src/main/java/com/yunbao/main/activity/TestActivity.java

config.gradle

@@ -4,14 +4,13 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 405,
-            versionName      : "6.4.8"
+            versionCode      : 413,
+            versionName      : "6.4.9"
     ]
     manifestPlaceholders = [
-            //正式
-
+            //正式、
 //            serverHost       : "https://napi.yaoulive.com",
-//
+            //测试
             serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
@@ -23,7 +22,6 @@ ext {
             baiduAppId       : "23774720",
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
-
 //            true表示谷歌支付 false
             isGooglePlay     :  false,
             //是否上报异常日志