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

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

@@ -61,5 +61,9 @@ public class CardActivity extends AppCompatActivity {
         context.startActivity(intent);
     }
 
+    @Override
+    public void onBackPressed() {
+        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);
     }
 }