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

feat：修正問題

Browse Source
This commit is contained in:
max
2024-08-28 17:36:57 +08:00
parent 5e6864d87f
commit aa2987cb0d
10 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt
View File

@@ -93,8 +93,8 @@ class RoomHeadlineWidget : FrameLayoutRoomWidget {
private fun requestCurrentHeadline() {
safeLaunch {
val data = PublicChatModel.getCurrentHeadline()
updateHeadline(data)
// val data = PublicChatModel.getCurrentHeadline()
// updateHeadline(data)
}
}

5
app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt
View File

@@ -1442,6 +1442,7 @@ class RoomEffectView @JvmOverloads constructor(
enterRoomEffects = remoteExtension[UserInfo.ENTER_ROOM_EFFECTS] as String?
}
val wrapNick = "【" + targetNicks[0].subAndReplaceDot(7) + "】" + enterText
if (!TextUtils.isEmpty(enterRoomEffects)) {
playMemberInAnimByUrl(wrapNick, enterRoomEffects)
} else {
@@ -1495,8 +1496,8 @@ class RoomEffectView @JvmOverloads constructor(
private fun playMemberInAnim(text: String, svgaVideoEntity: SVGAVideoEntity) {
binding.roomMenberInSvga.visibility = VISIBLE
binding.roomMenberInSvga.loops = 1
binding.roomMenberInSvga.clearsAfterStop = true
binding.roomMenberInSvga.loops = 10000
// binding.roomMenberInSvga.clearsAfterStop = true
val dynamicEntity = SVGADynamicEntity()
val textPaint = TextPaint()
textPaint.color = Color.WHITE //字體顏色

4
app/src/main/java/com/chwl/app/home/HomeMessageViewModel.kt
View File

@@ -13,8 +13,8 @@ class HomeMessageViewModel : BaseViewModel() {
safeLaunch(needLoading = false, onError = {
topPublicChatMessageLiveData.postValue(BeanResult.failed(it))
}) {
val value = PublicChatModel.getTopMessage()
topPublicChatMessageLiveData.postValue(BeanResult.success(value ?: emptyList()))
// val value = PublicChatModel.getTopMessage()
// topPublicChatMessageLiveData.postValue(BeanResult.success(value ?: emptyList()))
}
}

17
app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java
View File

@@ -10,6 +10,7 @@ import android.annotation.SuppressLint;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.media.Image;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -761,15 +762,15 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
AvatarHelper.loadAvatarFrame(ivAvatarHeadWear, avatarFrame, userHeadwear.getType());
}
}
if (vipInfo != null) {
if (vipInfo != null && !vipInfo.getUserCardBG().isEmpty()) {
// findViewById(R.id.transition_mask).setVisibility(View.GONE);
// ivAvatarBg.setImageResource(R.drawable.user_card_bg_vip_9);
int lv = vipInfo.getVipLevel();
String resourceName = "user_card_bg_vip_" + lv;
int resourceId = context.getResources().getIdentifier(resourceName, "drawable", context.getPackageName());
if (resourceId != 0) {
ivAvatarBg.setImageResource(resourceId);
}
ivAvatarBg.setScaleType(ImageView.ScaleType.MATRIX);
ImageLoadUtils.loadImage(
context,
vipInfo.getUserCardBG().replace("\n",""),
ivAvatarBg,
R.drawable.default_avatar
);
} else {
if (avatarBg == null || !avatarBg.equals(userInfo.getAvatar())) {
avatarBg = userInfo.getAvatar();

BIN
app/src/main/res/drawable-xhdpi/vip_center_back_button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xhdpi/vip_center_back_button.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

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

@@ -36,7 +36,7 @@
android:id="@+id/iv_avatar_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:scaleType="center"
android:src="@drawable/default_banner"
app:riv_corner_radius_top_left="@dimen/dp_10"
app:riv_corner_radius_top_right="@dimen/dp_10"

8
app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/HeadlineViewModel.kt
View File

@@ -16,8 +16,8 @@ class HeadlineViewModel : BaseViewModel() {
safeLaunch(needLoading = true, onError = {
sendHeadlineFlow.emit(BeanResult.failed(it))
}) {
PublicChatModel.sendHeadline(message)
sendHeadlineFlow.emit(BeanResult.success(true))
// PublicChatModel.sendHeadline(message)
// sendHeadlineFlow.emit(BeanResult.success(true))
}
}
@@ -30,8 +30,8 @@ class HeadlineViewModel : BaseViewModel() {
fun getHeadlinePayMoney() {
safeLaunch(needLoading = false, onError = {
}) {
val value = PublicChatModel.getHeadlinePayMoney()
headlinePayMoneyLiveData.postValue(value)
// val value = PublicChatModel.getHeadlinePayMoney()
// headlinePayMoneyLiveData.postValue(value)
}
}
}

4
app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomViewModel.kt
View File

@@ -35,8 +35,8 @@ class PublicChatRoomViewModel : BaseViewModel() {
fun getCurrentHeadline() {
safeLaunch(needLoading = false, onError = {
}) {
val value = PublicChatModel.getCurrentHeadline()
updateHeadline(value)
// val value = PublicChatModel.getCurrentHeadline()
// updateHeadline(value)
}
}

102
core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/model/PublicChatModel.kt
View File

@@ -12,55 +12,55 @@ import retrofit2.http.GET
import retrofit2.http.POST
object PublicChatModel : BaseModel() {
private val api = RxNet.create(PublicChatModel.Api::class.java)
suspend fun getTopMessage(): List<PublicChatMessageBean>? =
launchRequest {
api.getTopMessage()
}
suspend fun getCurrentHeadline(): HeadlineBean? =
launchRequest {
api.getCurrentHeadline()
}
suspend fun sendHeadline(message: String): Any? =
launchRequest {
api.sendHeadline(message)
}
suspend fun getHeadlinePayMoney(): Long? =
launchRequest {
api.getHeadlinePayMoney()
}
interface Api {
/**
* 获取前几条数据
*/
@GET("publicChatTopRecord/getChatForTop50")
suspend fun getTopMessage(): ServiceResult<List<PublicChatMessageBean>>
/**
* 获取头条
*/
@GET("publicChatTopRecord/getTop")
suspend fun getCurrentHeadline(): ServiceResult<HeadlineBean>
/**
* 发送头条
*
* @return
*/
@FormUrlEncoded
@POST("publicChatTopRecord/send")
suspend fun sendHeadline(@Field("content") content: String): ServiceResult<Any>
/**
* 获取头条支付金额
*/
@GET("publicChatTopRecord/payMoney")
suspend fun getHeadlinePayMoney(): ServiceResult<Long>
}
// private val api = RxNet.create(PublicChatModel.Api::class.java)
//
// suspend fun getTopMessage(): List<PublicChatMessageBean>? =
// launchRequest {
//// api.getTopMessage()
// }
//
// suspend fun getCurrentHeadline(): HeadlineBean? =
// launchRequest {
// api.getCurrentHeadline()
// }
//
// suspend fun sendHeadline(message: String): Any? =
// launchRequest {
// api.sendHeadline(message)
// }
//
// suspend fun getHeadlinePayMoney(): Long? =
// launchRequest {
// api.getHeadlinePayMoney()
// }
//
// interface Api {
//
// /**
// * 获取前几条数据
// */
// @GET("publicChatTopRecord/getChatForTop50")
// suspend fun getTopMessage(): ServiceResult<List<PublicChatMessageBean>>
//
// /**
// * 获取头条
// */
// @GET("publicChatTopRecord/getTop")
// suspend fun getCurrentHeadline(): ServiceResult<HeadlineBean>
//
// /**
// * 发送头条
// *
// * @return
// */
// @FormUrlEncoded
// @POST("publicChatTopRecord/send")
// suspend fun sendHeadline(@Field("content") content: String): ServiceResult<Any>
//
// /**
// * 获取头条支付金额
// */
// @GET("publicChatTopRecord/payMoney")
// suspend fun getHeadlinePayMoney(): ServiceResult<Long>
// }
}