From 28f56953297b5e2632818ad7d9bb0232dfa38f7d Mon Sep 17 00:00:00 2001 From: huangjian <547527489@qq.com> Date: Sat, 9 May 2020 17:11:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=AE=B1=E5=AD=90UI=E4=BF=AE=E6=94=B9?= =?UTF-8?q?(=E6=9C=AC=E6=9D=A5=E8=A6=81=E6=94=B9=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E4=BA=86=E6=94=B9=E6=88=90=E5=AE=BD=E4=BA=86...)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/treasure_box/activity/TreasureBoxActivity.java | 4 ++-- .../treasure_box/activity/TreasureBoxHonourActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java index 2427bc6e2..8af88da9b 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java @@ -72,7 +72,7 @@ public class TreasureBoxActivity extends BaseBindingActivity { translationYAnimator = ObjectAnimator.ofFloat(mBinding.ivGiftAnim, "translationY", 0, - ScreenUtil.screenHeight - (mBinding.ivBox.getBottom() + mBinding.ivBox.getTop()) / 2f - ScreenUtil.dip2px(10 + 19)).setDuration(500); + height - (mBinding.ivBox.getBottom() + mBinding.ivBox.getTop()) / 2f - ScreenUtil.dip2px(10 + 19)).setDuration(500); translationYAnimator.setInterpolator(new AccelerateDecelerateInterpolator()); }); WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo(); diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java index 1b6fd2652..9e559967f 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java @@ -71,7 +71,7 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity { translationYAnimator = ObjectAnimator.ofFloat(mBinding.ivGiftAnim, "translationY", 0, - ScreenUtil.screenHeight - (mBinding.ivBox.getBottom() + mBinding.ivBox.getTop()) / 2f - ScreenUtil.dip2px(55)).setDuration(500); + height - (mBinding.ivBox.getBottom() + mBinding.ivBox.getTop()) / 2f - ScreenUtil.dip2px(55)).setDuration(500); translationYAnimator.setInterpolator(new AccelerateDecelerateInterpolator()); }); WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo();