Merge branch 'yinyou_v3.6.4' into yinyou_develop

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
#	app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt
#	app/src/main/res/layout/layout_room_pk_board_view.xml
#	core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
#	core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java

app/build.gradle

@@ -6,8 +6,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.huawei.agconnect'
-apply plugin: 'android-junk-code'
-
 
 android {
     compileSdkVersion 29
@@ -24,13 +22,7 @@ android {
 
         ndk {
             //设置支持的SO库架构
-            if (ndk_abi_filters == "x86") {
-                abiFilters "x86"
-            } else if (ndk_abi_filters == "arm_x86") {
-                abiFilters "armeabi-v7a", "x86"
-            } else {
-                abiFilters "armeabi-v7a"
-            }
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
 
         flavorDimensions 'default'
@@ -42,7 +34,7 @@ android {
         variant ->
             variant.outputs.all {
                 def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
-                outputFileName = "yinyou_" + buildType.name + "_v${Boolean.parseBoolean(with_jenkins) ? "" : (defaultConfig.versionName + "-" + date)}.apk"
+                outputFileName = "yinyou_${buildType.name}_${channel}_v${defaultConfig.versionName}-${date}.apk"
             }
     }
 
@@ -190,12 +182,8 @@ android {
     productFlavors {
         accompany {
             dimension 'default'
+            manifestPlaceholders = [CHANNEL_VALUE: channel]
         }
-
-        oppo {
-            dimension 'default'
-        }
-
     }
     buildToolsVersion = '28.0.3'
 
@@ -260,12 +248,10 @@ dependencies {
     implementation files("libs/vivo_pushsdk-v2.9.0.0.aar")
 
     //阿里云实名认证
-    api(name: 'windvane', ext: 'aar')
-    api(name: 'oss-android-sdk-2.9.2', ext: 'aar')
-    api(name: 'rpsdk-4.5.0-open', ext: 'aar')
+    api(name: 'rpsdk-4.13.1-open', ext: 'aar')
     api(name: 'MiddleTierSDK-external-release-5.5.13874142', ext: 'aar')
-    api(name: 'SecurityBodySDK-external-release-5.5.19', ext: 'aar')
-    api(name: 'SecurityGuardSDK-external-release-5.5.14240408', ext: 'aar')
+    api(name: 'SecurityBodySDK-external-release-5.5.15071314', ext: 'aar')
+    api(name: 'SecurityGuardSDK-external-release-5.5.15071059', ext: 'aar')
 
     //数字滚动效果
     implementation 'com.github.YvesCheung:RollingText:1.2.3'
@@ -321,23 +307,3 @@ repositories {
         url "$storageUrl/download.flutter.io"
     }
 }
-
-android.applicationVariants.all { variant ->
-    print("variant.name=" + variant.name)
-    switch (variant.name) {//变体名称，如果没有设置productFlavors就是buildType名称，如果有设置productFlavors就是flavor+buildType，例如（freeRelease、proRelease）
-        case "oppoRelease":
-            androidJunkCode.configMap.put(variant.name, {
-                packageBase = "com.mango.plugin.ui"  //生成java类根包名
-                packageCount = 30 //生成包数量
-                activityCountPerPackage = 30 //每个包下生成Activity类数量
-                excludeActivityJavaFile = false
-                //是否排除生成Activity的Java文件,默认false(layout和写入AndroidManifest.xml还会执行)，主要用于处理类似神策全埋点编译过慢问题
-                otherCountPerPackage = 50  //每个包下生成其它类的数量
-                methodCountPerClass = 20  //每个类下生成方法数量
-                resPrefix = "mango_"  //生成的layout、drawable、string等资源名前缀
-                drawableCount = 300  //生成drawable资源数量
-                stringCount = 300  //生成string数量
-            })
-            break
-    }
-}