Merge branch 'peko_feature/notify' into peko_test/2.5.0

app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt

@@ -44,6 +44,8 @@ import com.yizhuan.erban.ui.utils.load
 import com.yizhuan.erban.ui.utils.loadAnim
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity
 import com.yizhuan.erban.ui.widget.SimpleAnimListener
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftGoRoomTipsDialog
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftGoRoomTipsDialog.Companion.isNeedTips
 import com.yizhuan.erban.ui.widget.drawgift.DrawGiftPlayHelper
 import com.yizhuan.erban.utils.MsgBuilder
 import com.yizhuan.erban.utils.RegexUtil
@@ -632,8 +634,11 @@ class RoomEffectView @JvmOverloads constructor(
             )
         }
         messageTextView.text = text.build()
-        roomView.setOnClickListener {
-            AVRoomActivity.start(mContext, noticeInfo.roomUid)
+        bagImageView.setOnClickListener {
+            goRoom(noticeInfo.roomTitle, noticeInfo.roomUid)
+        }
+        giftImageView.setOnClickListener {
+            goRoom(noticeInfo.roomTitle, noticeInfo.roomUid)
         }
         animationPlay = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify)
         binding.flLuckyBagNotify.addView(roomView)
@@ -643,12 +648,12 @@ class RoomEffectView @JvmOverloads constructor(
                 animationPlay = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify_close)
                 roomView.startAnimation(animationPlay)
             },
-            SHOW_TIME.toLong()
+            6500
         )
         binding.flLuckyBagNotify.postDelayed({
             playNotifyStateLiveData?.value = false
             binding.flLuckyBagNotify.removeView(roomView)
-        }, CLOSE_TIME.toLong())
+        }, 7000)
     }
 
     private fun showLuckySeaNotify(roomPlayBean: RoomPlayBean) {
@@ -1885,4 +1890,17 @@ class RoomEffectView @JvmOverloads constructor(
         playNotifyStateLiveData?.value = false
     }
 
+    private fun goRoom(roomTitle: String, roomUid: Long) {
+        if (roomUid <= 0L) {
+            return
+        }
+        if (roomUid == AvRoomDataManager.get().roomUid) {
+            return
+        }
+        if (isNeedTips()) {
+            AllServiceGiftGoRoomTipsDialog(context, roomTitle, roomUid).show()
+        } else {
+            AVRoomActivity.start(context, roomUid)
+        }
+    }
 }

app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java

@@ -282,10 +282,11 @@ public class AllPlayEffectDialog extends BaseDialog {
     private void showLuckyBagNotify(LuckyBagNoticeInfo noticeInfo) {
         View roomView = LayoutInflater.from(getContext())
                 .inflate(R.layout.layout_room_lucky_bag_notify, null);
-        roomView.setOnClickListener(view -> goRoom(noticeInfo.getRoomTitle(),noticeInfo.getRoomUid()));
         ImageView bagImageView = roomView.findViewById(R.id.iv_bag);
+        bagImageView.setOnClickListener(view -> goRoom(noticeInfo.getRoomTitle(),noticeInfo.getRoomUid()));
         ImageLoadUtilsV2.loadImage(bagImageView, noticeInfo.getLuckyBagGiftPic());
         ImageView giftImageView = roomView.findViewById(R.id.iv_gift);
+        giftImageView.setOnClickListener(view -> goRoom(noticeInfo.getRoomTitle(),noticeInfo.getRoomUid()));
         ImageLoadUtilsV2.loadImage(giftImageView, noticeInfo.getGiftPic());
         TextView messageTextView = roomView.findViewById(R.id.tv_message);
         SpannableBuilder text = new SpannableBuilder()

app/src/main/res/values/strings.xml

@@ -1809,7 +1809,7 @@
     <string name="avroom_widget_roomeffectview_025">恭喜</string>
     <string name="avroom_widget_roomeffectview_026">恭喜&lt;font color=&quot;#FFEE8F&quot;&gt;%s&lt;/font&gt;在幸運塔羅中運氣爆發，獲得&lt;font color=&quot;#FFEE8F&quot;&gt;%d&lt;/font&gt;钻石！</string>
     <string name="avroom_widget_roomeffectview_027">運氣爆表！在</string>
-    <string name="avroom_widget_roomeffectview_028">中開出了\n價值</string>
+    <string name="avroom_widget_roomeffectview_028">中開出了價值</string>
     <string name="avroom_widget_roomeffectview_029">的</string>
     <string name="avroom_widget_roomranknavigatoradapter_01">貢獻榜</string>
     <string name="avroom_widget_roomranknavigatoradapter_02">魅力榜</string>