From f4846d9a4e6184c3828d8e73aed105d3dceae202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E7=85=9C=E6=99=97?= <3383489395@qq.com> Date: Fri, 12 May 2023 13:55:18 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit e0613c414bd300a11af5e7fc7b4c1c4e7042cb21 Merge: 08309e0 42384aa Author: 陈禹昕 <2819428065@qq.com> Date: Wed Apr 19 22:15:59 2023 +0800 Merge branch 'dev-1' of https://bdgit.educoder.net/pf6tfm8hg/cyxgitProject into dev-1 # Conflicts: # Notes-master/.gradle/7.5/fileHashes/fileHashes.lock commit 08309e03b2d0da99de2e2bb4f98c532c35fafd43 Author: 陈禹昕 <2819428065@qq.com> Date: Wed Apr 19 22:12:37 2023 +0800 210340003陈禹昕 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 03fba0d9fc78bccdfe27c03ec11becfba60b5a5d Author: 陈禹昕 <2819428065@qq.com> Date: Thu Apr 13 21:37:16 2023 +0800 泛读报告初版 commit badc9fc0c3a26a2dc53bf78f59e1e3f935596a84 Author: 陈禹昕 <2819428065@qq.com> Date: Fri Apr 7 14:02:58 2023 +0800 doc 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 +- .../.idea/deploymentTargetDropDown.xml | 4 +- 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 ++++++++ doc/210340003陈禹昕/data/MetaData.txt | 104 +++ doc/210340003陈禹昕/data/Node.txt | 90 ++ doc/210340003陈禹昕/data/SqlData.txt | 224 +++++ doc/210340003陈禹昕/data/SqlNote.txt | 577 ++++++++++++ doc/210340003陈禹昕/data/Task.txt | 323 +++++++ doc/210340003陈禹昕/data/TaskList.txt | 370 ++++++++ .../remote/GTaskASyncTask.txt | 102 +++ doc/210340003陈禹昕/remote/GTaskClient.txt | 612 +++++++++++++ .../remote/GTaskManager.txt | 846 ++++++++++++++++++ .../remote/GTaskSyncService.txt | 124 +++ 36 files changed, 5488 insertions(+), 298 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 doc/210340003陈禹昕/data/MetaData.txt create mode 100644 doc/210340003陈禹昕/data/Node.txt create mode 100644 doc/210340003陈禹昕/data/SqlData.txt create mode 100644 doc/210340003陈禹昕/data/SqlNote.txt create mode 100644 doc/210340003陈禹昕/data/Task.txt create mode 100644 doc/210340003陈禹昕/data/TaskList.txt create mode 100644 doc/210340003陈禹昕/remote/GTaskASyncTask.txt create mode 100644 doc/210340003陈禹昕/remote/GTaskClient.txt create mode 100644 doc/210340003陈禹昕/remote/GTaskManager.txt create mode 100644 doc/210340003陈禹昕/remote/GTaskSyncService.txt 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/deploymentTargetDropDown.xml b/Notes-master/.idea/deploymentTargetDropDown.xml index 2557e4b..468a52d 100644 --- a/Notes-master/.idea/deploymentTargetDropDown.xml +++ b/Notes-master/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ 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 @@