From 0d8b0134d9e37c64d26085fa0a042bb79a501544 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 12 Dec 2025 10:13:45 +0800
Subject: [PATCH] =?UTF-8?q?84=20=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/activity/DailyTasksActivity.java     | 74 ++++++++++++-------
 1 file changed, 48 insertions(+), 26 deletions(-)

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 638ae783..b37382ad 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
@@ -2,15 +2,19 @@ package com.xscm.modulemain.activity.user.activity;
 
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.xscm.modulemain.Application;
 import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
 import com.xscm.modulemain.adapter.TaskBoxAdapter;
 import com.xscm.modulemain.adapter.TaskDataAdapter;
 import com.xscm.modulemain.adapter.TaskSectionAdapter;
@@ -101,9 +105,12 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
                         taskStatus1(item);
                         break;
                     case 2://待领取
-                        MvpPre.dailyTasksReceive(item.getTask_id() + "",item.getStudent_id());
+                        MvpPre.dailyTasksReceive(item.getTask_id() + "", item.getStudent_id());
                         break;
                     case 3://已完成
+                        if (item.getTask_id() == 1){
+
+                        }
                         break;
                 }
             }
@@ -144,31 +151,37 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
     }
 
     private void taskStatus1(GiftBoxBean.TaskDataBean.DailyTasksBean item) {
-        switch (item.getJump_type()) {
+        switch (item.getTask_id()){
             case 1:
-                toActivity(RealNameActivity.class);
                 break;
-            case 2:
-                toActivity(CreateAlbumActivity.class);
-                break;
-            case 3:
-                toActivity(BindCardActivity.class);
-                break;
-            case 4:
-                mBinding.coolWaitView.setVisibility(View.VISIBLE);
-                MvpPre.taskJumpRoom(item, item.getTask_id() + "");
-                break;
-            case 5:
-                //跳转加入公会
-                Intent intent = new Intent(DailyTasksActivity.this, WebViewActivity.class);
-                intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(), SpUtil.getToken(), ""));
-                intent.putExtra("title", "公会");
-                startActivity(intent);
-                break;
-            case 6:
-                toActivity(RechargeActivity.class);
-                break;
-            case 0:
+            default:
+                switch (item.getJump_type()) {
+                    case 1:
+                        toActivity(RealNameActivity.class);
+                        break;
+                    case 2:
+                        toActivity(CreateAlbumActivity.class);
+                        break;
+                    case 3:
+                        toActivity(BindCardActivity.class);
+                        break;
+                    case 4:
+                        mBinding.coolWaitView.setVisibility(View.VISIBLE);
+                        MvpPre.taskJumpRoom(item, item.getTask_id() + "");
+                        break;
+                    case 5:
+                        //跳转加入公会
+                        Intent intent = new Intent(DailyTasksActivity.this, WebViewActivity.class);
+                        intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(), SpUtil.getToken(), ""));
+                        intent.putExtra("title", "公会");
+                        startActivity(intent);
+                        break;
+                    case 6:
+                        toActivity(RechargeActivity.class);
+                        break;
+                    case 0:
+                        break;
+                }
                 break;
         }
     }
@@ -196,7 +209,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
 
     @Override
     public void taskJumpRoom(GiftBoxBean.TaskDataBean.DailyTasksBean item, String roomId) {
-        if (item.getFrom_id().equals("0")) {
+        if (TextUtils.isEmpty(roomId) || roomId.equals("0")) {
             ToastUtils.show("暂无此类型房间。");
             mBinding.coolWaitView.setVisibility(View.GONE);
             return;
@@ -215,11 +228,20 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
                             CustomMsgCode.INSTANCE.getCODE_TASK_APPRENTICE_JOIN_ROOM(),
                             item.getStudent_id(), text);
                     Application.Companion.getInstance().inviteApprenticeTaskTimer();
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
                 break;
         }
+
+        for (Activity activity : ActivityUtils.getActivityList()) {
+            if (activity instanceof RoomActivity) {
+                ((RoomActivity) activity).refreshRoomInfo(roomId);
+                finish();
+                return;
+            }
+        }
+
         RoomManager.getInstance().fetchRoomDataAndEnter(DailyTasksActivity.this, roomId, "", "");
         finish();
     }