From d9cf55b053d4efdb8f17ebbfa96239a48cf58fa4 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Fri, 7 Nov 2025 09:04:08 +0800 Subject: [PATCH] =?UTF-8?q?loading=20=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/MessageListenerSingleton.java | 7 - .../com/xscm/moduleutil/utils/TimeUtils.java | 2 +- .../utils/config/EnvironmentEnum.java | 8 +- .../widget/RoomDefaultWheatView.java | 12 +- .../moduleutil/widget/WheatLayoutManager.java | 16 +-- .../res/layout/room_view_default_wheat.xml | 2 +- .../main/res/layout/room_view_sing_wheat.xml | 7 +- .../activity/main/activity/MainActivity.java | 46 +++---- .../room/activity/PopularRoomActivity.java | 8 +- .../activity/room/activity/RoomActivity.kt | 13 +- .../room/fragment/HotListFragment.java | 3 +- .../room/fragment/VoiceCategoryFragment.java | 23 ---- .../activity/room/fragment/VoiceFragment.java | 14 +- .../user/activity/DailyTasksActivity.java | 8 +- .../user/activity/MyRoomActivity.java | 8 +- .../xscm/modulemain/manager/RoomManager.java | 127 +----------------- .../modulemain/widget/WheatLayoutManager.kt | 3 +- .../main/res/layout/activity_daily_tasks.xml | 22 +-- .../src/main/res/layout/activity_main.xml | 20 ++- .../main/res/layout/activity_popular_room.xml | 23 ++-- .../src/main/res/layout/fragment_hot_list.xml | 7 +- .../main/res/layout/fragment_sing_song.xml | 4 +- .../src/main/res/layout/fragment_voice.xml | 14 +- .../res/layout/fragment_voice_category.xml | 12 -- .../main/res/layout/room_activity_my_room.xml | 24 ++-- 25 files changed, 167 insertions(+), 266 deletions(-) diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java b/moduleUtil/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java index b3534dac..5ca1cc8b 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java @@ -249,13 +249,6 @@ public class MessageListenerSingleton { } } - // 等待一段时间确保退出完成 - try { - Thread.sleep(200); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - // 加入新群组 LogUtils.d("MessageListener", "开始加入群组: " + roomId); CountDownLatch joinLatch = new CountDownLatch(1); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java index 109031c7..2db7097a 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java @@ -207,7 +207,7 @@ public class TimeUtils { //获取当前日期 public static String getCurrentDate2() { Date d = new Date(); - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss SSS"); return sf.format(d); } /** diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java index 16e3b023..eadfe932 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java @@ -3,7 +3,7 @@ package com.xscm.moduleutil.utils.config; public enum EnvironmentEnum { // "https://vespa.qxyushen.top/", PRODUCTION(//生产环境 - "https://vespa.qxyushen.top/", + "http://1.13.101.98/", "KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=", "https://oss-cn-beijing.aliyuncs.com/", "LTAI5tKgrfcFQxH46ZwWYgFW", @@ -14,10 +14,10 @@ public enum EnvironmentEnum { 1600096860, "3e8f3add448d4692bc1d04c75ffe801b", "tcp://81.70.45.221", - "https://vespa.qxyushen.top/h5", + "http://1.13.101.98/h5", 0), TEST(//测试环境 - "https://test.vespa.qxyushen.top/", + "https://test.vespa.xscmmidi.site/", "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=", "https://oss-cn-beijing.aliyuncs.com/", "LTAI5tKgrfcFQxH46ZwWYgFW", @@ -28,7 +28,7 @@ public enum EnvironmentEnum { 1600096890, "02f7339ec98947deaeab173599891932", "tcp://1.13.181.248", - "https://test.vespa.qxyushen.top/h5", + "https://test.vespa.xscmmidi.site/h5", 1); private final String serverUrl;//服务器地址 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java index 30886b4c..2807a5fa 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java @@ -80,7 +80,7 @@ public class RoomDefaultWheatView extends BaseWheatView { "-1".equals(pitNumber) ? "" : "9".equals(pitNumber) ? "主持位" : "10".equals(pitNumber) ? "嘉宾位" : - pitNumber + "号麦位" + pitNumber + "号位" ); //麦位上锁 if (showBoss && WHEAT_BOSS.equals(pitNumber)) { @@ -120,20 +120,11 @@ public class RoomDefaultWheatView extends BaseWheatView { } else { tv_time_pk.setVisibility(GONE); } -// ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mCharmView.getLayoutParams(); -// params.width = 35; -// mCharmView.setLayoutParams(params); - } else { tv_time_pk.setVisibility(GONE); mCharmView.setVisibility(VISIBLE); -// ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mCharmView.getLayoutParams(); -// params.width = 52; -// mCharmView.setLayoutParams(params); } -// setCardiac(pitBean.getPit_number(), 0.0f); - updatePkState(bean); } private void updatePkState(RoomPitBean bean) { @@ -163,7 +154,6 @@ public class RoomDefaultWheatView extends BaseWheatView { long xd = Long.parseLong(value); if (xd > 9999 || xd < -9999) { tv_time_pk.setText(String.format("%.2fw", xd / 10000.0f)); -// mBinding.tvValue.setText(String.valueOf(xd)); } else { tv_time_pk.setText(value); } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java index 86c8a582..7437901d 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java @@ -143,8 +143,8 @@ public class WheatLayoutManager { int firstPitNumber = layoutType == 1 ? 10 : 9; int secondPitNumber = layoutType == 1 ? 9 : 10; - addWheatViewItem(row, firstPitNumber, itemWidth * 2, layoutType); - addWheatViewItem(row, secondPitNumber, itemWidth * 2, layoutType); + addWheatViewItem(row, firstPitNumber, (int)(itemWidth * 1.7), layoutType); + addWheatViewItem(row, secondPitNumber,(int)(itemWidth * 1.7), layoutType); container.addView(row); row = new LinearLayout(context); @@ -179,20 +179,20 @@ public class WheatLayoutManager { if (pitNumber == 9 || pitNumber == 10) { int fixedHeightInPx = context.getResources().getDimensionPixelSize(R.dimen.dp_90); if (pitNumber == 9) { - params = new LinearLayout.LayoutParams(itemWidth - 40, fixedHeightInPx); + params = new LinearLayout.LayoutParams(itemWidth , fixedHeightInPx); if (layoutType == 1) { params.rightMargin = context.getResources().getDimensionPixelSize(R.dimen.dp_1); - params.setMargins(20, -30, -20, 0); + params.setMargins(20, -20, -20, 0); } else { params.leftMargin = context.getResources().getDimensionPixelSize(R.dimen.dp_1); params.setMargins(-30, -20, 0, 0); } } else { - params = new LinearLayout.LayoutParams(itemWidth - 80, fixedHeightInPx); + params = new LinearLayout.LayoutParams(itemWidth , fixedHeightInPx); if (layoutType == 1) { - params.setMargins(-30, 10, 0, 0); + params.setMargins(-10, 10, 0, 0); } else { - params.setMargins(0, 10, -30, 0); + params.setMargins(0, 10, -10, 0); } } } else { @@ -288,7 +288,7 @@ public class WheatLayoutManager { }else if (layoutType==1){ wheatView.setTv_time_pk(true); } - wheatView.setSex(bean.getCharm(),true); + wheatView.setSex(bean.getCharm(),false); } } diff --git a/moduleUtil/src/main/res/layout/room_view_default_wheat.xml b/moduleUtil/src/main/res/layout/room_view_default_wheat.xml index 07be6e29..e495a581 100644 --- a/moduleUtil/src/main/res/layout/room_view_default_wheat.xml +++ b/moduleUtil/src/main/res/layout/room_view_default_wheat.xml @@ -17,6 +17,7 @@ android:id="@+id/riv" android:layout_width="0dp" android:layout_height="0dp" + app:layout_constraintDimensionRatio="1:1" android:layout_marginStart="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_12" @@ -24,7 +25,6 @@ android:scaleType="fitCenter" android:src="@mipmap/room_ic_wheat_default" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml index 7e032923..8832cbbf 100644 --- a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml +++ b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml @@ -9,9 +9,11 @@ + android:layout_height="wrap_content" + android:clipChildren="false" + android:clipToPadding="false"> - implements HomeContacts.View, View.OnClickListener, LocationProvider.LocationCallback { @@ -234,10 +240,6 @@ public class MainActivity extends BaseMvpActivity= Build.VERSION_CODES.Q) { // Android 10 (API 29) 及以上，可以同时请求前台和后台定位权限（注意：在Android 11及以后，策略有变） - permissionsToRequest = new String[] { + permissionsToRequest = new String[]{ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION // 在Android 11上，不建议在此同时申请后台权限 }; } else { // Android 9及以下 - permissionsToRequest = new String[] { + permissionsToRequest = new String[]{ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION }; @@ -803,12 +794,12 @@ public class MainActivity extends BaseMvpActivity { + mBinding.coolWaitView.setVisibility(View.GONE); + }); } } + @SuppressLint("CheckResult") @Override protected void onPause() { super.onPause(); - mBinding.coolWaitView.setVisibility(View.GONE); + Observable.timer(5, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe(aLong -> { + mBinding.coolWaitView.setVisibility(View.GONE); + }); + } private SystemLocationProvider locationProvider; diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java index 53d1b7dd..861f1628 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java @@ -23,6 +23,10 @@ import com.xscm.moduleutil.utils.ClickUtils; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; + +import io.reactivex.Observable; +import io.reactivex.android.schedulers.AndroidSchedulers; /** * @Description: 热门房间 @@ -96,7 +100,9 @@ public class PopularRoomActivity extends BaseMvpActivity { + mBinding.coolWaitView.setVisibility(View.GONE); + }); } @Override diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 1f21f621..63df0800 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -244,6 +244,7 @@ class RoomActivity : BaseMvpActivity(), override fun doDone() { + Log.e("AAAAAAAAAAA", "C " + com.xscm.moduleutil.utils.TimeUtils.getCurrentDate2()) isOnline = intent.getBooleanExtra("isOnline", false) password = intent.getStringExtra("password") roomId = intent.getStringExtra("roomId") @@ -276,9 +277,10 @@ class RoomActivity : BaseMvpActivity(), override fun onCreate(savedInstanceState: Bundle?) { // 在super.onCreate之前设置主题以避免闪白屏 - setTheme(com.xscm.moduleutil.R.style.BaseAppTheme) // 设置你的主主题 +// setTheme(com.xscm.moduleutil.R.style.BaseAppTheme) // 设置你的主主题 super.onCreate(savedInstanceState) // // 进入房间10s后检查是否显示提示上麦对话框 + LogUtils.e("RoomActivity", "onCreate") isSave = false sDestroied = false @@ -304,7 +306,6 @@ class RoomActivity : BaseMvpActivity(), appStateListener?.onRoomActivityCreated(this) } - MessageListenerSingleton.getInstance().joinGroup(roomId) // 处理房间数据 SpUtil.saveMyRoomId(roomId) // 检查是否从最小化状态恢复 @@ -322,7 +323,6 @@ class RoomActivity : BaseMvpActivity(), // 初始化礼物管理器 GiftDisplayManager.getInstance().setupDisplayView(mBinding!!.giftContainer) - initPublicScreenFragment() } @@ -878,7 +878,7 @@ class RoomActivity : BaseMvpActivity(), this.mRoomOwnerBean = resp.room_owner this.mPitList = mRoomBean?.pit_list ?: ArrayList() this.roomId = roomBean.room_id - MessageListenerSingleton.getInstance().joinGroup(roomId) //加入房间im + ImageUtils.loadHeadCC(resp.room_info.room_cover, mBinding!!.roomTop.avatar) mBinding!!.roomTop.name.text = roomBean.room_name mBinding!!.roomTop.idVal.text = "ID:" + roomBean.room_number @@ -2922,8 +2922,10 @@ class RoomActivity : BaseMvpActivity(), } } - // TODO: 2025/8/26 加入房间 + // TODO:不进入 2025/8/26 加入房间 override fun roomInfo(resp: RoomInfoResp) { + if (true) + return AppStateManager.getInstance().roomInfo = resp val roomBean = resp.room_info this.mRoomBean = roomBean @@ -3879,6 +3881,7 @@ class RoomActivity : BaseMvpActivity(), override fun finish() { LogUtils.e("RoomActivity", "finish") + CommonAppContext.getInstance().playId = null // 只有在真正退出房间时才清理最小化状态 if (!isMinimized) { clearMinimizeState() diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java index 7f56b6d7..59d322a8 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java @@ -1,6 +1,7 @@ package com.xscm.modulemain.activity.room.fragment; import android.os.Bundle; +import android.util.Log; import android.view.View; import androidx.annotation.NonNull; @@ -23,6 +24,7 @@ import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.listener.MessageListenerSingleton; import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ClickUtils; +import com.xscm.moduleutil.utils.TimeUtils; import java.util.ArrayList; import java.util.List; @@ -123,7 +125,6 @@ public class HotListFragment extends BaseMvpFragment list; - - // public MyFragmentPagerAdapter(FragmentManager fm, List list) { -// super(fm); -// this.list = list; -// } public MyFragmentPagerAdapter(@NonNull FragmentActivity fragmentActivity, List list) { super(fragmentActivity); this.list = list; @@ -402,23 +397,5 @@ public class VoiceCategoryFragment extends BaseMvpFragment implements VoiceContacts.View { @@ -53,8 +58,15 @@ public class VoiceFragment extends BaseMvpFragment { + mBinding.coolWaitView.setVisibility(View.GONE); + }); + } } @Override diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java index 040fd2c9..de15c239 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java @@ -28,6 +28,10 @@ import com.xscm.moduleutil.utils.ColorManager; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; + +import io.reactivex.Observable; +import io.reactivex.android.schedulers.AndroidSchedulers; /** * @author qx @@ -165,7 +169,9 @@ public class DailyTasksActivity extends BaseMvpActivity { + mBinding.coolWaitView.setVisibility(View.GONE); + }); } @Override diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java index 3213288d..9afec410 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java @@ -46,6 +46,10 @@ import com.xscm.moduleutil.widget.CustomTopBar; import org.greenrobot.eventbus.EventBus; import java.util.List; +import java.util.concurrent.TimeUnit; + +import io.reactivex.Observable; +import io.reactivex.android.schedulers.AndroidSchedulers; /** * @author @@ -224,7 +228,9 @@ public class MyRoomActivity extends BaseMvpActivity { + mBinding.coolWaitView.setVisibility(View.GONE); + }); } } diff --git a/modulemain/src/main/java/com/xscm/modulemain/manager/RoomManager.java b/modulemain/src/main/java/com/xscm/modulemain/manager/RoomManager.java index 3bf57fa7..580f4e1c 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/manager/RoomManager.java +++ b/modulemain/src/main/java/com/xscm/modulemain/manager/RoomManager.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; +import android.util.Log; import com.alibaba.android.arouter.launcher.ARouter; import com.blankj.utilcode.util.ActivityUtils; @@ -22,6 +23,7 @@ import com.xscm.moduleutil.listener.MessageListenerSingleton; import com.xscm.moduleutil.rtc.AgoraManager; import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.SpUtil; +import com.xscm.moduleutil.utils.TimeUtils; import com.xscm.moduleutil.utils.logger.Logger; import org.greenrobot.eventbus.EventBus; @@ -58,53 +60,6 @@ public class RoomManager { return instance; } - /** - * 进入房间 - 自动获取房间数据 - * - * @param context 上下文 - * @param roomId 房间ID - */ - public void enterRoom(Context context, String roomId) { - enterRoom(context, roomId, null, null); - } - - /** - * 进入房间 - 使用密码 - * - * @param context 上下文 - * @param roomId 房间ID - * @param password 房间密码 - */ - public void enterRoom(Context context, String roomId, String password) { - enterRoom(context, roomId, password, null); - } - - /** - * 进入房间 - 使用缓存数据 - * - * @param context 上下文 - * @param roomId 房间ID - * @param password 房间密码 - * @param cachedData 缓存的房间数据 - */ - public void enterRoom(Context context, String roomId, String password, RoomInfoResp cachedData) { - if (TextUtils.isEmpty(roomId)) { - ToastUtils.showShort("房间ID不能为空"); - return; - } - - // 检查是否有有效的缓存数据 - RoomInfoResp roomInfo = cachedData != null ? cachedData : getCachedRoomData(roomId); - - if (roomInfo != null) { - // 使用缓存数据直接进入房间 - navigateToRoom(context, roomId, password, roomInfo, false, null); - } else { - // 获取房间数据后进入房间 - fetchRoomDataAndEnter(context, roomId, password, null); - } - } - /** * 获取房间数据并进入房间 * @@ -121,8 +76,8 @@ public class RoomManager { CommonAppContext.getInstance().isRoomJoininj = true; // 检查是否有有效的缓存数据 RoomInfoResp roomInfo = getCachedRoomData(roomId); - // 检查是否是当前房间且用户在线 -// boolean isCurrentRoom = isCurrentRoom(roomId); + //加入房间 + MessageListenerSingleton.getInstance().joinGroup(roomId); if (CommonAppContext.getInstance().playId == null) { fetchAndJoinRoom(context, roomId, password, taskId); } else { @@ -155,7 +110,6 @@ public class RoomManager { navigateToRoom(context, roomId, password, roomInfoResp, false, taskId); } }); -// navigateToRoom(context, roomId, password, null, true, taskId); } else { fetchAndJoinRoom(context, roomId, password, taskId); } @@ -207,28 +161,6 @@ public class RoomManager { }); } - /** - * 检查是否是当前房间 - * - * @param roomId 房间ID - * @return true表示是当前房间，false表示不是 - */ - private boolean isCurrentRoom(String roomId) { - // 这里应该实现检查是否是当前房间的逻辑 - // 可以通过检查当前Activity或者通过全局变量等方式实现 - // 目前返回false，需要根据实际需求实现具体逻辑 - - RoomInfoResp roomInfo = getCachedRoomData(roomId); - if (roomInfo != null) { - if (roomInfo.getRoom_info().getRoom_id().equals(roomId)) { - return true; - } else { - return false; - } - } - - return false; - } /** * 跳转到房间页面 @@ -239,7 +171,6 @@ public class RoomManager { * @param roomInfo 房间信息 */ private void navigateToRoom(Context context, String roomId, String password, RoomInfoResp roomInfo, boolean isOnline, String taskId) { - try { // 构建跳转参数 Intent intent = new Intent(ActivityUtils.getTopActivity(), RoomActivity.class); @@ -376,14 +307,6 @@ public class RoomManager { } } - /** - * 清除所有房间缓存数据 - */ - public void clearAllRoomCache() { - roomDataCache.clear(); - cacheTimestamps.clear(); - } - /** * 退出房间 * @@ -410,46 +333,4 @@ public class RoomManager { Logger.d(TAG, "退出房间: " + roomId); } - - /** - * 批量退出房间 - * - * @param roomIds 房间ID列表 - */ - public void exitRooms(String... roomIds) { - if (roomIds != null) { - for (String roomId : roomIds) { - exitRoom(roomId); - } - } - } - - /** - * 获取房间缓存状态 - * - * @param roomId 房间ID - * @return 缓存状态信息 - */ - public String getRoomCacheStatus(String roomId) { - if (TextUtils.isEmpty(roomId)) { - return "无效的房间ID"; - } - - Long timestamp = cacheTimestamps.get(roomId); - if (timestamp == null) { - return "未缓存"; - } - - long elapsed = System.currentTimeMillis() - timestamp; - if (elapsed > CACHE_DURATION) { - return "缓存已过期"; - } - - RoomInfoResp data = roomDataCache.get(roomId); - if (data == null) { - return "缓存数据为空"; - } - - return String.format("已缓存 (%d秒前)", elapsed / 1000); - } } diff --git a/modulemain/src/main/java/com/xscm/modulemain/widget/WheatLayoutManager.kt b/modulemain/src/main/java/com/xscm/modulemain/widget/WheatLayoutManager.kt index cb8f848e..6ed1f887 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/widget/WheatLayoutManager.kt +++ b/modulemain/src/main/java/com/xscm/modulemain/widget/WheatLayoutManager.kt @@ -17,6 +17,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity import com.xscm.moduleutil.R import com.xscm.moduleutil.bean.RoomMessageEvent import com.xscm.moduleutil.bean.room.RoomPitBean +import com.xscm.moduleutil.widget.CircularImage import com.xscm.moduleutil.widget.GifAvatarOvalView import com.xscm.moduleutil.widget.RoomMakeWheatView import com.xscm.moduleutil.widget.RoomSingSongWheatView @@ -110,7 +111,7 @@ class WheatLayoutSingManager private constructor( */ private fun setupViewListeners(wheatView: RoomSingSongWheatView, pitNumber: Int) { // 头像点击事件 - val avatarView = wheatView.mRiv as GifAvatarOvalView + val avatarView = wheatView.mRiv as CircularImage avatarView.setOnClickListener { // 直接使用当前的 wheatClickListener（可能已被外部设置） wheatClickListener?.onWheatClick(wheatView, pitNumber) diff --git a/modulemain/src/main/res/layout/activity_daily_tasks.xml b/modulemain/src/main/res/layout/activity_daily_tasks.xml index 9d5e9e10..b8fae3d2 100644 --- a/modulemain/src/main/res/layout/activity_daily_tasks.xml +++ b/modulemain/src/main/res/layout/activity_daily_tasks.xml @@ -95,18 +95,24 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + + app:loading_renderer="CoolWaitLoadingRenderer" /> + diff --git a/modulemain/src/main/res/layout/activity_main.xml b/modulemain/src/main/res/layout/activity_main.xml index ec841690..0b4e3c53 100644 --- a/modulemain/src/main/res/layout/activity_main.xml +++ b/modulemain/src/main/res/layout/activity_main.xml @@ -250,14 +250,22 @@ app:pointsPosition="CENTER" app:pointsVisibility="true" /> - + android:clickable="true" + android:focusable="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/activity_popular_room.xml b/modulemain/src/main/res/layout/activity_popular_room.xml index c6149403..71c8a97d 100644 --- a/modulemain/src/main/res/layout/activity_popular_room.xml +++ b/modulemain/src/main/res/layout/activity_popular_room.xml @@ -43,17 +43,24 @@ tools:listitem="@layout/item_popular_room"/> - + + app:loading_renderer="CoolWaitLoadingRenderer" /> + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/fragment_hot_list.xml b/modulemain/src/main/res/layout/fragment_hot_list.xml index dcc74865..0cdfb11f 100644 --- a/modulemain/src/main/res/layout/fragment_hot_list.xml +++ b/modulemain/src/main/res/layout/fragment_hot_list.xml @@ -5,13 +5,13 @@ + android:paddingBottom="@dimen/dp_40" /> diff --git a/modulemain/src/main/res/layout/fragment_sing_song.xml b/modulemain/src/main/res/layout/fragment_sing_song.xml index f3cd4757..5b0ba2c7 100644 --- a/modulemain/src/main/res/layout/fragment_sing_song.xml +++ b/modulemain/src/main/res/layout/fragment_sing_song.xml @@ -57,7 +57,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_320" android:layout_marginTop="@dimen/dp_8" - android:layout_marginEnd="@dimen/dp_6" + android:layout_marginEnd="@dimen/dp_3" android:orientation="horizontal" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/bt_sta"> @@ -67,7 +67,6 @@ android:id="@+id/cl_left" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginEnd="@dimen/dp_4" android:layout_weight="1" android:background="@mipmap/pk_left" app:layout_constraintStart_toStartOf="parent" @@ -107,6 +106,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" + android:layout_marginStart="@dimen/dp_3" android:background="@mipmap/pk_right" app:layout_constraintStart_toEndOf="@+id/cl_left" app:layout_constraintTop_toTopOf="parent"> diff --git a/modulemain/src/main/res/layout/fragment_voice.xml b/modulemain/src/main/res/layout/fragment_voice.xml index 06c9e780..b2e56540 100644 --- a/modulemain/src/main/res/layout/fragment_voice.xml +++ b/modulemain/src/main/res/layout/fragment_voice.xml @@ -113,13 +113,19 @@ - + + app:loading_renderer="CoolWaitLoadingRenderer" /> + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/fragment_voice_category.xml b/modulemain/src/main/res/layout/fragment_voice_category.xml index 525aff40..8e7ffb69 100644 --- a/modulemain/src/main/res/layout/fragment_voice_category.xml +++ b/modulemain/src/main/res/layout/fragment_voice_category.xml @@ -276,18 +276,6 @@ app:tabIndicatorColor="@android:color/transparent" app:tabTextAppearance="@style/CustomTabTextAppearance" app:tabTextColor="#F1ECFF" /> - - - - - - - - - - - - diff --git a/modulemain/src/main/res/layout/room_activity_my_room.xml b/modulemain/src/main/res/layout/room_activity_my_room.xml index 8241d7ef..5b721da3 100644 --- a/modulemain/src/main/res/layout/room_activity_my_room.xml +++ b/modulemain/src/main/res/layout/room_activity_my_room.xml @@ -237,17 +237,25 @@ android:src="@mipmap/icon_guanbi" /> - + + app:loading_renderer="CoolWaitLoadingRenderer" /> + + \ No newline at end of file