Merge branch 'master' into dev_20221020

# Conflicts: # settings.gradle
2022-10-20 11:17:52 +08:00
parent e4ba0b7f80 4b5f3a9560
commit 79aadad668
15 changed files with 109 additions and 272 deletions
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
-include ':app',  ':video', ':common', ':main',  ':live', ':lib_country_code'
+include ':app',  ':video', ':common', ':main', ':baidu', ':live', ':lib_country_code'
 include ':FaceUnity'
-//include ':baidu'
+//include ':baidu'
+//include ':recognizer'//融云语音转文字模块