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

fix bugs. add 字体流光 自定义view,cos上传报错信息。

Browse Source
This commit is contained in:
骆召亮
2025-11-14 17:38:30 +08:00
parent 68b4a66046
commit 3322cfeb22
78 changed files with 1278 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
View File

@@ -50,6 +50,7 @@ import com.xscm.moduleutil.event.MqttBean;
import com.xscm.moduleutil.event.RedBean;
import com.xscm.moduleutil.event.UnreadCountEvent;
import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.utils.ClickUtils;
import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.LanguageUtil;
import com.tencent.imsdk.v2.V2TIMManager;
@@ -87,22 +88,22 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
@Override
public void showLoadings() {
// showLoading("加载中");
showLoading();
}
@Override
public void showLoadings(String content) {
// showLoading(content);
showLoading(content);
}
@Override
public void disLoadings() {
// disLoading();
disLoading();
}
@Override
protected void onDestroy() {
ClickUtils.clearAllClickRecords();
// 清理MQTT相关资源
synchronized (mqttQueueLock) {
mqttMessageQueue.clear();
@@ -135,7 +136,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
if (MvpPre != null) {
try {
MvpPre.detachView();
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@@ -168,9 +169,9 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
@Override
public void onSuccess(Long aLong) {
// 通知未读数变化
UnreadCountEvent event =CommonAppContext.getInstance().unreadCountEvent;
if (event==null){
event=new UnreadCountEvent();
UnreadCountEvent event = CommonAppContext.getInstance().unreadCountEvent;
if (event == null) {
event = new UnreadCountEvent();
}
event.setALong(aLong);
// 使用EventBus通知
@@ -197,9 +198,9 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
@Override
public void onConnectSuccess() {//重连成功
if (CommonAppContext.getInstance().playId!=null){
if (CommonAppContext.getInstance().playId != null) {
LogUtils.e("@@@", "重连成功");
LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId);
LogUtils.e("@@@", "" + CommonAppContext.getInstance().playId);
RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
}
}
@@ -207,13 +208,13 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
@Override
public void onConnectFailed(int code, String error) {
LogUtils.e("@@@", "断开连接");
CommonAppContext.getInstance().onConnectFailed=true;
CommonAppContext.getInstance().onConnectFailed = true;
}
@Override
public void onKickedOffline() {
// queren1();
if (CommonAppContext.getInstance().playId!=null){
if (CommonAppContext.getInstance().playId != null) {
ToastUtils.showShort("您的账号已被挤下线");
try {
CommonAppContext.getInstance().clearLoginInfo();
@@ -243,7 +244,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
v -> {
// 点击“确认”按钮时执行删除操作
if (CommonAppContext.getInstance().playId!=null){
if (CommonAppContext.getInstance().playId != null) {
RoomManager.getInstance().exitRoom(CommonAppContext.getInstance().playId);
}
try {
@@ -260,7 +261,6 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
}
@Override
public Resources getResources() {
Resources resources = super.getResources();
@@ -537,7 +537,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
public void onEvent(XLHBean event) {
LogUtils.e("收到XLH", event);
if (event == null) return;
if (event.getText()==null || event.getText().isEmpty()) return;
if (event.getText() == null || event.getText().isEmpty()) return;
if (SpUtil.getFloatingScreen() == 1) {
synchronized (xlhQueueLock) {
xlhMessageQueue.add(event);
@@ -552,10 +552,10 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(RedBean event){
public void onEvent(RedBean event) {
LogUtils.e("收到红包", event);
if (event==null) return;
if (SpUtil.getFloatingScreen()==1){
if (event == null) return;
if (SpUtil.getFloatingScreen() == 1) {
synchronized (RedQueueLock) {
redMessageQueue.add(event);
@@ -581,7 +581,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
showPiaoPingMessageRed(redBean);
}
private void showPiaoPingMessageRed(RedBean redBean){
private void showPiaoPingMessageRed(RedBean redBean) {
try {
// 清理之前的视图（如果存在）
if (currentRedView != null && currentRedView.getParent() != null) {
@@ -628,9 +628,11 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
}
}
}
// 在类中添加成员变量
private MediaPlayer redPacketMediaPlayer = null;
private boolean isRedPacketMediaPrepared = false;
// 添加播放红包音效的方法
private void playRedPacketSound() {
try {
@@ -664,11 +666,11 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
}
} catch (Exception e) {
LogUtils.e("播放红包音效失败", e);
isRedPacketMediaPrepared=false;
isRedPacketMediaPrepared = false;
}
}
private void updateRedFloatingViewData(View view, RedBean redBean){
private void updateRedFloatingViewData(View view, RedBean redBean) {
TextView textView = view.findViewById(R.id.tv_name);
if (redBean != null) {
@@ -989,7 +991,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
// 这里可以根据实际需求实现跳转逻辑
// 例如：跳转到礼物详情页面、用户主页等
// 使用缓存数据进入房间
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), xlhBean.getRoom_id(), "",null);
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), xlhBean.getRoom_id(), "", null);
}
@@ -997,7 +999,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
// 这里可以根据实际需求实现跳转逻辑
// 例如：跳转到礼物详情页面、用户主页等
// 使用缓存数据进入房间
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), redBean.getRoom_id(), "",null);
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), redBean.getRoom_id(), "", null);
}
@@ -1010,13 +1012,13 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
}
public void singleTaskToActivity(Class<?> clazz){
public void singleTaskToActivity(Class<?> clazz) {
Intent intent = new Intent(this, clazz);
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity( intent);
startActivity(intent);
}
public void toActivity(Class<?> clazz, Bundle bundle){
public void toActivity(Class<?> clazz, Bundle bundle) {
Intent intent = new Intent(this, clazz);
intent.putExtras(bundle);
startActivity(intent);