diff --git a/app/release/release/output-metadata.json b/app/release/release/output-metadata.json
index 48ce27c6..cb930ef1 100644
--- a/app/release/release/output-metadata.json
+++ b/app/release/release/output-metadata.json
@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 9,
-      "versionName": "1.0.1.7",
-      "outputFile": "羽声_1.0.1.7_9.apk"
+      "versionCode": 10,
+      "versionName": "1.0.1.8",
+      "outputFile": "羽声_1.0.1.8_10.apk"
     }
   ],
   "elementType": "File",
@@ -22,14 +22,14 @@
       "minApi": 28,
       "maxApi": 30,
       "baselineProfiles": [
-        "baselineProfiles/1/羽声_1.0.1.7_9.dm"
+        "baselineProfiles/1/羽声_1.0.1.8_10.dm"
       ]
     },
     {
       "minApi": 31,
       "maxApi": 2147483647,
       "baselineProfiles": [
-        "baselineProfiles/0/羽声_1.0.1.7_9.dm"
+        "baselineProfiles/0/羽声_1.0.1.8_10.dm"
       ]
     }
   ],
diff --git a/gradle.properties b/gradle.properties
index 6ae64312..150daee7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,8 +29,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.1.7
-APP_VERSION_CODE=9
+APP_VERSION_NAME=1.0.1.8
+APP_VERSION_CODE=10
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/FirstChargeDialog.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/FirstChargeDialog.java
index aa8a584c..94f7828e 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/FirstChargeDialog.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/FirstChargeDialog.java
@@ -113,13 +113,16 @@ public class FirstChargeDialog extends BaseDialog<DialogFirstChargeBinding> {
                 } else if (i == R.id.btn_2) {
                     List<RoonGiftModel> list = new ArrayList<>();
                     if (firstChargeGiftBean.getGift_bag().size() > 3) {
-                        mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle1());
-                        mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle2());
-                        mBinding.btn2.setText(firstChargeGiftBean.getGift_bag().get(2).getName());
-                        list.addAll(firstChargeGiftBean.getGift_bag().get(2).getGift_list());
-                        mBinding.bannerViewPager.create(baseListData(list, 4));
+                        if (firstChargeGiftBean.getGift_bag().get(2)!=null) {
+                            mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle1());
+                            mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle2());
+                            mBinding.btn2.setText(firstChargeGiftBean.getGift_bag().get(2).getName());
+                            list.addAll(firstChargeGiftBean.getGift_bag().get(2).getGift_list());
+                            mBinding.bannerViewPager.create(baseListData(list, 4));
+                            type = 3;
+                        }
                     }
-                    type=3;
+
                 }
 
             }
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java
index 7a425618..9d4eed18 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java
@@ -110,6 +110,11 @@ public interface ApiServer {
     @POST(Constants.dailyTasksOpenBox)
     Observable<BaseModel<GiftName>> dailyTasksOpenBox(@Field("gift_box_id") String gift_box_id);
 
+    @FormUrlEncoded
+    @POST(Constants.dailyTasksComplete)
+    Call<ResponseBody> dailyTasksComplete(@Field("task_id") String task_id);
+
+
     @FormUrlEncoded
     @POST(Constants.SEND_HEADLINE)
     Call<BaseModel<String>> sendHeadine(@Field("content") String content, @Field("money") String money, @Field("room_id") String roomId);
@@ -648,7 +653,7 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.POST_QUIT_ROOM)
-    Call<BaseModel<String>> quitRoom(@Field("room_id") String room_id, @Field("user_id") String user_id);
+    Call<ResponseBody> quitRoom(@Field("room_id") String room_id, @Field("user_id") String user_id);
 
     @FormUrlEncoded
     @POST(Constants.POST_RELATION_CARD)
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java
index de580da3..7404b4bc 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java
@@ -75,6 +75,7 @@ import com.qxcm.moduleutil.bean.room.AuctionBean;
 import com.qxcm.moduleutil.bean.room.RoomApplyListBean;
 import com.qxcm.moduleutil.bean.room.RoomAuction;
 import com.qxcm.moduleutil.bean.room.RoomBean;
+import com.qxcm.moduleutil.bean.room.RoomGiveGiftModel;
 import com.qxcm.moduleutil.bean.room.RoomInfoResp;
 import com.qxcm.moduleutil.bean.room.RoomOnline;
 import com.qxcm.moduleutil.bean.room.RoomOnlineBean;
@@ -92,6 +93,7 @@ import java.net.Proxy;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -443,6 +445,23 @@ public class RetrofitClient {
         sApiServer.dailyTasksOpenBox(gift_box_id).compose(new DefaultTransformer<>()).subscribe(observer);
     }
 
+    public void  dailyTasksComplete(String task_id,BaseObserver<String> observer){
+        sApiServer.dailyTasksComplete(task_id).enqueue(new Callback<ResponseBody>() {
+
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                if (response.code() == 200){
+                    observer.onNext("任务完成");
+                }
+            }
+
+            @Override
+            public void onFailure(Call<ResponseBody> call, Throwable t) {
+                    t.printStackTrace();
+            }
+        });
+    }
+
     public void sendHeadine(String content, String money, String roomId, BaseObserver<String> observer) {
         sApiServer.sendHeadine(content, money, roomId).enqueue(new Callback<BaseModel<String>>() {
             @Override
@@ -1225,6 +1244,60 @@ public class RetrofitClient {
 
     public void firstChargeGift(BaseObserver<FirstChargeGiftBean> observer) {
         sApiServer.firstChargeGift().compose(new DefaultTransformer<>()).subscribe(observer);
+//                .enqueue(new Callback<ResponseBody>() {
+//            @Override
+//            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+//                if (response.code() == 200) {
+//                    try {
+//                        String json = response.body().string();
+//                        BaseModel<FirstChargeGiftBean> data =GsonUtils.fromJson(json, BaseModel.class);
+////                        String data1=GsonUtils.toJson(data.getData());
+////                        LogUtils.e("data1",data.getData());
+////                        FirstChargeGiftBean firstChargeGiftBean=new FirstChargeGiftBean();
+////                        firstChargeGiftBean.setName(data.getData().getName());
+////                        List<FirstChargeGiftBean.GiftBag>  giftBags=new ArrayList<>();
+////                        for (int i=0;i<data.getData().getGift_bag().size();i++){
+////
+////                            FirstChargeGiftBean.GiftBag giftBag=new FirstChargeGiftBean.GiftBag();
+////                            giftBag.setName(data.getData().getGift_bag().get(i).getName());
+////                            giftBag.setMoney(data.getData().getGift_bag().get(i).getMoney());
+////                            giftBag.setTitle1(data.getData().getGift_bag().get(i).getTitle1());
+////                            giftBag.setTitle2(data.getData().getGift_bag().get(i).getTitle2());
+////                            List<RoonGiftModel> roonGiftModels=new ArrayList<>();
+////                            for (int j=0;j<data.getData().getGift_bag().get(i).getGift_list().size();j++){
+////                                RoonGiftModel roonGiftModel=new RoonGiftModel();
+////                                roonGiftModel.setGift_name(data.getData().getGift_bag().get(i).getGift_list().get(j).getGift_name());
+////                                roonGiftModel.setNum(data.getData().getGift_bag().get(i).getGift_list().get(j).getNum());
+////                                roonGiftModel.setGift_price(data.getData().getGift_bag().get(i).getGift_list().get(j).getGift_price());
+////                                roonGiftModel.setType(data.getData().getGift_bag().get(i).getGift_list().get(j).getType());
+////                                roonGiftModel.setBase_image(data.getData().getGift_bag().get(i).getGift_list().get(j).getBase_image());
+////                                roonGiftModels.add(roonGiftModel);
+////                            }
+////                            giftBag.setGift_list(roonGiftModels);
+////                            giftBags.add(giftBag);
+////                        }
+////
+////                        firstChargeGiftBean.setGift_bag(giftBags);
+//
+//
+//
+////                        List<FirstChargeGiftBean> data2=GsonUtils.fromJson(data1, new TypeToken<List<FirstChargeGiftBean>>(){}.getType());
+////                        observer.onNext(data2.get(0));
+////                        FirstChargeGiftBean firstChargeGiftBean = GsonUtils.fromJson(data1, FirstChargeGiftBean.class);
+////                        Object data3=GsonUtils.fromJson(data1, FirstChargeGiftBean.class);
+////                        LogUtils.e("data3",data3);
+//                        observer.onNext(data.getData());
+//                    }catch (Exception e){
+//                        e.printStackTrace();
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void onFailure(Call<ResponseBody> call, Throwable t) {
+//                t.printStackTrace();
+//            }
+//        });
     }
 
     public void applyPit(String roomId, String pitNumber, BaseObserver<String> observer) {
@@ -1437,15 +1510,15 @@ public class RetrofitClient {
 
 
     public void quitRoom(String room_id, String user_id, BaseObserver<String> observer) {
-        sApiServer.quitRoom(room_id, user_id).enqueue(new Callback<BaseModel<String>>() {
+        sApiServer.quitRoom(room_id, user_id).enqueue(new Callback<ResponseBody>() {
             @Override
-            public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
-                onNextRetu(response, observer);
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                observer.onNext(null);
             }
 
             @Override
-            public void onFailure(Call<BaseModel<String>> call, Throwable t) {
-                com.blankj.utilcode.util.ToastUtils.showShort(t.toString());
+            public void onFailure(Call<ResponseBody> call, Throwable t) {
+                t.printStackTrace();
             }
         });
     }
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java
index 966c16c5..071ab13d 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java
@@ -364,6 +364,7 @@ public class Constants {
     public static final String POST_DELETE_RELATION_CARD = "/api/Room/delete_relation_card";//删除关系
     public static final String GET_FIRST_CHARGE = "/api/Activities/first_charge_gift_permission";//首充好礼弹框权限
     public static final String GET_FIRST_CHARGE_GIFT = "/api/Activities/first_charge_gift";//首充好礼列表接口
+    public static final String dailyTasksComplete = "/api/Dailytasks/dailyTasksReceive";//领取每日任务奖励
 
 
 
diff --git a/modulemain/src/main/java/com/qxcm/modulemain/activity/MainActivity.java b/modulemain/src/main/java/com/qxcm/modulemain/activity/MainActivity.java
index f4a56288..43b1b727 100644
--- a/modulemain/src/main/java/com/qxcm/modulemain/activity/MainActivity.java
+++ b/modulemain/src/main/java/com/qxcm/modulemain/activity/MainActivity.java
@@ -239,7 +239,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
                     } else if (type == 3) {
                         s = giftBean.getGift_bag().get(2).getMoney();
                     }
-                    if (s == null){
+                    if (s == null) {
                         ToastUtils.showShort("暂无礼物");
                         return;
                     }
@@ -483,10 +483,12 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
 
     @Override
     public void myInfoSuccess(FirstChargeBean data) {
-        if (data.getPermission() == 1) {
-            mBinding.ivShouchl.setVisibility(View.VISIBLE);
-        } else {
-            mBinding.ivShouchl.setVisibility(View.GONE);
+        if (data != null) {
+            if (data.getPermission() == 1) {
+                mBinding.ivShouchl.setVisibility(View.VISIBLE);
+            } else {
+                mBinding.ivShouchl.setVisibility(View.GONE);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
index 88e0e417..faf8c5d3 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
@@ -802,13 +802,19 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         } else {
             mBinding.roomTop.btnFollow.setBackground(getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.collect));
         }
-        if ((roomBean.getType_id().equals("1") && roomBean.getLabel_id().equals("2")) || (roomBean.getType_id().equals("3") && roomBean.getLabel_id().equals("2")
-                || (roomBean.getType_id().equals("4") && roomBean.getLabel_id().equals("2")))) {
+        if ((roomBean.getType_id().equals("3") || roomBean.getType_id().equals("1") || roomBean.getType_id().equals("4"))&& roomBean.getLabel_id().equals("2")){
             AgoraManager.getInstance(this).setBjMusic(false);
-
-        } else {
+        }else {
             AgoraManager.getInstance(this).setBjMusic(true);
         }
+
+//        if ((roomBean.getType_id().equals("1") && roomBean.getLabel_id().equals("2")) || (roomBean.getType_id().equals("3") && roomBean.getLabel_id().equals("2")
+//                || (roomBean.getType_id().equals("4") && roomBean.getLabel_id().equals("2")))) {
+//            AgoraManager.getInstance(this).setBjMusic(false);
+//
+//        } else {
+//            AgoraManager.getInstance(this).setBjMusic(true);
+//        }
         AgoraManager.getInstance(this).stopMuisc();
         initializeAudio();
 
@@ -1162,10 +1168,9 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         } else {
             mBinding.roomTop.btnFollow.setBackground(getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.collect));
         }
-        if (roomBean.getType_id().equals("1") && roomBean.getLabel_id().equals("2")) {
+        if ((roomBean.getType_id().equals("3") || roomBean.getType_id().equals("1") || roomBean.getType_id().equals("4"))&& roomBean.getLabel_id().equals("2")){
             AgoraManager.getInstance(this).setBjMusic(false);
-
-        } else {
+        }else {
             AgoraManager.getInstance(this).setBjMusic(true);
         }
         AgoraManager.getInstance(this).stopMuisc();
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
index 7d2497f6..5f725957 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
@@ -735,9 +735,11 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
             rl_misc.setVisibility(View.GONE);
             rl_more.setVisibility(View.GONE);
-        } else if (roleType != 5) {
+        } else if (roleType != 5 ) {
             rl_misc.setVisibility(View.VISIBLE);
-            rl_more.setVisibility(View.VISIBLE);
+            if (mRoomInfoResp.getUser_info().getPit_number()==9) {
+                rl_more.setVisibility(View.VISIBLE);
+            }
         }
         if ((mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("3")) && mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
             rl_more.setVisibility(View.GONE);
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java
index 93cffd6e..d904fad4 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java
@@ -3,11 +3,14 @@ package com.example.modulevocal.activity;
 
 import android.content.Intent;
 import android.graphics.Color;
+import android.view.View;
+import android.widget.TextView;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.example.modulevocal.R;
 import com.example.modulevocal.adapter.TaskBoxAdapter;
 import com.example.modulevocal.adapter.TaskDataAdapter;
@@ -22,6 +25,7 @@ import com.qxcm.moduleutil.bean.GiftBoxBean;
 import com.qxcm.moduleutil.bean.GiftName;
 import com.qxcm.moduleutil.bean.TaskDataBean;
 import com.qxcm.moduleutil.bean.TaskItem;
+import com.qxcm.moduleutil.utils.ARouteConstants;
 import com.qxcm.moduleutil.utils.SpUtil;
 
 import java.util.ArrayList;
@@ -37,6 +41,8 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
     private TaskBoxAdapter mTaskBoxAdapter;
     private TaskSectionAdapter mTaskDataAdapter;
 
+    private TaskDataAdapter taskDataAdapter;
+
     @Override
     protected DailyTasksPresenter bindPresenter() {
         return new DailyTasksPresenter(this, this);
@@ -76,6 +82,25 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
             MvpPre.dailyTasksOpenBox(item.getId());
         });
 
+//        taskDataAdapter = new TaskDataAdapter();
+//        taskDataAdapter.setItemClickLitener(new TaskDataAdapter.ItemClickLitener() {
+//            @Override
+//            public void onItemClick(View view, int position, GiftBoxBean.TaskDataBean.DailyTasksBean item) {
+//                if (view.getId() == R.id.task_type){
+//                    MvpPre.dailyTasksOpenBox(item.getTask_id()+"");
+//                }
+//            }
+//        });
+//        mTaskBoxAdapter.setOnItemChildClickListener((adapter, view, position) -> {
+//            if (view.getId() == R.id.task_type){
+//                TextView tv = (TextView) view;
+//                if (tv.getText().toString().equals("领取金币")){
+//                    GiftBoxBean.TaskDataBean taskDataBean = (GiftBoxBean.TaskDataBean) adapter.getItem(position);
+//                    MvpPre.dailyTasksOpenBox(taskDataBean.getDaily_tasks().get(position).getTask_id()+"");
+//                }
+//            }
+//        });
+
     }
 
     @Override
@@ -85,7 +110,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
 
     @Override
     public void setGiftBox(GiftBoxBean giftBoxBean) {
-        mBinding.tvTitle.setText("今日累计获得金币:" + giftBoxBean.getUser_gold());
+        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));
@@ -97,12 +122,33 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
         sections.add(new TaskItem("特殊任务", giftBoxBean.getTasks().getDaily_tasks_special()));
 // 平台任务
         sections.add(new TaskItem("平台任务", giftBoxBean.getTasks().getUsual_tasks()));
-        mBinding.rvTaskToday.setAdapter(new TaskSectionAdapter(sections));
+        mTaskDataAdapter = new TaskSectionAdapter(sections);
+        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("平台任务")) {
+                    if (item.getTask_status()==2) {
+                        MvpPre.dailyTasksComplete(item.getTask_id() + "");
+                    }
+                } else {
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("room_id", item.getFrom_id() + "").navigation();
+                }
+            }
+        });
+
 
     }
 
     @Override
     public void dailyTasksOpenBox(GiftName giftName) {
         ToastUtils.show(giftName.getGift_name());
+        MvpPre.tasksLihen();
+    }
+
+    @Override
+    public void dailyTasksComplete() {
+        ToastUtils.show("任务完成");
+        MvpPre.tasksLihen();
     }
 }
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
index 4bcbac9d..898533c7 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
@@ -58,9 +58,15 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
         }
 
         helper.setText(R.id.tv_jb,  "满"+item.getMeet()+"金币");
+        double progress = Double.parseDouble(item.getUnlock_progress()!=null?item.getUnlock_progress():"0.00");
+        long progressNum = (long) (progress * 1000);
         LinearProgressIndicator progressIndicator= helper.getView(R.id.progress_indicator);
-        progressIndicator.setProgress(Integer.parseInt(item.getUnlock_progress())*100);
-        helper.setText(R.id.tv_jb_num,  Integer.parseInt(item.getUnlock_progress())*100+"%");
+        progressIndicator.setProgress(Integer.parseInt(String.valueOf(progressNum)));
+
+        double unlock_num = Double.parseDouble(item.getUnlock_progress()!=null?item.getUnlock_progress():"0.00");
+        long unlock_num_long = (long) (unlock_num * 1000);
+
+        helper.setText(R.id.tv_jb_num,  Integer.parseInt(String.valueOf(unlock_num_long))/10 + "%");
         if (position==0){
             progressIndicator.setIndicatorColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_E24171));
         }else {
@@ -79,6 +85,9 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
             unlockView.setClickable(true);
             unlockView.setEnabled(true);
             unlockView.setAlpha(1.0f); // 恢复正常显示
+        }else if (item.getStatus().equals("2")){
+            unlockView.setClickable(false);
+            unlockView.setEnabled(false);
         }
         else {
 //            helper.setImageDrawable(R.id.iv_unlock, mContext.getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.unlocked));
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskDataAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskDataAdapter.java
index c2516e05..52fdaf93 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskDataAdapter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskDataAdapter.java
@@ -1,5 +1,6 @@
 package com.example.modulevocal.adapter;
 
+import android.view.View;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -17,6 +18,14 @@ public class TaskDataAdapter extends BaseQuickAdapter<GiftBoxBean.TaskDataBean.D
         super(R.layout.item_task_data);
     }
 
+    public interface ItemClickLitener{
+        void onItemClick(View view, int position,GiftBoxBean.TaskDataBean.DailyTasksBean item);
+    }
+    private ItemClickLitener mItemClickLitener;
+    public void setItemClickLitener(ItemClickLitener mItemClickLitener) {
+        this.mItemClickLitener = mItemClickLitener;
+    }
+
     @Override
     protected void convert(BaseViewHolder helper, GiftBoxBean.TaskDataBean.DailyTasksBean item) {
         TextView textView=helper.getView(R.id.task_type);
@@ -34,9 +43,18 @@ public class TaskDataAdapter extends BaseQuickAdapter<GiftBoxBean.TaskDataBean.D
 //            textView.setBackground(mContext.getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.ylq));
 //        }
 
-        textView.setText(item.getTask_type_str());
+        textView.setText(item.getTask_type_str().equals("去完成")?"未完成": (item.getTask_type_str().equals("领取金币")?"待领取":item.getTask_type_str()));
 
         helper.setText(R.id.task_name, item.getTask_name())
                 .setText(R.id.task_jb_number, "+"+item.getGold_reward());
+        helper.getView(R.id.task_type).setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                if (mItemClickLitener!= null){
+                    mItemClickLitener.onItemClick(view, helper.getLayoutPosition(), item);
+                }
+            }
+        });
     }
 }
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskSectionAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskSectionAdapter.java
index bfd3d4c2..3ea052b7 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskSectionAdapter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskSectionAdapter.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.GiftBoxBean;
 import com.qxcm.moduleutil.bean.TaskItem;
 
 import java.util.List;
@@ -21,7 +22,16 @@ public class TaskSectionAdapter extends RecyclerView.Adapter<TaskSectionAdapter.
     public TaskSectionAdapter(List<TaskItem> sections) {
         this.sections = sections;
     }
+    // 定义点击事件接口
+    public interface OnItemClickListener {
+        void onItemClick(TaskItem taskItem, GiftBoxBean.TaskDataBean.DailyTasksBean item);
+    }
 
+    private OnItemClickListener listener;
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.listener = listener;
+    }
     @NonNull
     @Override
     public SectionViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -43,6 +53,15 @@ public class TaskSectionAdapter extends RecyclerView.Adapter<TaskSectionAdapter.
         }else {
             holder.view.setVisibility(View.GONE);
         }
+
+        adapter.setItemClickLitener(new TaskDataAdapter.ItemClickLitener() {
+            @Override
+            public void onItemClick(View view, int position, GiftBoxBean.TaskDataBean.DailyTasksBean item) {
+                if (listener!= null) {
+                    listener.onItemClick(section,item);
+                }
+            }
+        });
     }
 
     @Override
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/DailyTasksConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/DailyTasksConacts.java
index 7af373d1..158ece97 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/DailyTasksConacts.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/DailyTasksConacts.java
@@ -17,6 +17,8 @@ public class DailyTasksConacts {
         void setGiftBox(GiftBoxBean giftBoxBean);
 
         void dailyTasksOpenBox(GiftName giftName);
+
+        void dailyTasksComplete();
     }
 
     public interface IMePre extends IPresenter {
@@ -25,5 +27,7 @@ public class DailyTasksConacts {
 
         void dailyTasksOpenBox(String gift_box_id);
 
+        void  dailyTasksComplete(String task_id);
+
     }
 }
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java
index 1efadfa1..001c62aa 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java
@@ -70,8 +70,10 @@ public class MyBagListFragment extends BaseMvpFragment<MyBagPresenter, FragmentM
 
     @Override
     public void packIncome(List<MyBagDataBean> myBagDataBean) {
-        myBagDataBeanList.addAll(myBagDataBean);
-        mAdapter.setNewData(myBagDataBeanList);
+        if (myBagDataBeanList!=null) {
+            myBagDataBeanList.addAll(myBagDataBean);
+            mAdapter.setNewData(myBagDataBeanList);
+        }
     }
 
     @Override
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/DailyTasksPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/DailyTasksPresenter.java
index 344649b9..cf659ce2 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/DailyTasksPresenter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/DailyTasksPresenter.java
@@ -50,4 +50,22 @@ public class DailyTasksPresenter extends BasePresenter<DailyTasksConacts.View> i
         });
     }
 
+    @Override
+    public void dailyTasksComplete(String task_id) {
+        api.dailyTasksComplete(task_id, new BaseObserver<String>() {
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(String s) {
+                MvpRef.get().dailyTasksComplete();
+            }
+        });
+    }
+
+
+
 }