diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index 805def723..bd6fab53f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -23,6 +23,7 @@ import android.view.animation.RotateAnimation; import android.widget.Button; import android.widget.EditText; import android.widget.FrameLayout; +import android.widget.HorizontalScrollView; import android.widget.ImageView; import android.widget.TextView; @@ -43,11 +44,9 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog; import com.yizhuan.erban.base.BaseActivity; import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; import com.yizhuan.erban.ui.gift.dialog.GiftInfoVm; import com.yizhuan.erban.ui.gift.dialog.PageIndicatorView; -import com.yizhuan.erban.ui.pay.ChargeActivity; import com.yizhuan.erban.ui.pay.ChargeDialog; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.ui.webview.DialogWebViewActivity; @@ -70,9 +69,6 @@ import com.yizhuan.xchat_android_core.gift.bean.GiftType; import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; import com.yizhuan.xchat_android_core.gift.event.UpdateKnapEvent; import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.exception.MagicOutOfDateException; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.manager.RoomEvent; @@ -88,8 +84,6 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.FreezeException; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.bindinglist.IItem; import com.yizhuan.xchat_android_library.bindinglist.MultiTypeAdapter; @@ -106,7 +100,6 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -182,11 +175,11 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene private List> pagerList; private WalletInfo goldWalletInfo; private int itemType = ITEM_TYPE_GOLD; + private HorizontalScrollView hsvTabs; private View rlGifts; private View llTabs; private View llDrawGift; private TextView tvDrawGiftTips; - private TextView tvDrawGiftChange; private View ivDrawGiftRemoveLast; private View ivDrawGiftRemoveAll; private View ivDrawGiftClose; @@ -375,19 +368,17 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene reloadView = root.findViewById(R.id.tv_reload); reloadView.setOnClickListener(this); loadingView = root.findViewById(R.id.iv_loading); + hsvTabs = root.findViewById(R.id.hsv_tabs); rlGifts = root.findViewById(R.id.rl_gifts); llTabs = root.findViewById(R.id.ll_tabs); llDrawGift = root.findViewById(R.id.ll_draw_gift); tvDrawGiftTips = root.findViewById(R.id.tv_draw_gift_tips); - tvDrawGiftChange = root.findViewById(R.id.tv_draw_gift_change); - setGradient(tvDrawGiftChange); ivDrawGiftRemoveLast = root.findViewById(R.id.iv_draw_gift_remove_last); ivDrawGiftRemoveAll = root.findViewById(R.id.iv_draw_gift_remove_all); ivDrawGiftClose = root.findViewById(R.id.iv_draw_gift_close); ivDrawGiftClose.setOnClickListener(this); ivDrawGiftRemoveLast.setOnClickListener(this); ivDrawGiftRemoveAll.setOnClickListener(this); - tvDrawGiftChange.setOnClickListener(this); showLoadingView(); showLoadingAnimation(); sendGiftButton.setOnClickListener(this); @@ -535,18 +526,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene } - private void setGradient(TextView textView) { - float endX = textView.getPaint().getTextSize() * textView.getText().length(); - LinearGradient linearGradient = new LinearGradient( - 0f, 0f, endX, 0f, - Color.parseColor("#57CF99"), - Color.parseColor("#33ECFF"), - Shader.TileMode.CLAMP - ); - textView.getPaint().setShader(linearGradient); - textView.invalidate(); - } - private void showLoadingAnimation() { Animation rotateAnimation = new RotateAnimation(0, 360, Animation.RELATIVE_TO_SELF, 0.5f, @@ -669,6 +648,13 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene updateWeekStarDesc(); isShowDrawGiftModel = false; updateDrawGift(); + giftIndicator.post(() -> { + if (position < GiftIndicator.TYPE_WEEK) { + hsvTabs.fullScroll(View.FOCUS_LEFT); + } else { + hsvTabs.fullScroll(View.FOCUS_RIGHT); + } + }); } private void updateLuckyBagIntro() { @@ -803,7 +789,8 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene tvDrawGiftTips.setText(spannableBuilder.build()); sendGiftButton.setEnabled(true); } else { - sendGiftButton.setEnabled(false); + boolean isDrawGiftTab = giftIndicator.getCurrrentType() == GiftIndicator.TYPE_DRAW_GIFT; + sendGiftButton.setEnabled(!isDrawGiftTab); tvDrawGiftTips.setText("至少画10个才能送出"); } } @@ -818,7 +805,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene totalValue = totalValue / 10000.0f; diamond = FormatUtils.formatBigDecimal(totalValue) + "W+"; } else { - diamond = String.valueOf(totalValue); + diamond = String.valueOf((int) totalValue); } SpannableBuilder text = new SpannableBuilder() .append("总价值: ", new ForegroundColorSpan(Color.parseColor("#7A797A"))) @@ -1254,13 +1241,15 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene DialogWebViewActivity.start(context, UriProvider.getWeekStarUrl(), true); break; case R.id.iv_draw_gift_close: - case R.id.tv_draw_gift_change: clearDrawGift(); isShowDrawGiftModel = false; updateDrawGift(); break; case R.id.iv_draw_gift_remove_last: - if (drawGiftHelper != null) drawGiftHelper.removeLastStroke(); + if (drawGiftHelper != null) { + drawGiftHelper.removeLastStroke(); + updateDrawGiftTips(); + } break; case R.id.iv_draw_gift_remove_all: clearDrawGift(); @@ -1365,8 +1354,8 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene private void clearDrawGift() { if (drawGiftHelper != null) { - tvDrawGiftTips.setText("至少画10个才能送出"); drawGiftHelper.clearDrawGift(); + updateDrawGiftTips(); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java index 3b1e02c75..91a981b9b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java @@ -30,25 +30,22 @@ public class GiftIndicator extends LinearLayout { /**普通礼物*/ public static final int TYPE_NORMAL = 0; - /**魔法礼物*/ - public static final int TYPE_MAGIC = 1; - /**贵族礼物*/ - public static final int TYPE_NOBLE = 2; - /**背包礼物*/ - public static final int TYPE_KNAP = 3; - /** - * 萝卜礼物 - */ - public static final int TYPE_RADISH = 4; /**星球礼物*/ - public static final int TYPE_LUCKY = 5; + public static final int TYPE_LUCKY = 1; + + /**贵族礼物*/ + public static final int TYPE_NOBLE = 2; + /**周星礼物*/ - public static final int TYPE_WEEK = 6; + public static final int TYPE_WEEK = 3; /**涂鸦礼物*/ - public static final int TYPE_DRAW_GIFT = 7; + public static final int TYPE_DRAW_GIFT = 4; + + /**背包礼物*/ + public static final int TYPE_KNAP = 5; private Map map = new HashMap<>(); diff --git a/app/src/main/res/layout/dialog_bottom_gift.xml b/app/src/main/res/layout/dialog_bottom_gift.xml index 5e19c0fb0..16daeb5fa 100644 --- a/app/src/main/res/layout/dialog_bottom_gift.xml +++ b/app/src/main/res/layout/dialog_bottom_gift.xml @@ -14,7 +14,9 @@ android:layout_height="55dp" android:background="@drawable/bg_draw_gift_operation" android:gravity="center_vertical" - android:orientation="horizontal"> + android:orientation="horizontal" + android:visibility="gone" + tools:visibility="visible"> - - + android:layout_height="wrap_content" + android:layout_marginTop="10dp"> - - - + android:layout_weight="1" + android:clipToPadding="false" + android:paddingStart="9dp" + android:requiresFadingEdge="horizontal"> - - - - - - - - - + android:layout_gravity="center_vertical" /> + + + + + + + + + + + android:layout_gravity="center_vertical|end" + android:gravity="center" + android:orientation="horizontal" + android:visibility="gone" + tools:visibility="gone"> - + + + + + + + diff --git a/app/src/module_treasure_box/res/layout/activity_pull_radish.xml b/app/src/module_treasure_box/res/layout/activity_pull_radish.xml index fe9527415..fb9e78dec 100644 --- a/app/src/module_treasure_box/res/layout/activity_pull_radish.xml +++ b/app/src/module_treasure_box/res/layout/activity_pull_radish.xml @@ -182,8 +182,8 @@ android:gravity="center" android:maxLength="4" android:text="1" - android:textColor="@color/white" - android:textSize="13sp" + android:textColor="#64472E" + android:textSize="15sp" app:layout_constraintBottom_toBottomOf="@id/iv_sub" app:layout_constraintEnd_toStartOf="@id/iv_add" app:layout_constraintStart_toEndOf="@id/iv_sub"