From 7f5205804b0f0134985928cee001d9f70648dc8d Mon Sep 17 00:00:00 2001
From: harvey <harveyleeh@163.com>
Date: Mon, 12 Jul 2021 09:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=B0=E9=83=A8=E5=88=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B92.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/main/java/com/diary/showme/MainActivity.java      | 2 +-
 .../main/java/com/diary/showme/diary/ui/AddDiaryActivity.java | 2 +-
 .../src/main/java/com/diary/showme/diary/ui/CardActivity.java | 4 +++-
 .../java/com/diary/showme/diary/ui/UpdateDiaryActivity.java   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/showme/app/src/main/java/com/diary/showme/MainActivity.java b/src/showme/app/src/main/java/com/diary/showme/MainActivity.java
index f8cbe06..974e8ed 100644
--- a/src/showme/app/src/main/java/com/diary/showme/MainActivity.java
+++ b/src/showme/app/src/main/java/com/diary/showme/MainActivity.java
@@ -90,7 +90,7 @@ public class MainActivity extends AppCompatActivity {
         viewAdapter = new CalendarViewAdapter(this, attr, onSelectDateListener,
                 clickListener);
         initPager();
-//        initSchedule();
+        initSchedule();
     }
 
     private void initSQL() {
diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java
index cd8be34..b0b8218 100644
--- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java
+++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java
@@ -497,6 +497,6 @@ public class AddDiaryActivity extends AppCompatActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-//        DiaryActivity.startActivity(this);
+        DiaryActivity.startActivity(this);
     }
 }
\ No newline at end of file
diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java
index 6bb6f30..637cc3d 100644
--- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java
+++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java
@@ -18,6 +18,7 @@ import com.diary.showme.Course.AddCourseActivity;
 import com.diary.showme.Course.Course;
 import com.diary.showme.Course.CourseActivity;
 import com.diary.showme.R;
+import com.diary.showme.diary.utils.AppManager;
 
 
 public class CardActivity extends AppCompatActivity {
@@ -33,6 +34,7 @@ public class CardActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.card);
 
+        AppManager.getAppManager().addActivity(this);
         card1 = findViewById(R.id.card1);
         card2 = findViewById(R.id.card2);
         card3 = findViewById(R.id.card3);
@@ -63,7 +65,7 @@ public class CardActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
+        AppManager.getAppManager().findActivity(CardActivity.class);
         super.onBackPressed();
-
     }
 }
diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java
index 3e77f63..1e1688a 100644
--- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java
+++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java
@@ -491,6 +491,6 @@ public class UpdateDiaryActivity extends AppCompatActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-//        DiaryActivity.startActivity(this);
+        DiaryActivity.startActivity(this);
     }
 }
\ No newline at end of file