From 4079a09ef527a6e00f204fdeb84265e6a0e572c3 Mon Sep 17 00:00:00 2001 From: huangjian <547527489@qq.com> Date: Thu, 7 May 2020 11:16:01 +0800 Subject: [PATCH] bug fix --- .../java/com/yizhuan/erban/MainActivity.java | 100 ++++++------------ .../activities/BillGiftExpendActivity.java | 2 +- .../activities/BillGiftInComeActivity.java | 2 +- .../MonsterHuntingActivity.java | 2 +- .../erban/ui/wallet/ExchangeGoldActivity.java | 2 +- .../yizhuan/erban/ui/widget/GiftDialog.java | 2 +- .../erban/ui/widget/MainTabLayout.java | 22 ++-- .../main/res/layout/activity_wallet_gold.xml | 2 +- .../main/res/layout/fragment_wallet_gold.xml | 2 +- .../square/SquareDynamicFragment.java | 1 - .../community/square/SquareFragment.java | 2 +- .../xchat_android_core/pay/PayModel.java | 12 +-- 12 files changed, 52 insertions(+), 99 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index f2c9fe4b7..f4c557959 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -68,7 +68,6 @@ import com.yizhuan.erban.home.fragment.CommunityNoticeAct; import com.yizhuan.erban.home.fragment.ContactsListFragment; import com.yizhuan.erban.home.fragment.GameHomeFragment; import com.yizhuan.erban.home.fragment.MeFragment; -import com.yizhuan.erban.home.fragment.RankingFragment; import com.yizhuan.erban.home.presenter.MainPresenter; import com.yizhuan.erban.home.view.IMainView; import com.yizhuan.erban.luckymoney.viewholder.LuckyMoneyMsgViewHolder; @@ -206,7 +205,7 @@ import static com.yizhuan.xchat_android_core.Constants.SHOW_CAR_GUIDE; */ @CreatePresenter(MainPresenter.class) public class MainActivity extends BaseMvpActivity - implements MainTabLayout.OnTabClickListener, IMainView , View.OnClickListener { + implements MainTabLayout.OnTabClickListener, IMainView, View.OnClickListener { private static final String TAG = "MainActivity"; @@ -224,7 +223,7 @@ public class MainActivity extends BaseMvpActivity private FloatingLiveMiniView floatingLiveMiniView; private MainTabLayout mMainTabLayout; - private int mCurrentMainPosition = MainTabLayout.MAIN_TAB_POS_GAME; + private int mCurrentMainPosition = MainTabLayout.MAIN_TAB_POS_HOME; /** * 是否需要预加载home，by lvzebiao v3.1.2 * 因为首页标签添加帧动画，防止，第一次点击标签过于卡顿 @@ -338,7 +337,7 @@ public class MainActivity extends BaseMvpActivity if (reason == null) return; //加入黑名单，踢出房间回调 ChatRoomKickOutEvent.ChatRoomKickOutReason reasonReason = reason.getReason(); - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.USER_KICKED_EVENT,"用户被踢"); + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.USER_KICKED_EVENT, "用户被踢"); if (reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.BE_BLACKLISTED || reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.KICK_OUT_BY_MANAGER || reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.KICK_OUT_BY_CONFLICT_LOGIN @@ -351,7 +350,7 @@ public class MainActivity extends BaseMvpActivity updateRoomState(); } else if (event == RoomEvent.MY_SELF_KICK_OUT_ROOM_BY_S_ADMIN) { toast(R.string.kick_out_room_by_s_admin); - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.USER_KICKED_EVENT,"用户被踢"); + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.USER_KICKED_EVENT, "用户被踢"); getMvpPresenter().exitRoom(); } } @@ -564,7 +563,7 @@ public class MainActivity extends BaseMvpActivity startTime = System.currentTimeMillis(); } else if (intent.hasExtra("gameTab") && intent.getBooleanExtra("gameTab", false)) { if (mMainTabLayout != null) { - mMainTabLayout.select(MainTabLayout.MAIN_TAB_POS_GAME); + mMainTabLayout.select(MainTabLayout.MAIN_TAB_POS_HOME); } } else if (intent.hasExtra(MSG_TAB) && intent.getBooleanExtra(MSG_TAB, false)) { if (mMainTabLayout != null) { @@ -850,7 +849,7 @@ public class MainActivity extends BaseMvpActivity @Override public void accept(UserInfo userInfo) throws Exception { if (userInfo != null) { - displayAvatarLayout(userInfo.getAvatar(),userInfo.getNick(),userInfo.getErbanNo()); + displayAvatarLayout(userInfo.getAvatar(), userInfo.getNick(), userInfo.getErbanNo()); } else { NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(roomInfo.getUid() + ""); if (nimUserInfo == null) { @@ -858,12 +857,12 @@ public class MainActivity extends BaseMvpActivity @Override public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) { if (nimUserInfo != null) { - displayAvatarLayout(nimUserInfo.getAvatar(),userInfo.getNick(),userInfo.getUid()); + displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid()); } } }); } else { - displayAvatarLayout(nimUserInfo.getAvatar(),userInfo.getNick(),userInfo.getUid()); + displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid()); } } } @@ -892,7 +891,7 @@ public class MainActivity extends BaseMvpActivity avatarLayout.clearAnimation(); avatarLayout.setVisibility(View.VISIBLE); tvName.setText(nickName); - tvId.setText("ID:"+uid); + tvId.setText("ID:" + uid); userLivingView.start(); stopRoomMinAnim(); startRoomMinAnim(); @@ -907,34 +906,19 @@ public class MainActivity extends BaseMvpActivity @SuppressLint("RestrictedApi") @Override public void onTabClick(int position) { - List fragments = getSupportFragmentManager().getFragments(); switchFragment(position); - if (position == MainTabLayout.MAIN_TAB_POS_HOME) { - //显示引导 -// FragmentManager fragmentManager = getSupportFragmentManager(); -// Fragment mainFragment = fragmentManager.findFragmentByTag(MainFragment.TAG); -// if (mainFragment != null && mainFragment instanceof MainFragment) { -// ((MainFragment) mainFragment).handleGuide(); -// } - } } private void switchFragment(int position) { FragmentManager fragmentManager = getSupportFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - //Fragment mainFragment = fragmentManager.findFragmentByTag(MainFragment.TAG); - Fragment attentionFragment = fragmentManager.findFragmentByTag(SquareFragment.TAG); -// Fragment msgFragment = fragmentManager.findFragmentByTag(MsgFragment.TAG); + Fragment squareFragment = fragmentManager.findFragmentByTag(SquareFragment.TAG); Fragment contactFragment = fragmentManager.findFragmentByTag(ContactsListFragment.TAG); Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG); - Fragment rankingFragment = fragmentManager.findFragmentByTag(RankingFragment.TAG); - Fragment gameFragment = fragmentManager.findFragmentByTag(GameHomeFragment.TAG); - //先隐藏所有的 -// if (mainFragment != null && mainFragment.isVisible()) { -// fragmentTransaction.hide(mainFragment); -// } - if (attentionFragment != null && attentionFragment.isVisible()) { - fragmentTransaction.hide(attentionFragment); + Fragment homeFragment = fragmentManager.findFragmentByTag(GameHomeFragment.TAG); + + if (squareFragment != null && squareFragment.isVisible()) { + fragmentTransaction.hide(squareFragment); } if (contactFragment != null && contactFragment.isVisible()) { fragmentTransaction.hide(contactFragment); @@ -942,35 +926,22 @@ public class MainActivity extends BaseMvpActivity if (meFragment != null && meFragment.isVisible()) { fragmentTransaction.hide(meFragment); } - if (rankingFragment != null && rankingFragment.isVisible()) { - fragmentTransaction.hide(rankingFragment); + if (homeFragment != null && homeFragment.isVisible()) { + fragmentTransaction.hide(homeFragment); } - if (gameFragment != null && gameFragment.isVisible()) { - fragmentTransaction.hide(gameFragment); - } - //预加载首页 -// if (PRELOAD_HOME && mainFragment == null) { -// mainFragment = new MainFragment(); -// fragmentTransaction.add(R.id.main_fragment, mainFragment, MainFragment.TAG); -// } - if (position == MainTabLayout.MAIN_TAB_POS_GAME) { - if (gameFragment == null) { - gameFragment = new GameHomeFragment(); - fragmentTransaction.add(R.id.main_fragment, gameFragment, GameHomeFragment.TAG); + + if (position == MainTabLayout.MAIN_TAB_POS_HOME) { + if (homeFragment == null) { + homeFragment = new GameHomeFragment(); + fragmentTransaction.add(R.id.main_fragment, homeFragment, GameHomeFragment.TAG); } - fragmentTransaction.show(gameFragment); - } else if (position == MainTabLayout.MAIN_TAB_POS_HOME) { -// if (mainFragment == null) { -// mainFragment = new MainFragment(); -// fragmentTransaction.add(R.id.main_fragment, mainFragment, MainFragment.TAG); -// } -// fragmentTransaction.show(mainFragment); - } else if (position == MainTabLayout.MAIN_TAB_POS_ATTENTION) { - if (attentionFragment == null) { - attentionFragment = new SquareFragment(); - fragmentTransaction.add(R.id.main_fragment, attentionFragment, SquareFragment.TAG); + fragmentTransaction.show(homeFragment); + } else if (position == MainTabLayout.MAIN_TAB_POS_SQUARE) { + if (squareFragment == null) { + squareFragment = new SquareFragment(); + fragmentTransaction.add(R.id.main_fragment, squareFragment, SquareFragment.TAG); } - fragmentTransaction.show(attentionFragment); + fragmentTransaction.show(squareFragment); } else if (position == MainTabLayout.MAIN_TAB_POS_MSG) { if (contactFragment == null) { contactFragment = new ContactsListFragment(); @@ -984,8 +955,7 @@ public class MainActivity extends BaseMvpActivity } fragmentTransaction.show(meFragment); } - if (!isDestroyed()) - fragmentTransaction.commitAllowingStateLoss(); + if (!isDestroyed()) fragmentTransaction.commitAllowingStateLoss(); mCurrentMainPosition = position; } @@ -1069,7 +1039,7 @@ public class MainActivity extends BaseMvpActivity public void onMarketVerifyUpdateEvent(MarketVerifyUpdateEvent event) { //审核包隐藏tab if (MarketVerifyModel.get().isMarketChecking()) { - mMainTabLayout.showOrHideTab(MainTabLayout.MAIN_TAB_POS_ATTENTION, View.GONE); + mMainTabLayout.showOrHideTab(MainTabLayout.MAIN_TAB_POS_SQUARE, View.GONE); } } @@ -1097,14 +1067,6 @@ public class MainActivity extends BaseMvpActivity GuideActivity.start(this); } - public boolean isShowGameTab() { - return mCurrentMainPosition == MainTabLayout.MAIN_TAB_POS_GAME; - } - - public boolean isShowMainTab() { - return mCurrentMainPosition == MainTabLayout.MAIN_TAB_POS_HOME; - } - public boolean isShowMsgTab() { return mCurrentMainPosition == MainTabLayout.MAIN_TAB_POS_MSG; } @@ -1259,14 +1221,14 @@ public class MainActivity extends BaseMvpActivity @Override public void onClick(View v) { - switch (v.getId()){ + switch (v.getId()) { case R.id.avatar_image: case R.id.ll_drag_info: RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; if (roomInfo != null) { if (AvRoomDataManager.get().isParty()) { AVRoomActivity.start(MainActivity.this, true); - }else { + } else { AVRoomActivity.start(MainActivity.this, roomInfo.getUid()); } } else { diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java index f0417ee86..da5bc7731 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java @@ -64,7 +64,7 @@ public class BillGiftExpendActivity extends BillBaseActivity 0 && walletInfo.getGoldNum() >= price) { - walletInfo.setGoldNum(gold - price); + double gold = walletInfo.getDiamondNum(); + if (walletInfo.getDiamondNum() > 0 && walletInfo.getDiamondNum() >= price) { + walletInfo.setDiamondNum(gold - price); EventBus.getDefault().post(new UpdateWalletInfoEvent()); } } @@ -306,9 +306,9 @@ public class PayModel extends BaseModel implements IPayModel { */ public void decreaseLocalGold(float price) { if (walletInfo != null) { - double gold = walletInfo.getGoldNum(); - if (walletInfo.getGoldNum() > 0) { - walletInfo.setGoldNum(gold - price); + double gold = walletInfo.getDiamondNum(); + if (walletInfo.getDiamondNum() > 0) { + walletInfo.setDiamondNum(gold - price); } // 兼容旧版扣钱 compatOtherWalletInfo(walletInfo);