From 601f14db94013373df700e007095f7f2f5ecbe24 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 10 一月 2025 10:07:25 +0800
Subject: [PATCH] 反馈修改
---
app/src/main/java/com/sinata/xqmuse/ui/tree/TreeFragment.kt | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/tree/TreeFragment.kt b/app/src/main/java/com/sinata/xqmuse/ui/tree/TreeFragment.kt
index d72c556..ddc5d59 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/tree/TreeFragment.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/tree/TreeFragment.kt
@@ -49,9 +49,9 @@
Log.e("虚拟导航栏高度", "$virtualBarHeigh")
val navigationBarHeight = getNavigationBarHeight()
Log.e("导航栏高度", "$navigationBarHeight")
- if (virtualBarHeigh >= getNavigationBarHeight()) //如果虚拟导航栏高度大于或等于导航栏高度，说明虚拟导航栏在显示，需要减去导航栏的高度
- behavior.setPeekHeight(dip(63) - getNavigationBarHeight(), true)
- else
+// if (virtualBarHeigh >= getNavigationBarHeight()) //如果虚拟导航栏高度大于或等于导航栏高度，说明虚拟导航栏在显示，需要减去导航栏的高度
+// behavior.setPeekHeight(dip(63) + getNavigationBarHeight(), true)
+// else
behavior.setPeekHeight(dip(63), true)
tv_rule.setOnClickListener {
HttpManager.getH5(6).requestByF(this){ _, data->
@@ -78,7 +78,7 @@
EventBus.getDefault().post(EmptyEvent(Const.EventCode.SWITCH_HOME))
}
iv_water.clickDelay {
-// showWater()
+ showWater()
// tree?.energyValue = 0
// tree!!.treeLevelType++
// showTreeAnim(tree!!.getTreeApng(),true)
@@ -94,19 +94,23 @@
else
HttpManager.watering().requestByF(this){_,data->
data?.apply {
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.USER_INFO_CHANGED)) //刷新成长值
tv_max.text = "/$nextLevel"
tv_growth.text = growthValue.toString()
val targetHeight = growthValue.toDouble()/nextLevel*dip(155)
val layoutParams = progress.layoutParams
showGrowthAnim(layoutParams.height, max(1,targetHeight.toInt()))
showWater()
- tree?.energyValue = 0
+ tree?.energyValue = energyValue
tv_power.text = "当前能量值：${(tree?.energyValue?:0)}"
- if (isNext){
- tree!!.treeLevelType++
+ if (tree!!.treeLevelType != data.treeLevelType){
+ tree!!.treeLevelType = data.treeLevelType
showTreeAnim(tree!!.getTreeApng(),true)
audioPlayer.startPlayMusic(requireContext(),tree!!.getLevelUpAudio())
- TreeTipDialog.show(childFragmentManager,"升级","恭喜！你的树苗已升级为${tree!!.getLevelName()}阶段！")
+ TreeTipDialog.show(childFragmentManager,"生命之树",tree!!.getLevelName())
+ }else if (tree!!.status != 2){
+ tree!!.status = 2
+ showTreeAnim(tree!!.getTreeApng(),tree!!.treeLevelType != 1)
}
}
}
--
Gitblit v1.7.1