YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'branch_new_dev' into branch_new

Browse Source
This commit is contained in:
骆召亮
2025-12-02 11:42:12 +08:00
parent 9135198b9d 456a063bbf
commit 56489b3af7
6 changed files with 98 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -1158,17 +1158,19 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private fun startGiftProgressTime() {
giftProgress = 0
if (giftCountTimer != null) {
giftCountTimer!!.cancel()
giftCountTimer?.cancel()
}
LogUtils.e("xj2", "onSubscribe")
giftCountTimer = object : CountDownTimer((1000 * 10).toLong(), 50) {
override fun onTick(millisUntilFinished: Long) {
LogUtils.e("startGiftProgressTime onTick:${(!isFinishing)}")
if (!isFinishing) {
circularProgress!!.progress = 1000 - (millisUntilFinished / 10).toInt()
}
}
override fun onFinish() {
LogUtils.e("startGiftProgressTime onFinish")
circularProgress!!.progress = 1000
hideGiftGiveProgress()
}
@@ -1177,6 +1179,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
private fun showGiftGiveProgress() {
LogUtils.e("showGiftGiveProgress")
ImageUtils.loadImageView(
giftGiveEvent!!.roonGiftModel.base_image,
mBinding!!.giftShowProgressImg
@@ -1187,6 +1190,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
private fun hideGiftGiveProgress() {
LogUtils.e("hideGiftGiveProgress")
mBinding!!.giftShowLayout.visibility = View.GONE
if (giftCountTimer != null) {
giftCountTimer!!.cancel()

9
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
View File

@@ -345,8 +345,8 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
mBinding.tvTabAll.setTextSize(12);
mBinding.tvTabUser.setTextSize(12);
} else if (view_id == R.id.tv_count) {
mBinding.recycleViewPublic.scrollToPosition(easeChatAdapter.getItemCount() - 1);
isBottom = true;
scrollToBottomIfNeed();
mBinding.tvCount.setVisibility(View.GONE);
}
@@ -688,7 +688,12 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
if (isBottom && easeChatAdapter != null) {
int itemCount = easeChatAdapter.getItemCount();
if (itemCount > 0) {
mBinding.recycleViewPublic.scrollToPosition(itemCount - 1);
mBinding.recycleViewPublic.postDelayed(new Runnable() {
@Override
public void run() {
mBinding.recycleViewPublic.scrollToPosition(itemCount - 1);
}
},100);
}
} else {
count++;