From ea2b45c1be2c6332ed63e5e178f861cc04f89710 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Tue, 16 Dec 2025 15:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=AD=8C=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=8F=82=E6=95=B0isAutoNext=200=EF=BC=9A?=
 =?UTF-8?q?=E8=A2=AB=E5=8A=A8=EF=BC=8C1=EF=BC=9A=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xscm/moduleutil/http/ApiServer.java   |  2 +-
 .../xscm/moduleutil/http/RetrofitClient.java  |  4 +-
 .../activity/room/contacts/RoomContacts.java  |  2 +-
 .../room/fragment/RoomKtvFragment.java        |  4 +-
 .../room/presenter/RoomPresenter.java         |  4 +-
 .../main/res/layout/activity_daily_tasks.xml  | 48 +++++++++++--------
 .../main/res/layout/item_recycleview_task.xml |  2 +
 7 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
index e132d73f..a27d94fe 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
@@ -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)
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index 4813801a..aeb852fe 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -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);
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
index 95545789..a596237b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
@@ -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);
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
index e6070dc3..41659499 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
@@ -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");
                     }
                 }
             }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
index 967738bf..ea6e8d77 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
@@ -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);
diff --git a/MainModule/src/main/res/layout/activity_daily_tasks.xml b/MainModule/src/main/res/layout/activity_daily_tasks.xml
index da6f6d6b..f39c9887 100644
--- a/MainModule/src/main/res/layout/activity_daily_tasks.xml
+++ b/MainModule/src/main/res/layout/activity_daily_tasks.xml
@@ -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
diff --git a/MainModule/src/main/res/layout/item_recycleview_task.xml b/MainModule/src/main/res/layout/item_recycleview_task.xml
index b6e0b14c..d904a540 100644
--- a/MainModule/src/main/res/layout/item_recycleview_task.xml
+++ b/MainModule/src/main/res/layout/item_recycleview_task.xml
@@ -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" />