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

1.签约抱麦添加拒绝逻辑。

Browse Source 
2.爵位不返回userInfo 逻辑容错。
3.礼物动画优化。
This commit is contained in:
骆召亮
2025-12-08 19:00:15 +08:00
parent 61106bc5eb
commit 079d9ab1b1
19 changed files with 120 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
View File

@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
//设置mqtt环境 false 测试环境 true 正式环境
// ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
//设置http环境 false 测试环境 true 正式环境
ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
initialization();

3
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java
View File

@@ -148,7 +148,8 @@ public class EMMessageInfo implements MultiItemEntity {
/// 延时到这个时间点
public static final int QXRoomMessageTypeSignDelayText = 1093;
/// 被签约者提示弹窗
public static final int QXRoomMessageTypeSignTipText = 1094;
private RoomMessageEvent emMessage;
private int custom = 0;

14
BaseModule/src/main/java/com/xscm/moduleutil/dialog/ConfirmDialog.java
View File

@@ -128,11 +128,6 @@ public class ConfirmDialog extends Dialog {
}
dismiss();
});
// 倒计时逻辑
if (isCountdownEnabled && countdownSeconds > 0) {
startCountdown(btnNegative);
}
} else {
// 隐藏取消按钮
btnNegative.setVisibility(View.GONE);
@@ -154,15 +149,6 @@ public class ConfirmDialog extends Dialog {
ThemeableDrawableUtils.setThemeableRoundedBackground(btnPositive, ColorManager.getInstance().getPrimaryColorInt(), 53);
btnPositive.setTextColor(ColorManager.getInstance().getButtonColorInt());
// 找到根布局并应用动画
// if (rootView != null) {
// Animation slideDown = AnimationUtils.loadAnimation(context, R.anim.slide_down);
// Animation shake = AnimationUtils.loadAnimation(context, R.anim.shake);
//
// rootView.startAnimation(slideDown);
// rootView.startAnimation(shake);
// }
}
private boolean isCountdownCancelled = false; // 添加标志位
private void startCountdown(Button btnNegative) {

4
BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
View File

@@ -905,4 +905,8 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.POST_RE_SIGN)
Call<BaseModel<String>> reSign(@Field("user_id") String user_id);
@FormUrlEncoded
@POST(Constants.POST_SIGN_REFUSE)
Call<BaseModel<String>> signRefuse(@Field("room_id") String room_id);
}

15
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -4799,6 +4799,21 @@ public class RetrofitClient {
});
}
public void signRefuse(String roomId,BaseObserver<String> observer){
sApiServer.signRefuse(roomId).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
onNextRetu(response, observer);
}
@Override
public void onFailure(Call<BaseModel<String>> call, Throwable t) {
}
});
}
public void freeReSign(int type, String userId,BaseObserver<String> observer) {
if (type==1) {
sApiServer.freeReSign(userId).enqueue(new Callback<BaseModel<String>>() {

1
BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java
View File

@@ -433,6 +433,7 @@ public class Constants {
public static final String GET_SKILL_LIST = "/api/Sign/skill_list";//才艺列表
public static final String POST_FREE_RE_SIGN = "/api/Sign/free_re_sign";//免费续约
public static final String POST_RE_SIGN = "/api/Sign/re_sign";//续签（花金币）
public static final String POST_SIGN_REFUSE = "/api/RoomPit/refuse_sign_room_host_invite";//签约房间主持邀请上签约麦用户拒绝

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

@@ -18,6 +18,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
import com.tencent.qgame.animplayer.AnimConfig;
import com.tencent.qgame.animplayer.AnimView;
import com.tencent.qgame.animplayer.inter.IAnimListener;
import com.xscm.moduleutil.R;
import com.xscm.moduleutil.bean.GiftBean;
import java.io.File;
@@ -31,6 +32,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.locks.ReentrantLock;
import lombok.Setter;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.OkHttpClient;
@@ -46,7 +48,8 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
private boolean isShow = true;//是否开启特效
private ReentrantLock lock = new ReentrantLock();
private List<String> giftArray = new ArrayList<>();
public ExecutorService queue = Executors.newSingleThreadExecutor();
@Setter
public ExecutorService queue;
private Context mContext;
private boolean isOnece;
// 添加带Context参数的构造函数
@@ -64,9 +67,6 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
this.mContext = context;
init();
}
public void setQueue(ExecutorService queue) {
this.queue = queue;
}
public GiftAnimView(Context context) {
super(context);
@@ -76,13 +76,11 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
private void init() {
isLoadEffect = false;
setBackgroundColor(getResources().getColor(R.color.colorBlack45));
// 初始化SVGA视图
svgaView = new GiftSvgaView(getContext());
addView(svgaView);
playerMp4View = new AnimView(getContext());
addView(playerMp4View);
// 设置布局参数 - 在Android中通常使用LayoutParams

7
BaseModule/src/main/java/com/xscm/moduleutil/widget/QXGiftPlayerManager.java
View File

@@ -85,7 +85,7 @@ public class QXGiftPlayerManager {
roomCPView.setLayoutParams(new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
));
));
// 创建专用线程池替代GCD队列
ExecutorService queue = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(),
@@ -153,10 +153,13 @@ public class QXGiftPlayerManager {
}
chatEffectView = null;
}
if (roomCPView != null) {
// 先调用destroyEffectView方法，它会自动从父视图中移除
roomCPView.destroyEffectView();
if (bgEffectView != null) {
((ViewGroup) bgEffectView).removeView(roomCPView);
}
roomCPView = null;
}