From be2306b50cd7be2649385640dc91efe7de12e6c6 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Thu, 25 Dec 2025 15:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95=20loading?= =?UTF-8?q?=20hide,fix=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moduleutil/base/CommonAppContext.java | 12 +++++++--- .../moduleutil/presenter/BasePresenter.java | 10 -------- .../com/xscm/moduleutil/utils/ImageUtils.java | 2 +- .../activity/ForgetPasswordActivity.java | 5 ++++ .../login/activity/LoginActivity.java | 5 ++++ .../activity/SwitchAccountsActivity.java | 5 ++++ .../login/present/LoginContacter.java | 2 ++ .../activity/room/activity/RoomActivity.kt | 5 +--- .../com/qxcm/qxlive/LaunchPageActivity.java | 24 ++++++++++++++++--- .../qxcm/qxlive/PasswordLoginActivity.java | 10 +++++++- 10 files changed, 58 insertions(+), 22 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 57b520f5..47198879 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -26,6 +26,7 @@ import androidx.multidex.MultiDex; import androidx.multidex.MultiDexApplication; import com.alibaba.android.arouter.launcher.ARouter; +import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.AppUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.LogUtils; @@ -107,6 +108,8 @@ public class CommonAppContext extends MultiDexApplication implements Application public boolean isMai = false; + public boolean isLogout = false; + public void onAppBackground() { wasInBackground = true; } @@ -767,10 +770,13 @@ public class CommonAppContext extends MultiDexApplication implements Application mqttConnect.close(); } - + isLogout = true; // 发送广播通知所有Activity刷新状态 - Intent refreshIntent = new Intent("com.xscm.moduleutil.ACTION_USER_LOGOUT"); - sendBroadcast(refreshIntent); +// Intent refreshIntent = new Intent("com.xscm.moduleutil.ACTION_USER_LOGOUT"); +// sendBroadcast(refreshIntent); + + ActivityUtils.finishAllActivities(); + Intent intent = new Intent("com.qxcm.qxlive.LAUNCH_PAGE"); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); getApplicationContext().startActivity(intent); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java index 9f7796a1..d02fc8d2 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java @@ -58,21 +58,11 @@ public abstract class BasePresenter implements IPresenter { @Override public void detachView() { cancelRequest(); - if (MvpRef != null) { - MvpRef.clear(); - MvpRef = null; - } - if (api != null) { - api = null; - } unBindView(); } public void unBindView() { - if (MvpRef != null) { - MvpRef.clear(); - } mContext=null; } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java index 70e33415..d801ff76 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java @@ -226,7 +226,7 @@ public class ImageUtils { return; } } - Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); + Glide.with(mImageView).asBitmap().load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); } public static void loadHead(String path, ImageView mImageView) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java index 65f86fed..7222bc5d 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java @@ -130,6 +130,11 @@ public class ForgetPasswordActivity extends BaseMvpActivity(), } } } - LogUtils.e("handleMsgType1004", "mRoomInfoResp = ${mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1]}") - mRoomInfoResp?.room_info?.pit_list?.forEach { it -> - LogUtils.e("PitBean:${it.toString()}") - } + roomFragment!!.upRoomInfoData(mRoomInfoResp) roomFragment?.handleRoomMessage(messageEvent) roomBtnShowIsHide(fromUserInfo.user_id) diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java index c6d6cc5c..fce91b42 100644 --- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java @@ -75,9 +75,20 @@ public class LaunchPageActivity extends BaseMvpActivity implements LoginContacter.View, View.OnClickListener { private CountDownTimer mTimer; @@ -624,6 +625,13 @@ public class PasswordLoginActivity extends BaseMvpActivity