合并 new_dev

MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java

@@ -97,6 +97,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
     }
 
     public static RoomGiftDialogFragment show(RoomInfoResp roomInfoResp, UserInfo userInfo, String roomId, int jingp, String heart_id, FragmentManager fragmentManager) {
+        if (roomInfoResp == null && userInfo == null) {
+            LogUtils.e("RoomGiftDialogFragment_show", "roomInfoResp and userInfo is null");
+            return null;
+        }
         RoomGiftDialogFragment dialogFragment = new RoomGiftDialogFragment();
         Bundle args = new Bundle();
         args.putSerializable("roomInfoResp", roomInfoResp);
@@ -811,7 +815,6 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
             if (mBinding.tvBbQs != null) {
                 mBinding.tvBbQs.setVisibility(View.GONE);
                 mBinding.cz.setVisibility(View.VISIBLE);
-                MvpPre.wallet();
             }
         }
     }