diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
index b1d53d69..9e6263b1 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
@@ -69,16 +69,18 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
     private String user_id;
     private String giftNumber = "";
     private int point;
+
     @Override
     protected RewardGiftPresenter bindPresenter() {
         return new RewardGiftPresenter(this, getActivity());
     }
-    public static void show(String id,String userId,int point, FragmentManager fragmentManager) {
+
+    public static void show(String id, String userId, int point, FragmentManager fragmentManager) {
         RewardGiftDialogFragment dialogFragment = new RewardGiftDialogFragment();
         Bundle args = new Bundle();
         args.putString("circle_id", id); // 可选：传递参数
         args.putString("user_id", userId);
-        args.putInt("point",point);
+        args.putInt("point", point);
         // 设置参数...
         dialogFragment.setArguments(args);
         dialogFragment.show(fragmentManager, "RewardGiftDialogFragment");
@@ -87,9 +89,9 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-        circle_id=getArguments().getString("circle_id");
-        user_id=getArguments().getString("user_id");
-        point=getArguments().getInt("point");
+        circle_id = getArguments().getString("circle_id");
+        user_id = getArguments().getString("user_id");
+        point = getArguments().getInt("point");
     }
 
     @Override
@@ -97,12 +99,13 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
         super.initDialogStyle(window);
         window.setGravity(Gravity.BOTTOM);
     }
+
     @Override
     protected void initData() {
         MvpPre.getRewardList(circle_id, 1, 10);
         MvpPre.getGiftLabel("1");
         MvpPre.wallet();
-        mGiftNumList=new ArrayList<>();
+        mGiftNumList = new ArrayList<>();
         mGiftNumList.add(new GiftNumBean("20", "x20"));
         mGiftNumList.add(new GiftNumBean("15", "x15"));
         mGiftNumList.add(new GiftNumBean("10", "x10"));
@@ -118,7 +121,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             @Override
             protected void convert(BaseViewHolder helper, RewardUserBean item) {
                 GifAvatarOvalView gifAvatarOvalView = helper.getView(com.xscm.moduleutil.R.id.im_reward1);
-                if (item!=null ) {
+                if (item != null) {
                     ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(com.xscm.moduleutil.R.id.im_reward1));
                 }
             }
@@ -130,13 +133,13 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
         mBinding.tvGive.setOnClickListener(this::onClisk);
 
         float[] corners = {0f, 65f, 65f, 0f};
-        ThemeableDrawableUtils.setThemeableRoundedBackground( mBinding.tvGive, ColorManager.getInstance().getPrimaryColorInt(), corners);
+        ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.tvGive, ColorManager.getInstance().getPrimaryColorInt(), corners);
         mBinding.tvGive.setTextColor(ColorManager.getInstance().getButtonColorInt());
         mBinding.cz.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
     }
 
     private void onClisk(View view1) {
-        if (view1.getId()==R.id.tv_give_coin_num){
+        if (view1.getId() == R.id.tv_give_coin_num) {
             if (mSelectGiftNumPopupWindow == null) {
 
                 mSelectGiftNumPopupWindow = new SelectGiftNumPopupWindow(getSelfActivity(), (adapter, view, position) -> {
@@ -160,12 +163,12 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             mSelectGiftNumPopupWindow.setData(mGiftNumList);
             mSelectGiftNumPopupWindow.showAtLocation(mBinding.tvGiveCoinNum, Gravity.BOTTOM | Gravity.RIGHT, 100, 230);
 
-        }else if (view1.getId()== com.xscm.moduleutil.R.id.tv_reward_num){
-            RewardDialogFragment.show(circle_id,getChildFragmentManager());
-        }else if (view1.getId()== R.id.cz){
-            RechargeDialogFragment.show("",null, getActivity().getSupportFragmentManager(),"0","0");
-        }else if (view1.getId()== R.id.tv_give){
-            for (int i=0;i<mGiftNumList.size();i++) {
+        } else if (view1.getId() == com.xscm.moduleutil.R.id.tv_reward_num) {
+            RewardDialogFragment.show(circle_id, getChildFragmentManager());
+        } else if (view1.getId() == R.id.cz) {
+            RechargeDialogFragment.show("", null, getActivity().getSupportFragmentManager(), "0", "0");
+        } else if (view1.getId() == R.id.tv_give) {
+            for (int i = 0; i < mGiftNumList.size(); i++) {
                 if (mBinding.tvGiveCoinNum.getText().toString().equals(mGiftNumList.get(i).getText())) {
                     giftNumber = mGiftNumList.get(i).getNumber();
                 }
@@ -196,25 +199,24 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             mBinding.tvRewardTitle.setVisibility(View.VISIBLE);
         }
     }
+
     private List<GiftLabelBean> giftLabelBeanList;
 
     @Override
     public void getGiftLabel(List<GiftLabelBean> giftLabelBeans) {
 
         if (giftLabelBeans == null) return;
-        if (SpUtil.getShelf()==1){
-            for (GiftLabelBean giftLabelBean1 : giftLabelBeans){
-                if (giftLabelBean1.getId().equals("2")){
-                    giftLabelBeans.remove(giftLabelBean1);
-                    break;
-                }
+        for (GiftLabelBean giftLabelBean1 : giftLabelBeans) {
+            if (giftLabelBean1.getId().equals("2")) {
+                giftLabelBeans.remove(giftLabelBean1);
+                break;
             }
         }
 
-        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans,fragmentList,""));
+        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans, fragmentList, ""));
         mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
         mBinding.slidingTabLayout.setCurrentTab(0);
-        refreshCurrentGiftFragment(giftLabelBeans.get(0).getId(),2,"");
+        refreshCurrentGiftFragment(giftLabelBeans.get(0).getId(), 2, "");
         mBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -224,7 +226,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             @Override
             public void onPageSelected(int position) {
                 // 当页面切换时，控制 tv_bb_qs 按钮的显示
-                refreshCurrentGiftFragment(giftLabelBeans.get(position).getId(),2,"");
+                refreshCurrentGiftFragment(giftLabelBeans.get(position).getId(), 2, "");
             }
 
             @Override
@@ -233,11 +235,13 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             }
         });
     }
-    private void refreshCurrentGiftFragment(String id,int type,String roomId) {
-        if (getCurrentGiftFragment()!=null){
-            getCurrentGiftFragment().loadDataIfNeeded(id,type,roomId);
+
+    private void refreshCurrentGiftFragment(String id, int type, String roomId) {
+        if (getCurrentGiftFragment() != null) {
+            getCurrentGiftFragment().loadDataIfNeeded(id, type, roomId);
         }
     }
+
     private GiftTwoDetailsFragment getCurrentGiftFragment() {
         int currentPosition = mBinding.viewPager.getCurrentItem();
         // 使用 ViewPager 的 adapter 获取当前 fragment
@@ -251,10 +255,12 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
         }
         return null;
     }
+
     private int getSelectedGift() {
         int currentItem = mBinding.viewPager.getCurrentItem();
         return currentItem;
     }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void userRefresh(GiftUserRefreshEvent event) {
         if (event.addSelf) {
@@ -264,26 +270,27 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
 
     private void giveGift(String num) {
         getSelectedGift();
-            if (roonGiftModel == null) {
-                ToastUtils.show("请选择礼物");
-                return;
-            }
+        if (roonGiftModel == null) {
+            ToastUtils.show("请选择礼物");
+            return;
+        }
 
-            if (TextUtils.isEmpty(num)) {
-                ToastUtils.show("请选择打赏礼物数量");
-                return;
-            }
-            if (Integer.valueOf(num) <= 0) {
-                ToastUtils.show("请选择打赏礼物数量");
-                return;
-            }
+        if (TextUtils.isEmpty(num)) {
+            ToastUtils.show("请选择打赏礼物数量");
+            return;
+        }
+        if (Integer.valueOf(num) <= 0) {
+            ToastUtils.show("请选择打赏礼物数量");
+            return;
+        }
 
-            //礼物打赏
-            giftNumber = num;
-            MvpPre.reward_zone(circle_id, roonGiftModel.getGift_id(), num, "1");
+        //礼物打赏
+        giftNumber = num;
+        MvpPre.reward_zone(circle_id, roonGiftModel.getGift_id(), num, "1");
     }
+
     @Override
-    public void setGiftList(List<RoonGiftModel> roonGiftModels,int type) {
+    public void setGiftList(List<RoonGiftModel> roonGiftModels, int type) {
 
     }
 
@@ -300,7 +307,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
     @Override
     public void reward_zone() {
         com.blankj.utilcode.util.ToastUtils.showShort("打赏成功");
-        EventBus.getDefault().post(new GiftRewardEvent(point,circle_id));
+        EventBus.getDefault().post(new GiftRewardEvent(point, circle_id));
         dismiss();
     }