Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

2024-03-29 14:52:03 +08:00
parent 081a2ee350 326e376323
commit 91217e6bda
8 changed files with 10 additions and 11 deletions
--- a/common/src/main/res/layout/item_comment_video_view.xml
+++ b/common/src/main/res/layout/item_comment_video_view.xml
@@ -86,7 +86,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="10dp"
            android:padding="10dp"
-            android:text="回复"
+            android:text="@string/reply"
            android:textColor="#777777"
            android:textSize="11dp" />