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

feat : 转赠主页 UI

Browse Source
This commit is contained in:
eggmanQQQ
2025-02-21 14:40:04 +08:00
parent c73ebf5ae9
commit 07c02daae9
8 changed files with 350 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt
View File

@@ -40,7 +40,6 @@ import com.chwl.app.view.GenderAgeTextView
import com.chwl.app.vip.VipCenterActivity
import com.chwl.app.vip.VipViewModel
import com.chwl.core.auth.AuthModel
import com.chwl.core.initial.InitialModel
import com.chwl.core.level.UserLevelVo
import com.chwl.core.manager.IMNetEaseManager
import com.chwl.core.manager.RelationShipEvent
@@ -190,29 +189,10 @@ class MeFragment : BaseFragment(), View.OnClickListener {
}
setUserLevel(it.userLevelVo)
setWalletInfo()
setDonation(it)
}
}
private fun setDonation(userInfo: UserInfo) {
val initInfo = InitialModel.get().cacheInitInfo
val diamondList = initInfo?.giveDiamondErbanNoList
val giftList = initInfo?.giveGiftErbanNoList
val levelSep = userInfo.userLevelVo.experLevelSeq
if (diamondList?.contains(userInfo.erbanNo) == true
|| giftList?.contains(userInfo.erbanNo) == true
|| levelSep >= (initInfo?.giveDiamondExperLevel ?: 0)
|| levelSep >= (initInfo?.giveGiftExperLevel ?: 0)
) {
meViewModel.updateDonationMenuVisible(true)
} else {
meViewModel.updateDonationMenuVisible(false)
}
}
private fun copyName(erbanNo: String) {
try {

55
app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
View File

@@ -11,6 +11,7 @@ import android.widget.TextView
import android.widget.TextView.OnEditorActionListener
import androidx.activity.viewModels
import androidx.recyclerview.widget.LinearLayoutManager
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chwl.app.R
import com.chwl.app.base.BaseViewBindingActivity
import com.chwl.app.common.EmptyViewHelper
@@ -62,6 +63,7 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
override fun init() {
initTitleBar(ResUtil.getString(R.string.me_donation))
binding.etSearch.setOnEditorActionListener(OnEditorActionListener { v, actionId, event -> //以下方法防止两次发送请求
if (actionId == EditorInfo.IME_ACTION_SEARCH && event != null || event != null && event.keyCode == KeyEvent.KEYCODE_ENTER) {
if (event.action == KeyEvent.ACTION_UP) { //发送请求
@@ -93,8 +95,19 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
.setRecyclerView(binding.recyclerView)
.build()
mAdapter.setOnItemClickListener { _, _, position ->
mAdapter.getItem(position)?.targetUid?.let { GiveGoldDetailActivity.start(this, it) }
}
mAdapter.onItemChildClickListener = BaseQuickAdapter.OnItemChildClickListener { adapter, view, position ->
mAdapter.getItem(position)?.let {
if (view?.id == R.id.history) {
GiveGoldDetailActivity.start(this, it.targetUid)
}else if (view?.id == R.id.transfer) {
giveGoldModel.getSearchUserInfo(it.targetErbanNo)
}
}
}
mAdapter.setOnLoadMoreListener({
loadData(false)
}, binding.recyclerView)
@@ -115,18 +128,6 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
}
binding.etSearch.setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || (event.keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN)) {
val newStr: String = binding.etSearch.text.toString().trim { it <= ' ' }
if (!TextUtils.isEmpty(newStr)) {
giveGoldModel.getSearchUserInfo(newStr.toLong())
} else {
toast(getString(R.string.password_input_user_id))
}
return@setOnEditorActionListener true
}
return@setOnEditorActionListener false
}
binding.more.click {
@@ -159,6 +160,23 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
star.setImageResource( if (i < it.starLevel) R.drawable.icon_star_s else R.drawable.icon_star_n)
binding.starLayout.addView(star)
}
if (it.usCoin != -1L) {
binding.arView.setVis(true)
binding.enView.setVis(false)
} else {
binding.arView.setVis(false)
binding.enView.setVis(true)
}
binding.arUs.text = it.usCoin.toString()
binding.arCoin.text = it.enCoin.toString()
binding.enCoin.text = it.enCoin.toString()
binding.agentNum.text = it.agentNum.toString()
}
}.subscribe()
@@ -173,6 +191,15 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
binding.avatar.loadAvatar(user.avatar)
}
binding.arDetail.click {
}
binding.enDetail.click {
}
}
override fun onResume() {
@@ -199,7 +226,7 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
}
private fun getRechargeUserInfo(): Single<RechargeUserInfo> {
private fun getRechargeUserInfo(): Single<RechargeUserInfo> {
return api.getRechargeUserInfo()
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers())

3
app/src/main/java/com/chwl/app/pay/adapter/LatelyGiveAdapter.kt
View File

@@ -17,6 +17,9 @@ class LatelyGiveAdapter :
helper.getView<TextView>(R.id.tv_id).text = "ID:${item.targetErbanNo}"
helper.getView<TextView>(R.id.tv_nickname).text = item.targetNick
ImageLoadUtils.loadAvatar(mContext, item.targetAvatar, helper.getView(R.id.iv_avatar))
helper.addOnClickListener(R.id.transfer)
helper.addOnClickListener(R.id.history)
}
}

5
app/src/main/java/com/chwl/app/ui/bean/RechargeUserInfo.java
View File

@@ -13,4 +13,9 @@ public class RechargeUserInfo {
public String nick;
public String avatar;
public int isOnline;
public int agentNum;
public long usCoin = -1L;
public long enCoin = -1L;
}

BIN
app/src/main/res/drawable-ldrtl-xxhdpi/base_ic_arrow_right.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 324 B

288
app/src/main/res/layout/activity_give_gold.xml
View File

@@ -14,23 +14,63 @@
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:id="@+id/llSearch"
android:layout_width="0dp"
android:layout_height="34dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="15dp"
android:background="@drawable/base_shape_f7f7f7_25dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar">
<EditText
android:id="@+id/etSearch"
android:layout_width="match_parent"
android:layout_height="34dp"
android:background="@android:color/transparent"
android:gravity="center_vertical"
android:hint="@string/search_user_id"
android:imeOptions="actionSearch"
android:inputType="number"
android:paddingHorizontal="37dp"
android:singleLine="true"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/text_color_secondary"
android:textSize="@dimen/sp_12" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical|start"
android:layout_marginStart="12dp"
android:src="@drawable/ic_send_search"
app:tint="@color/color_7b7b7d" />
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/userInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="6dp"
android:layout_marginTop="14dp"
android:background="@drawable/base_shape_f7f7f7_10dp"
app:layout_constraintTop_toBottomOf="@id/title_bar">
app:layout_constraintTop_toBottomOf="@id/llSearch">
<ImageView
android:id="@+id/avatar"
android:layout_width="59dp"
android:layout_height="59dp"
android:src="@drawable/default_avatar"
android:layout_marginVertical="12dp"
android:layout_marginStart="12dp"
app:layout_constraintBottom_toBottomOf="parent"
android:src="@drawable/default_avatar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -96,63 +136,215 @@
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_cp_list_more"
app:tint="@color/color_7b7b7d"
app:layout_constraintBottom_toBottomOf="@id/starLayout"
app:layout_constraintStart_toEndOf="@id/starLayout"
app:layout_constraintTop_toTopOf="@id/starLayout" />
app:layout_constraintTop_toTopOf="@id/starLayout"
app:tint="@color/color_7b7b7d" />
<!-- 不同区 区别view-->
<FrameLayout
android:id="@+id/centerLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="11dp"
android:paddingBottom="10dp"
app:layout_constraintTop_toBottomOf="@id/avatar">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/enView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<TextView
android:id="@+id/enCoinTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="@string/_ver_23_Transfer_Coins"
android:textColor="@color/color_313131"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/enCoin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:drawablePadding="4dp"
android:text="0"
android:textColor="@color/color_ff8c03"
android:textSize="26sp"
android:textStyle="bold"
app:dt_drawableRightHeight="30dp"
app:dt_drawableRightSrc="@drawable/ic_coin_84"
app:dt_drawableRightWidth="30dp"
app:layout_constraintStart_toStartOf="@id/enCoinTitle"
app:layout_constraintTop_toBottomOf="@id/enCoinTitle" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/enDetail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layoutDirection="ltr"
android:text="@string/_ver_23_View_Details"
android:textColor="@color/color_7b7b7d"
android:textSize="12sp"
app:drawableTint="#969698"
app:dt_drawableRightHeight="17dp"
app:dt_drawableRightSrc="@drawable/base_ic_arrow_right"
app:dt_drawableRightWidth="17dp"
app:layout_constraintBottom_toBottomOf="@+id/enCoin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/enCoin" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/arView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<TextView
android:id="@+id/arUsTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="@string/_ver_23_Us_Settlement"
android:textColor="@color/color_313131"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/arCoinTitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/arUs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:drawablePadding="4dp"
android:text="0"
android:textColor="@color/color_ff8c03"
android:textSize="26sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/arUsTitle"
app:layout_constraintTop_toBottomOf="@id/arUsTitle" />
<TextView
android:id="@+id/arCoinTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="@string/_ver_23_Transfer_Coins"
android:textColor="@color/color_313131"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/arUsTitle"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/arCoin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:drawablePadding="4dp"
android:text="0"
android:textColor="@color/color_ff8c03"
android:textSize="26sp"
android:textStyle="bold"
app:dt_drawableRightHeight="30dp"
app:dt_drawableRightSrc="@drawable/ic_coin_84"
app:dt_drawableRightWidth="30dp"
app:layout_constraintStart_toStartOf="@id/arCoinTitle"
app:layout_constraintTop_toBottomOf="@id/arCoinTitle" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/arDetail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:layout_marginEnd="12dp"
android:layoutDirection="ltr"
android:text="@string/_ver_23_View_Details"
android:textColor="@color/color_7b7b7d"
android:textSize="12sp"
app:drawableTint="#969698"
app:dt_drawableRightHeight="17dp"
app:dt_drawableRightSrc="@drawable/base_ic_arrow_right"
app:dt_drawableRightWidth="17dp"
app:layout_constraintStart_toStartOf="@+id/arUs"
app:layout_constraintTop_toBottomOf="@id/arUs" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/agent"
android:layout_width="match_parent"
android:layout_height="44dp"
android:gravity="center_vertical|start"
android:paddingHorizontal="12dp"
android:text="@string/_ver_23_sub_recharge_agent"
android:textSize="14sp"
android:textStyle="bold"
app:dt_drawableType="shape"
app:dt_leftBottomRadius="10dp"
app:dt_rightBottomRadius="10dp"
app:dt_soildColor="#e7e7e7"
app:layout_constraintTop_toBottomOf="@+id/centerLayout" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/agentNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layoutDirection="ltr"
android:textColor="@color/color_7b7b7d"
android:textSize="12sp"
app:drawableTint="#969698"
app:dt_drawableRightHeight="17dp"
app:dt_drawableRightSrc="@drawable/base_ic_arrow_right"
app:dt_drawableRightWidth="17dp"
app:layout_constraintBottom_toBottomOf="@id/agent"
app:layout_constraintEnd_toEndOf="@id/agent"
app:layout_constraintTop_toTopOf="@id/agent"
tools:text="100" />
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:id="@+id/llSearch"
android:layout_width="0dp"
android:layout_height="34dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp"
android:gravity="center_vertical"
android:background="@drawable/base_shape_f7f7f7_25dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/userInfo">
<EditText
android:id="@+id/etSearch"
android:layout_width="match_parent"
android:layout_height="34dp"
android:background="@android:color/transparent"
android:gravity="center_vertical"
android:hint="@string/search_user_id"
android:imeOptions="actionSearch"
android:inputType="number"
android:paddingHorizontal="37dp"
android:singleLine="true"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/text_color_secondary"
android:textSize="@dimen/sp_12" />
<ImageView
android:src="@drawable/ic_send_search"
app:tint="@color/color_7b7b7d"
android:layout_width="20dp"
android:layout_gravity="center_vertical|start"
android:layout_marginStart="12dp"
android:layout_height="20dp"/>
</FrameLayout>
<TextView
android:id="@+id/rvListTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:text="@string/_ver_23_Recent_Transfers"
android:textColor="@color/color_313131"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/userInfo"
app:layout_constraintTop_toBottomOf="@id/userInfo" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_marginTop="15dp"
android:layout_height="0dp"
android:layout_marginTop="11dp"
android:layout_marginBottom="10dp"
app:layout_constraintBottom_toTopOf="@+id/tv_tip"
app:layout_constraintTop_toBottomOf="@+id/llSearch">
app:layout_constraintTop_toBottomOf="@+id/rvListTitle">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
@@ -167,13 +359,13 @@
<TextView
android:id="@+id/tv_tip"
android:layout_width="wrap_content"
android:paddingTop="@dimen/dp_20"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginBottom="@dimen/dp_40"
android:paddingTop="@dimen/dp_20"
android:text="@string/displayed_three_month"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

58
app/src/main/res/layout/item_lately_give.xml
View File

@@ -34,6 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="3dp"
android:textColor="@color/color_b3b3b3"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
@@ -41,20 +42,61 @@
app:layout_constraintTop_toBottomOf="@id/tv_nickname"
tools:text="ID:123456" />
<com.chwl.app.view.AutoMirroredImageView
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/donation_arrow_right"
app:layout_constraintBottom_toBottomOf="parent"
<!-- <com.chwl.app.view.AutoMirroredImageView-->
<!-- android:layout_width="21dp"-->
<!-- android:layout_height="21dp"-->
<!-- android:layout_marginEnd="@dimen/dp_15"-->
<!-- android:src="@drawable/donation_arrow_right"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/history"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:gravity="center"
android:minWidth="68dp"
android:paddingHorizontal="11dp"
android:layout_marginEnd="15dp"
android:textStyle="bold"
android:paddingVertical="6dp"
app:dt_drawableType="shape"
app:dt_radius="25dp"
app:dt_soildColor="#e4eeff"
android:textColor="#3b70c8"
android:text="@string/_ver_23_History"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="@id/iv_avatar" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/transfer"
android:layout_width="wrap_content"
android:layout_marginEnd="11dp"
android:layout_height="30dp"
android:gravity="center"
android:minWidth="68dp"
android:paddingHorizontal="11dp"
android:paddingVertical="6dp"
android:textStyle="bold"
app:dt_drawableType="shape"
app:dt_radius="25dp"
android:text="@string/_ver_23_Transfer"
app:dt_soildColor="#ffefdc"
android:textColor="#CD6300"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintEnd_toStartOf="@id/history"
app:layout_constraintTop_toTopOf="@id/iv_avatar" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#e4e4e4"
android:layout_marginHorizontal="15dp"
android:background="#e4e4e4"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

11
app/src/main/res/values/strings.xml
View File

@@ -5450,6 +5450,17 @@ You cannot join again within 24 hours after leaving</string>
<string name="_ver_23_ID_Login">ID Login</string>
<string name="_ver_23_SMS_Login">SMS Login</string>
<string name="_ver_23_sub_recharge_agent">sub recharge agent</string>
<string name="_ver_23_Recent_Transfers">Recent Transfers</string>
<string name="_ver_23_Transfer_Coins">Transfer Coins</string>
<string name="_ver_23_Us_Settlement">Us Settlement</string>
<string name="_ver_23_View_Details">View Details</string>
<string name="_ver_23_History">History</string>
<string name="_ver_23_Transfer">Transfer</string>
<!-- <string name="_ver_23_">xxxx</string>-->
</resources>