diff --git a/doc/软件设计/~$设计规格说明书-秀米日记.doc b/doc/软件设计/~$设计规格说明书-秀米日记.doc deleted file mode 100644 index 5fbb8bd..0000000 Binary files a/doc/软件设计/~$设计规格说明书-秀米日记.doc and /dev/null differ 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 b0b8218..cd8be34 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 be4eb3a..6bb6f30 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 @@ -61,5 +61,9 @@ public class CardActivity extends AppCompatActivity { context.startActivity(intent); } + @Override + public void onBackPressed() { + 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 1e1688a..3e77f63 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