From 23de7e5bf6a97259ebd51a72c7c1c51ba0e25f8a Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 12 Dec 2025 16:02:42 +0800
Subject: [PATCH] =?UTF-8?q?84=20=E4=BB=BB=E5=8A=A1=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawable/bg_r99_e7fe67_90ff86_5cfbbd.xml  |  5 ++-
 .../java/com/xscm/modulemain/Application.kt   |  4 +--
 .../user/activity/DailyTasksActivity.java     | 32 +++++++++++--------
 .../src/main/res/layout/dialog_sign.xml       |  2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/BaseModule/src/main/res/drawable/bg_r99_e7fe67_90ff86_5cfbbd.xml b/BaseModule/src/main/res/drawable/bg_r99_e7fe67_90ff86_5cfbbd.xml
index 4e2d3bac..a63e8901 100644
--- a/BaseModule/src/main/res/drawable/bg_r99_e7fe67_90ff86_5cfbbd.xml
+++ b/BaseModule/src/main/res/drawable/bg_r99_e7fe67_90ff86_5cfbbd.xml
@@ -8,7 +8,6 @@
         android:startColor="#5CFBBD"
         android:type="linear"
         android:useLevel="true" />
-    <corners
-        android:radius="@dimen/dp_99"
-       />
+    <stroke android:color="#FFFFF072" android:width="@dimen/dp_1"/>
+    <corners android:radius="@dimen/dp_99" />
 </shape>
\ No newline at end of file
diff --git a/MainModule/src/main/java/com/xscm/modulemain/Application.kt b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
index 22024e91..c2f060b2 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/Application.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
@@ -60,10 +60,9 @@ open class Application : CommonAppContext() {
 
     override fun onCreate() {
         super.onCreate()
+        APP_CONENT = getExternalFilesDir("APP_CONTENT")?.absolutePath.toString()
         LOGUTILS_SAVE_PATH = getExternalFilesDir("APP_CONTENT/APP_LOG")?.absolutePath.toString()
         CRASHUTILS_SAVE_PATH = getExternalFilesDir("APP_CONTENT/APP_CRASH")?.absolutePath.toString()
-        getExternalFilesDir("")
-        APP_CONENT = getExternalFilesDir("APP_CONTENT")?.absolutePath.toString()
         // 初始化单例实例
         instance = this
 
@@ -123,7 +122,6 @@ open class Application : CommonAppContext() {
                     }catch (E: Exception){
                         LogUtils.e("Exception",E.message.toString())
                     }
-
                 }
             }
         }
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 910f8445..94a89af1 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
@@ -111,7 +111,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
                         MvpPre.dailyTasksReceive(item.getTask_id() + "", item.getStudent_id());
                         break;
                     case 3://已完成
-                        if (item.getTask_id() == 1){
+                        if (item.getTask_id() == 1) {
                             SignInDialog sginDialog = new SignInDialog(DailyTasksActivity.this);
                             sginDialog.show();
                         }
@@ -155,7 +155,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
     }
 
     private void taskStatus1(GiftBoxBean.TaskDataBean.DailyTasksBean item) {
-        switch (item.getTask_id()){
+        switch (item.getTask_id()) {
             case 1:
                 SignInDialog sginDialog = new SignInDialog(this);
                 sginDialog.setOnCloseListener(new Function0<Unit>() {
@@ -246,21 +246,25 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
                 }
                 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)){
-            finish();
-            return;
-        }
-
-        for (Activity activity : ActivityUtils.getActivityList()) {
-            if (activity instanceof RoomActivity) {
-                ((RoomActivity) activity).refreshRoomInfo(roomId);
-                finish();
-                return;
+                    ((RoomActivity) ActivityUtils.getActivityList().get(ActivityUtils.getActivityList().size() - 2)).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();
     }
 }
\ No newline at end of file
diff --git a/MainModule/src/main/res/layout/dialog_sign.xml b/MainModule/src/main/res/layout/dialog_sign.xml
index 39fa0966..8869b7c0 100644
--- a/MainModule/src/main/res/layout/dialog_sign.xml
+++ b/MainModule/src/main/res/layout/dialog_sign.xml
@@ -118,7 +118,7 @@
             android:layout_marginBottom="20dp"
             android:background="@drawable/bg_r99_e7fe67_90ff86_5cfbbd"
             android:gravity="center"
-            android:paddingVertical="@dimen/dp_15"
+            android:paddingVertical="@dimen/dp_12"
             android:text="立即签到"
             android:textColor="@color/black"
             android:textSize="@dimen/sp_14"