From c27225db1206ae126a0e703fb678a9bf60c8dd8a Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 13 Mar 2023 03:03:50 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E6=94=B9=E5=A4=BA=E5=AE=9D?= =?UTF-8?q?=E7=B2=BE=E7=81=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/treasurefairy/FairyViewModel.kt | 5 ++++- .../adapter/MyFairyRecordAdapter.kt | 2 +- .../erban/treasurefairy/dialog/MyFairyDialog.kt | 16 ++++++++++++++++ .../treasurefairy/dialog/MyFairySendDialog.kt | 6 +++--- .../treasurefairy/event/UpdateDataEvent.java | 8 ++++++++ .../treasurefairy/fragment/MyFairyFragment.kt | 1 + .../treasure_fairy_dialog_my_fairy_record.xml | 2 +- app/src/main/res/values/strings.xml | 9 +++++---- 8 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/com/yizhuan/erban/treasurefairy/event/UpdateDataEvent.java diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt index 2e3b1cdf0..0710751d0 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt @@ -6,12 +6,14 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.yizhuan.erban.base.BaseViewModel import com.yizhuan.erban.base.Event +import com.yizhuan.erban.treasurefairy.event.UpdateDataEvent import com.yizhuan.erban.treasurefairy.view.MyFairyItemView import com.yizhuan.xchat_android_core.bean.response.ListResult import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo import com.yizhuan.xchat_android_core.treasurefairy.* import com.yizhuan.xchat_android_core.utils.net.ServerException import com.yizhuan.xchat_android_core.utils.toast +import org.greenrobot.eventbus.EventBus class FairyViewModel : BaseViewModel() { @@ -232,6 +234,7 @@ class FairyViewModel : BaseViewModel() { TreasureFairyModel.sendFairy(elfId, targetUid) _sendFairyLiveData.value = Event(true) "贈送成功!".toast() + EventBus.getDefault().post(UpdateDataEvent()) } ) } @@ -324,7 +327,7 @@ class FairyViewModel : BaseViewModel() { compoundFairyInfos.put(nextIndex(compoundFairyInfos), it) } } - if (needNum == 3) { + if (needNum <= 3 && needNum != 0) { "精靈數量不足".toast() return } diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt index 59839e9ee..1c4b6cd4d 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt @@ -20,7 +20,7 @@ class MyFairyRecordAdapter : val isSend = item.type == 2 helper.setText( R.id.tv_content, - "${if (isSend) "你" else item.targetNick}贈送${if (isSend) "" else "了你"}一張“${item.elfName}”精靈卡" + "${if (isSend) "你" else item.targetNick}贈送${if (isSend) item.targetNick else "了你"}一張“${item.elfName}”精靈卡" ) } diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt index 53b39f1c6..2ce62f2b3 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt @@ -11,9 +11,13 @@ import com.yizhuan.erban.avroom.adapter.RoomVPAdapter import com.yizhuan.erban.base.BaseDialog import com.yizhuan.erban.databinding.TreasureFairyDialogMyFairyBinding import com.yizhuan.erban.treasurefairy.FairyViewModel +import com.yizhuan.erban.treasurefairy.event.UpdateDataEvent import com.yizhuan.erban.treasurefairy.fragment.MyFairyFragment import com.yizhuan.erban.treasurefairy.view.MyFairyItemView import com.yizhuan.xchat_android_core.DemoCache +import org.greenrobot.eventbus.EventBus +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode class MyFairyDialog : BaseDialog() { @@ -33,6 +37,8 @@ class MyFairyDialog : BaseDialog() { @SuppressLint("CheckResult") override fun init() { + EventBus.getDefault().register(this) + binding.ivBack.setOnClickListener { dismissAllowingStateLoss() } @@ -70,4 +76,14 @@ class MyFairyDialog : BaseDialog() { viewModel.getMyFairyInfo() } + @Subscribe(threadMode = ThreadMode.MAIN) + fun onUpdateDataEvent(event: UpdateDataEvent?) { + viewModel.getMyFairyInfo() + } + + override fun onDestroyView() { + super.onDestroyView() + EventBus.getDefault().unregister(this) + } + } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt index bd8360929..0ed7a9966 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt @@ -44,10 +44,10 @@ class MyFairySendDialog : BaseDialog() { binding.ivFairyIcon.load(fairyInfo.elfPicUrl) binding.tvContent.text = SpannableBuilder() - .append(if (isSend) "確定贈送”" else "確定向", ForegroundColorSpan(Color.WHITE)) - .append("${userInfo.nick}", ForegroundColorSpan("#FEF8AA".toColorInt())) + .append(if (isSend) "確定贈送" else "確定向", ForegroundColorSpan(Color.WHITE)) + .append("\"${userInfo.nick}\"", ForegroundColorSpan("#FEF8AA".toColorInt())) .append( - "”${if (isSend) "" else "索要"}1張“${fairyInfo.elfName}”精靈卡嗎？", + "\"${if (isSend) "" else "索要"}1張“${fairyInfo.elfName}”精靈卡嗎？", ForegroundColorSpan(Color.WHITE) ) .build() diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/event/UpdateDataEvent.java b/app/src/main/java/com/yizhuan/erban/treasurefairy/event/UpdateDataEvent.java new file mode 100644 index 000000000..f0bcb061f --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/event/UpdateDataEvent.java @@ -0,0 +1,8 @@ +package com.yizhuan.erban.treasurefairy.event; + +/** + * 更新我的精灵数据 + * Created by wushaocheng on 2023/3/13. + */ +public class UpdateDataEvent { +} diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/MyFairyFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/MyFairyFragment.kt index d4652cfb4..2737fc2f2 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/MyFairyFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/MyFairyFragment.kt @@ -28,6 +28,7 @@ class MyFairyFragment : BaseViewBindingFragment史詩召喚 傳說召喚 精靈球 - 初級森林 - 史詩森林 - 傳說森林 + 初級猛獁森林 + 史詩猛獁森林 + 傳說猛獁森林 我是個默認簽名 你 贈送 當前幸運值： - 使用初級球有一定幾率抓到史詩精靈 + 使用初級球有一定幾率抓到初級精靈 抓捕一次 (初級精靈球X1) (初級精靈球X10) 抓捕十次 >]]> + 記錄 \ No newline at end of file