84 任务优化。

This commit is contained in:
2025-12-12 10:13:45 +08:00
parent feb922624f
commit 0d8b0134d9

View File

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