Merge branch 'v1.5.0/hour_ranking' into v1.5.0/test

This commit is contained in:
Max
2023-11-08 14:22:15 +08:00

View File

@@ -16,6 +16,7 @@ import com.nnbc123.app.ui.webview.DialogWebViewActivity
import com.nnbc123.core.UriProvider import com.nnbc123.core.UriProvider
import com.nnbc123.core.manager.AvRoomDataManager import com.nnbc123.core.manager.AvRoomDataManager
import com.nnbc123.core.room.bean.RoomHourRankInfo import com.nnbc123.core.room.bean.RoomHourRankInfo
import com.nnbc123.core.room.bean.RoomInfo
import com.nnbc123.core.statistic.StatisticManager import com.nnbc123.core.statistic.StatisticManager
import com.nnbc123.core.statistic.protocol.StatisticsProtocol import com.nnbc123.core.statistic.protocol.StatisticsProtocol
import com.nnbc123.library.utils.FormatUtils import com.nnbc123.library.utils.FormatUtils
@@ -55,10 +56,17 @@ class RoomHourRankWidget : FrameLayout, ILog {
inAnimation = binding.viewFlipper.inAnimation inAnimation = binding.viewFlipper.inAnimation
outAnimation = binding.viewFlipper.outAnimation outAnimation = binding.viewFlipper.outAnimation
singleClick { singleClick {
DialogWebViewActivity.start( if (AvRoomDataManager.get().mCurrentRoomInfo?.type == RoomInfo.ROOM_TYPE_SINGLE) {
context, DialogWebViewActivity.start(
UriProvider.getSingleRoomHourRankUrl(AvRoomDataManager.get().roomUid) context,
) UriProvider.getSingleRoomHourRankUrl(AvRoomDataManager.get().roomUid)
)
} else {
DialogWebViewActivity.start(
context,
UriProvider.getRoomHourRankUrl(AvRoomDataManager.get().roomUid)
)
}
StatisticManager.Instance() StatisticManager.Instance()
.onEvent(StatisticsProtocol.EVENT_ROOM_RANKLIST_CLICK, "房间小时榜点击") .onEvent(StatisticsProtocol.EVENT_ROOM_RANKLIST_CLICK, "房间小时榜点击")
} }