From 365728e9b823ce727d7a5840c7cf98a3ae049ee6 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Sun, 26 Feb 2023 14:13:19 +0800 Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E5=A4=8D1.6.0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 1 + .../im/dialog/RefuseApplyDialog.java | 27 ++++++++++++++----- .../im/msgholder/HallMsgViewHolder.java | 7 +++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b0c789d2..c934541bf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5087,5 +5087,6 @@ 確定通過該用戶加入房間的申請嗎? 確定拒绝該用戶加入房間的申請嗎? 7天内不再接受該用戶的申請 + 確定拒绝該房間的加入邀請嗎? \ No newline at end of file diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/dialog/RefuseApplyDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/dialog/RefuseApplyDialog.java index 235b29eef..24db44819 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/dialog/RefuseApplyDialog.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/dialog/RefuseApplyDialog.java @@ -17,7 +17,6 @@ import androidx.core.content.ContextCompat; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.dialog.BaseDialog; -import com.yizhuan.xchat_android_core.DemoCache; /** * @author wushaocheng @@ -26,6 +25,9 @@ import com.yizhuan.xchat_android_core.DemoCache; */ public class RefuseApplyDialog extends BaseDialog { + private String tipMsg = ""; + private boolean isInvite = false; + public RefuseApplyDialog(Context context) { super(context, R.style.dialog); init(); @@ -43,10 +45,10 @@ public class RefuseApplyDialog extends BaseDialog { AppCompatTextView tvName = findViewById(R.id.tv_tip); if (tvName != null) { - String tip = getContext().getString(R.string.sure_to_refuse_user_join_room); + String tip = tipMsg; SpannableStringBuilder builder = new SpannableStringBuilder(tip); builder.setSpan( - new ForegroundColorSpan(ContextCompat.getColor(getContext(),R.color.color_F92020)), 2, + new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.color_F92020)), 2, 4, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ); @@ -54,9 +56,14 @@ public class RefuseApplyDialog extends BaseDialog { } CheckBox checkBox = findViewById(R.id.tv_refuse_tip); - if(checkBox != null) { - checkBox.setHighlightColor(Color.TRANSPARENT); - checkBox.setMovementMethod(new LinkMovementMethod()); + if (checkBox != null) { + if (isInvite) { + checkBox.setVisibility(View.VISIBLE); + checkBox.setHighlightColor(Color.TRANSPARENT); + checkBox.setMovementMethod(new LinkMovementMethod()); + } else { + checkBox.setVisibility(View.GONE); + } } ImageView close = findViewById(R.id.iv_close); @@ -87,6 +94,14 @@ public class RefuseApplyDialog extends BaseDialog { } + public void setTipMsg(String tipMsg) { + this.tipMsg = tipMsg; + } + + public void setIsInvite(boolean isInvite) { + this.isInvite = isInvite; + } + private OnActionListener l; public void setOnActionListener(OnActionListener l) { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java index 27f19b09e..389f47f9c 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java @@ -227,6 +227,13 @@ public class HallMsgViewHolder extends MsgViewHolderBase { }); stvReject.setOnClickListener(view -> { RefuseApplyDialog dialog = new RefuseApplyDialog(context); + if(info.getUrl().contains("hall/dealInvite")){ + dialog.setIsInvite(false); + dialog.setTipMsg(context.getString(R.string.sure_to_refuse_room_join_apply)); + }else { + dialog.setIsInvite(true); + dialog.setTipMsg(context.getString(R.string.sure_to_refuse_user_join_room)); + } dialog.setOnActionListener(new RefuseApplyDialog.OnActionListener() { @Override public void onOk(Boolean isCheck) {