From e59024139d5a3adc52bf54e6aea967732666c908 Mon Sep 17 00:00:00 2001 From: harvey Date: Mon, 12 Jul 2021 08:33:49 +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=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~$设计规格说明书-秀米日记.doc | Bin 162 -> 0 bytes .../diary/showme/diary/ui/AddDiaryActivity.java | 2 +- .../com/diary/showme/diary/ui/CardActivity.java | 4 ++++ .../showme/diary/ui/UpdateDiaryActivity.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 doc/软件设计/~$设计规格说明书-秀米日记.doc diff --git a/doc/软件设计/~$设计规格说明书-秀米日记.doc b/doc/软件设计/~$设计规格说明书-秀米日记.doc deleted file mode 100644 index 5fbb8bd7da141f3d97bf676cd9470b1cac57a5a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmZQO@NU6y8m{R|8%`2N&0Fi1nSOH5in`!kSTV4PF*g^_`w%y1r9 g9%ecdkO5L}dI=^1p;=ZQe0?boRSd+N_jCdu01h4+9{>OV 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 -- 2.34.1