Merge branch 'master' into dev_pkrank

# Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java
2022-11-16 11:22:35 +08:00
parent 749ac197de 85971339d4
commit 45257e8fe1
7 changed files with 68 additions and 19 deletions
--- a/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java
@@ -62,7 +62,7 @@ public class VoiceDialog extends AbsDialogFragment {

    public String sendMessage() {

-        return voiceChat.getText().toString();
+        return WordsTypeUtil.changeTraditional(builder.toString());
    }

    @Override