diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java
index 27d21369..55d0d283 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java
@@ -12,7 +12,7 @@ import lombok.Data;
 public class GiftBoxBean {
     private String user_gold;//累计获取的金币
     private List<GiftBean> gift_box_list;
-    private TaskDataBean tasks;
+    private List<TaskDataBean> tasks;
     @Data
     public static class GiftBean {
 //        private String giftName; //初级礼盒、高级礼盒
@@ -37,10 +37,13 @@ public class GiftBoxBean {
 
     @Data
     public static class TaskDataBean {
-        private List<DailyTasksBean> daily_tasks;
-        private List<DailyTasksBean> daily_tasks_special;
-        private List<DailyTasksBean> usual_tasks;
-        private List<DailyTasksBean> teacher_tasks;
+        private List<DailyTasksBean> task_list;
+//        private List<DailyTasksBean> daily_tasks_special;
+//        private List<DailyTasksBean> usual_tasks;
+//        private List<DailyTasksBean> teacher_tasks;
+
+        private int task_type_id;
+        private String task_type_name;
 
         @Data
         public static class DailyTasksBean {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
index 92415b4f..c8baf223 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
@@ -103,45 +103,38 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
         mBinding.tvTitle.setText("今日累计充值获得金币:" + (giftBoxBean.getUser_gold() != null ? giftBoxBean.getUser_gold() : "0"));
         mTaskBoxAdapter.setNewData(giftBoxBean.getGift_box_list());
 
-        mBinding.rvTaskToday.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+        mBinding.rvTaskToday.setLayoutManager(new GridLayoutManager(this, 1));
 
-        List<TaskItem> sections = new ArrayList<>();
-        // 每日任务
-        sections.add(new TaskItem("今日任务", giftBoxBean.getTasks().getDaily_tasks()));
-        // 特殊任务
-        sections.add(new TaskItem("特殊任务", giftBoxBean.getTasks().getDaily_tasks_special()));//
-        // 师徒任务
-        if (giftBoxBean.getTasks().getTeacher_tasks() != null && giftBoxBean.getTasks().getTeacher_tasks().size() > 0) {
-            sections.add(new TaskItem("师徒任务", giftBoxBean.getTasks().getTeacher_tasks()));
-        }
-
-        // 平台任务
-        sections.add(new TaskItem("平台任务", giftBoxBean.getTasks().getUsual_tasks()));
-        mTaskDataAdapter = new TaskSectionAdapter(sections);
+//        List<TaskItem> sections = new ArrayList<>();
+//        // 每日任务
+//        sections.add(new TaskItem("今日任务", giftBoxBean.getTasks().getDaily_tasks()));
+//        // 特殊任务
+//        sections.add(new TaskItem("特殊任务", giftBoxBean.getTasks().getDaily_tasks_special()));//
+//        // 师徒任务
+//        if (giftBoxBean.getTasks().getTeacher_tasks() != null && giftBoxBean.getTasks().getTeacher_tasks().size() > 0) {
+//            sections.add(new TaskItem("师徒任务", giftBoxBean.getTasks().getTeacher_tasks()));
+//        }
+//
+//        // 平台任务
+//        sections.add(new TaskItem("平台任务", giftBoxBean.getTasks().getUsual_tasks()));
+        mTaskDataAdapter = new TaskSectionAdapter(giftBoxBean.getTasks());
         mBinding.rvTaskToday.setAdapter(mTaskDataAdapter);
         mTaskDataAdapter.setOnItemClickListener(new TaskSectionAdapter.OnItemClickListener() {
             @Override
-            public void onItemClick(TaskItem taskItem, GiftBoxBean.TaskDataBean.DailyTasksBean item) {
-                if (taskItem.getTitle().equals("今日任务") || taskItem.getTitle().equals("平台任务") || taskItem.getTitle().equals("师徒任务")) {
-                    if (item.getTask_status() == 2) {
-                        MvpPre.dailyTasksReceive(item.getTask_id() + "");
-                    }
-                } else {
-                    if (item.getTask_status() == 2) {
-                        MvpPre.dailyTasksReceive(item.getTask_id() + "");
-                    } else if (item.getTask_status() == 1) {
-                        mBinding.coolWaitView.setVisibility(View.VISIBLE);
-//                        if (item.getTask_id() == 9) {
-                        RoomManager.getInstance().fetchRoomDataAndEnter(DailyTasksActivity.this, item.getFrom_id(), "", item.getTask_id() + "");
-                        finish();
-//                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getFrom_id()).withString("taskId", item.getTask_id() + "").navigation();
-//                        } else {
-//                            RoomManager.getInstance().fetchRoomDataAndEnter(DailyTasksActivity.this, item.getFrom_id(), "", item.getTask_id() + "");
-
-//                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getFrom_id()).withString("taskId", item.getTask_id() + "").navigation();
-//                        }
-                    }
-                }
+            public void onItemClick(GiftBoxBean.TaskDataBean taskItem, GiftBoxBean.TaskDataBean.DailyTasksBean item) {
+//                if (taskItem.getTitle().equals("今日任务") || taskItem.getTitle().equals("平台任务") || taskItem.getTitle().equals("师徒任务")) {
+//                    if (item.getTask_status() == 2) {
+//                        MvpPre.dailyTasksReceive(item.getTask_id() + "");
+//                    }
+//                } else {
+//                    if (item.getTask_status() == 2) {
+//                        MvpPre.dailyTasksReceive(item.getTask_id() + "");
+//                    } else if (item.getTask_status() == 1) {
+//                        mBinding.coolWaitView.setVisibility(View.VISIBLE);
+//                        RoomManager.getInstance().fetchRoomDataAndEnter(DailyTasksActivity.this, item.getFrom_id(), "", item.getTask_id() + "");
+//                        finish();
+//                    }
+//                }
             }
         });
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/TaskSectionAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/TaskSectionAdapter.java
index ee728bc1..ef773fc8 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/TaskSectionAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/TaskSectionAdapter.java
@@ -17,14 +17,14 @@ import java.util.List;
 
 public class TaskSectionAdapter extends RecyclerView.Adapter<TaskSectionAdapter.SectionViewHolder> {
 
-    private List<TaskItem> sections;
+    private List<GiftBoxBean.TaskDataBean> sections;
 
-    public TaskSectionAdapter(List<TaskItem> sections) {
+    public TaskSectionAdapter(List<GiftBoxBean.TaskDataBean> sections) {
         this.sections = sections;
     }
     // 定义点击事件接口
     public interface OnItemClickListener {
-        void onItemClick(TaskItem taskItem, GiftBoxBean.TaskDataBean.DailyTasksBean item);
+        void onItemClick(GiftBoxBean.TaskDataBean taskItem, GiftBoxBean.TaskDataBean.DailyTasksBean item);
     }
 
     private OnItemClickListener listener;
@@ -41,13 +41,13 @@ public class TaskSectionAdapter extends RecyclerView.Adapter<TaskSectionAdapter.
 
     @Override
     public void onBindViewHolder(@NonNull SectionViewHolder holder, int position) {
-        TaskItem section = sections.get(position);
-        holder.title.setText(section.title);
+        GiftBoxBean.TaskDataBean section = sections.get(position);
+        holder.title.setText(section.getTask_type_name());
 
         TaskDataAdapter adapter = new TaskDataAdapter();
         holder.recyclerView.setLayoutManager(new LinearLayoutManager(holder.itemView.getContext()));
         holder.recyclerView.setAdapter(adapter);
-        adapter.setNewData(section.tasks);
+        adapter.setNewData(section.getTask_list());
 //        if (position==2){
 //            holder.view.setVisibility(View.VISIBLE);
 //        }else {