moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

房间 "夺宝精灵" 精灵试炼 传说试炼 底部精灵展示为普通精灵

Browse Source
This commit is contained in:
wzq
2023-10-11 16:02:49 +08:00
parent 9e9eb5d5b7
commit ae4d327baf
3 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt
View File

@@ -39,31 +39,31 @@ class MyFairyDialog : BaseDialog<TreasureFairyDialogMyFairyBinding>() {
override fun init() {
EventBus.getDefault().register(this)
binding?.ivBack?.setOnClickListener {
binding.ivBack.setOnClickListener {
dismissAllowingStateLoss()
}
binding?.ivFairyTest?.setOnClickListener {
binding.ivFairyTest.setOnClickListener {
TestFairyDialog.newInstance().show(context)
}
binding?.ivRecord?.setOnClickListener {
binding.ivRecord.setOnClickListener {
MyFairyRecordDialog.newInstance().show(context)
}
binding?.rg?.setOnCheckedChangeListener { _, checkedId ->
binding.rg.setOnCheckedChangeListener { _, checkedId ->
when (checkedId) {
R.id.rb_base -> binding?.viewPager?.currentItem = 0
R.id.rb_legend -> binding?.viewPager?.currentItem = 1
R.id.rb_base -> binding.viewPager.currentItem = 0
R.id.rb_legend -> binding.viewPager.currentItem = 1
}
}
binding?.viewPager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
binding.viewPager.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
override fun onPageSelected(position: Int) {
when (position) {
0 -> binding?.rg?.check(R.id.rb_base)
1 -> binding?.rg?.check(R.id.rb_legend)
0 -> binding.rg.check(R.id.rb_base)
1 -> binding.rg.check(R.id.rb_legend)
}
DemoCache.saveMyFairyIndex(position)
}
})
binding?.viewPager?.adapter = RoomVPAdapter(
binding.viewPager.adapter = RoomVPAdapter(
childFragmentManager,
listOf(
MyFairyFragment.newInstance(MyFairyItemView.BASE),
@@ -71,7 +71,7 @@ class MyFairyDialog : BaseDialog<TreasureFairyDialogMyFairyBinding>() {
)
)
binding?.viewPager?.setCurrentItem(DemoCache.readMyFairyIndex(), false)
binding.viewPager.setCurrentItem(DemoCache.readMyFairyIndex(), false)
viewModel.getMyFairyInfo()
}

18
app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyDialog.kt
View File

@@ -32,29 +32,29 @@ class TestFairyDialog : BaseDialog<TreasureFairyDialogTestFairyBinding>() {
@SuppressLint("CheckResult")
override fun init() {
binding?.ivBack?.setOnClickListener {
binding.ivBack.setOnClickListener {
dismissAllowingStateLoss()
}
binding?.tvRecord?.setOnClickListener {
binding.tvRecord.setOnClickListener {
TestFairyRecordDialog.newInstance().show(context)
}
binding?.rg?.setOnCheckedChangeListener { _, checkedId ->
binding.rg.setOnCheckedChangeListener { _, checkedId ->
when (checkedId) {
R.id.rb_epic -> binding?.viewPager?.currentItem = 0
R.id.rb_legend -> binding?.viewPager?.currentItem = 1
R.id.rb_epic -> binding.viewPager.currentItem = 0
R.id.rb_legend -> binding.viewPager.currentItem = 1
}
}
binding?.viewPager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
binding.viewPager.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
override fun onPageSelected(position: Int) {
when (position) {
0 -> binding?.rg?.check(R.id.rb_epic)
1 -> binding?.rg?.check(R.id.rb_legend)
0 -> binding.rg.check(R.id.rb_epic)
1 -> binding.rg.check(R.id.rb_legend)
}
viewModel.cleanTestParam()
}
})
binding?.viewPager?.adapter = RoomVPAdapter(
binding.viewPager.adapter = RoomVPAdapter(
childFragmentManager,
listOf(
TestFairyFragment.newInstance(MyFairyItemView.BASE),

11
app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt
View File

@@ -96,16 +96,7 @@ class TestFairyFragment : BaseViewBindingFragment<TreasureFairyFragmentTestFairy
.build()
viewModel.myFairyInfoLiveData.observe(viewLifecycleOwner) {
val fairyInfos = it?.let {
when (fairyType) {
MyFairyItemView.LEGEND -> {
it.highElves
}
else -> {
it.lowElves
}
}
}
val fairyInfos = it?.lowElves
if(fairyType == MyFairyItemView.BASE) {
val list = mutableListOf<FairyInfo>()
it?.lowElves?.take(3)?.let { it1 -> list.addAll(it1) }