From 74a412c8160dfeb8a3e9f6383d45b0495a928818 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期二, 11 八月 2026 14:11:59 +0800
Subject: [PATCH] 活动奖励优化
---
app/src/main/res/layout/activity_mine_wallet.xml | 15 +++
app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/IncomeDetailActivity.kt | 37 ++++++++
app/src/main/res/layout/activity_all_detail_income.xml | 2
app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/DelMoneyDetailActivity.kt | 2
app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/ApplyWithdrawActivity.kt | 8 +-
app/src/main/java/com/fangxinxing/xxfxx/bean/UserInfoBean.java | 4 +
app/src/main/res/layout/activity_del_money_detail.xml | 12 +++
app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/MineWalletActivity.kt | 11 ++
app/src/main/res/layout/activity_income_detail.xml | 91 +++++++++++++++++++++-
app/build.gradle | 4
10 files changed, 166 insertions(+), 20 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index d7bee72..9f0944b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@
applicationId "com.fangxinxing.xxfxx"
minSdkVersion 24
targetSdkVersion 29
- versionCode 3
- versionName "1.0.2"
+ versionCode 4
+ versionName "1.0.3"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
diff --git a/app/src/main/java/com/fangxinxing/xxfxx/bean/UserInfoBean.java b/app/src/main/java/com/fangxinxing/xxfxx/bean/UserInfoBean.java
index 8e84711..7310291 100644
--- a/app/src/main/java/com/fangxinxing/xxfxx/bean/UserInfoBean.java
+++ b/app/src/main/java/com/fangxinxing/xxfxx/bean/UserInfoBean.java
@@ -83,6 +83,10 @@
public String company;
//平台
public String enterpriseName;
+ //活动奖励总金额
+ public String activityMoney;
+ //活动奖励剩余金额
+ public String laveActivityMoney;
public double getLaveBusinessMoney() {
return laveBusinessMoney;
diff --git a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/ApplyWithdrawActivity.kt b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/ApplyWithdrawActivity.kt
index 7a8049e..df176c8 100644
--- a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/ApplyWithdrawActivity.kt
+++ b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/ApplyWithdrawActivity.kt
@@ -27,7 +27,7 @@
override fun initView() {
setTitleText("申请提现")
- et_money.hint = "${getFormatTwo(CacheKey.getUserInfo().laveBusinessMoney)}元可提现"
+ et_money.hint = "${getFormatTwo(CacheKey.getUserInfo().balance)}元可提现"
et_money.filters = arrayOf<InputFilter>(object : InputFilter {
override fun filter(
source: CharSequence,
@@ -58,7 +58,7 @@
callNet(Api.queryInfo, map) {
val user = gson.fromJson<UserBean>(it, UserBean::class.java)
CacheKey.saveUserInfo(user.data)
- et_money.hint = "${getFormatTwo(CacheKey.getUserInfo().laveBusinessMoney)}元可提现"
+ et_money.hint = "${getFormatTwo(CacheKey.getUserInfo().balance)}元可提现"
}
}
@@ -73,8 +73,8 @@
toast("提现金额必须大于0")
return@clickDelay
}
- if (money > CacheKey.getUserInfo().laveBusinessMoney) {
- toast("提现金额不能大于${CacheKey.getUserInfo().laveBusinessMoney}元")
+ if (money > CacheKey.getUserInfo().balance) {
+ toast("提现金额不能大于${CacheKey.getUserInfo().balance}元")
return@clickDelay
}
val map = getMapByAny()
diff --git a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/DelMoneyDetailActivity.kt b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/DelMoneyDetailActivity.kt
index 5a5854c..cb1338a 100644
--- a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/DelMoneyDetailActivity.kt
+++ b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/DelMoneyDetailActivity.kt
@@ -5,7 +5,7 @@
class DelMoneyDetailActivity : MyBaseActivity() {
override fun setContentView() {
- setContentView(R.layout.activity_income_detail)
+ setContentView(R.layout.activity_del_money_detail)
}
override fun initView() {
diff --git a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/IncomeDetailActivity.kt b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/IncomeDetailActivity.kt
index 12fefa6..3a41f13 100644
--- a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/IncomeDetailActivity.kt
+++ b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/IncomeDetailActivity.kt
@@ -2,17 +2,48 @@
import com.fangxinxing.xxfxx.R
import com.fangxinxing.xxfxx.base.MyBaseActivity
+import com.fangxinxing.xxfxx.bean.UserBean
+import com.fangxinxing.xxfxx.netUtls.Api
+import com.fangxinxing.xxfxx.netUtls.callNet
+import com.fangxinxing.xxfxx.netUtls.getMapByAny
+import com.fangxinxing.xxfxx.utils.Cache.CacheKey
+import com.fangxinxing.xxfxx.utils.getFormatTwo
+import kotlinx.android.synthetic.main.activity_income_detail.tv_left_title_income
+import kotlinx.android.synthetic.main.activity_income_detail.tv_money
-class IncomeDetailActivity: MyBaseActivity() {
+class IncomeDetailActivity : MyBaseActivity() {
override fun setContentView() {
setContentView(R.layout.activity_income_detail)
}
override fun initView() {
- setTitleText("收益明细")
- addFragment(InconeDetailFragment(),R.id.fl_container)
+ showTitle(false)
+ showHeader(false)
+ addFragment(InconeDetailFragment(), R.id.fl_container)
+ }
+
+ override fun onResume() {
+ super.onResume()
+ callMine()
+ }
+
+ private fun callMine() {
+ val map = getMapByAny()
+ callNet(Api.queryInfo, map) {
+ val user = gson.fromJson<UserBean>(it, UserBean::class.java)
+ CacheKey.saveUserInfo(user.data)
+ showUI()
+ }
+ }
+
+ private fun showUI() {
+ tv_money.text =
+ "¥" + getFormatTwo(CacheKey.getUserInfo().activityMoney?.toDoubleOrNull() ?: 0.0)
}
override fun setOnclick() {
+ tv_left_title_income.setOnClickListener {
+ onBackPressed()
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/MineWalletActivity.kt b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/MineWalletActivity.kt
index 113999c..2d3ec33 100644
--- a/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/MineWalletActivity.kt
+++ b/app/src/main/java/com/fangxinxing/xxfxx/ui/mine/money_bag/MineWalletActivity.kt
@@ -11,6 +11,7 @@
import com.fangxinxing.xxfxx.utils.Cache.CacheKey
import com.fangxinxing.xxfxx.utils.clickDelay
import com.fangxinxing.xxfxx.utils.getFormatTwo
+import kotlinx.android.synthetic.main.activity_mine_wallet.tv_activity_income_record
import kotlinx.android.synthetic.main.activity_mine_wallet.tv_all_income_detail
import kotlinx.android.synthetic.main.activity_mine_wallet.tv_back
import kotlinx.android.synthetic.main.activity_mine_wallet.tv_del_money_detail
@@ -46,16 +47,20 @@
}
private fun showUI() {
- tv_money.text = "¥" + getFormatTwo(CacheKey.getUserInfo().laveBusinessMoney)
- tv_withdraw.isVisible = CacheKey.getUserInfo().laveBusinessMoney > 0
+ tv_money.text = "¥" + getFormatTwo(CacheKey.getUserInfo().balance)
+ tv_withdraw.isVisible = CacheKey.getUserInfo().balance > 0
}
override fun setOnclick() {
tv_back.clickDelay { finish() }
- //收入明细
+ //订单收入明细
tv_all_income_detail.clickDelay {
startActivity<AllIncomeDetailActivity>()
}
+ //活动收入明细
+ tv_activity_income_record.clickDelay {
+ startActivity<IncomeDetailActivity>()
+ }
//提现记录
tv_record.clickDelay {
startActivity<IncomeCommitDetailActivity>()
diff --git a/app/src/main/res/layout/activity_all_detail_income.xml b/app/src/main/res/layout/activity_all_detail_income.xml
index 345998c..c2d74fb 100644
--- a/app/src/main/res/layout/activity_all_detail_income.xml
+++ b/app/src/main/res/layout/activity_all_detail_income.xml
@@ -38,7 +38,7 @@
android:maxWidth="280dp"
android:maxLines="1"
android:singleLine="true"
- android:text="收入明细"
+ android:text="订单收入明细"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
diff --git a/app/src/main/res/layout/activity_del_money_detail.xml b/app/src/main/res/layout/activity_del_money_detail.xml
new file mode 100644
index 0000000..162592e
--- /dev/null
+++ b/app/src/main/res/layout/activity_del_money_detail.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <FrameLayout
+ android:id="@+id/fl_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_income_detail.xml b/app/src/main/res/layout/activity_income_detail.xml
index 660d3e2..aa756aa 100644
--- a/app/src/main/res/layout/activity_income_detail.xml
+++ b/app/src/main/res/layout/activity_income_detail.xml
@@ -1,11 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
- android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="180dp"
+ android:background="@color/color_fd943a">
+
+ <RelativeLayout
+ android:id="@+id/rl_title"
+ android:layout_width="match_parent"
+ android:layout_height="42dp"
+ android:layout_marginTop="22dp">
+
+ <TextView
+ android:id="@+id/tv_left_title_income"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:background="@drawable/bg_clicker"
+ android:drawableStart="@mipmap/back_white"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_10"
+ android:paddingEnd="@dimen/dp_15"
+ android:textColor="#333333"
+ android:textSize="16sp" />
+
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:drawablePadding="3dp"
+ android:maxWidth="280dp"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:text="活动收入明细"
+ android:textColor="@color/white"
+ android:textSize="16sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tv_right_commit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="14dp"
+ android:drawablePadding="3dp"
+ android:maxWidth="280dp"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:text="提现记录"
+ android:textColor="@color/white"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:visibility="gone" />
+
+
+ </RelativeLayout>
+
+ <TextView
+ android:id="@+id/tv_view_hint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/rl_title"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="20dp"
+ android:text="历史总收益"
+ android:textColor="#ffffffff"
+ android:textSize="14sp" />
+
+ <TextView
+ android:id="@+id/tv_money"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/tv_view_hint"
+ android:layout_centerHorizontal="true"
+ android:text="¥0"
+ android:textColor="#ffffffff"
+ android:textSize="30sp" />
+ </RelativeLayout>
<FrameLayout
android:id="@+id/fl_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_height="match_parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_mine_wallet.xml b/app/src/main/res/layout/activity_mine_wallet.xml
index e085533..6f39fa3 100644
--- a/app/src/main/res/layout/activity_mine_wallet.xml
+++ b/app/src/main/res/layout/activity_mine_wallet.xml
@@ -78,7 +78,20 @@
android:gravity="center_vertical"
android:paddingStart="14dp"
android:paddingEnd="14dp"
- android:text="收入明细"
+ android:text="订单收入明细"
+ android:textColor="#ff333333"
+ android:textSize="14sp" />
+
+ <TextView
+ android:id="@+id/tv_activity_income_record"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:gravity="center_vertical"
+ android:paddingStart="14dp"
+ android:paddingEnd="14dp"
+ android:text="活动收入明细"
android:textColor="#ff333333"
android:textSize="14sp" />
--
Gitblit v1.7.1