update version to release-9.5.11178

Android/.gitignore

@@ -7,3 +7,6 @@ build/
 /captures
 .externalNativeBuild
 .cxx
+*.codecc/
+/build.yml
+tui*/

Android/Debug/src/main/java/com/tencent/liteav/debug/GenerateTestUserSig.java

@@ -55,7 +55,7 @@ public class GenerateTestUserSig {
  * key：url_push 获取RTMP推流地址
  * key：url_play_flv 获取FLV播放地址
  */
- public static final String URL_FETCH_PUSH_URL = PLACEHOLDER;
+ public static final String URL_FETCH_PUSH_URL = "PLACEHOLDER";
 
  /**
  * 计算签名用的加密密钥，获取步骤如下：
@@ -67,7 +67,7 @@ public class GenerateTestUserSig {
  * 注意：该方案仅适用于调试Demo，正式上线前请将 UserSig 计算代码和密钥迁移到您的后台服务器上，以避免加密密钥泄露导致的流量盗用。
  * 文档：https://cloud.tencent.com/document/product/269/32688#Server
  */
- private static final String SECRETKEY = PLACEHOLDER;
+ private static final String SECRETKEY = "PLACEHOLDER";
 
  /**
  * 计算 UserSig 签名

Android/Source/build.gradle

@@ -21,21 +21,7 @@ android {
 
 dependencies {
  api fileTree(dir: 'libs', include: ['*.jar'])
- api "androidx.multidex:multidex:2.0.0"
- api "androidx.recyclerview:recyclerview:1.0.0"
- api "androidx.appcompat:appcompat:1.0.0"
- api "com.google.android.material:material:1.0.0"
- api "androidx.constraintlayout:constraintlayout:1.1.3"
- api "com.squareup.okhttp3:logging-interceptor:$LOGGING_INTERCEPTOR_VERSION"
- api "com.squareup.retrofit2:converter-gson:$CONVERTER_GSON_VERSION"
- api "com.squareup.retrofit2:retrofit:$RETROFIT_VERSION"
- api "com.squareup.okhttp3:okhttp:$OKHTTP_VERSION"
- api "com.github.bumptech.glide:glide:$GLIDE_VERSION"
- api "com.github.ctiao:DanmakuFlameMaster:$DANMAKU_FLAME_MASTER_VERSION"
- api "de.hdodenhof:circleimageview:$CIRCLEIMAGEVIEW_VERSION"
- api "com.google.code.gson:gson:$GSON_VERSION"
- api "com.blankj:utilcode:$UTIL_CODE_VERSION"
- api rootProject.ext.liteavSdk
+ api(name: 'LiteAVSDK_Enterprise', ext: 'aar')
  api rootProject.ext.imSdk
  api project(':Debug')
 }

Android/Source/src/main/res/values-en/strings.xml

@@ -15,10 +15,10 @@
  <string name="trtcchatsalon_already_anchor">you are the anchor</string>
  <string name="trtcchatsalon_room_not_ready">The room is loading</string>
  <string name="trtcchatsalon_room_destroy">The host has closed the room</string>
- <string name="trtcchatsalon_already_open_mic">The microphone is turned on</string>
- <string name="trtcchatsalon_already_close_mic">The microphone is turned off</string>
+ <string name="trtcchatsalon_already_open_mic">Mic on</string>
+ <string name="trtcchatsalon_already_close_mic">Mic off</string>
  <string name="trtcchatsalon_anchor_permission">Only the host can operate</string>
- <string name="trtcchatsalon_btn_cancel">Wait a bit</string>
+ <string name="trtcchatsalon_btn_cancel">Cancel</string>
  <string name="trtcchatsalon_btn_confirm">Confirm</string>
  <string name="trtcchatsalon_hand_up_list">Raised hands</string>
  <string name="trtcchatsalon_room_title">default room topic</string>

Android/Source/src/main/res/values-zh/strings.xml

@@ -19,7 +19,7 @@
  <string name="trtcchatsalon_already_close_mic">您已关闭麦克风</string>
  <string name="trtcchatsalon_anchor_permission">主播才能操作</string>
  <string name="trtcchatsalon_btn_confirm">确认</string>
- <string name="trtcchatsalon_btn_cancel">再等等</string>
+ <string name="trtcchatsalon_btn_cancel">取消</string>
  <string name="trtcchatsalon_hand_up_list">举手列表</string>
  <string name="trtcchatsalon_room_title">默认房间名称</string>
  <string name="trtcchatsalon_room_username">默认用户名</string>

Android/Source/src/main/res/values/strings.xml

@@ -15,10 +15,10 @@
  <string name="trtcchatsalon_already_anchor">you are the anchor</string>
  <string name="trtcchatsalon_room_not_ready">The room is loading</string>
  <string name="trtcchatsalon_room_destroy">The host has closed the room</string>
- <string name="trtcchatsalon_already_open_mic">The microphone is turned on</string>
- <string name="trtcchatsalon_already_close_mic">The microphone is turned off</string>
+ <string name="trtcchatsalon_already_open_mic">Mic on</string>
+ <string name="trtcchatsalon_already_close_mic">Mic off</string>
  <string name="trtcchatsalon_anchor_permission">Only the host can operate</string>
- <string name="trtcchatsalon_btn_cancel">Wait a bit</string>
+ <string name="trtcchatsalon_btn_cancel">Cancel</string>
  <string name="trtcchatsalon_btn_confirm">Confirm</string>
  <string name="trtcchatsalon_hand_up_list">Raised hands</string>
  <string name="trtcchatsalon_room_title">default room topic</string>

Android/build.gradle

@@ -3,9 +3,12 @@
 buildscript {
 
  repositories {
- jcenter()
- google()
- mavenCentral()
+ maven { url "https://mirrors.tencent.com/nexus/repository/maven-public/" }
+ maven { url "https://mirrors.tencent.com/repository/maven/liteavsdk" }
+ maven { url "https://mirrors.tencent.com/repository/maven/thirdparty" }
+ //jcenter()
+ //google()
+ //mavenCentral()
  }
  dependencies {
  classpath 'com.android.tools.build:gradle:3.5.3'
@@ -20,9 +23,12 @@ allprojects {
  flatDir {
  dirs project(':App').file('libs')
  }
- jcenter()
- google()
- mavenCentral()
+ maven { url "https://mirrors.tencent.com/nexus/repository/maven-public/" }
+ maven { url "https://mirrors.tencent.com/repository/maven/liteavsdk" }
+ maven { url "https://mirrors.tencent.com/repository/maven/thirdparty" }
+ //jcenter()
+ //google()
+ //mavenCentral()
  }
 }
 
@@ -31,6 +37,6 @@ task clean(type: Delete) {
 }
 
 ext {
- liteavSdk="com.tencent.liteav:LiteAVSDK_TRTC:latest.release"
+ liteavSdk = "com.tencent.liteav:LiteAVSDK_Enterprise:latest.release"
  imSdk = "com.tencent.imsdk:imsdk-plus:$IMSDK_VERSION"
 }

Android/gradle.properties

@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
 # Gradle 相关配置
 COMPILE_SDK_VERSION = 28
 BUILD_TOOLS_VERSION = 28.0.3
-MIN_SDK_VERSION = 19
+MIN_SDK_VERSION = 16
 TARGET_SDK_VERSION = 26
 
 # 客户端版本号
@@ -31,7 +31,7 @@ DESIGN_VERSION = 27.1.0
 APPCOMPAT_V7_VERSION = 26.0.1
 RECYCLERVIEW_V7_VERSION = 26.0.1
 DANMAKU_FLAME_MASTER_VERSION = 0.5.3
-GLIDE_VERSION = 4.7.1
+GLIDE_VERSION = 4.12.0
 OKHTTP_VERSION = 3.11.0
 RETROFIT_VERSION = 2.2.0
 CONVERTER_GSON_VERSION = 2.2.0