From 62dc2e3c9dad14d85ecd1054c4303a1cffc902ed Mon Sep 17 00:00:00 2001 From: max Date: Mon, 22 Apr 2024 16:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=80=82=E9=85=8D?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98=EF=BC=88=E7=A7=81?= =?UTF-8?q?=E8=81=8A=E9=A1=B5=E3=80=81PK=E6=8B=92=E7=BB=9D=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E3=80=81PK=E6=90=9C=E7=B4=A2ID=E7=AD=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anotherroompk/RoomPKSearchAdapter.kt | 2 +- .../SingleRoomPkReceivedDialog.kt | 3 +- .../main/res/layout/activity_p2p_message.xml | 60 +++++++++++++------ .../chwl/core/manager/IMNetEaseManager.java | 2 +- core/src/main/res/values-ar/strings.xml | 1 + core/src/main/res/values-zh-rTW/strings.xml | 2 + core/src/main/res/values/strings.xml | 3 + .../res/layout/nim_message_item_text.xml | 4 +- 8 files changed, 52 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt index 728177598..2c98f776d 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt +++ b/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) diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt index 1935b8275..ac811a3b8 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt +++ b/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 @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 diff --git a/app/src/main/res/layout/activity_p2p_message.xml b/app/src/main/res/layout/activity_p2p_message.xml index 86b2d24b4..b5dbaf9c2 100644 --- a/app/src/main/res/layout/activity_p2p_message.xml +++ b/app/src/main/res/layout/activity_p2p_message.xml @@ -59,10 +59,10 @@ + android:layout_height="24dp" + android:layout_gravity="end" + android:orientation="horizontal"> + app:layout_constraintEnd_toStartOf="@+id/iv_add_black_list" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> @@ -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"> - + app:layout_constraintEnd_toEndOf="parent"> + + + + + استثناء تحليل البيانات خطأ في المعلمة + رفض الطرف الآخر طلب الـ PK diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 61f083f99..ea3c00a34 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -669,4 +669,6 @@ Find and join the best groups,talk with strangers 數據解析異常 參數錯誤 + + 對方拒絕你的PK請求 diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 977ac8b90..24c187863 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -663,5 +663,8 @@ Find and join the best groups, talk with strangers Data parsing exception Parameter error + + + The opponent rejected your PK request diff --git a/nim_uikit/res/layout/nim_message_item_text.xml b/nim_uikit/res/layout/nim_message_item_text.xml index e26154f05..1e8279527 100644 --- a/nim_uikit/res/layout/nim_message_item_text.xml +++ b/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" /> \ No newline at end of file