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" />
-
+
+
\ 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() {
@@ -246,21 +246,25 @@ public class DailyTasksActivity extends BaseMvpActivity 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"