diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
index 245ea043..ebcea95d 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
@@ -41,6 +41,7 @@ import com.tencent.imsdk.v2.V2TIMValueCallback;
import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.modulemain.activity.main.activity.MainActivity;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.xscm.modulemain.activity.user.activity.HeartCpActivity;
import com.xscm.modulemain.manager.RoomManager;
import com.xscm.moduleutil.BaseEvent;
@@ -83,6 +84,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import io.reactivex.disposables.Disposable;
@@ -1079,6 +1081,12 @@ public abstract class BaseMvpActivity
(),
GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
}
+ fun refreshRoomInfo(roomId:String) {
+ MvpPre?.getRoomIn(roomId,"")
+ }
+
// 添加检查房间连接状态的方法
private fun resumeRoomState() {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
index f4f9677c..fc4d55ac 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
@@ -443,6 +443,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment recordingSegments = new java.util.ArrayList<>(); // 录音片段列表
private int isSinger;//传递过来的参数,
+
+ // 在类中添加变量
+ private boolean isLongPressTriggered = false;
+ private static final int LONG_PRESS_DELAY = 500; // 长按阈值500ms
/**
* 绑定Presenter
* @return 返回该Activity对应的Presenter实例
@@ -118,35 +124,109 @@ public class SingerVerificationActivity extends BaseMvpActivity v.getWidth() ||
+ event.getY() < 0 || event.getY() > v.getHeight()) {
+ handler.removeCallbacks(longPressRunnable);
+ if (isRecording) {
+ stopRecording();
+ mBinding.recordButton.setImageResource(R.mipmap.but_ly);
}
}
return true;
+
case MotionEvent.ACTION_UP:
+ case MotionEvent.ACTION_CANCEL:
+ // 移除长按检测
+ handler.removeCallbacks(longPressRunnable);
+
if (isRecording) {
stopRecording();
- // 手指离开后恢复默认图案
+ mBinding.recordButton.setImageResource(R.mipmap.but_ly);
+ } else if (isLongPressTriggered) {
+ // 长按已触发但录音未开始(可能录音启动失败)
mBinding.recordButton.setImageResource(R.mipmap.but_ly);
}
+ isLongPressTriggered = false;
return true;
+
default:
- return false;
+ return true;
}
}
});
@@ -326,6 +406,11 @@ public class SingerVerificationActivity extends BaseMvpActivity
when {
// 第一页数据为空
page == 1 && data.isEmpty() -> {
+ adapter.data.clear()
}
// 第一页有数据
page == 1 && data.isNotEmpty() -> {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt
index bedfbbc4..32a02f6b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
+import com.blankj.utilcode.util.LogUtils
import com.blankj.utilcode.util.ToastUtils
import com.tencent.imsdk.v2.V2TIMConversation
import com.tencent.qcloud.tuicore.TUIConstants
@@ -94,7 +95,11 @@ class JoinedFamilyFragment(var data: MyFamilyBean) : BaseFragment 0) {
queren1(
1,
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/TotalRevenueAdapter.kt b/MainModule/src/main/java/com/xscm/modulemain/adapter/TotalRevenueAdapter.kt
index dac81b42..ace6c197 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/TotalRevenueAdapter.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/TotalRevenueAdapter.kt
@@ -19,7 +19,7 @@ class TotalRevenueAdapter : BaseQuickAdapter(R.
helper.setText(R.id.tv_name, item?.nickname)
helper.setText(R.id.tv_gift_name, item?.gift_name)
helper.setText(R.id.tv_gift_price, item?.gift_price)
- helper.setText(R.id.tv_time, "时间"+TimeUtils.getDateToStringNoZ(item?.createtime?:0L))
+ helper.setText(R.id.tv_time, "时间"+TimeUtils.getDateToStringNoZ(item?.createtime!!*1000))
helper.setText(R.id.tv_jb, item?.earnings)
}
}
\ No newline at end of file
diff --git a/MainModule/src/main/java/com/xscm/modulemain/manager/RoomManager.java b/MainModule/src/main/java/com/xscm/modulemain/manager/RoomManager.java
index 7bc9282c..22f34139 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/manager/RoomManager.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/manager/RoomManager.java
@@ -78,6 +78,9 @@ public class RoomManager {
public void fetchRoomDataAndEnter(Context context, String roomId, String password, String taskId) {
this.taskId=taskId;
this.context=context;
+
+
+
// 显示加载提示
// 这里可以根据需要添加加载对话框
if (CommonAppContext.getInstance().isRoomJoininj) {
@@ -225,6 +228,7 @@ public class RoomManager {
LogUtils.dTag("RoomActivity", "navigateToRoom:房间信息获取存在问题");
return;
}
+ LogUtils.e(ActivityUtils.getTopActivity().getComponentName());
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
ActivityUtils.getTopActivity().startActivity(intent);
} catch (Exception e) {
diff --git a/MainModule/src/main/res/layout/dialog_custom_input.xml b/MainModule/src/main/res/layout/dialog_custom_input.xml
index f358cc6e..5656964c 100644
--- a/MainModule/src/main/res/layout/dialog_custom_input.xml
+++ b/MainModule/src/main/res/layout/dialog_custom_input.xml
@@ -65,7 +65,7 @@
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_12"
android:paddingEnd="@dimen/dp_12"
- android:text="点击选择"
+ android:hint="点击选择"
android:textColor="#9B9B9B"
android:textSize="@dimen/sp_14" />
diff --git a/MainModule/src/main/res/layout/fragment_vocal_range.xml b/MainModule/src/main/res/layout/fragment_vocal_range.xml
index 7c842bb5..fb161bde 100644
--- a/MainModule/src/main/res/layout/fragment_vocal_range.xml
+++ b/MainModule/src/main/res/layout/fragment_vocal_range.xml
@@ -949,33 +949,6 @@
android:textSize="@dimen/sp_12" />
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@id/bnv_second"
+ android:visibility="gone">
+ app:layout_constraintTop_toBottomOf="@id/bnv_first"
+ android:visibility="gone">
+ app:layout_constraintTop_toBottomOf="@id/bnv_third"
+ android:visibility="gone">
+ app:layout_constraintTop_toTopOf="@+id/room_item_head"
+ android:visibility="gone"/>