From c36f127bce5dcedb7d2766a5580647b709c2ebde Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Wed, 16 Aug 2023 18:27:33 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E7=99=BB=E9=8C=84=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E6=88=BF=E9=96=93=E5=86=85=E9=80=81?=
=?UTF-8?q?=E7=A6=AE=E9=A3=84=E5=B1=8F=E9=9A=B1=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../erban/avroom/widget/GiftEffectView.java | 59 +------------------
.../ui/login/LoginBoundAuthCodeActivity.kt | 5 +-
app/src/main/res/layout/activity_login.xml | 3 -
.../layout/activity_login_bound_auth_code.xml | 2 +-
app/src/main/res/values/strings.xml | 1 +
5 files changed, 6 insertions(+), 64 deletions(-)
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
index 7b69f0a71..9242cf66e 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
@@ -130,63 +130,8 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
giftInfo = giftEffectInfo.getGift();
}
if (giftInfo != null) {
- int totalCoin = giftInfo.getGoldPrice() * giftEffectInfo.getGiftNum() * giftEffectInfo.getTargetUsers().size();
- if (totalCoin >= 520 &&
- giftEffectInfo.getGiftReceiveType() != GiftEffectInfo.GIFT_RECEIVE_TYPE_LUCKY
- && !AvRoomDataManager.get().isSelfGamePlaying()) {//礼物栏
- ImageLoadUtils.loadImage(benefactorAvatar.getContext(), giftEffectInfo.getAvatar(), benefactorAvatar);
- ImageLoadUtils.loadImage(giftImg.getContext(), giftInfo.getGiftUrl(), giftImg);
- benefactorNick.setText(giftEffectInfo.getNick());
- giftNumber.setText("X" + giftEffectInfo.getGiftNum());
- giftName.setText(giftInfo.getGiftName());
- container.setVisibility(VISIBLE);
- isPlayAnim = true;
- if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_SINGLE) {
- GiftReceiver giftReceiver = giftEffectInfo.getTargetUsers().get(0);
- ImageLoadUtils.loadAvatar(receiverAvatar.getContext(), giftReceiver.getAvatar(), receiverAvatar);
- receiverNick.setText(giftReceiver.getNick());
- } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_ALL) {
- receiverAvatar.setImageResource(R.mipmap.app_logo);
- receiverNick.setText(ResUtil.getString(R.string.avroom_widget_gifteffectview_01));
- } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_MULTI) {
- receiverAvatar.setImageResource(R.mipmap.app_logo);
- StringBuilder sb = new StringBuilder();
- for (GiftReceiver targetUser : giftEffectInfo.getTargetUsers()) {
- RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByAccount(targetUser.getUid() + "");
- if (roomQueueInfo == null) continue;
- sb.append(roomQueueInfo.mRoomMicInfo.getPosition() + 1).append(ResUtil.getString(R.string.avroom_widget_gifteffectview_02)).append(",");
- }
- if (sb.length() > 0) {
- sb.replace(sb.lastIndexOf(","), sb.length(), "");
- }
- receiverNick.setText(sb.toString());
- }
-
- Animation operatingAnim = AnimationUtils.loadAnimation(getContext(), R.anim.light_bg_rotate_anim);
- LinearInterpolator lin = new LinearInterpolator();
- operatingAnim.setInterpolator(lin);
- giftLightBg.setAnimation(operatingAnim);
-
- final Point center = new Point();
- center.x = ResolutionUtils.getScreenWidth(getContext()) / 2;
- ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(container, "translationX", -UIUtil.dip2px(getContext(), 400), center.x - container.getWidth() / 2).setDuration(1250);
- objectAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
- objectAnimator.start();
-
- ObjectAnimator objectAnimator1 = ObjectAnimator.ofFloat(container, "alpha", 0.0F, 1.0F).setDuration(1250);
- objectAnimator1.setInterpolator(new AccelerateDecelerateInterpolator());
- objectAnimator1.start();
- if (totalCoin < 4999) {
- imgBg.setImageResource(R.drawable.icon_gift_effect_bg_1);
- } else if (totalCoin < 9999) {
- imgBg.setImageResource(R.drawable.icon_gift_effect_bg_2);
- } else {
- imgBg.setImageResource(R.drawable.icon_gift_effect_bg_3);
- }
- } else {
- isPlayAnim = false;
- container.setVisibility(INVISIBLE);
- }
+ isPlayAnim = false;
+ container.setVisibility(INVISIBLE);
effectHandler.sendEmptyMessageDelayed(0, 4000);
if (giftInfo.getOtherViewType() == 1 && !TextUtils.isEmpty(giftInfo.getViewUrl())) {
drawVAPEffect(giftInfo.getViewUrl());
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginBoundAuthCodeActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/login/LoginBoundAuthCodeActivity.kt
index acf9222d3..1c3fe9b1f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginBoundAuthCodeActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginBoundAuthCodeActivity.kt
@@ -36,7 +36,7 @@ class LoginBoundAuthCodeActivity : BaseViewBindingActivity
@@ -103,7 +102,6 @@
android:text="@string/login_facebook"
android:textColor="@color/color_6D6B89"
android:textSize="16sp"
- android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
@@ -153,7 +151,6 @@
android:text="@string/login_line"
android:textColor="@color/color_6D6B89"
android:textSize="16sp"
- android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/activity_login_bound_auth_code.xml b/app/src/main/res/layout/activity_login_bound_auth_code.xml
index 6743bf5ff..8ae5bcd97 100644
--- a/app/src/main/res/layout/activity_login_bound_auth_code.xml
+++ b/app/src/main/res/layout/activity_login_bound_auth_code.xml
@@ -80,7 +80,7 @@
android:background="@drawable/bg_common_enabled"
android:enabled="false"
android:gravity="center"
- android:text="@string/text_login"
+ android:text="@string/finish"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0394dac0a..64f133d69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5116,5 +5116,6 @@
設置登錄密碼
為了方便您下次登錄，請先設置登錄密碼
上次登錄
+ 完成
\ No newline at end of file