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

Merge branch 'branch_new_dev' into branch_new

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

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -4027,8 +4027,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
GiftDisplayManager.getInstance().clearAll()
mBinding!!.giftContainer.removeAllViews()
CommonAppContext.getInstance().isMai = false
CommonAppContext.getInstance().playId = null
// 确保父类的 onDestroy 被调用
super.finish()
}

3
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingChildFragment.java
View File

@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xscm.modulemain.Application;
import com.xscm.modulemain.R;
import com.xscm.modulemain.adapter.RankingCharmListAdapter;
import com.xscm.modulemain.databinding.RoomRankingChildBinding;
@@ -215,7 +216,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
for (String url : images) {
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
ImageView imageView1 = new ImageView(Application.getInstance());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_57),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RelationshipFragment.java
View File

@@ -11,6 +11,8 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ActivityUtils;
import com.xscm.modulemain.Application;
import com.xscm.modulemain.R;
import com.xscm.modulemain.adapter.RelationshipAdapter;
import com.xscm.modulemain.databinding.FragmentRelationshipBinding;
@@ -84,7 +86,7 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
private void queren(int type, int id, String num) {
if (type == 1) {
// 创建并显示确认对话框
new ConfirmDialog(getActivity(),
new ConfirmDialog(ActivityUtils.getTopActivity(),
"提示",
"您确定要置顶本关系吗？",
"确认",

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomCabinFragment.java
View File

@@ -16,10 +16,12 @@ import android.view.View;
import androidx.core.app.NotificationManagerCompat;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.hjq.toast.ToastUtils;
import com.orhanobut.logger.Logger;
import com.xscm.modulemain.Application;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.xscm.modulemain.activity.room.contacts.RoomCabinContacts;
@@ -105,7 +107,7 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
return;
}
Log.d("RoomCabinFragment", "Notifications not enable!");
new AlertDialog.Builder(getActivity())
new AlertDialog.Builder(ActivityUtils.getTopActivity())
.setTitle("提示")
.setMessage("请打开通知权限，防止后台共享屏幕中断")
.setPositiveButton("设置", (dialog, which) -> {

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
View File

@@ -315,8 +315,6 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
/// 给子fragment传递参数
public void updateFriendshipState(int status, int friend_id, long end_time, FriendUserBean friendshipUserBean) {
// 保持 tag 使用一致性
FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
if (friendshipRoomFragment != null && friendshipRoomFragment.isAdded()) {
if (status == FriendshipRoomFragment.FriendshipPartType.WAIT.getValue())
friendshipRoomFragment.upDataFriendship(FriendshipRoomFragment.FriendshipPartType.WAIT, friend_id, end_time, friendshipUserBean);

13
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MyMoneyPresenter.java
View File

@@ -9,11 +9,15 @@ import com.xscm.moduleutil.bean.WalletBean;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
import io.reactivex.disposables.Disposable;
public class MyMoneyPresenter extends BasePresenter<MyMoneyConactos.View> implements MyMoneyConactos.IMePre {
MyMoneyConactos.View mView;
public MyMoneyPresenter(MyMoneyConactos.View view, Context context) {
super(view, context);
mView = view;
}
@Override
@@ -26,6 +30,9 @@ public class MyMoneyPresenter extends BasePresenter<MyMoneyConactos.View> implem
@Override
public void onNext(WalletBean walletBean) {
if (MvpRef == null){
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().wallet(walletBean);
}
});
@@ -41,6 +48,9 @@ public class MyMoneyPresenter extends BasePresenter<MyMoneyConactos.View> implem
@Override
public void onNext(BindType bindType) {
if (MvpRef == null){
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().bindType(bindType);
}
});
@@ -56,6 +66,9 @@ public class MyMoneyPresenter extends BasePresenter<MyMoneyConactos.View> implem
@Override
public void onNext(UserInfo userInfo) {
if (MvpRef == null){
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().myInfoSuccess(userInfo);
}
});