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

[Modify]1.4.0bug修復

Browse Source
This commit is contained in:
wushaocheng
2022-12-20 21:54:42 +08:00
parent bec7657d43
commit 59a433d9c5
9 changed files with 91 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt
View File

@@ -3,9 +3,6 @@ package com.yizhuan.erban.earn.activity
import android.content.Context
import android.content.Intent
import android.text.style.ForegroundColorSpan
import android.view.animation.AccelerateInterpolator
import android.view.animation.Animation
import android.view.animation.RotateAnimation
import androidx.activity.viewModels
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
@@ -108,14 +105,21 @@ class GoldDetailActivity : BaseViewBindingActivity<ActivityGoldDetailBinding>(),
dialog.show(supportFragmentManager, "year_month_day")
}
mGoldRoomAdapter.setOnItemClickListener { adapter, view, position ->
val settlementList: HallMemberGoldFlowTotalInfo? =
settlementList?.get(mGoldRoomAdapter.data[position].hallId)
mGoldDetailAdapter.setNewData(settlementList?.hallMember)
mGoldRoomAdapter.setOnItemSelectListener(object : GoldRoomAdapter.OnItemSelectListener {
override fun onItemSelect(position: Int) {
val settlementList: HallMemberGoldFlowTotalInfo? =
settlementList?.get(mGoldRoomAdapter.data[position].hallId)
mGoldDetailAdapter.setNewData(settlementList?.hallMember)
}
})
binding.llDiamondArrow.setOnClickListener {
val list = mGoldDetailAdapter.data.sortBy { it.giftDiamonds }
}
binding.llArrow.setOnClickListener {
binding.llGoldArrow.setOnClickListener {
val list = mGoldDetailAdapter.data.sortBy { it.remainGolds }
}
}

6
app/src/main/java/com/yizhuan/erban/earn/adapter/GoldDetailAdapter.kt
View File

@@ -12,9 +12,9 @@ class GoldDetailAdapter :
override fun convert(helper: BaseViewHolder, item: HallMemberGoldFlowInfo) {
helper.setText(R.id.tv_user_name, item.nick ?: "--")
.setText(R.id.tv_have_exchange, item.exchangeGolds.toString())
.setText(R.id.tv_settlement, item.remainGolds.toString())
.setText(R.id.tv_diamond_pay_record, FormatUtils.formatToShortDown(item.giftDiamonds))
.setText(R.id.tv_have_exchange, FormatUtils.formatToShortDownW(item.exchangeGolds))
.setText(R.id.tv_settlement, FormatUtils.formatToShortDownW(item.remainGolds))
.setText(R.id.tv_diamond_pay_record, FormatUtils.formatToShortDownW(item.giftDiamonds))
.setText(
R.id.tv_have_change,
mContext.getString(R.string.have_converted, item.giftGolds.toString())

8
app/src/main/java/com/yizhuan/erban/earn/adapter/GoldRecordAdapter.kt
View File

@@ -12,14 +12,14 @@ class GoldRecordAdapter :
override fun convert(helper: BaseViewHolder, item: HallMemberGoldFlowInfo) {
helper.setText(R.id.tv_user_name, item.nick ?: "--")
.setText(R.id.tv_have_exchange, item.giftGolds.toString())
.setText(R.id.tv_settlement, item.remainGolds.toString())
.setText(R.id.tv_diamond_pay_record, FormatUtils.formatToShortDown(item.giftDiamonds))
.setText(R.id.tv_have_exchange, FormatUtils.formatToShortDownW(item.giftGolds))
.setText(R.id.tv_settlement, FormatUtils.formatToShortDownW(item.remainGolds))
.setText(R.id.tv_diamond_pay_record, FormatUtils.formatToShortDownW(item.giftDiamonds))
.setText(
R.id.tv_have_change,
mContext.getString(R.string.have_converted, item.exchangeGolds.toString())
)
.setText(R.id.tv_pos, (helper.layoutPosition+1).toString())
.setText(R.id.tv_pos, (helper.layoutPosition + 1).toString())
ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_user_avatar), item.avatar)
}

13
app/src/main/java/com/yizhuan/erban/earn/adapter/GoldRoomAdapter.kt
View File

@@ -1,8 +1,10 @@
package com.yizhuan.erban.earn.adapter
import android.widget.TextView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
import com.yizhuan.xchat_android_core.earn.bean.HallVo
@@ -13,6 +15,8 @@ class GoldRoomAdapter : BaseQuickAdapter<HallVo, BaseViewHolder>(R.layout.item_g
//临时记录上次选择的位置
var temp =-1
private var mOnItemSelectListener: OnItemSelectListener? = null
override fun convert(helper: BaseViewHolder, item: HallVo) {
helper.setText(R.id.tv_content, item.hallName)
ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_hall_avatar), item.ownerAvatar)
@@ -27,7 +31,16 @@ class GoldRoomAdapter : BaseQuickAdapter<HallVo, BaseViewHolder>(R.layout.item_g
selPosition = helper.layoutPosition
//更新旧位置
notifyItemChanged(temp)
mOnItemSelectListener?.onItemSelect(helper.layoutPosition)
}
}
fun setOnItemSelectListener(onItemSelectListener: OnItemSelectListener) {
mOnItemSelectListener = onItemSelectListener
}
interface OnItemSelectListener {
fun onItemSelect(position: Int)
}
}

7
app/src/main/res/layout/activity_gold_detail.xml
View File

@@ -138,18 +138,20 @@
android:textStyle="bold" />
<LinearLayout
android:id="@+id/ll_arrow"
android:id="@+id/ll_diamond_arrow"
android:orientation="vertical"
android:layout_marginStart="@dimen/dp_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_diamond_top"
android:src="@mipmap/ic_arrow_gray_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/iv_diamond_bottom"
android:src="@mipmap/ic_arrow_black_bottom"
android:layout_marginTop="@dimen/dp_2"
android:layout_width="wrap_content"
@@ -184,17 +186,20 @@
android:textStyle="bold" />
<LinearLayout
android:id="@+id/ll_gold_arrow"
android:orientation="vertical"
android:layout_marginStart="@dimen/dp_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_gold_top"
android:src="@mipmap/ic_arrow_gray_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/iv_gold_down"
android:src="@mipmap/ic_arrow_black_bottom"
android:layout_marginTop="@dimen/dp_2"
android:layout_width="wrap_content"

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

@@ -4253,7 +4253,6 @@
<string name="layout_activity_income_statistics_04">排名</string>
<string name="layout_activity_income_statistics_05">頭像</string>
<string name="layout_activity_income_statistics_06">昵稱</string>
<string name="layout_activity_income_statistics_07">房間鉆石收入</string>
<string name="layout_activity_module_clan_01">我是會長</string>
<string name="layout_activity_module_clan_02">家族ID:123456</string>
<string name="layout_activity_module_clan_03">公會房間數量:11</string>
@@ -4962,7 +4961,7 @@
<string name="no_search_room">沒有搜到相關房間</string>
<string name="clan_income">廳收入</string>
<string name="live_income">主播收入</string>
<string name="diamond_income">房間鉆石收入</string>
<string name="diamond_income">簽約流水</string>
<string name="department_of_management">所屬廳</string>
<string name="give_gift">送礼物</string>
<string name="room_perform_go_update">去設置</string>
@@ -5015,7 +5014,7 @@
<string name="dialog_free_gift_top">今天觀看直播滿%s啦,送你一個禮物</string>
<string name="dialog_free_gift_bottom_text">每天觀看直播達到特定時長,即可獲得一個\"%s\",每日上限%d個,禮物當日生效</string>
<string name="dialog_free_gift_know">我知道啦</string>
<string name="room_diamond_message">當前房間總計鑽石流水:</string>
<string name="room_diamond_message">當前房間總計鉆石流水:</string>
<string name="diamond_string">%s</string>
<string name="diamond_name">鉆</string>
<string name="have_converted">已兌:%s</string>

2
app/src/module_labour_union/res/layout/activity_income_statistics.xml
View File

@@ -161,7 +161,7 @@
android:layout_height="wrap_content"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_12"
android:text="@string/layout_activity_income_statistics_07" />
android:text="@string/diamond_income" />
</LinearLayout>