diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
index 1590f9a31..973dc1707 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
@@ -101,7 +101,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
private ViewPager mVPWrapList;
private RadioGroup mRadioGroup, mRGroupWrap;
private View mLoading;
- private View mArrow;
+ private View mArrow, iconMasking;
private View mBtnSend;
private View mBtnSendGroup;
private View mBtnSendLian;
@@ -215,6 +215,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
progressBlind1 = mRootView.findViewById(R.id.progress_blind2);
progressBlind2 = mRootView.findViewById(R.id.progress_blind3);
mArrow = mRootView.findViewById(R.id.arrow);
+ iconMasking = mRootView.findViewById(R.id.icon_masking);
blindSvga = mRootView.findViewById(R.id.blind_svga);
mBtnSend = mRootView.findViewById(R.id.btn_send);
mBtnSendGroup = mRootView.findViewById(R.id.btn_send_group);
@@ -718,7 +719,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
} else {
if (isPk) {
mVipGold.setVisibility(View.GONE);
- }else {
+ } else {
mVipGold.setVisibility(View.VISIBLE);
}
blindBox.setVisibility(View.INVISIBLE);
@@ -810,10 +811,11 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
builder.setSpan(new ForegroundColorSpan(Color.parseColor("#FFF682")), dressNameIndexOf, dressNameIndexOf + dressNameSize, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.setSpan(new ForegroundColorSpan(Color.parseColor("#FFF682")), individualDressingIndexOf, individualDressingIndexOf + individualDressingSize, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
blindNumber.setText(builder);
+ iconMasking.setAlpha(0.f);
} else {
int progress = Integer.parseInt(model.getThresholdValue()) - Integer.parseInt(model.getDressThresholdValue());
String msg = mContext.getString(R.string.resend_win);
- msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName());
+ msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName());
int dressNameIndexOf = msg.indexOf(model.getThresholdDressName());
int progressIndexOf = msg.indexOf(String.valueOf(progress));
int dressNameSize = model.getThresholdDressName().length();
@@ -828,6 +830,8 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
.append("/")
.append(model.getThresholdValue());
textBlindProgress.setText(stringBuffer.toString());
+ float maskingAlpha = (float) progress / Float.parseFloat(model.getThresholdValue());
+ iconMasking.setAlpha(maskingAlpha);
}
//盲盒礼物文字跑马灯
for (int i = 0; i < model.getItemName().size(); i++) {
@@ -1091,7 +1095,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
} else {
int progress = Integer.parseInt(model.getThresholdValue()) - Integer.parseInt(model.getDressThresholdValue());
String msg = mContext.getString(R.string.resend_win);
- msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName());
+ msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName());
int dressNameIndexOf = msg.indexOf(model.getThresholdDressName());
int progressIndexOf = msg.indexOf(String.valueOf(progress));
int dressNameSize = model.getThresholdDressName().length();
@@ -1106,6 +1110,8 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
.append("/")
.append(model.getThresholdValue());
textBlindProgress.setText(stringBuffer.toString());
+ float maskingAlpha = (float) progress / Float.parseFloat(model.getThresholdValue());
+ iconMasking.setAlpha(maskingAlpha);
}
if (stringBuilders.size() == 0) {
boxBlindHandler.postDelayed(boxBlindRunnable, 1500);
diff --git a/live/src/main/res/layout/view_blind_box.xml b/live/src/main/res/layout/view_blind_box.xml
index 61ba90ec6..d84c5522d 100644
--- a/live/src/main/res/layout/view_blind_box.xml
+++ b/live/src/main/res/layout/view_blind_box.xml
@@ -11,12 +11,24 @@
android:layout_height="86.5dp"
android:background="@mipmap/bg_kirin">
-
+ android:layout_marginTop="51dp">
+
+
+
+
+
+