From 09984c59ff78ef392cb92b86a3c26e352a0b352a Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Wed, 26 Nov 2025 16:27:14 +0800 Subject: [PATCH] fix bugs 55 2 --- .../moduleutil/utils/oss/OSSOperUtils.java | 4 +- .../activity/room/activity/RoomActivity.kt | 1 + .../user/presenter/SettingPresenter.java | 46 +++++++++++-------- .../modulemain/dialog/GiftLotteryDialog.java | 10 ++++ .../dialog/RoomGiftDialogFragment.java | 5 +- 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/oss/OSSOperUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/oss/OSSOperUtils.java index 02c09dbb..1b8dccc6 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/oss/OSSOperUtils.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/oss/OSSOperUtils.java @@ -14,9 +14,11 @@ import com.alibaba.sdk.android.oss.internal.OSSAsyncTask; import com.alibaba.sdk.android.oss.model.PutObjectRequest; import com.alibaba.sdk.android.oss.model.PutObjectResult; import com.blankj.utilcode.util.FileUtils; +import com.blankj.utilcode.util.SPUtils; import com.blankj.utilcode.util.ThreadUtils; import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.utils.Md5Utils; +import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.TimeUtils; import com.xscm.moduleutil.utils.logger.Logger; @@ -85,7 +87,7 @@ public class OSSOperUtils { if (file.getName().contains(".")) { suffix = file.getName().substring(file.getName().lastIndexOf(".")); } - return AppLog + fileMD5 + TimeUtils.getCurrentDate2() + suffix; + return AppLog+ SpUtil.getUserInfo().getNickname()+"_"+SpUtil.getUserInfo().getUser_id() +"_"+ TimeUtils.getCurrentDate2() +"_" + fileMD5+ suffix; } public static OSSOperUtils newInstance() { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 6834ad7b..1fedee8e 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -2518,6 +2518,7 @@ class RoomActivity : BaseMvpActivity(), addActiveDialogFragment(fragment) // 添加到管理列表 } } else if (id == R.id.rl_gift) { //礼物 + LogUtils.e("RoomGiftDialogFragment_RoomActivity"); val fragment = RoomGiftDialogFragment.show( mRoomInfoResp, null, roomId, 0, "", supportFragmentManager diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java index aabe8697..9af6243f 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java @@ -33,10 +33,12 @@ import io.reactivex.schedulers.Schedulers; public class SettingPresenter extends BasePresenter implements SettingConacts.IMePre { private SettingConacts.View mView; + public SettingPresenter(SettingConacts.View view, Context context) { super(view, context); mView = view; } + @Override public void clearLoginInfo() { api.clearLoginInfo(new BaseObserver() { @@ -47,8 +49,8 @@ public class SettingPresenter extends BasePresenter impleme @Override public void onNext(String s) { - if (MvpRef==null){ - MvpRef=new WeakReference<>(mView); + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); } MvpRef.get().clearLoginInfo(s); } @@ -66,8 +68,8 @@ public class SettingPresenter extends BasePresenter impleme @Override public void onNext(String s) { - if (MvpRef==null){ - MvpRef=new WeakReference<>(mView); + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); } MvpRef.get().cancel(s); } @@ -101,18 +103,18 @@ public class SettingPresenter extends BasePresenter impleme try { File file = new File(Application.Companion.getInstance().getAppContent()); - if (FileUtils.isFileExists(file.getParent() +"/DataInfo.zip")){ - FileUtils.delete(file.getParent() +"/DataInfo.zip"); + if (FileUtils.isFileExists(file.getParent() + "/DataInfo.zip")) { + FileUtils.delete(file.getParent() + "/DataInfo.zip"); } boolean isZip = ZipUtils.zipFile(Application.Companion.getInstance().getAppContent(), - file.getParent() +"/DataInfo.zip"); + file.getParent() + "/DataInfo.zip"); if (isZip) { emitter.onNext(file.getParent() + "/DataInfo.zip"); - }else { + } else { emitter.onNext(""); } - }catch (Exception e){ - LogUtils.e("压缩失败",e.toString()); + } catch (Exception e) { + LogUtils.e("压缩失败", e.toString()); emitter.onNext(""); } } @@ -121,15 +123,15 @@ public class SettingPresenter extends BasePresenter impleme @Override public void accept(String zipPath) { String upLogUrl = OSSOperUtils.getAppLogPath(new File(zipPath)); - if(!zipPath.isEmpty()){ - CosUploadManager.getInstance(Application.getInstance()).upParameters(upLogUrl,zipPath, new CosUploadManager.UploadCallback(){ + if (!zipPath.isEmpty()) { + CosUploadManager.getInstance(Application.getInstance()).upParameters(upLogUrl, zipPath, new CosUploadManager.UploadCallback() { @Override public void onSuccess(String url) { - if (MvpRef==null){ - MvpRef=new WeakReference<>(mView); + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); } - api.sendAppLog(upLogUrl,url, new BaseObserver() { + api.sendAppLog(upLogUrl, url, new BaseObserver() { @Override @@ -149,21 +151,27 @@ public class SettingPresenter extends BasePresenter impleme @Override public void onFailure(Exception e) { ToastUtils.showLong("上传失败"); - LogUtils.e("上传失败",e.toString()); + LogUtils.e("上传失败", e.toString()); + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); + } MvpRef.get().disLoadings(); } @Override public void onFailure1(IllegalStateException e) { ToastUtils.showLong("上传失败"); - LogUtils.e("上传失败",e.toString()); + LogUtils.e("上传失败", e.toString()); MvpRef.get().disLoadings(); } }); - }else { + } else { ToastUtils.showLong("上传失败"); LogUtils.e("压缩失败"); - MvpRef.get().disLoadings(); + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); + } + MvpRef.get().disLoadings(); } } }); diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java index 84485eb8..c26160e1 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java @@ -22,6 +22,7 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import com.blankj.utilcode.util.GsonUtils; +import com.blankj.utilcode.util.LogUtils; import com.xscm.modulemain.R; import com.xscm.modulemain.databinding.DialogGiftLotteryBinding; import com.xscm.moduleutil.base.BaseMvpDialogFragment; @@ -371,6 +372,15 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment