moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]寻爱之旅完善

Browse Source
This commit is contained in:
wushaocheng
2023-09-15 17:44:07 +08:00
committed by wzq
parent 348e63b45e
commit 1c20b65a64
3 changed files with 222 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/drawable/bg_7748c7_r10.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<solid android:color="@color/color_7748C7" />
</shape>

35
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
View File

@@ -17,7 +17,9 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -63,7 +65,6 @@ import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.utils.Logger;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.common.SpConstants;
import com.yizhuan.xchat_android_library.common.util.SPUtils;
@@ -95,6 +96,8 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
private int mNum = 1;
private String inputNumber = "";
private UserTicketInfo userTicketInfo;
public static void start(Context context) {
@@ -140,23 +143,45 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
mBinding.view2.setOnClickListener(v -> setBoxPriceSelect(2));
mBinding.view3.setOnClickListener(v -> setBoxPriceSelect(3));
mBinding.edInputNum.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
if (!TextUtils.isEmpty(s)) {
inputNumber = s.toString();
} else {
inputNumber = "";
}
}
});
mBinding.tvBuy.setOnClickListener(v -> {
if (userTicketInfo != null) {
long date = SPUtils.getLong(SpConstants.BOX_BUY_LOVE, 0L);
int num = TextUtils.isEmpty(inputNumber) ? mNum : Integer.parseInt(inputNumber);
if (date != 0L) {
if (TimeUtils.isToday(date)) {
BoxModel.get()
.buyTicket(mNum)
.buyTicket(num)
.compose(bindToLifecycle())
.subscribe(userTicketInfo -> {
ToastUtils.show("購買成功");
loadUserTicket();
});
} else {
BuyLoveDialog.Companion.newInstance(mNum, (int) userTicketInfo.getTicketPrice()).show(this);
BuyLoveDialog.Companion.newInstance(num, (int) userTicketInfo.getTicketPrice() * num).show(this);
}
} else {
BuyLoveDialog.Companion.newInstance(mNum, (int) userTicketInfo.getTicketPrice()).show(this);
BuyLoveDialog.Companion.newInstance(num, (int) userTicketInfo.getTicketPrice() * num).show(this);
}
}
});
@@ -259,7 +284,7 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
SingleToastUtil.showToast(ResUtil.getString(R.string.treasure_box_activity_treasureboxactivity_03));
return;
}
if(count > Integer.parseInt(mBinding.tvBoxNum.getText().toString())){
if (count > Integer.parseInt(mBinding.tvBoxNum.getText().toString())) {
if (userTicketInfo != null) {
BoxLoveLackDialog.Companion.newInstance(count, (int) userTicketInfo.getTicketPrice()).show(context);
}

258
app/src/module_treasure_box/res/layout/activity_treasure_box.xml
View File

@@ -18,8 +18,8 @@
<View
android:id="@+id/view_bg"
android:layout_width="285dp"
android:layout_height="434dp"
android:layout_width="311dp"
android:layout_height="474dp"
android:layout_marginTop="20dp"
android:background="@drawable/treasure_box_bg_normal"
android:onClick="@{click}"
@@ -70,13 +70,196 @@
android:id="@+id/iv_first_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="84dp"
android:adjustViewBounds="true"
android:src="@drawable/ic_box_temp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/view_bg" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_box_1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:onClick="@{click}"
android:src="@drawable/ic_box_1"
app:layout_constraintBottom_toBottomOf="@+id/iv_first_box"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="@+id/iv_first_box" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_box_2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_8"
android:onClick="@{click}"
android:src="@drawable/ic_box_10"
app:layout_constraintBottom_toBottomOf="@+id/iv_first_box"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@+id/iv_box_1" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_box_3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:onClick="@{click}"
android:src="@drawable/ic_box_100"
app:layout_constraintBottom_toBottomOf="@+id/iv_first_box"
app:layout_constraintEnd_toEndOf="@+id/iv_first_box"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@+id/iv_box_2" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cs_bottom"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/bg_8651e0_stroke_ffffff"
app:layout_constraintStart_toStartOf="@+id/iv_first_box"
app:layout_constraintEnd_toEndOf="@+id/iv_first_box"
app:layout_constraintTop_toBottomOf="@+id/iv_first_box">
<com.coorchice.library.SuperTextView
android:id="@+id/tv_box_num"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="0"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_white"
android:gravity="center"
android:layout_marginStart="@dimen/dp_16"
app:solid="@color/color_7748C7"
app:corner="@dimen/dp_8"
app:layout_constraintDimensionRatio="42:16"
app:layout_constraintWidth_percent="0.145"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_token"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_marginStart="@dimen/dp_4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<View
android:id="@+id/view_1"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:layout_marginStart="@dimen/dp_8"
android:background="@drawable/selector_bg_box_price"
app:layout_constraintDimensionRatio="30:16"
app:layout_constraintWidth_percent="0.104"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/tv_box_num"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_1"
android:text="1"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_white"
android:alpha="0.4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@+id/view_1"
app:layout_constraintEnd_toEndOf="@+id/view_1"
app:layout_constraintTop_toTopOf="@+id/view_1"
app:layout_constraintBottom_toBottomOf="@+id/view_1"/>
<View
android:id="@+id/view_2"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:layout_marginStart="@dimen/dp_8"
android:background="@drawable/selector_bg_box_price"
app:layout_constraintDimensionRatio="30:16"
app:layout_constraintWidth_percent="0.104"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/view_1"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_white"
android:alpha="0.4"
app:layout_constraintStart_toStartOf="@+id/view_2"
app:layout_constraintEnd_toEndOf="@+id/view_2"
app:layout_constraintTop_toTopOf="@+id/view_2"
app:layout_constraintBottom_toBottomOf="@+id/view_2"/>
<View
android:id="@+id/view_3"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
android:layout_marginStart="@dimen/dp_8"
android:background="@drawable/selector_bg_box_price"
app:layout_constraintDimensionRatio="30:16"
app:layout_constraintWidth_percent="0.104"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/view_2"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="100"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_white"
android:alpha="0.4"
app:layout_constraintStart_toStartOf="@+id/view_3"
app:layout_constraintEnd_toEndOf="@+id/view_3"
app:layout_constraintTop_toTopOf="@+id/view_3"
app:layout_constraintBottom_toBottomOf="@+id/view_3"/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/ed_input_num"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_18"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:gravity="center"
android:hint="輸入數量"
android:textColorHint="@color/white_tran_40"
android:textSize="@dimen/sp_10"
android:textColor="@color/white"
android:background="@drawable/bg_7748c7_r10"
android:maxLength="4"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/view_3"
app:layout_constraintEnd_toStartOf="@+id/tv_buy"/>
<com.coorchice.library.SuperTextView
android:id="@+id/tv_buy"
android:text="購買"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_white"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_box_buy"
android:layout_marginEnd="@dimen/dp_4"
app:layout_constraintDimensionRatio="52:22"
app:layout_constraintWidth_percent="0.18"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_box"
android:layout_width="190dp"
@@ -116,75 +299,6 @@
app:layout_constraintStart_toStartOf="@id/iv_box"
app:layout_constraintTop_toTopOf="@id/iv_box" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_30"
android:background="@drawable/ic_add_num_bg"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/iv_open"
app:layout_constraintEnd_toEndOf="@+id/view_bg"
app:layout_constraintStart_toStartOf="@+id/view_bg">
<ImageView
android:id="@+id/iv_sub"
android:layout_width="40dp"
android:layout_height="20dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_3"
android:onClick="@{click}"
android:src="@drawable/treasure_box_sub_normal" />
<EditText
android:id="@+id/edit_num"
android:layout_width="62dp"
android:layout_height="23dp"
android:layout_marginTop="1dp"
android:background="@null"
android:gravity="center"
android:inputType="number"
android:maxLength="4"
android:minWidth="40dp"
android:text="1"
android:textColor="@color/white"
android:textSize="@dimen/sp_12" />
<ImageView
android:id="@+id/iv_add"
android:layout_width="40dp"
android:layout_height="20dp"
android:layout_marginTop="@dimen/dp_3"
android:layout_marginEnd="@dimen/dp_4"
android:onClick="@{click}"
android:src="@drawable/treasure_box_add_normal" />
</LinearLayout>
<ImageView
android:id="@+id/iv_open"
android:layout_width="135dp"
android:layout_height="40dp"
android:layout_marginStart="25dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="25dp"
android:layout_marginBottom="@dimen/dp_26"
android:onClick="@{click}"
android:src="@drawable/click_open_box_selector"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_diamond"
android:textSize="@dimen/sp_10"
android:textColor="@color/color_DF7604"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintStart_toStartOf="@+id/iv_open"
app:layout_constraintEnd_toEndOf="@+id/iv_open"
app:layout_constraintBottom_toBottomOf="@+id/iv_open"
tools:text="1000钻/次"/>
<LinearLayout
android:id="@+id/ll_prize_hint"
android:layout_width="wrap_content"