moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BugFix]修复1.6.0bug

Browse Source
This commit is contained in:
wushaocheng
2023-02-26 14:13:19 +08:00
parent 608eb5e2be
commit 365728e9b8
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/values/strings.xml
View File

@@ -5087,5 +5087,6 @@
<string name="sure_to_agree_user_join_room">確定通過該用戶加入房間的申請嗎？</string>
<string name="sure_to_refuse_user_join_room">確定拒绝該用戶加入房間的申請嗎？</string>
<string name="seven_day_can_no_receive_apply">7天内不再接受該用戶的申請</string>
<string name="sure_to_refuse_room_join_apply">確定拒绝該房間的加入邀請嗎？</string>
</resources>

23
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/dialog/RefuseApplyDialog.java
View File

@@ -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) {
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) {

7
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
View File

@@ -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) {