diff --git a/app/build.gradle b/app/build.gradle
index 5e866c37c..738fb1dc9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -144,7 +144,7 @@ android {
ext.enableCrashlytics = false
ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
- buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\""
+ buildConfigField "String", "BASE_URL", "\"http://beta.api.pekolive.com/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt
index 710c406b8..dae76de63 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt
@@ -44,6 +44,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.*
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager
import com.yizhuan.xchat_android_core.manager.RoomEvent
+import com.yizhuan.xchat_android_core.monsterhunting.SimpleAnimationListener
import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil
import com.yizhuan.xchat_android_core.user.UserModel
@@ -334,7 +335,7 @@ class RoomEffectBoxView @JvmOverloads constructor(
ForegroundColorSpan(Color.WHITE)
)
.append(
- attachment.nick + " ",
+ attachment.nick.subAndReplaceDot(8),
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
.append(
@@ -344,7 +345,7 @@ class RoomEffectBoxView @JvmOverloads constructor(
)
.append(
attachment.prizeName,
- ForegroundColorSpan(resources.getColor(R.color.color_00EAFF))
+ ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
if (attachment.prizeNum > 1) {
text.append("x" + attachment.prizeNum, ForegroundColorSpan(Color.WHITE))
@@ -407,22 +408,31 @@ class RoomEffectBoxView @JvmOverloads constructor(
)
.append(
attachment.prizeName,
- ForegroundColorSpan(resources.getColor(R.color.color_00EAFF))
+ ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
if (attachment.prizeNum > 1) {
text.append("x" + attachment.prizeNum, ForegroundColorSpan(Color.WHITE))
}
val svgaImageView = SVGAImageView(mContext)
svgaImageView.loops = 1
- svgaImageView.clearsAfterStop = true
+ svgaImageView.clearsAfterDetached = true
val params = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
svgaImageView.layoutParams = params
svgaImageView.callback = object : SimpleSvgaCallback() {
override fun onFinished() {
- binding.flSvgaBoxNotify.post { binding.flSvgaBoxNotify.removeView(svgaImageView) }
+ animationBox = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify_close)
+ animationBox!!.setAnimationListener(object : SimpleAnimationListener() {
+ override fun onAnimationEnd(animation: Animation?) {
+ binding.flSvgaBoxNotify.removeView(svgaImageView)
+ }
+ })
+ binding.flSvgaBoxNotify.startAnimation(animationBox)
}
}
+ animationBox = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify)
binding.flSvgaBoxNotify.addView(svgaImageView)
+ binding.flSvgaBoxNotify.startAnimation(animationBox)
+
shareParser().decodeFromAssets("svga/box_notify.svga", object : SVGAParser.ParseCompletion {
override fun onComplete(videoItem: SVGAVideoEntity) {
val dynamicEntity = SVGADynamicEntity()
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
index 1fcfc065f..d220f0843 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
@@ -977,7 +977,7 @@ class RoomEffectView @JvmOverloads constructor(
ForegroundColorSpan(Color.WHITE)
)
.append(
- attachment.nick + " ",
+ attachment.nick.subAndReplaceDot(8),
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
.append(
@@ -987,7 +987,7 @@ class RoomEffectView @JvmOverloads constructor(
)
.append(
attachment.prizeName,
- ForegroundColorSpan(resources.getColor(R.color.color_00EAFF))
+ ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
if (attachment.prizeNum > 1) {
text.append("x" + attachment.prizeNum, ForegroundColorSpan(Color.WHITE))
@@ -1084,7 +1084,7 @@ class RoomEffectView @JvmOverloads constructor(
)
.append(
attachment.prizeName,
- ForegroundColorSpan(resources.getColor(R.color.color_00EAFF))
+ ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
if (attachment.prizeNum > 1) {
text.append("x" + attachment.prizeNum, ForegroundColorSpan(Color.WHITE))
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java
index a962a8377..6516c32b0 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java
@@ -131,7 +131,7 @@ public class AllPlayEffectDialog extends BaseDialog {
)
.append(
roomBoxPrizeInfo.getPrizeName(),
- new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.color_00EAFF))
+ new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.notice_nick))
);
if (roomBoxPrizeInfo.getPrizeNum() > 1) {
text.append("x" + roomBoxPrizeInfo.getPrizeNum(), new ForegroundColorSpan(Color.WHITE));
diff --git a/app/src/main/res/layout/layout_room_box_notify.xml b/app/src/main/res/layout/layout_room_box_notify.xml
index a5155a13e..610f537aa 100644
--- a/app/src/main/res/layout/layout_room_box_notify.xml
+++ b/app/src/main/res/layout/layout_room_box_notify.xml
@@ -8,11 +8,12 @@
android:ellipsize="end"
android:gravity="center"
android:includeFontPadding="false"
- android:maxLines="2"
android:lineSpacingExtra="0dp"
android:lineSpacingMultiplier="0.9"
- android:paddingStart="80dp"
- android:paddingEnd="80dp"
+ android:maxLines="2"
+ android:paddingStart="@dimen/dp_60"
+ android:paddingEnd="@dimen/dp_60"
+ android:textColor="@color/white"
android:textSize="12sp"
tools:layout_height="wrap_content"
tools:text="@string/layout_layout_room_box_notify_01" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 119050170..a59ef2c54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1791,10 +1791,10 @@
鉆的
厲害了!
獲取
- 獲得
+ 獲得\n
厲害了!
獲取
- 獲得
+ 獲得\n
厲害了!
獲得
厲害了!