YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

84 任务跳转

Browse Source
This commit is contained in:
骆召亮
2025-12-12 16:02:42 +08:00
parent 37395ccff3
commit 23de7e5bf6
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BaseModule/src/main/res/drawable/bg_r99_e7fe67_90ff86_5cfbbd.xml
View File

@@ -8,7 +8,6 @@
android:startColor="#5CFBBD" android:startColor="#5CFBBD"
android:type="linear" android:type="linear"
android:useLevel="true" /> android:useLevel="true" />
<corners <stroke android:color="#FFFFF072" android:width="@dimen/dp_1"/>
android:radius="@dimen/dp_99" <corners android:radius="@dimen/dp_99" />
/>
</shape> </shape>

4
MainModule/src/main/java/com/xscm/modulemain/Application.kt
View File

@@ -60,10 +60,9 @@ open class Application : CommonAppContext() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
APP_CONENT = getExternalFilesDir("APP_CONTENT")?.absolutePath.toString()
LOGUTILS_SAVE_PATH = getExternalFilesDir("APP_CONTENT/APP_LOG")?.absolutePath.toString() LOGUTILS_SAVE_PATH = getExternalFilesDir("APP_CONTENT/APP_LOG")?.absolutePath.toString()
CRASHUTILS_SAVE_PATH = getExternalFilesDir("APP_CONTENT/APP_CRASH")?.absolutePath.toString() CRASHUTILS_SAVE_PATH = getExternalFilesDir("APP_CONTENT/APP_CRASH")?.absolutePath.toString()
getExternalFilesDir("")
APP_CONENT = getExternalFilesDir("APP_CONTENT")?.absolutePath.toString()
// 初始化单例实例 // 初始化单例实例
instance = this instance = this
@@ -123,7 +122,6 @@ open class Application : CommonAppContext() {
}catch (E: Exception){ }catch (E: Exception){
LogUtils.e("Exception",E.message.toString()) LogUtils.e("Exception",E.message.toString())
} }
} }
} }
} }

32
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
View File

@@ -111,7 +111,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
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){ if (item.getTask_id() == 1) {
SignInDialog sginDialog = new SignInDialog(DailyTasksActivity.this); SignInDialog sginDialog = new SignInDialog(DailyTasksActivity.this);
sginDialog.show(); sginDialog.show();
} }
@@ -155,7 +155,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
} }
private void taskStatus1(GiftBoxBean.TaskDataBean.DailyTasksBean item) { private void taskStatus1(GiftBoxBean.TaskDataBean.DailyTasksBean item) {
switch (item.getTask_id()){ switch (item.getTask_id()) {
case 1: case 1:
SignInDialog sginDialog = new SignInDialog(this); SignInDialog sginDialog = new SignInDialog(this);
sginDialog.setOnCloseListener(new Function0<Unit>() { sginDialog.setOnCloseListener(new Function0<Unit>() {
@@ -246,21 +246,25 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
} }
break; break;
} }
try {
if (ActivityUtils.getActivityList().size() > 1) {
if (ActivityUtils.getActivityList().get(ActivityUtils.getActivityList().size() - 2) instanceof RoomActivity) {
if (!TextUtils.isEmpty(CommonAppContext.getInstance().playId) && CommonAppContext.getInstance().playId.equals(roomId)) {
finish();
return;
}
if (!TextUtils.isEmpty(CommonAppContext.getInstance().playId) && CommonAppContext.getInstance().playId.equals(roomId)){ ((RoomActivity) ActivityUtils.getActivityList().get(ActivityUtils.getActivityList().size() - 2)).refreshRoomInfo(roomId);
finish(); finish();
return; return;
} }
for (Activity activity : ActivityUtils.getActivityList()) {
if (activity instanceof RoomActivity) {
((RoomActivity) activity).refreshRoomInfo(roomId);
finish();
return;
} }
RoomManager.getInstance().fetchRoomDataAndEnter(DailyTasksActivity.this, roomId, "", "");
finish();
} catch (Exception e) {
e.printStackTrace();
LogUtils.e("taskJumpRoom error: " + e.getMessage());
} }
RoomManager.getInstance().fetchRoomDataAndEnter(DailyTasksActivity.this, roomId, "", "");
finish();
} }
} }

2
MainModule/src/main/res/layout/dialog_sign.xml
View File

@@ -118,7 +118,7 @@
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:background="@drawable/bg_r99_e7fe67_90ff86_5cfbbd" android:background="@drawable/bg_r99_e7fe67_90ff86_5cfbbd"
android:gravity="center" android:gravity="center"
android:paddingVertical="@dimen/dp_15" android:paddingVertical="@dimen/dp_12"
android:text="立即签到" android:text="立即签到"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_14" android:textSize="@dimen/sp_14"