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-27 18:58:31 +08:00
parent fe4a576b17
commit 201c12d381
31 changed files with 225 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/assets/mp4/lucky_bag_gift_open.mp4 Normal file
View File

Binary file not shown.

BIN
app/src/main/assets/mp4/lucky_bag_gold_open.mp4 Normal file
View File

Binary file not shown.

1
app/src/main/java/com/chwl/app/avroom/bean/LuckyBagOpenGiftBean.java
View File

@@ -6,4 +6,5 @@ import lombok.Data;
public class LuckyBagOpenGiftBean {
public String giftUrl;
public String giftName;
public int goldPrice;
}

7
app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt
View File

@@ -177,7 +177,7 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
binding.giftIndicator.initView(IndicatorConfig().apply {
radius = 50.toDP()
selectedColor = R.color.color_FFEA5C.getColor()
normalColor = R.color.black.getColor()
normalColor = R.color.black_transparent_30.getColor()
selectedWidth = 5.toDP()
normalWidth = 5.toDP()
indicatorSpace = 3.toDP()
@@ -477,6 +477,11 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
}
binding.btnConfirm.text = if (mIsGift) R.string._ver_24_Send_Gift_Lucky_Bag.getString() else R.string._ver_24_Send_Coin_Lucky_Bag.getString()
binding.btnGoldBag.paint.isFakeBoldText = !isGift
binding.btnGiftBag.paint.isFakeBoldText = isGift
}
private fun changeViewStatus() {

47
app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt
View File

@@ -34,6 +34,9 @@ import com.chwl.library.common.util.toDP
import com.chwl.library.net.rxnet.RxNet
import com.example.lib_utils.ktx.getDrawable
import com.example.lib_utils.ktx.getString
import com.tencent.qgame.animplayer.AnimConfig
import com.tencent.qgame.animplayer.inter.IAnimListener
import com.tencent.qgame.animplayer.util.ScaleType
import io.reactivex.Single
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
@@ -79,6 +82,8 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>
}
}
binding.bagAnim.setLoop(1)
binding.bagAnim.setScaleType(ScaleType.FIT_XY)
mData?.let {
isGift = it.isGift
@@ -111,7 +116,7 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>
.compose(bindToLifecycle())
.doOnSuccess {
if (it.currentUserGifts.isVerify() || it.currentUserAmount > 0){
open(it)
playAnim(it)
}else {
showEmpty()
}
@@ -175,15 +180,19 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>
binding.giftName.setVis(true)
binding.giftNum.setVis(true)
binding.giftImg.setVis(true)
binding.giftCoin.setVis(true)
binding.giftHint.setVis(true)
entity.currentUserGifts.isVerify(0){
binding.giftName.text = it?.giftVo?.giftName?:""
binding.giftCoin.text = ((it?.giftVo?.goldPrice?:0) * (it?.giftNum?:0)).toString()
binding.giftNum.text = "x"+(it?.giftNum?.toString()?:"0")
binding.giftImg.loadImage(it?.giftVo?.giftUrl?:"")
}
} else {
binding.gold.setVis(true)
binding.goldHint.setVis(true)
binding.gold.text = entity?.currentUserAmount?.toString()?:"0"
}
mActionCallBack?.onAction(1,mData)
@@ -243,10 +252,16 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>
isOpen = false
binding.viewOthers.visibility = View.INVISIBLE
binding.time.visibility = View.INVISIBLE
binding.giftName.visibility = View.INVISIBLE
binding.giftNum.visibility = View.INVISIBLE
binding.giftImg.visibility = View.INVISIBLE
binding.giftHint.visibility = View.INVISIBLE
binding.giftCoin.visibility = View.INVISIBLE
binding.gold.visibility = View.INVISIBLE
binding.goldHint.visibility = View.INVISIBLE
binding.bagImg.visibility = View.INVISIBLE
binding.comingHint.visibility = View.INVISIBLE
@@ -258,6 +273,36 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment<DialogRoomLuckyBagOpenBinding>
binding.confirm.setMargin(bottom = 20)
}
private fun playAnim(luckyBagOpenEntity: LuckyBagOpenEntity) {
context?.let {
binding.bagAnim.setVis(true)
binding.bagAnim.setAnimListener(object : IAnimListener {
override fun onFailed(errorType: Int, errorMsg: String?) {
binding.bagAnim.postSafe {
binding.bagAnim.setVis(false)
open(luckyBagOpenEntity)
}
}
override fun onVideoComplete() {
binding.bagAnim.postSafe {
binding.bagAnim.setVis(false)
open(luckyBagOpenEntity)
}
}
override fun onVideoDestroy() {}
override fun onVideoRender(frameIndex: Int, config: AnimConfig?) {}
override fun onVideoStart() {
binding.bagImg.postSafe {
binding.bagImg.setVis(isVis = false, isInVis = true)
}
}
})
val url = if (isGift) "mp4/lucky_bag_gift_open.mp4" else "mp4/lucky_bag_gold_open.mp4"
binding.bagAnim.startPlay(it.assets,url)
}
}
override fun onDismiss(dialog: DialogInterface) {
super.onDismiss(dialog)
mTimeJop?.cancel()

1
app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -815,6 +815,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
giftDialog?.dismiss()
giftDialog = null
}
luckyBagBtn?.doDetach()
super.onDestroyView()
releaseView()
unregisterWidgets()

14
app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt
View File

@@ -33,6 +33,8 @@ class LuckyBagBtn : FrameLayout{
private val needLog = false
private var mOpenDialog :RoomLuckyBagOpenDialog ? = null
private fun initView(context: Context) {
mBinding = ViewLuckyBagBtnBinding.inflate(LayoutInflater.from(context),this,true)
mBinding.number.setBgColor("#f33a49")
@@ -45,9 +47,9 @@ class LuckyBagBtn : FrameLayout{
private fun onClick() {
mData.isVerify(0){
val dialog = RoomLuckyBagOpenDialog()
dialog.mData = it
dialog.mActionCallBack = object : BaseDialogFragment.Action {
mOpenDialog = RoomLuckyBagOpenDialog()
mOpenDialog?.mData = it
mOpenDialog?.mActionCallBack = object : BaseDialogFragment.Action {
override fun onAction(type: Int, data: Any?) {
if (data != null && data is LuckyBagEntity) {
mData.remove(data)
@@ -55,9 +57,8 @@ class LuckyBagBtn : FrameLayout{
}
}
}
dialog.show(context)
mOpenDialog?.show(context)
}
}
@@ -115,7 +116,10 @@ class LuckyBagBtn : FrameLayout{
mTimeDownJob?.cancel()
mTimeDownJob = null
super.onDetachedFromWindow()
}
fun doDetach() {
mOpenDialog?.dismiss()
}
}

25
app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
View File

@@ -181,9 +181,9 @@ import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean;
import com.chwl.core.user.UserModel;
import com.chwl.core.user.bean.UserInfo;
import com.chwl.core.utils.ExtensionUtil;
import com.chwl.core.utils.myutil.MyJsonUtils;
import com.chwl.core.utils.LogUtils;
import com.chwl.core.utils.extension.StringExtensionKt;
import com.chwl.core.utils.myutil.MyJsonUtils;
import com.chwl.core.utils.net.DontWarnObserver;
import com.chwl.core.utils.net.RxHelper;
import com.chwl.core.vip.bean.VipMessageInfo;
@@ -1719,6 +1719,7 @@ public class MessageView extends FrameLayout {
text.append(nickName, new ForegroundColorSpan(greyColor)).append(": ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
ImageLoadUtils.loadRoundedImage(avatar,data.getPicUrl(),20);
avatar.setOnClickListener(v -> {
ShowPhotoActivity.start(v.getContext(),data.getPicUrl());
});
@@ -1747,7 +1748,10 @@ public class MessageView extends FrameLayout {
try {
TextView tvContent = baseViewHolder.tvContent;
TextView tvCpContent = baseViewHolder.itemView.findViewById(R.id.cpTv);
if (tvContent != null && tvCpContent != null ) {
if (tvContent != null && tvCpContent != null ) {
OtherExtKt.setAutoSizeModel(tvCpContent);
TextSpannableBuilder text = new TextSpannableBuilder(tvContent);
MsgAttachment attachment = chatRoomMessage.getAttachment();
if (attachment instanceof RoomUserEnterRoomMsgAttachment){
@@ -1863,44 +1867,39 @@ public class MessageView extends FrameLayout {
} else {
//cp背景
tvCpContent.setVisibility(VISIBLE);
tvContent.setVisibility(GONE);
String cpNameStr = CpUtils.INSTANCE.getCpLevelUpStr(data.cpLevel);
String message = "";
String nickStr = StringExtensionKt.subAndReplaceDot(data.nick,7);
String cpNickStr = StringExtensionKt.subAndReplaceDot(data.cpNick,7);
List<SpannableTextBuilder.TextStyleBean> textStyles = new ArrayList<>();
SpannableTextBuilder.TextStyleBean cpNick = new SpannableTextBuilder.TextStyleBean();
cpNick.setTextColor(ResourcesKtxKt.getColor(R.color.color_ffdf66));
cpNick.setText(data.cpNick);
cpNick.setText(cpNickStr);
SpannableTextBuilder.TextStyleBean nick = new SpannableTextBuilder.TextStyleBean();
nick.setTextColor(ResourcesKtxKt.getColor(R.color.color_ffdf66));
nick.setText(data.nick);
nick.setText(nickStr);
SpannableTextBuilder.TextStyleBean cpName = new SpannableTextBuilder.TextStyleBean();
cpName.setTextColor(ResourcesKtxKt.getColor(R.color.color_ffdf66));
cpName.setText(cpNameStr);
if (data.isCpInRoom()) {
message = ResourcesKtxKt.getString(R.string._ver_24_cpInRoomTips, data.cpNick,cpNameStr, data.nick);
message = ResourcesKtxKt.getString(R.string._ver_24_cpInRoomTips, cpNickStr,cpNameStr, nickStr);
tvCpContent.setBackgroundResource(R.drawable.ic_msg_room_msg_cp_bg_enter);
if (OtherExtKt.isRtl(tvCpContent.getContext())) {
textStyles.add(cpNick);
textStyles.add(nick);
textStyles.add(cpName);
} else {
textStyles.add(cpNick);
textStyles.add(cpName);
textStyles.add(nick);
}
} else if (data.isCpUpMic()) {
message = ResourcesKtxKt.getString(R.string._ver_24_cpUpMicTips, cpNameStr, data.nick,data.cpNick);
message = ResourcesKtxKt.getString(R.string._ver_24_cpUpMicTips, cpNameStr, nickStr,cpNickStr);
tvCpContent.setBackgroundResource(R.drawable.ic_msg_room_msg_cp_bg_mic);
textStyles.add(cpName);
textStyles.add(nick);
textStyles.add(cpNick);
}

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

@@ -215,6 +215,9 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
binding.agentNum.text = it.subNum.toString()
binding.agentNum.setVis(it.subNum != 0)
binding.agent.setVis(it.subNum != 0)
}
}.subscribe()
}

5
app/src/main/java/com/chwl/app/pay/activity/GiveGoldBiliActivity.kt
View File

@@ -156,6 +156,9 @@ class GiveGoldBiliActivity : BaseViewBindingActivity<ActivityGiveGoldBiliBinding
binding.btnGoldUs.setTextColor(if (type == GiveGoldBiliEntity.TabType.goldUs) R.color.white.getColor() else R.color.color_AFB1B3.getColor())
binding.btnGold.setTextColor(if (type == GiveGoldBiliEntity.TabType.gold) R.color.white.getColor() else R.color.color_AFB1B3.getColor())
binding.totalTitle.text = if (type == GiveGoldBiliEntity.TabType.goldUs) R.string._ver_23_Total_Amount_of_Transfer_Us.getString() else R.string._ver_23_Total_Amount_of_Transfer_Coins.getString()
mTabType = type
mAdapter.mTabType = type
loadData()
@@ -366,7 +369,7 @@ class GiveGoldBiliActivity : BaseViewBindingActivity<ActivityGiveGoldBiliBinding
viewBinding.day.text = MyTimeUtils.millis2String(data.createTime, "yyyy-MM-dd")
viewBinding.avatar.loadAvatar(data.targetAvatar)
viewBinding.nick.text = data.targetNick ?: ""
viewBinding.erBanNo.text = data.targetErbanNo.toString()
viewBinding.erBanNo.text = R.string.text_user_id.getString(data.targetErbanNo)
viewBinding.time.text = MyTimeUtils.millis2String(data.createTime)
viewBinding.gold.text = data.diamondNum.toString()

9
app/src/main/java/com/chwl/app/ui/utils/ImageLoadUtils.java
View File

@@ -350,18 +350,21 @@ public class ImageLoadUtils {
GlideApp.with(imageView.getContext())
.asDrawable()
.load(url)
.transform(new RoundedCorners(Rounded))
.placeholder(R.drawable.default_cover)
.error(R.drawable.default_cover)
.listener(new RequestListener<Drawable>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
imageView.setImageResource(R.drawable.default_cover);
if (imageView.isAttachedToWindow()) {
imageView.setImageResource(R.drawable.default_cover);
}
return true;
}
@Override
public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
imageView.setImageDrawable(resource);
if (imageView.isAttachedToWindow()) {
imageView.setImageDrawable(resource);
}
return true;
}
})

2
app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt
View File

@@ -488,7 +488,7 @@ class VipCenterActivity : BaseViewBindingActivity<ActivityVipCenterBinding>(),
}
override fun onItemSelect(position: Int, view: TextView?) {
TODO("Not yet implemented")
}
override fun onBillingClientSetupFinished() {

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

@@ -282,7 +282,7 @@
app:dt_drawableRightHeight="17dp"
app:dt_drawableRightSrc="@drawable/base_ic_arrow_right"
app:dt_drawableRightWidth="17dp"
app:layout_constraintStart_toStartOf="@+id/arGoldUs"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/arGoldUs" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/activity_give_gold_bili.xml
View File

@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
xmlns:tools="http://schemas.android.com/tools">

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

@@ -44,8 +44,9 @@
android:layout_marginTop="@dimen/dp_21"
android:gravity="center_horizontal"
android:paddingVertical="10dp"
android:textStyle="bold"
android:text="@string/_ver_23_ID_Login"
android:textColor="@color/black"
android:textColor="#afb1b3"
android:textSize="@dimen/dp_16"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
@@ -316,8 +317,8 @@
android:gravity="center_horizontal"
android:paddingVertical="10dp"
android:text="@string/_ver_23_SMS_Login"
android:textColor="@color/black"
android:textSize="@dimen/dp_16"
android:textColor="@color/color_313131"
android:textSize="@dimen/dp_14"
android:textStyle="bold"
android:layout_marginTop="10dp"
app:layout_constraintTop_toBottomOf="@+id/layout_google"

3
app/src/main/res/layout/dialog_room_lucky_bag.xml
View File

@@ -416,6 +416,7 @@
android:text="@string/_ver_24_Send_Gift_Lucky_Bag"
android:textColor="#292601"
android:textSize="15sp"
android:textStyle="bold"
app:dt_drawableType="shape"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottomSpace"
@@ -471,7 +472,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shape_white_20dp_round"
android:hint="@string/room_say_here"
android:hint="@string/hint_lucky_money_count"
android:paddingStart="10dp"
android:paddingTop="10dp"
android:maxLength="2"

66
app/src/main/res/layout/dialog_room_lucky_bag_open.xml
View File

@@ -31,9 +31,10 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="9.5dp"
android:layout_marginTop="4dp"
android:textColor="#292601"
android:textSize="15sp"
tools:text="@string/loading"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -61,6 +62,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/comingHint" />
<com.tencent.qgame.animplayer.AnimView
android:id="@+id/bagAnim"
android:layout_width="275dp"
android:layout_height="275dp"
tools:visibility="gone"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="40dp"
app:layout_constraintStart_toStartOf="parent"/>
<!-- 开奖-->
<com.chwl.library.widget.text.DrawableTextView
@@ -80,11 +92,25 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
<TextView
android:id="@+id/goldHint"
app:layout_constraintStart_toStartOf="@id/gold"
app:layout_constraintEnd_toEndOf="@id/gold"
app:layout_constraintTop_toBottomOf="@id/gold"
android:textSize="12sp"
android:textColor="#292601"
android:layout_marginTop="25dp"
android:text="@string/_ver_23_gold_in_wallet"
android:visibility="gone"
tools:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/giftImg"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_marginTop="16dp"
android:layout_marginTop="1dp"
android:background="@drawable/shape_f5d2b1_r12_9f6f41"
android:padding="5dp"
app:layout_constraintEnd_toEndOf="parent"
@@ -114,7 +140,7 @@
android:id="@+id/giftName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="1dp"
android:textColor="#292601"
android:textSize="16sp"
android:text="@string/loading"
@@ -123,6 +149,34 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/giftImg" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/giftCoin"
app:layout_constraintStart_toStartOf="@+id/giftName"
app:layout_constraintEnd_toEndOf="@+id/giftName"
app:layout_constraintTop_toBottomOf="@+id/giftName"
tools:text="0"
app:dt_drawableLeftWidth="16dp"
app:dt_drawableLeftHeight="16dp"
app:dt_drawableLeftSrc="@drawable/ic_coin_84"
android:drawablePadding="3dp"
android:textSize="13sp"
android:textColor="#292601"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/giftHint"
android:visibility="gone"
tools:visibility="visible"
android:textColor="#292601"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/giftCoin"
app:layout_constraintEnd_toEndOf="@+id/giftCoin"
app:layout_constraintTop_toBottomOf="@+id/giftCoin"
android:text="@string/_ver_23_gift_in_bag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/time"
@@ -143,7 +197,7 @@
android:id="@+id/viewOthers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:layout_marginTop="14dp"
android:text="@string/_ver_24_View_Others"
android:gravity="center_vertical"
android:textColor="#292601"
@@ -186,14 +240,12 @@
<TextView
android:id="@+id/confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="46dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:minWidth="190dp"
android:minHeight="47dp"
android:paddingHorizontal="85dp"
android:background="@drawable/ic_lucky_bag_confirm"
android:paddingVertical="17dp"
android:text="@string/ok"
android:textColor="#292601"
android:textStyle="bold"

6
app/src/main/res/layout/item_give_gold_agent.xml
View File

@@ -65,12 +65,16 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/avatar" />
<TextView
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="@string/loading"
app:dt_drawableRightSrc="@drawable/ic_coin_84"
app:dt_drawableRightWidth="22dp"
app:dt_drawableRightHeight="22dp"
android:drawablePadding="2dp"
android:textColor="@color/color_ff8c03"
android:textSize="16sp"
android:textStyle="bold"

9
app/src/main/res/layout/item_give_gold_bili.xml
View File

@@ -12,6 +12,7 @@
android:layout_height="38dp"
android:background="@color/color_F4F4F4"
android:gravity="center_vertical"
android:layout_marginStart="15dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -33,6 +34,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="11dp"
android:layout_marginTop="3dp"
android:text="@string/loading"
android:textColor="@color/color_313131"
android:layout_marginEnd="10dp"
android:ellipsize="end"
@@ -47,6 +49,7 @@
android:id="@+id/erBanNo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading"
android:layout_marginTop="3dp"
android:textColor="@color/color_7b7b7d"
android:textSize="13sp"
@@ -58,7 +61,6 @@
android:id="@+id/goldLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginEnd="15dp"
app:layout_constraintBottom_toBottomOf="@id/nick"
app:layout_constraintEnd_toEndOf="parent"
@@ -104,11 +106,12 @@
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/loading"
android:textColor="@color/color_7b7b7d"
app:layout_constraintBottom_toBottomOf="@+id/erBanNo"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="@id/goldLayout"
app:layout_constraintTop_toBottomOf="@id/goldLayout" />
app:layout_constraintTop_toTopOf="@+id/erBanNo" />
<View

3
app/src/main/res/layout/item_room_lucky_bag_bili.xml
View File

@@ -61,8 +61,9 @@
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="11dp"
android:background="#b75a6f"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/item" />
app:layout_constraintTop_toBottomOf="@+id/time" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/item_room_lucky_bag_gift.xml
View File

@@ -10,7 +10,7 @@
<ImageView
android:id="@+id/gift"
android:layout_width="match_parent"
android:layout_width="75dp"
android:layout_height="75dp"
app:layout_constraintDimensionRatio="75:75"
android:background="@drawable/bg_lucky_bag_gift_item"
@@ -84,6 +84,7 @@
android:layout_width="0dp"
android:layout_height="21dp"
android:src="@drawable/ic_btn_remove"
android:padding="5dp"
app:layout_constraintEnd_toStartOf="@+id/etNum"
app:layout_constraintStart_toStartOf="@id/bgNumber"
app:layout_constraintTop_toTopOf="@id/bgNumber" />
@@ -109,6 +110,7 @@
android:id="@+id/up"
android:layout_width="0dp"
android:layout_height="21dp"
android:padding="5dp"
android:src="@drawable/ic_btn_add"
app:layout_constraintEnd_toEndOf="@id/bgNumber"
app:layout_constraintStart_toEndOf="@+id/etNum"

2
app/src/main/res/layout/item_room_lucky_bag_gold.xml
View File

@@ -7,7 +7,7 @@
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/goldBg"
android:layout_width="75dp"
android:layout_width="match_parent"
app:dt_drawableType="shape"
app:dt_radius="12dp"
app:dt_strikeWidth="0.5dp"

14
app/src/main/res/layout/item_room_lucky_bag_view_others.xml
View File

@@ -20,11 +20,11 @@
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/me"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="14dp"
android:layout_marginBottom="-4dp"
android:paddingHorizontal="4dp"
android:paddingVertical="2dp"
android:paddingHorizontal="6dp"
android:text="@string/ui_widget_userinfodialog_01"
android:gravity="center"
android:textColor="#292601"
android:textSize="11sp"
android:textStyle="bold"
@@ -44,9 +44,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="5dp"
android:ellipsize="end"
android:lines="1"
android:layout_marginBottom="4dp"
tools:text="loadingloadingloadingloadingloadingloadingloadingloadingloadingloadingloading"
android:textColor="#292601"
android:textSize="14sp"
@@ -62,8 +62,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@+id/name"
android:layout_marginTop="4dp"
android:text="loading..."
android:textSize="12sp"
android:layout_marginTop="2dp"
android:textColor="#CC292601"
android:lines="1"
app:layout_constraintBottom_toBottomOf="@+id/avatar"
@@ -91,6 +92,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#edc59f"
app:layout_constraintBottom_toBottomOf="parent" />
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/avatar"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/layout_msg_view_holder_room_lucky_bag.xml
View File

@@ -33,7 +33,6 @@
android:text="@string/loading"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar" />
@@ -50,7 +49,6 @@
android:lines="2"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/avatar" />

23
app/src/main/res/layout/layout_msg_view_holder_room_pic_screen.xml
View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:id="@+id/rootBg"
android:padding="4dp"
@@ -19,11 +20,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/pic"
android:src="@drawable/default_banner"
android:scaleType="centerCrop"
android:layout_width="200dp"
android:layout_height="200dp"/>
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
app:cardElevation="0dp"
app:cardCornerRadius="8dp"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/pic"
android:src="@drawable/default_banner"
android:scaleType="centerCrop"
android:layout_width="200dp"
android:layout_height="200dp"/>
</androidx.cardview.widget.CardView>
</LinearLayout>

20
app/src/main/res/layout/view_room_lucky_bag_notify.xml
View File

@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="100dp"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rootBg"
android:background="@drawable/ic_lucky_bag_room_notify_gift_bg">
@@ -26,9 +27,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="1dp"
android:text="@string/loading"
android:textColor="#ffea5c"
android:textSize="14sp"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar" />
@@ -40,22 +41,24 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/loading"
android:layout_marginEnd="10dp"
android:lines="1"
app:layout_constraintEnd_toStartOf="@id/btnGo"
android:ellipsize="end"
android:textColor="#ffea5c"
android:textSize="12sp"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:layout_constraintStart_toEndOf="@id/avatar" />
<ImageView
android:id="@+id/btnGo"
android:layout_width="43dp"
android:layout_height="20dp"
android:layout_marginEnd="30dp"
android:layout_width="45dp"
android:layout_height="27dp"
android:layout_marginEnd="27dp"
android:src="@drawable/ic_notify_go"
app:layout_constraintBottom_toBottomOf="@id/nick"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/nick" />
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="12dp"
app:layout_constraintEnd_toEndOf="parent" />
<View
android:id="@+id/clickView"
@@ -64,6 +67,7 @@
app:layout_constraintTop_toTopOf="@id/avatar"
app:layout_constraintBottom_toBottomOf="@id/avatar"
android:layout_width="0dp"
tools:visibility="gone"
android:layout_height="0dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/values-ar/strings.xml
View File

@@ -5433,4 +5433,7 @@
<string name="_ver_23_Transfer_Past_30_days">التحويل خلال الثلاثين يومًا الماضية</string>
<string name="_ver_23_Transfer_History">سجل التحويلات</string>
<string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>
<string name="_ver_23_Total_Amount_of_Transfer_Us">إجمالي مبلغ تحويل الراتب</string>
<string name="_ver_23_gold_in_wallet">تم وضع الكونزات في المحفظة!</string>
<string name="_ver_23_gift_in_bag">تم وضع الهدايا في الحقيبة!</string>
</resources>

3
app/src/main/res/values-tr/strings.xml
View File

@@ -5227,4 +5227,7 @@ Toplam imza alın, ilgili ödülü alın
<string name="_ver_23_Transfer_Past_30_days">Geçmiş 30 gün içindeki transfer</string>
<string name="_ver_23_Transfer_History">Transfer Geçmişi</string>
<string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>
<string name="_ver_23_Total_Amount_of_Transfer_Us">ÜS Hesaplaşmasının Toplam Miktarı</string>
<string name="_ver_23_gold_in_wallet">Cüzdana paralar konuldu!</string>
<string name="_ver_23_gift_in_bag">Çantaya hediyeler konuldu!</string>
</resources>

3
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -5375,5 +5375,8 @@
<string name="_ver_23_Transfer_Past_30_days">近30天轉贈</string>
<string name="_ver_23_Transfer_History">轉贈歷史</string>
<string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>
<string name="_ver_23_Total_Amount_of_Transfer_Us">代發薪</string>
<string name="_ver_23_gold_in_wallet">硬幣已放入錢包！</string>
<string name="_ver_23_gift_in_bag">禮物已放入背包！</string>
</resources>

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

@@ -499,7 +499,7 @@
<string name="hint_lucky_money_amount">0.00</string>
<string name="text_lucky_money_coin_name">Gold Bean</string>
<string name="text_lucky_money_count">Number of Red Envelopes</string>
<string name="hint_lucky_money_count">Enter number</string>
<string name="hint_lucky_money_count">Please Enter number</string>
<string name="text_lucky_money_count_unit">pcs</string>
<string name="text_total_family_member">This group has a total of %s family members</string>
<string name="hint_lucky_money_greetings">Congratulations and best wishes</string>
@@ -5464,12 +5464,16 @@ You cannot join again within 24 hours after leaving</string>
<string name="_ver_23_Last_Cycle">Last Cycle</string>
<string name="_ver_23_Total_Amount_of_Transfer_Coins">Total Amount of Coin Transfers</string>
<string name="_ver_23_Total_Amount_of_Transfer_Us">Total Amount of ÜS Settlement</string>
<string name="_ver_23_Sub_Recharge_Agent_List">Sub Recharge Agent List</string>
<string name="_ver_23_Transfer_Past_30_days">Transfer Past 30 days</string>
<string name="_ver_23_Transfer_History">Transfer History</string>
<string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>
<string name="_ver_23_gold_in_wallet">Coins have been put into the wallet!</string>
<string name="_ver_23_gift_in_bag">Gifts have been put into the bag!</string>
<!-- <string name="_ver_23_">xxxx</string>-->

4
core/src/main/java/com/chwl/core/widget/img/MyCircleImageView.kt
View File

@@ -5,7 +5,6 @@ import android.content.res.TypedArray
import android.graphics.drawable.GradientDrawable
import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatImageView
import androidx.core.view.setPadding
import com.chwl.core.R
class MyCircleImageView : AppCompatImageView {
@@ -44,9 +43,8 @@ class MyCircleImageView : AppCompatImageView {
//设置边框，参数为边框的类型，有矩形，椭圆，还有线等等，自己去试；
shape.shape = GradientDrawable.RECTANGLE
shape.cornerRadius = mBorderRadius
shape.setColor(mBorderColor)
shape.setStroke(mBorderWidth.toInt(), mBorderColor)
background = shape
setPadding(mBorderWidth.toInt())
}