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

切歌接口添加新参数isAutoNext 0：被动，1：自动。

Browse Source
This commit is contained in:
骆召亮
2025-12-16 15:06:26 +08:00
parent 19bc9dbad8
commit ea2b45c1be
7 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
View File

@@ -693,7 +693,7 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.CHANGE_SONG)
Call<BaseModel<String>> changeSong(@Field("room_id") String roomId, @Field("now_did") String now_did);
Call<BaseModel<String>> changeSong(@Field("room_id") String roomId, @Field("now_did") String now_did,@Field("is_auto_next") String is_auto_next);
@FormUrlEncoded
@POST(Constants.POST_HOST_LIST)

4
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -3689,8 +3689,8 @@ public class RetrofitClient {
});
}
public void changeSong(String room_id, String now_did, BaseObserver<String> observer) {
sApiServer.changeSong(room_id, now_did).enqueue(new Callback<BaseModel<String>>() {
public void changeSong(String room_id, String now_did,String isAutoNext, BaseObserver<String> observer) {
sApiServer.changeSong(room_id, now_did,isAutoNext).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
onNextRetu(response, observer);

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
View File

@@ -76,7 +76,7 @@ public class RoomContacts {
void getCharmRank(String roomId);
void changeSong(String roomId, String now_did);
void changeSong(String roomId, String now_did,String isAutoNext);
void hostUserPit(String roomId, String pitNumber, String userId, String type);

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
View File

@@ -550,7 +550,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
return;
}
AgoraManager.getInstance().stopMuisc();
MvpPre.changeSong(roomInfoResp.getRoom_info().getRoom_id(), did);
MvpPre.changeSong(roomInfoResp.getRoom_info().getRoom_id(), did,"0");
} else if (id == R.id.ll_ds) {
if (mBinding.muYc.pitBean.getUser_id() != null && !mBinding.muYc.pitBean.getUser_id().equals("") && !mBinding.muYc.pitBean.getUser_id().equals("0")) {
UserInfo userInfo = new UserInfo();
@@ -651,7 +651,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
double duration = Math.ceil(position / 1000);
if (duration >= Double.parseDouble(musicSongBean.getDuration())) {
AgoraManager.getInstance().stopMuisc();
MvpPre.changeSong(roomInfoResp.getRoom_info().getRoom_id(), did);
MvpPre.changeSong(roomInfoResp.getRoom_info().getRoom_id(), did,"1");
}
}
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
View File

@@ -269,8 +269,8 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
}
@Override
public void changeSong(String roomId, String now_did) {
api.changeSong(roomId, now_did, new BaseObserver<String>() {
public void changeSong(String roomId, String now_did,String isAutoNext) {
api.changeSong(roomId, now_did,isAutoNext, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);

48
MainModule/src/main/res/layout/activity_daily_tasks.xml
View File

@@ -75,30 +75,36 @@
android:visibility="gone" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_title"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_34"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_16"
app:tabIndicatorColor="@color/transparent"
app:tabIndicatorFullWidth="false"
app:tabIndicatorGravity="bottom"
app:tabIndicatorHeight="@dimen/dp_2"
app:tabMinWidth="@dimen/dp_30"
app:tabMode="scrollable"
android:textSize="@dimen/sp_16"
app:tabSelectedTextColor="@color/black"
app:tabTextColor="@color/colorBlack45" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager2"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_12"
android:background="@drawable/bg_r16_fff"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_title"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_34"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_16"
android:textSize="@dimen/sp_16"
app:tabIndicatorColor="@color/transparent"
app:tabIndicatorFullWidth="false"
app:tabIndicatorGravity="bottom"
app:tabIndicatorHeight="0dp"
app:tabMinWidth="@dimen/dp_20"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/black"
app:tabTextColor="@color/colorBlack45" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager2"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
<ImageView

2
MainModule/src/main/res/layout/item_recycleview_task.xml
View File

@@ -3,6 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/recycle_view"
android:paddingHorizontal="@dimen/dp_12"
android:clipToPadding="false"
android:paddingBottom="@dimen/dp_40"
android:layout_width="match_parent"
android:layout_height="match_parent" />