From af90dc92b311496e6372a4f01e89c6c60bd5191c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=93=E6=9D=A8?= <2424012376@qq.com> Date: Wed, 19 Apr 2023 20:13:56 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit a6c1e465e40c5c34a18388b6714e9ee29fb77d1c Merge: 9b42789 42384aa Author: pf6tfm8hg <2819428065@qq.com> Date: Wed Apr 19 19:50:39 2023 +0800 Merge pull request '1' (#4) from dev-1 into zzy-branch commit 42384aac835f673c9f851babc6e5e7f401cba673 Merge: 33d2919 548abb3 Author: pf6tfm8hg <2819428065@qq.com> Date: Wed Apr 19 19:49:41 2023 +0800 Merge pull request '陈荣浩精读' (#3) from crh_branch into dev-1 commit 548abb34a372012fd9291131879abd3148f73c32 Author: 陈荣浩 <1652154670@qq.com> Date: Wed Apr 19 19:13:58 2023 +0800 2 commit af332a0b83fe86cc6ead5ff255fc6cfa6d66ac36 Author: 陈荣浩 <1652154670@qq.com> Date: Wed Apr 19 18:59:20 2023 +0800 精读notes包model包,gtask包exception文件 commit 9b4278994ec02896563aa11a2449b9c3e3a27923 Author: pyote5ckf <2424012376@qq.com> Date: Mon Apr 17 21:45:54 2023 +0800 ADD file via upload commit 33d291958591177c302bffd25cc9bb1bd3ce7c20 Merge: e76723e 7627b24 Author: pf6tfm8hg <2819428065@qq.com> Date: Fri Mar 31 14:40:42 2023 +0800 Merge pull request '111' (#1) from crh_branch into dev-1 commit 7627b24b7be2b680adec2e3c1c263423ac7d1ef9 Author: 陈荣浩 <1652154670@qq.com> Date: Fri Mar 31 14:38:43 2023 +0800 111 --- .idea/.gitignore | 3 + .idea/cyxgitProject.iml | 9 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 42647 -> 42747 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes Notes-master/.idea/compiler.xml | 2 +- Notes-master/.idea/gradle.xml | 2 +- Notes-master/.idea/misc.xml | 2 +- Notes-master/.idea/vcs.xml | 6 + .../java/net/micode/notes/data/Contact.java | 14 +- .../java/net/micode/notes/data/Notes.java | 110 +++-- .../notes/data/NotesDatabaseHelper.java | 273 ++++++------ .../net/micode/notes/data/NotesProvider.java | 79 ++-- .../exception/ActionFailureException.java | 17 +- .../exception/NetworkFailureException.java | 18 +- .../java/net/micode/notes/model/Note.java | 58 +-- .../net/micode/notes/model/WorkingNote.java | 96 +++-- Notes-master/local.properties | 7 +- doc/210340002陈荣浩/data/Contact.java | 81 ++++ doc/210340002陈荣浩/data/Notes.java | 303 ++++++++++++++ .../data/NotesDatabaseHelper.java | 349 ++++++++++++++++ .../data/NotesProvider.java | 320 ++++++++++++++ doc/210340002陈荣浩/model/Note.java | 255 ++++++++++++ doc/210340002陈荣浩/model/WorkingNote.java | 392 ++++++++++++++++++ e76723e5a7 | 0 26 files changed, 2114 insertions(+), 296 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/cyxgitProject.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 Notes-master/.idea/vcs.xml create mode 100644 doc/210340002陈荣浩/data/Contact.java create mode 100644 doc/210340002陈荣浩/data/Notes.java create mode 100644 doc/210340002陈荣浩/data/NotesDatabaseHelper.java create mode 100644 doc/210340002陈荣浩/data/NotesProvider.java create mode 100644 doc/210340002陈荣浩/model/Note.java create mode 100644 doc/210340002陈荣浩/model/WorkingNote.java create mode 100644 e76723e5a7 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/cyxgitProject.iml b/.idea/cyxgitProject.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/cyxgitProject.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..d52c2e0 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin index 47f3a10f07b5968ce47b8f6144ca1ba9664d3647..25d4aeb7f24fc57a6ff08e06bd543ab17d0a63de 100644 GIT binary patch delta 116 zcmbP!mg)CdrVS<%j88Y4N+` - + \ No newline at end of file diff --git a/Notes-master/.idea/gradle.xml b/Notes-master/.idea/gradle.xml index cbbe561..a0de2a1 100644 --- a/Notes-master/.idea/gradle.xml +++ b/Notes-master/.idea/gradle.xml @@ -7,7 +7,7 @@