Merge pull request '日记部分逻辑修改2.0' (#17) from p86231950/ShowMe:master into master

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() {

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);
     }
 }

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();
-
     }
 }

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);
     }
 }