1:修改送礼中趣味的岁月之城和时空之巅,不需要选择人员就可以打开
2:优化用在房间点击用户,点击抱麦出现的错误 3: 在岁月之城和时空之巅中查看记录的时候,进行判断,当返回的nickname是null的时候,就直接不展示赠与 4:修改任务UI, 5:添加房间暴币功能 6:修改房间暴币飘屏 7:添加启动页动画 8:修改房间的设置
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package com.xscm.modulemain;
|
||||
|
||||
import static android.view.View.GONE;
|
||||
import static android.view.View.VISIBLE;
|
||||
import static com.xscm.moduleutil.base.CommonAppContext.postDelayed;
|
||||
|
||||
import android.animation.Animator;
|
||||
@@ -14,6 +16,7 @@ import android.media.MediaPlayer;
|
||||
import android.os.Bundle;
|
||||
import android.text.Spannable;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.TextUtils;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.view.Gravity;
|
||||
@@ -528,8 +531,8 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
|
||||
ivAvatar.setImageResource(com.xscm.moduleutil.R.mipmap.hourl_top3);
|
||||
break;
|
||||
default:
|
||||
tvName.setVisibility(View.GONE);
|
||||
ivAvatar.setVisibility(View.GONE);
|
||||
tvName.setVisibility(GONE);
|
||||
ivAvatar.setVisibility(GONE);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -710,7 +713,9 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
|
||||
|
||||
updateRedFloatingViewData(currentRedView, redBean);
|
||||
// 播放红包音效
|
||||
playRedPacketSound();
|
||||
if (SpUtil.getRedSound() == 1) {
|
||||
playRedPacketSound();
|
||||
}
|
||||
resetAndStartXlhAnimation(currentRedView, () -> {
|
||||
// 清理当前视图
|
||||
if (currentRedView != null && currentRedView.getParent() != null) {
|
||||
@@ -1061,12 +1066,18 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
|
||||
TextView tv_time = view.findViewById(com.xscm.moduleutil.R.id.tv_num);
|
||||
|
||||
if (mqttBean != null) {
|
||||
textView2.setText("送给" + (mqttBean.getToUserName() != null ? mqttBean.getToUserName() : ""));
|
||||
textView.setText(mqttBean.getFromUserName() != null ? mqttBean.getFromUserName() : "");
|
||||
if (TextUtils.isEmpty(mqttBean.getToUserName())){
|
||||
textView2.setVisibility(GONE);
|
||||
textView.setText(mqttBean.getText());
|
||||
}else {
|
||||
textView2.setVisibility(VISIBLE);
|
||||
textView2.setText("送给" + (mqttBean.getToUserName() != null ? mqttBean.getToUserName() : ""));
|
||||
textView.setText(mqttBean.getFromUserName() != null ? mqttBean.getFromUserName() : "");
|
||||
tv_time.setText("x" + (mqttBean.getNumber() != null ? mqttBean.getNumber() : "1"));
|
||||
}
|
||||
if (mqttBean.getGift_picture() != null) {
|
||||
ImageUtils.loadHeadCC(mqttBean.getGift_picture(), view.findViewById(com.xscm.moduleutil.R.id.iv_piaoping));
|
||||
}
|
||||
tv_time.setText("x" + (mqttBean.getNumber() != null ? mqttBean.getNumber() : "1"));
|
||||
} else {
|
||||
textView2.setText("送给");
|
||||
textView.setText("");
|
||||
|
||||
Reference in New Issue
Block a user