多语言适配：修复部分多语言适配问题（私聊页、PK拒绝提示、PK搜索ID等）

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt

@@ -12,7 +12,7 @@ class RoomPKSearchAdapter :
 
     override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
         helper.setText(R.id.tv_room_title,item.title.subAndReplaceDot(7))
-            .setText(R.id.tv_room_id,"MoliStar号:${item.erbanNo}")
+            .setText(R.id.tv_room_id,"ID:${item.erbanNo}")
             .setChecked(R.id.check_box,item.checked)
         ImageLoadUtils.loadImage(mContext,item.avatar,helper.getView(R.id.iv_avatar))
         helper.addOnClickListener(R.id.iv_avatar,R.id.check_box)

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt

@@ -3,6 +3,7 @@ package com.chwl.app.avroom.singleroompk
 import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.core.view.isVisible
+import com.chwl.app.R
 import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogSingleRoomPkReceivedBinding
 import com.chwl.core.im.custom.bean.RoomPkBean
@@ -37,7 +38,7 @@ class SingleRoomPkReceivedDialog : BaseDialog<DialogSingleRoomPkReceivedBinding>
     @SuppressLint("CheckResult")
     override fun init() {
         binding?.tvNick?.text = pkBean.inviteRoomTitle.subAndReplaceDot(7)
-        binding?.tvTime?.text = "${pkBean.pkDuration}分鐘"
+        binding?.tvTime?.text = "${pkBean.pkDuration}${getString(R.string.layout_activity_room_pk_create_010)}"
         pkBean.pkDesc.ifNotNullOrEmpty {
             binding?.tvDescTitle?.isVisible = true
             binding?.tvDesc?.isVisible = true

app/src/main/res/layout/activity_p2p_message.xml

@@ -59,10 +59,10 @@
                 </LinearLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:orientation="horizontal"
-                    android:layout_gravity="end"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp">
+                    android:layout_height="24dp"
+                    android:layout_gravity="end"
+                    android:orientation="horizontal">
 
                     <ImageView
                         android:id="@+id/iv_attention"
@@ -71,10 +71,10 @@
                         android:layout_marginEnd="@dimen/dp_10"
                         android:src="@drawable/ic_chat_navigation_attention"
                         android:visibility="gone"
-                        tools:visibility="visible"
-                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/iv_add_black_list"/>
+                        app:layout_constraintEnd_toStartOf="@+id/iv_add_black_list"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:visibility="visible" />
 
                     <TextView
                         android:id="@+id/iv_add_black_list"
@@ -86,10 +86,10 @@
                         android:textColor="@color/color_b3b3b3"
                         android:textSize="@dimen/sp_12"
                         android:visibility="gone"
-                        tools:visibility="visible"
-                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:visibility="visible" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -139,7 +139,8 @@
             android:layout_marginEnd="15dp"
             android:layout_marginBottom="8dp"
             android:background="@drawable/bg_p2p_top_userinfo"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <com.chwl.app.common.widget.CircleImageView
                 android:id="@+id/iv_avatar"
@@ -168,31 +169,52 @@
 
             <TextView
                 android:id="@+id/tv_content"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
+                android:layout_marginEnd="5dp"
+                android:ellipsize="end"
                 android:textColor="@color/color_666666"
                 android:textSize="14dp"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/layout_go_room"
                 app:layout_constraintStart_toStartOf="@id/tv_nick"
                 app:layout_constraintTop_toBottomOf="@id/tv_nick"
                 tools:text="@string/layout_activity_p2p_message_06" />
 
-            <com.chwl.library.widget.DrawableCenterTextView
+            <LinearLayout
-                android:id="@+id/tv_go_room"
+                android:id="@+id/layout_go_room"
                 android:layout_width="82dp"
                 android:layout_height="26dp"
                 android:layout_marginEnd="7dp"
                 android:layout_marginBottom="20dp"
                 android:background="@drawable/bg_p2p_top_userinfo_btn"
-                android:drawableStart="@drawable/ic_living_1"
-                android:drawablePadding="4dp"
                 android:gravity="center"
-                android:text="@string/layout_activity_p2p_message_07"
+                android:orientation="horizontal"
-                android:textColor="@color/white"
-                android:textSize="12dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="7dp"
+                    android:src="@drawable/ic_living_1" />
+
+                <TextView
+                    android:id="@+id/tv_go_room"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="3dp"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:text="@string/layout_activity_p2p_message_07"
+                    android:textColor="@color/white"
+                    android:textSize="12dp"
+                    app:autoSizeMaxTextSize="12dp"
+                    app:autoSizeMinTextSize="7dp"
+                    app:autoSizeStepGranularity="1px"
+                    app:autoSizeTextType="uniform" />
+            </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.fragment.app.FragmentContainerView

core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java

@@ -1295,7 +1295,7 @@ public final class IMNetEaseManager {
                             case CUSTOM_MSG_SUB_SINGLE_ROOM_PK_REFUSE:
                                 if (roomPkBean.getInviteUid() == AuthModel.get().getCurrentUid()) {
                                     noticeRoomEvent(msg, RoomEvent.ROOM_PK_REFUSE);
-                                    SingleToastUtil.showToast(roomPkBean.getMsg());
+                                    SingleToastUtil.showToast(ResUtil.getString(R.string.pk_refuse));
                                 }
                                 break;
                             case CUSTOM_MSG_SUB_ROOM_PK_UPDATE:

core/src/main/res/values-ar/strings.xml

@@ -683,4 +683,5 @@
     <string name="data_parsing_exception">استثناء تحليل البيانات</string>
     <string name="parameter_error">خطأ في المعلمة</string>
 
+    <string name="pk_refuse">رفض الطرف الآخر طلب الـ PK</string>
 </resources>

core/src/main/res/values-zh-rTW/strings.xml

@@ -669,4 +669,6 @@
     <string name="wechat_share_content">Find and join the best groups,talk with strangers</string>
     <string name="data_parsing_exception">數據解析異常</string>
     <string name="parameter_error">參數錯誤</string>
+
+    <string name="pk_refuse">對方拒絕你的PK請求</string>
 </resources>

core/src/main/res/values/strings.xml

@@ -663,5 +663,8 @@
     <string name="wechat_share_content">Find and join the best groups, talk with strangers</string>
     <string name="data_parsing_exception">Data parsing exception</string>
     <string name="parameter_error">Parameter error</string>
+
+
+    <string name="pk_refuse">The opponent rejected your PK request</string>
 </resources>
 

nim_uikit/res/layout/nim_message_item_text.xml

@@ -10,12 +10,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:autoLink="phone|email|web"
-        android:gravity="center_vertical|start"
+        android:gravity="center"
         android:includeFontPadding="false"
         android:lineSpacingExtra="3dip"
         android:maxWidth="238dp"
-        android:minWidth="40dp"
-        android:minHeight="40dp"
         android:textColor="@color/color_black_333333"
         android:textSize="13sp" />
 </LinearLayout>