From 0cb3184e35112a7ca729c0b980f38c45c4468bed Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Mon, 11 Jan 2021 16:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A6=85=E9=81=93=E9=97=AE?= =?UTF-8?q?=E9=A2=98179=EF=BC=88=E3=80=90=E5=85=89=E8=83=BD=E3=80=91?= =?UTF-8?q?=E5=85=89=E8=83=BD=E6=95=B0=E5=80=BC=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/common/util/DialogUtils.java | 2 +- .../gh/gamecenter/energy/EnergyCenterFragment.kt | 15 +++++++++++++-- .../gh/gamecenter/energy/EnergyHouseFragment.kt | 6 ++++-- .../gamecenter/personal/NewPersonalFragment.java | 4 +++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 43fcfcb809..77bdf759c7 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -1945,7 +1945,7 @@ public class DialogUtils { return dialog; } - public static void showEnergyDialog(Context context, String userName, String energy) { + public static void showEnergyDialog(Context context, String userName, int energy) { context = checkDialogContext(context); final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent); diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt index 62d3f5e231..03c8856eae 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt @@ -15,6 +15,7 @@ import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentEnergyCenterBinding import com.gh.gamecenter.entity.CommodityCategoryEntity +import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.personalhome.UserHomeViewModel import com.gh.gamecenter.user.UserViewModel @@ -32,6 +33,8 @@ class EnergyCenterFragment : BaseLazyFragment() { private val mTitleList = listOf("赚光能", "兑换区") private var mFragmentsList = ArrayList() private var mCategoryList = ArrayList() + private var mUserInfo: UserInfoEntity? = null + private var mEnergy = 0 override fun getLayoutId() = 0 @@ -85,6 +88,7 @@ class EnergyCenterFragment : BaseLazyFragment() { mUserViewModel.loginObsUserinfo.observeNonNull(viewLifecycleOwner) { if (it.data != null) { + mUserInfo = it.data mUserHomeViewModel.userId = UserManager.getInstance().userId mUserHomeViewModel.getUserEnergy() if (mFragmentsList.isNotEmpty()) { @@ -94,7 +98,8 @@ class EnergyCenterFragment : BaseLazyFragment() { } mUserHomeViewModel.energy.observeNonNull(viewLifecycleOwner) { - mBinding.userEnergy.text = if (it > 9999) "9999+光能" else "${it}光能" + mEnergy = it + mBinding.userEnergy.text = "${it}光能" } mBinding.run { @@ -213,12 +218,18 @@ class EnergyCenterFragment : BaseLazyFragment() { } } - @OnClick(R.id.backIv, R.id.energyRecord, R.id.lotteryCenter, R.id.signSwitch, R.id.signBubble, + @OnClick(R.id.backIv, R.id.userEnergy, R.id.energyRecord, R.id.lotteryCenter, R.id.signSwitch, R.id.signBubble, R.id.oneDay, R.id.twoDay, R.id.threeDay, R.id.fourDay, R.id.fiveDay, R.id.sixDay, R.id.sevenDay) fun onViewClicked(v: View) { when (v.id) { R.id.backIv -> requireActivity().finish() + R.id.userEnergy -> { + mUserInfo?.run { + DialogUtils.showEnergyDialog(requireContext(), name, mEnergy) + } + } + R.id.energyRecord -> { ifLogin("光能中心-光能记录") { DirectUtils.directToEnergyRecord(requireContext()) diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt index 78ce201924..9d18451fb6 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt @@ -42,6 +42,7 @@ class EnergyHouseFragment: BaseLazyFragment() { private val mRollNotices = ArrayList() private var mCurrentSizeIndex = 0 private var mCurrentSize = SubjectSettingEntity.Size() + private var mEnergy = 0 override fun getLayoutId() = 0 @@ -87,7 +88,8 @@ class EnergyHouseFragment: BaseLazyFragment() { } mUserHomeViewModel.energy.observeNonNull(viewLifecycleOwner) { - mBinding.userEnergy.text = if (it > 9999) "9999+光能" else "${it}光能" + mEnergy = it + mBinding.userEnergy.text = "${it}光能" } mEnergyHouseViewModel.rollNotices.observeNonNull(viewLifecycleOwner) { list -> @@ -293,7 +295,7 @@ class EnergyHouseFragment: BaseLazyFragment() { R.id.userEnergy -> { mUserInfo?.run { - DialogUtils.showEnergyDialog(requireContext(), name, mBinding.userEnergy.text.toString()) + DialogUtils.showEnergyDialog(requireContext(), name, mEnergy) } } diff --git a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.java index 04e8e1a1ad..22e0e5ff1d 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.java @@ -165,6 +165,7 @@ public class NewPersonalFragment extends BaseLazyFragment { private NewPersonalFunctionGroupAdapter mPersonalFuncGroupAdapter; private boolean mIsLogging = false; + private int mEnergy = 0; @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -376,6 +377,7 @@ public class NewPersonalFragment extends BaseLazyFragment { }); mUserHomeViewModel.getEnergy().observe(this, energy -> { + mEnergy = energy; if (energy > 9999) { mPersonalEnergy.setText("9999+"); } else { @@ -573,7 +575,7 @@ public class NewPersonalFragment extends BaseLazyFragment { case R.id.personal_energy: if (mUserInfoEntity != null) { MtaHelper.onEvent("我的光环_新", "光能值", "点击光能值"); - DialogUtils.showEnergyDialog(requireContext(), mUserInfoEntity.getName(), mPersonalEnergy.getText().toString()); + DialogUtils.showEnergyDialog(requireContext(), mUserInfoEntity.getName(), mEnergy); } else { CheckLoginUtils.checkLogin(getContext(), "我的光环-光能值", null); }