YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix bugs 55 3

Browse Source
This commit is contained in:
骆召亮
2025-11-27 11:47:10 +08:00
parent 366478f547
commit 5ed3717acc
22 changed files with 271 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
View File

@@ -277,6 +277,8 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
@Override
public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) {
if (mIvRipple == null)
return;
SVGADrawable drawable = new SVGADrawable(svgaVideoEntity);
mIvRipple.setImageDrawable(drawable);
mIvRipple.startAnimation();
@@ -322,6 +324,8 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
@Override
public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) {
if (mIvRipple == null)
return;
SVGADrawable drawable = new SVGADrawable(svgaVideoEntity);
mIvRipple.setImageDrawable(drawable);
mIvRipple.startAnimation();
@@ -354,6 +358,8 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
@Override
public void pkOffSide(int uid) {
if (String.valueOf(uid).equals(pitBean.getUser_id())) {
if (mIvRipple == null)
return;
mIvRipple.setVisibility(GONE);
}
}

13
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java
View File

@@ -61,8 +61,10 @@ public class RoomDefaultWheatView extends BaseWheatView {
sex = bean.getSex();
if (isOn()) {
//开启声浪
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
if (mIvRipple != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
}
mTvName.setText(bean.getNickname());
ImageUtils.loadHeadCC(bean.getAvatar(), mRiv);
if (TextUtils.isEmpty(pitBean.getDress())) {
@@ -100,8 +102,10 @@ public class RoomDefaultWheatView extends BaseWheatView {
mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove();
//停止声浪
mIvRipple.stopAnimation( true);
mIvRipple.setVisibility(GONE);
if (mIvRipple != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(GONE);
}
}
if (showSexIcon) {
checkSex();
@@ -236,6 +240,7 @@ public class RoomDefaultWheatView extends BaseWheatView {
@Override
public void onLocalSoundLevelUpdate(int volume) {
if (mIvRipple == null) return;
if (volume == 0) {
mIvRipple.stopAnimation( true);
} else {

12
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java
View File

@@ -91,8 +91,10 @@ public class RoomFriendshipWheatView extends BaseWheatView {
sex = bean.getSex();
if (isOn()) {
//开启声浪
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
if (mIvRipple != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
}
mTvName.setText(bean.getNickname());
ImageUtils.loadHeadCC(bean.getAvatar(), mRiv);
if (TextUtils.isEmpty(pitBean.getDress())) {
@@ -129,8 +131,10 @@ public class RoomFriendshipWheatView extends BaseWheatView {
mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove();
//停止声浪
mIvRipple.stopAnimation( true);
mIvRipple.setVisibility(GONE);
if (mIvRipple != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(GONE);
}
mCharmView.setVisibility(GONE);
}
if (showSexIcon) {

13
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomKtvWheatView.java
View File

@@ -74,8 +74,10 @@ public class RoomKtvWheatView extends BaseWheatView {
sex = bean.getSex();
if (isOn()) {
//开启声浪
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
if (mCharmView != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
}
mTvName.setText(bean.getNickname());
ImageUtils.loadHeadCC(bean.getAvatar(), mRiv);
if (TextUtils.isEmpty(pitBean.getDress())) {
@@ -115,8 +117,10 @@ public class RoomKtvWheatView extends BaseWheatView {
mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove();
//停止声浪
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(GONE);
if (mIvRipple != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(GONE);
}
}
if (showSexIcon) {
checkSex();
@@ -236,6 +240,7 @@ public class RoomKtvWheatView extends BaseWheatView {
@Override
public void onLocalSoundLevelUpdate(int volume) {
if (mIvRipple == null) return;
if (volume==0){
mIvRipple.stopAnimation(true);
} else {

58
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
View File

@@ -20,7 +20,7 @@ public class RoomMakeWheatView extends BaseWheatView {
public ImageView mIvTagBoss;
public TextView mTvTime;
public ImageView iv_zhul;
// public ImageView iv_on_line;
// public ImageView iv_on_line;
private ImageView iv_tag_type;
public WheatCharmView mCharmView;
private boolean showBoss;//显示老板标识
@@ -44,12 +44,12 @@ public class RoomMakeWheatView extends BaseWheatView {
protected void initPit(Context context, AttributeSet attrs) {
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoomMakeWheatView);
pitNumber = typedArray.getString(R.styleable.RoomMakeWheatView_room_make_wheat_number);
pitImageVId=typedArray.getResourceId(R.styleable.RoomMakeWheatView_room_make_pic, 0);
pitImageVId = typedArray.getResourceId(R.styleable.RoomMakeWheatView_room_make_pic, 0);
typedArray.recycle();
mIvTagBoss = findViewById(R.id.iv_tag_boos);
mTvTime = findViewById(R.id.tv_time);
// iv_on_line=findViewById(R.id.iv_online);
iv_tag_type=findViewById(R.id.iv_tag_type);
iv_tag_type = findViewById(R.id.iv_tag_type);
mCharmView = findViewById(R.id.charm_view);
mRiv.setImageResource(pitImageVId);
@@ -83,7 +83,9 @@ public class RoomMakeWheatView extends BaseWheatView {
}
private OnClickListener onWholeViewClickListener;
@Override
protected int getLayoutId() {
return R.layout.room_view_make_wheat;
@@ -94,13 +96,16 @@ public class RoomMakeWheatView extends BaseWheatView {
iv_zhul.setVisibility(show ? VISIBLE : GONE);
}
}
@Override
protected void setPitData(RoomPitBean bean) {
sex = bean.getSex();
if (isOn()) {
//开启声浪
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
if (mIvRipple != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(VISIBLE);
}
mTvName.setText(bean.getNickname());
ImageUtils.loadHeadCC(bean.getAvatar(), mRiv);
if (TextUtils.isEmpty(pitBean.getDress())) {
@@ -114,24 +119,26 @@ public class RoomMakeWheatView extends BaseWheatView {
mIvTagBoss.setVisibility(GONE);
}
} else {
mTvName.setText((!"8".equals(pitBean.getPit_number()) && !"9".equals(pitBean.getPit_number()))? pitBean.getPit_number() : "");
mTvName.setText((!"8".equals(pitBean.getPit_number()) && !"9".equals(pitBean.getPit_number())) ? pitBean.getPit_number() : "");
//麦位上锁
//麦位上锁
if (showBoss && WHEAT_BOSS.equals(pitNumber)) {
mIvTagBoss.setVisibility(VISIBLE);
ImageUtils.loadRes(isLocked() ? R.mipmap.room_ic_wheat_default_suo : R.mipmap.room_ic_wheat_default, mRiv);
} else {
mRiv.setImageResource(bean.getIs_lock()==1 ? R.mipmap.room_ic_wheat_default_suo : R.mipmap.room_ic_wheat_default);
mRiv.setImageResource(bean.getIs_lock() == 1 ? R.mipmap.room_ic_wheat_default_suo : R.mipmap.room_ic_wheat_default);
}
if (isMute()){
if (isMute()) {
ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex);
}
mIvFrame.stopAll();
mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove();
//停止声浪
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(GONE);
if (mIvRipple != null) {
mIvRipple.stopAnimation(true);
mIvRipple.setVisibility(GONE);
}
}
if (showSexIcon) {
checkSex();
@@ -141,25 +148,25 @@ public class RoomMakeWheatView extends BaseWheatView {
// }else {
// iv_on_line.setVisibility(GONE);
// }
if (pitBean.getPit_number().equals("888")){
if (pitBean.getPit_number().equals("888")) {
iv_tag_type.setVisibility(GONE);
mCharmView.setVisibility(GONE);
mTvName.setText(pitBean.getNickname()!=null && !pitBean.getNickname().equals("")?pitBean.getNickname():"拍卖者");
mTvName.setText(pitBean.getNickname() != null && !pitBean.getNickname().equals("") ? pitBean.getNickname() : "拍卖者");
mTvName.setBackgroundResource(com.xscm.moduleutil.R.mipmap.za_maiw_b);
}else if (pitBean.getPit_number().equals("9")){
} else if (pitBean.getPit_number().equals("9")) {
iv_tag_type.setVisibility(VISIBLE);
mCharmView.setVisibility(GONE);
}else if (pitBean.getPit_number().equals("111") || pitBean.getPit_number().equals("222")|| pitBean.getPit_number().equals("333")){
} else if (pitBean.getPit_number().equals("111") || pitBean.getPit_number().equals("222") || pitBean.getPit_number().equals("333")) {
iv_tag_type.setVisibility(GONE);
mTvName.setVisibility(GONE);
mCharmView.setVisibility(GONE);
if (pitBean.getUser_id()==null || pitBean.getUser_id().equals("0") ||pitBean.getUser_id().isEmpty()){
if (pitBean.getUser_id() == null || pitBean.getUser_id().equals("0") || pitBean.getUser_id().isEmpty()) {
mTvTime.setVisibility(GONE);
}else {
} else {
mTvTime.setVisibility(VISIBLE);
}
mTvTime.setText(StringUtil.toWan2(pitBean.getCharm(),1));
}else if (pitBean.getPit_number().equals("000")){
mTvTime.setText(StringUtil.toWan2(pitBean.getCharm(), 1));
} else if (pitBean.getPit_number().equals("000")) {
iv_tag_type.setVisibility(GONE);
mCharmView.setVisibility(GONE);
}
@@ -176,20 +183,23 @@ public class RoomMakeWheatView extends BaseWheatView {
}
public void setmTvTime(String charm){
mTvTime.setText(StringUtil.toWan2(pitBean.getCharm(),1));
public void setmTvTime(String charm) {
mTvTime.setText(StringUtil.toWan2(pitBean.getCharm(), 1));
}
private onCharmClickListener mOnCharmClickListener;
//
//
public void setmOnCharmClickListener(onCharmClickListener mOnCharmClickListener) {
this.mOnCharmClickListener = mOnCharmClickListener;
}
//
public interface onCharmClickListener{
//
public interface onCharmClickListener {
void onCharmClick(RoomMakeWheatView view, RoomPitBean pitBean);
}
public void setChe(String che){
public void setChe(String che) {
}

4
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
View File

@@ -109,7 +109,9 @@ public class RoomSingSongWheatView extends BaseWheatView {
mIvFrame.stopAll();
mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove();
mIvRipple.setVisibility(GONE);
if (mIvRipple != null) {
mIvRipple.setVisibility(GONE);
}
}
private String getPitNumberText() {

3
BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
View File

@@ -23,6 +23,7 @@ import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.R;
import com.xscm.moduleutil.adapter.GiftTwoDetailsFragment;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftNumBean;
import com.xscm.moduleutil.bean.GiftPackBean;
@@ -112,7 +113,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
@Override
protected void initView() {
mBinding.recycleView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
mBinding.recycleView.setLayoutManager(new LinearLayoutManager(CommonAppContext.getInstance(), LinearLayoutManager.HORIZONTAL, false));
adapter = new BaseQuickAdapter<RewardUserBean, BaseViewHolder>(com.xscm.moduleutil.R.layout.item_reward1, null) {
@Override
protected void convert(BaseViewHolder helper, RewardUserBean item) {