fix: bugfix

This commit is contained in:
eggmanQQQ
2024-12-04 18:55:01 +08:00
parent 257e40cb32
commit 5f72425b85
17 changed files with 567 additions and 476 deletions

View File

@@ -72,7 +72,11 @@ class RoomBgSetDialog : BaseDialogFragment<DialogRoomBgSetBinding>() {
when (view.id) {
R.id.statusPlay, R.id.statusBuy -> {
data?.let {
if (data.status != RoomBgInfo.Status.S_REJECT && data.status != RoomBgInfo.Status.S_REVIEW) {
if (it.type == RoomBgInfo.Type.T_CUSTOM) {
if (it.status != RoomBgInfo.Status.S_REJECT && it.status != RoomBgInfo.Status.S_REVIEW) {
showPreViewDialog(null, data, true)
}
} else {
showPreViewDialog(null, data, true)
}
}

View File

@@ -15,12 +15,17 @@ open class BaseBindingAdapter<VB : ViewBinding?, T>() : BaseQuickAdapter<T, Base
//反射没有想象中的那么耗时
val type = javaClass.genericSuperclass as ParameterizedType
val aClass = type.actualTypeArguments[0] as Class<*>
val method = aClass.getDeclaredMethod("inflate", LayoutInflater::class.java,ViewGroup::class.java, Boolean::class.java)
val binding = method.invoke(null, mLayoutInflater,parent,false) as VB
val method = aClass.getDeclaredMethod("inflate", LayoutInflater::class.java)
val binding = method.invoke(null, mLayoutInflater) as VB
val view = binding?.root?:return View(mContext)
view.setTag(R.id.BaseQuickAdapter_databinding_support, binding)
onCreateView(view)
return view
}
protected open fun onCreateView(view : View) {
}
override fun convert(helper: BaseBindingViewHolder<VB>, item: T) {}
}

View File

@@ -108,8 +108,10 @@ class DressUpMyFragment : BaseListFragment<DressUpInfo>() {
.doOnSuccess {
it?.let {
val newData = mutableListOf<DressUpInfo>()
it.forEach {
newData.add(DressUpUtil.tranData(it))
if (it.isVerify()) {
it.forEach {
newData.add(DressUpUtil.tranData(it))
}
}
setData(newData)
}
@@ -125,8 +127,10 @@ class DressUpMyFragment : BaseListFragment<DressUpInfo>() {
.doOnSuccess {
it?.let {
val newData = mutableListOf<DressUpInfo>()
it.forEach {
newData.add(DressUpUtil.tranData(it))
if (it.isVerify()) {
it.forEach {
newData.add(DressUpUtil.tranData(it))
}
}
setData(newData)
}
@@ -142,8 +146,10 @@ class DressUpMyFragment : BaseListFragment<DressUpInfo>() {
.doOnSuccess {
it?.let {
val newData = mutableListOf<DressUpInfo>()
it.nameplateList.forEach {
newData.add(DressUpUtil.tranData(it))
if (it.nameplateList.isVerify()) {
it.nameplateList.forEach {
newData.add(DressUpUtil.tranData(it))
}
}
setData(newData)
}
@@ -159,8 +165,10 @@ class DressUpMyFragment : BaseListFragment<DressUpInfo>() {
.doOnSuccess {
it?.let {
val newData = mutableListOf<DressUpInfo>()
it.forEach {
newData.add(DressUpUtil.tranData(it))
if (it.isVerify()) {
it.forEach {
newData.add(DressUpUtil.tranData(it))
}
}
setData(newData)
}
@@ -176,8 +184,10 @@ class DressUpMyFragment : BaseListFragment<DressUpInfo>() {
.doOnSuccess {
it?.let {
val newData = mutableListOf<DressUpInfo>()
it.forEach {
newData.add(DressUpUtil.tranData(it))
if (it.isVerify()) {
it.forEach {
newData.add(DressUpUtil.tranData(it))
}
}
setData(newData)
}
@@ -340,7 +350,7 @@ class DressUpMyFragment : BaseListFragment<DressUpInfo>() {
}
//取出 新选中, 有就设置选中
if (mPosition.isVerify(data)) {
if (position.isVerify(data)) {
newItem = data?.getOrNull(position)
newItem?.isSelect = true
}
@@ -360,8 +370,13 @@ class DressUpMyFragment : BaseListFragment<DressUpInfo>() {
}
}
//新选中位置被移动到 index : 1
mPosition = 1
//新选中位置被移动到 index : 1 , 0 时等于0
if (position == 0) {
mPosition = 0
} else {
mPosition = 1
}
adapter?.setNewData(data)
R.string.doSuccess.doToast()

View File

@@ -77,12 +77,17 @@ class DressUpStoreFragment: BaseListFragment<DressUpInfo>() {
.doOnSuccess {
it?.let {
val newData = mutableListOf<DressUpInfo>()
it.forEach {
newData.add(DressUpUtil.tranData(it))
if (it.isVerify()){
it.forEach {
newData.add(DressUpUtil.tranData(it))
}
}
mAdapter.setNewData(newData)
binding.rvList.post {
setlect(0)
if (newData.isVerify()) {
binding.rvList.post {
setlect(0)
}
}
}
}

View File

@@ -488,12 +488,17 @@ class DressUpUtil {
//item 时占满就行
if (!isDialog) {
animView?.setViewWH(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, false)
svgaView?.setViewWH(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,false)
if (data.dressType == TAB_USER_CARD) {
animView?.setViewWH(132, 116, true)
svgaView?.setViewWH(132, 116, true)
} else {
animView?.setViewWH(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, false)
svgaView?.setViewWH(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,false)
}
} else {
if (data.dressType == TAB_USER_CARD) {
animView?.setViewWH(182, 161, true)
svgaView?.setViewWH(182, 161, true)
animView?.setViewWH(188, 168, true)
svgaView?.setViewWH(188, 168, true)
} else {
animView?.setViewWH(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, false)
svgaView?.setViewWH(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,false)

View File

@@ -3,7 +3,7 @@ package com.chwl.app.ui.search
import android.content.Context
import android.content.Intent
import androidx.core.widget.doOnTextChanged
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.chwl.app.R
import com.chwl.app.base.BaseViewBindingActivity
@@ -55,7 +55,7 @@ class SearchUserActivity : BaseViewBindingActivity<ActivitySearchUserBinding>()
}
mAdapter= UserAdapter()
binding.rvList.layoutManager = LinearLayoutManager(context,RecyclerView.VERTICAL,false)
binding.rvList.layoutManager = GridLayoutManager(context,1,RecyclerView.VERTICAL,false)
binding.rvList.adapter = mAdapter
mAdapter.setEmptyView(EmptyViewHelper.createEmptyTextViewHeight(context,R.string.no_frenids_text.getString()))
@@ -129,7 +129,7 @@ class SearchUserActivity : BaseViewBindingActivity<ActivitySearchUserBinding>()
helper.binding.let {
it.avatar.loadAvatar(item.avatar)
it.name.text = item.nick
it.id.text = item.erbanNo.toString()
it.id.text = "ID: ${item.erbanNo}"
helper.addOnClickListener(it.btnGive.id)
}

View File

@@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.view.View
import androidx.core.view.isVisible
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.chwl.app.R
import com.chwl.app.base.BaseViewBindingActivity
@@ -64,7 +64,7 @@ class UserCpListActivity : BaseViewBindingActivity<ActivityUserCpListBinding>()
private fun initRvList(){
mAdapter = UserCpListAdapter(R.layout.item_user_cp_list,1)
binding.rvList.layoutManager = LinearLayoutManager(context,RecyclerView.VERTICAL,false)
binding.rvList.layoutManager = GridLayoutManager(context,1,RecyclerView.VERTICAL,false)
binding.rvList.adapter = mAdapter
mAdapter.setOnItemChildClickListener { adapter, view, position ->
when (view.id) {

View File

@@ -13,7 +13,6 @@ import com.chwl.app.databinding.ActivityUserForbidBinding
import com.chwl.app.databinding.ItemForbidTimeBinding
import com.chwl.app.ui.utils.loadAvatar
import com.chwl.core.bean.response.ServiceResult
import com.chwl.core.user.bean.UserCPListBean
import com.chwl.core.utils.net.RxHelper
import com.chwl.library.common.util.ClickUtils.click
import com.chwl.library.common.util.doToast
@@ -54,7 +53,7 @@ class UserForbidActivity : BaseViewBindingActivity<ActivityUserForbidBinding>()
binding.nick.text = nick
binding.avatar.loadAvatar(avatar)
binding.uid.text = erBanNo.toString()
binding.uid.text = "ID: ${erBanNo}"
mAdapter = TimeAdapter()

View File

@@ -56,7 +56,7 @@
android:layout_height="1dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="20dp"
android:background="@color/color_FEE4E4"
android:background="#e4e4e4"
app:layout_constraintTop_toBottomOf="@id/avatar" />
@@ -78,7 +78,7 @@
android:id="@+id/rvList"
android:layout_width="match_parent"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="20dp"
android:layout_marginTop="12dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/forbidHint" />

View File

@@ -6,6 +6,9 @@
android:layout_height="wrap_content"
android:background="@drawable/ic_dress_dialog_bg">
<LinearLayout
android:id="@+id/picLayout"
android:layout_width="155dp"
@@ -67,11 +70,11 @@
app:layout_constraintTop_toBottomOf="@id/line" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/btnCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:gravity="center"
android:minWidth="90dp"
android:minHeight="32dp"
@@ -80,7 +83,9 @@
android:text="@string/cancel"
android:textColor="@color/white"
android:textSize="14sp"
android:layout_marginEnd="5dp"
android:textStyle="bold"
android:layout_marginBottom="12dp"
app:dt_drawableType="shape"
app:dt_radius="47dp"
app:dt_soildColor="@color/black_transparent_30"
@@ -94,15 +99,16 @@
android:id="@+id/btnBuy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:gravity="center"
android:minWidth="90dp"
android:layout_marginStart="5dp"
android:minHeight="32dp"
android:paddingHorizontal="12dp"
tools:visibility="visible"
android:paddingVertical="6dp"
android:text="@string/buy"
android:textColor="#172055"
android:layout_marginBottom="12dp"
android:textSize="14sp"
android:textStyle="bold"
app:dt_drawableType="shape"
@@ -115,4 +121,5 @@
app:layout_constraintTop_toBottomOf="@id/line" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -1,144 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:layout_marginBottom="10dp">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/bg"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="244dp"
android:background="@drawable/ic_dress_item_n"
app:layout_constraintTop_toTopOf="parent" />
android:layout_marginHorizontal="5dp"
android:layout_marginBottom="10dp"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/bg"
android:layout_width="match_parent"
android:layout_height="244dp"
android:background="@drawable/ic_dress_item_n"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.app.common.widget.RectRoundImageView
android:id="@+id/picBg"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_marginTop="9dp"
android:background="#04184A"
app:borderRadius="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:type="round" />
<com.chwl.app.common.widget.RectRoundImageView
android:id="@+id/picBg"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_marginTop="9dp"
android:background="#04184A"
app:borderRadius="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:type="round" />
<LinearLayout
android:id="@+id/picLayout"
android:layout_width="150dp"
android:layout_height="150dp"
android:gravity="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/picBg"
app:layout_constraintEnd_toEndOf="@+id/picBg"
app:layout_constraintStart_toStartOf="@+id/picBg"
app:layout_constraintTop_toTopOf="@+id/picBg"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/picLayout"
android:layout_width="150dp"
android:layout_height="150dp"
android:gravity="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/picBg"
app:layout_constraintEnd_toEndOf="@+id/picBg"
app:layout_constraintStart_toStartOf="@+id/picBg"
app:layout_constraintTop_toTopOf="@+id/picBg"
tools:visibility="visible" />
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="9dp"
android:lines="1"
android:paddingTop="5dp"
android:textColor="#d9e7f7"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/price"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/picBg"
tools:text="11111" />
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="9dp"
android:lines="1"
android:paddingTop="5dp"
android:textColor="#d9e7f7"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/price"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/picBg"
tools:text="11111" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="9dp"
android:drawablePadding="2dp"
android:gravity="start|center_vertical"
android:paddingVertical="5dp"
android:textColor="#F8CE1F"
android:textSize="10sp"
android:visibility="gone"
app:dt_drawableLeftHeight="18dp"
app:dt_drawableLeftSrc="@drawable/ic_coin_84"
app:dt_drawableLeftWidth="18dp"
app:dt_drawableType="shape"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/name"
tools:text="@string/s_sDays_s"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="9dp"
android:drawablePadding="2dp"
android:gravity="start|center_vertical"
android:paddingVertical="5dp"
android:textColor="#F8CE1F"
android:textSize="10sp"
android:visibility="gone"
app:dt_drawableLeftHeight="18dp"
app:dt_drawableLeftSrc="@drawable/ic_coin_84"
app:dt_drawableLeftWidth="18dp"
app:dt_drawableType="shape"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/name"
tools:text="@string/s_sDays_s"
tools:visibility="visible" />
<TextView
android:id="@+id/discount"
android:layout_width="match_parent"
android:layout_height="29dp"
android:layout_marginHorizontal="1.5dp"
android:layout_marginBottom="2dp"
android:background="@drawable/ic_dress_up_bottom_bg2"
android:gravity="center"
android:textColor="#80D9E7F7"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="11111"
tools:visibility="visible" />
<TextView
android:id="@+id/discount"
android:layout_width="match_parent"
android:layout_height="29dp"
android:layout_marginHorizontal="1.5dp"
android:layout_marginBottom="2dp"
android:background="@drawable/ic_dress_up_bottom_bg2"
android:gravity="center"
android:textColor="#80D9E7F7"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="11111"
tools:visibility="visible" />
<ImageView
android:id="@+id/empty"
android:layout_width="55dp"
android:layout_height="55dp"
android:background="@drawable/ic_dress_up_empty"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/picBg"
app:layout_constraintEnd_toEndOf="@id/picBg"
app:layout_constraintStart_toStartOf="@id/picBg"
app:layout_constraintTop_toTopOf="@id/picBg"
tools:visibility="visible" />
<ImageView
android:id="@+id/empty"
android:layout_width="55dp"
android:layout_height="55dp"
android:background="@drawable/ic_dress_up_empty"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/picBg"
app:layout_constraintEnd_toEndOf="@id/picBg"
app:layout_constraintStart_toStartOf="@id/picBg"
app:layout_constraintTop_toTopOf="@id/picBg"
tools:visibility="visible" />
<ImageView
android:id="@+id/btnPlay"
android:layout_width="46dp"
android:layout_height="42dp"
android:layout_marginEnd="-8dp"
android:layout_marginBottom="-8dp"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:src="@drawable/ic_dress_play"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/picLayout"
app:layout_constraintEnd_toEndOf="@id/picLayout"
tools:visibility="visible" />
<ImageView
android:id="@+id/btnPlay"
android:layout_width="46dp"
android:layout_height="42dp"
android:layout_marginEnd="-8dp"
android:layout_marginBottom="-8dp"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:src="@drawable/ic_dress_play"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/picLayout"
app:layout_constraintEnd_toEndOf="@id/picLayout"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/limit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="7dp"
android:paddingVertical="2dp"
android:textColor="#51281b"
android:textSize="12sp"
app:dt_drawableType="shape"
app:dt_endColor="#E9A71D"
app:dt_leftBottomRadius="0dp"
app:dt_leftTopRadius="10dp"
app:dt_rightBottomRadius="10dp"
app:dt_rightTopRadius="0dp"
app:dt_startColor="#FFE3B2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Limited" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/limit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="7dp"
android:paddingVertical="2dp"
android:textColor="#51281b"
android:textSize="12sp"
app:dt_drawableType="shape"
app:dt_endColor="#E9A71D"
app:dt_leftBottomRadius="0dp"
app:dt_leftTopRadius="10dp"
app:dt_rightBottomRadius="10dp"
app:dt_rightTopRadius="0dp"
app:dt_startColor="#FFE3B2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Limited" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

View File

@@ -1,27 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="14dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox
android:id="@+id/check"
android:checked="true"
android:clickable="false"
android:focusable="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/time"
android:layout_width="0dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="0"
android:textColor="@color/color_313131"
android:textSize="14sp" />
android:layout_marginBottom="14dp"
android:gravity="center_vertical"
android:orientation="horizontal">
</LinearLayout>
<CheckBox
android:id="@+id/check"
android:checked="true"
android:clickable="false"
android:focusable="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="0"
android:textColor="@color/color_313131"
android:textSize="14sp" />
</LinearLayout>
</FrameLayout>

View File

@@ -1,160 +1,166 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/dp_5"
android:paddingTop="@dimen/dp_10"
tools:background="@color/black">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_marginTop="10dp"
android:layout_marginHorizontal="5dp"
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:id="@+id/bgView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/transparent"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.cardview.widget.CardView
android:id="@+id/bgView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/transparent"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.chwl.library.widget.SVGAView
android:id="@+id/bg"
android:layout_width="@dimen/dp_135"
android:layout_height="@dimen/dp_180"
android:scaleType="centerCrop"
app:autoPlay="true"
app:fillMode="Backward"
app:loopCount="1"
tools:src="@drawable/bg_login" />
<com.chwl.library.widget.SVGAView
android:id="@+id/bg"
android:layout_width="@dimen/dp_135"
android:layout_height="@dimen/dp_180"
android:scaleType="centerCrop"
app:autoPlay="true"
app:fillMode="Backward"
app:loopCount="1"
tools:src="@drawable/bg_login" />
</androidx.cardview.widget.CardView>
</androidx.cardview.widget.CardView>
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/select"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone"
app:dt_drawableType="shape"
app:dt_radius="@dimen/dp_9"
app:dt_soildColor="@color/transparent"
app:dt_strikeColor="#FF8C03"
app:dt_strikeWidth="@dimen/dp_2"
app:layout_constraintBottom_toBottomOf="@id/bgView"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/select"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone"
app:dt_drawableType="shape"
app:dt_radius="@dimen/dp_9"
app:dt_soildColor="@color/transparent"
app:dt_strikeColor="#FF8C03"
app:dt_strikeWidth="@dimen/dp_2"
app:layout_constraintBottom_toBottomOf="@id/bgView"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/statusLimit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:minWidth="@dimen/dp_48"
android:paddingHorizontal="@dimen/dp_4"
android:paddingVertical="@dimen/dp_1"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
app:dt_drawableType="shape"
app:dt_radius="@dimen/dp_10"
app:dt_soildColor="#80000000"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:text="@string/Original"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/statusLimit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:minWidth="@dimen/dp_48"
android:paddingHorizontal="@dimen/dp_4"
android:paddingVertical="@dimen/dp_1"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
app:dt_drawableType="shape"
app:dt_radius="@dimen/dp_10"
app:dt_soildColor="#80000000"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:text="@string/Original"
tools:visibility="visible" />
<ImageView
android:id="@+id/statusGif"
android:layout_width="@dimen/dp_27"
android:layout_height="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:src="@drawable/icon_room_bg_gif_type"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/statusPlay"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<ImageView
android:id="@+id/statusGif"
android:layout_width="@dimen/dp_27"
android:layout_height="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:src="@drawable/icon_room_bg_gif_type"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/statusPlay"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<ImageView
android:id="@+id/statusPlay"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:src="@drawable/icon_room_bg_player"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<ImageView
android:id="@+id/statusPlay"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:src="@drawable/icon_room_bg_player"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<ImageView
android:id="@+id/statusDel"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:src="@drawable/icon_room_bg_del"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<ImageView
android:id="@+id/statusDel"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_6"
android:src="@drawable/icon_room_bg_del"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:drawablePadding="@dimen/dp_3"
android:gravity="center"
android:textColor="@color/white"
android:textSize="14sp"
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:drawablePadding="@dimen/dp_3"
android:gravity="center"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone"
app:dt_drawableLeftHeight="@dimen/dp_20"
app:dt_drawableLeftSrc="@drawable/ic_coin_84"
app:dt_drawableLeftWidth="@dimen/dp_20"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toBottomOf="@id/bgView"
tools:text="11111"
tools:visibility="visible" />
android:visibility="gone"
app:dt_drawableLeftHeight="@dimen/dp_20"
app:dt_drawableLeftSrc="@drawable/ic_coin_84"
app:dt_drawableLeftWidth="@dimen/dp_20"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toBottomOf="@id/bgView"
tools:text="11111"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/statusBuy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:minWidth="@dimen/dp_71"
android:minHeight="@dimen/dp_22"
android:paddingHorizontal="@dimen/dp_7"
android:paddingVertical="@dimen/dp_2"
android:textColor="@color/white"
android:visibility="gone"
android:includeFontPadding="false"
app:dt_drawableType="shape"
app:dt_endColor="#373639"
app:dt_radius="@dimen/dp_16"
app:dt_startColor="#373639"
app:dt_strikeColor="@color/white"
app:dt_strikeWidth="@dimen/dp_1"
app:layout_constraintEnd_toEndOf="@+id/price"
app:layout_constraintStart_toStartOf="@+id/price"
app:layout_constraintTop_toBottomOf="@+id/price"
tools:text="@string/lu_reject"
tools:visibility="visible" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/statusBuy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:minWidth="@dimen/dp_71"
android:minHeight="@dimen/dp_22"
android:paddingHorizontal="@dimen/dp_7"
android:paddingVertical="@dimen/dp_2"
android:textColor="@color/white"
android:visibility="gone"
android:includeFontPadding="false"
app:dt_drawableType="shape"
app:dt_endColor="#373639"
app:dt_radius="@dimen/dp_16"
app:dt_startColor="#373639"
app:dt_strikeColor="@color/white"
app:dt_strikeWidth="@dimen/dp_1"
app:layout_constraintEnd_toEndOf="@+id/price"
app:layout_constraintStart_toStartOf="@+id/price"
app:layout_constraintTop_toBottomOf="@+id/price"
tools:text="@string/lu_reject"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

View File

@@ -4,64 +4,71 @@
android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
tools:background="@color/black"
android:layout_height="72dp">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/avatar"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="15dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="72dp">
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="1111"
android:layout_marginStart="10dp"
android:layout_marginTop="4dp"
android:textStyle="bold"
android:textColor="@color/color_d9e7f7"
android:textSize="14sp"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintTop_toTopOf="@+id/avatar" />
<ImageView
android:id="@+id/avatar"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="15dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="1111"
android:layout_marginStart="10dp"
android:layout_marginTop="4dp"
android:textStyle="bold"
android:textColor="@color/color_d9e7f7"
android:textSize="14sp"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintTop_toTopOf="@+id/avatar" />
<TextView
android:id="@+id/id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="4dp"
android:alpha="0.5"
tools:text="1111"
android:textColor="@color/color_d9e7f7"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@+id/avatar"
app:layout_constraintStart_toEndOf="@+id/avatar" />
<TextView
android:id="@+id/id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="4dp"
android:alpha="0.5"
tools:text="1111"
android:textColor="@color/color_d9e7f7"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@+id/avatar"
app:layout_constraintStart_toEndOf="@+id/avatar" />
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/btnGive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:gravity="center"
android:paddingHorizontal="15dp"
android:paddingVertical="3dp"
android:text="@string/ui_search_searchadapter_03"
android:textColor="#172055"
android:textSize="14sp"
android:textStyle="bold"
app:dt_drawableType="shape"
app:dt_endColor="#4da2ea"
app:dt_radius="47dp"
app:dt_startColor="#b2fcff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/btnGive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:gravity="center"
android:paddingHorizontal="15dp"
android:paddingVertical="3dp"
android:text="@string/ui_search_searchadapter_03"
android:textColor="#172055"
android:textSize="14sp"
android:textStyle="bold"
app:dt_drawableType="shape"
app:dt_endColor="#4da2ea"
app:dt_radius="47dp"
app:dt_startColor="#b2fcff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -2,19 +2,14 @@ package com.chwl.core.utils
import android.annotation.SuppressLint
import android.content.Context
import android.util.Log
import java.io.BufferedOutputStream
import java.io.BufferedWriter
import java.io.File
import java.io.FileOutputStream
import java.text.SimpleDateFormat
import java.util.Date
@SuppressLint("StaticFieldLeak")
object WLog {
private var outPutDir: File? = null
private var fileOutputStream: FileOutputStream? = null
private var bufferedOutputStream: BufferedOutputStream? = null
@@ -30,7 +25,23 @@ object WLog {
// outPutDir!!.mkdirs()
// }
// }
// writeLog(" WLog 初始化 成功------")
//
// Thread.setDefaultUncaughtExceptionHandler(object : Thread.UncaughtExceptionHandler {
// override fun uncaughtException(t: Thread, e: Throwable) {
// val errorMsg = "error = ${e.javaClass.simpleName} : ${e.message}"
// writeLog2(errorMsg)
//
//
// val msg = StringBuilder()
// e.stackTrace.forEach {
// msg.append("\tat ").append(it.toString()).append("\n")
// }
// writeLog2(msg.toString())
// }
// })
//
//
// writeLog2(" WLog 初始化 成功------")
}
@@ -54,7 +65,31 @@ object WLog {
// } catch (e: Exception) {
// Log.e("IO Exception", e.toString())
// }
// LogUtils.dd(" RoomBoomManager $log");
}
fun writeLog2(log: String) {
// var log = log
// val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
// val fileTime = SimpleDateFormat("yyyy-MM-dd-")
// log = "-${simpleDateFormat.format(Date(System.currentTimeMillis()))}-:-$log".trimIndent()
// try {
// val outPutFile = File(
// outPutDir,
// "mmmmLog-" + fileTime.format(Date(System.currentTimeMillis())) + ".txt"
// )
// fileOutputStream = FileOutputStream(outPutFile, true)
// bufferedOutputStream = BufferedOutputStream(fileOutputStream)
// bufferedOutputStream?.write(System.getProperty("line.separator")?.toByteArray())
// bufferedOutputStream?.write(log.toByteArray())
// bufferedOutputStream?.flush()
// fileOutputStream?.close()
// bufferedOutputStream?.close()
// } catch (e: Exception) {
// Log.e("IO Exception", e.toString())
// }
}
}

View File

@@ -27,24 +27,28 @@ import java.util.Locale
fun View.setMargin(start:Int?=null,top:Int?=null,end:Int?=null,bottom:Int?=null,isDP:Boolean = true) {
val lp = this.layoutParams as MarginLayoutParams
if (this.layoutParams != null) {
val lp = this.layoutParams
if (lp is MarginLayoutParams){
if (start != null) {
lp.marginStart = if (isDP)SizeUtils.dp2px(this.context,start.toFloat()) else start
}
if (start != null) {
lp.marginStart = if (isDP)SizeUtils.dp2px(this.context,start.toFloat()) else start
if (top != null) {
lp.topMargin = if (isDP)SizeUtils.dp2px(this.context,top.toFloat()) else top
}
if (end != null) {
lp.marginEnd = if (isDP)SizeUtils.dp2px(this.context,end.toFloat()) else end
}
if (bottom != null) {
lp.bottomMargin = if (isDP)SizeUtils.dp2px(this.context,bottom.toFloat()) else bottom
}
this.layoutParams = lp
}
}
if (top != null) {
lp.topMargin = if (isDP)SizeUtils.dp2px(this.context,top.toFloat()) else top
}
if (end != null) {
lp.marginEnd = if (isDP)SizeUtils.dp2px(this.context,end.toFloat()) else end
}
if (bottom != null) {
lp.bottomMargin = if (isDP)SizeUtils.dp2px(this.context,bottom.toFloat()) else bottom
}
this.layoutParams = lp
}

164
mode.json
View File

@@ -1,95 +1,83 @@
{
"code": 200,
"message": "success",
"data": {
"fullScreen": false,
"giftId": 1979,
"giftUrl": "http://beta.img.pekolive.com/Fl4idNRgnahpCmrz0MhV4oNXrPp1?imageslim",
"giftVo": {
"consumeType": 1,
"giftExplainUrl": "",
"giftId": 1979,
"giftName": "端午",
"giftType": 2,
"giftUrl": "http://beta.img.pekolive.com/Fl4idNRgnahpCmrz0MhV4oNXrPp1?imageslim",
"goldPrice": 60,
"hasEffect": false,
"hasLatest": false,
"hasSvga": false,
"hasTimeLimit": false,
"hasVggPic": false,
"i18nGiftNameMap": {
"ar": "端午小粽",
"en": "端午小粽",
"zh": "端午",
"tr": "端午小粽"
},
"isNobleGift": false,
"isSendMsg": false,
"isSkipRoom": false,
"isWholeServer": true,
"luckyGiftSvgaUrl": "",
"nobleId": 0,
"notifyFull": 1,
"otherViewType": 0,
"roomExclude": false,
"seqNo": -99999,
"showAvatarType": 0,
"vggUrl": "",
"viewUrl": ""
},
"homeShow": false,
"notifyFull": 1,
"recvUserAvatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif",
"recvUserErbanNo": 6228657,
"recvUserNick": "Molistar",
"recvUserUid": 3224,
"sendMsg": false,
"sendUserAvatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif",
"sendUserErbanNo": 6228657,
"sendUserNick": "Molistar",
"sendUserUid": 3224,
"showAvatarType": 0,
"skipRoom": false,
"targetUid": 3224,
"targetUids": [
3224
],
"targetUsers": [
"totalPage": 1,
"nameplateList": [
{
"appVersion": "1.0.17",
"avatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif",
"birth": 1137772800000,
"certifyModifyTimes": 0,
"channel": "official",
"channelType": 1,
"createTime": 1724986857000,
"currentApp": "molistar",
"defUser": 1,
"deviceId": "c0e4cd00-242e-4c46-abc4-0e4885de6668",
"erbanNo": 6228657,
"fansNum": 3,
"followNum": 3,
"gender": 1,
"hasPrettyErbanNo": false,
"lastLoginIp": "123.88.32.247",
"lastLoginRegion": "中國|廣東省|鐵通",
"lastLoginTime": 1733283423000,
"newDevice": true,
"nick": "Molistar",
"os": "android",
"osversion": "5.1.1",
"partitionId": 2,
"phone": "-6228657",
"phoneAreaCode": "86",
"platformRole": 0,
"region": "馬來西亞",
"regionId": 14,
"roomUid": 3481,
"id": 406,
"uid": 3224,
"updateTime": 1733283422000,
"useStatus": 0
"nameplateId": 101,
"isCustomWord": true,
"word": " 555",
"remark": " 555",
"expireTime": 1738663248000,
"createTime": 1731319248000,
"updateTime": 1731319248000,
"nameplateName": " 555",
"nameplateImage": "https://image.pekolive.com/11094f2f00fb491f963132463bab97ec.png",
"isExpired": false,
"expireDays": 62,
"isUsing": false,
"iconPic": "https://image.pekolive.com/gonghuizhangmingpaikaobei.png",
"fixedWord": " 555",
"nameplateType": "1",
"dressShopId": 33,
"dressPrice": 1000,
"discountPrice": 950,
"vipLevel": 5,
"discount": 95,
"dressDay": 9
},
{
"id": 529,
"uid": 3224,
"nameplateId": 100,
"isCustomWord": false,
"word": " ",
"remark": " ",
"expireTime": 1737195843000,
"createTime": 1733307843000,
"updateTime": 1733307843000,
"nameplateName": "schoolgirl-Advanced",
"nameplateImage": "https://image.pekolive.com/guanfangzhuli-bajisitan.png",
"isExpired": false,
"expireDays": 45,
"isUsing": true,
"iconPic": "https://image.pekolive.com/guanfangzhuli-bajisitan.png",
"nameplateType": "1",
"dressShopId": 84,
"dressPrice": 2233,
"discountPrice": 2121,
"vipLevel": 5,
"discount": 95,
"dressDay": 9
},
{
"id": 407,
"uid": 3224,
"nameplateId": 100,
"isCustomWord": false,
"word": " ",
"remark": " ",
"expireTime": 1733220061000,
"createTime": 1731319261000,
"updateTime": 1731319261000,
"nameplateName": "schoolgirl-Advanced",
"nameplateImage": "https://image.pekolive.com/guanfangzhuli-bajisitan.png",
"isExpired": true,
"expireDays": 0,
"isUsing": false,
"iconPic": "https://image.pekolive.com/guanfangzhuli-bajisitan.png",
"nameplateType": "1",
"dressShopId": 84,
"dressPrice": 2233,
"discountPrice": 2121,
"vipLevel": 5,
"discount": 95,
"dressDay": 9
}
]
},
"first": 3,
"second": 35
} null
"timestamp": 1733307990888
}