Merge pull request '第九次合并' (#9) from dev into master

1 year ago · bb0e721cf8
parent 5d3104ef47 985b37da56
commit bb0e721cf8
85 changed files with 4 additions and 9 deletions
--- a/README.md
+++ b/README.md
@ -14,11 +14,7 @@
 - 2023/5/26 完成了回收站的雏形
 - 2023/6/04 完成回收站所有功能
 - 2023/6/05 完成背景切换所有功能
 - 2023/6/17 完成所有材料的整理
 ## TODO
- [x] 回收站
+- [x] NULL
 - [x] BUG修复
 - [x] 背景切换
 - [x] 代码质量分析报告
 - [x] 需求与设计方案
 - [x] 汇报PPT
--- a/doc/小米便签开源代码的泛读报告.docx
+++ b/doc/小米便签开源代码的泛读报告.docx
--- a/doc/小米便签源代码质量分析报告.docx
+++ b/doc/小米便签源代码质量分析报告.docx
--- a/doc/03_孔维屿_维护需求与设计方案.docx
+++ b/doc/03_孔维屿_维护需求与设计方案.docx
--- a/model/旧图/体系结构.png
+++ b/model/旧图/体系结构.png
--- a/model/旧图/回收站UI.png
+++ b/model/旧图/回收站UI.png
--- a/model/旧图/背景设置UI.png
+++ b/model/旧图/背景设置UI.png
--- a/model/最后一版图/体系结构.png
+++ b/model/最后一版图/体系结构.png
--- a/model/最后一版图/分析类图.png
+++ b/model/最后一版图/分析类图.png
--- a/model/最后一版图/分析类图1.png
+++ b/model/最后一版图/分析类图1.png
--- a/model/最后一版图/用例图.png
+++ b/model/最后一版图/用例图.png
--- a/model/最后一版图/用例描述.png
+++ b/model/最后一版图/用例描述.png
--- a/model/最后一版图/用例描述1.png
+++ b/model/最后一版图/用例描述1.png
--- a/other/04_孔维屿_软件工程汇报PPT.pptx
+++ b/other/04_孔维屿_软件工程汇报PPT.pptx
--- a/other/05_孔维屿_系统演示录屏/desktop.ini
+++ b/other/05_孔维屿_系统演示录屏/desktop.ini
@ -1,3 +1,3 @@
 [LocalizedFileNames]
 Screenrecorder-2023-06-06-14-59-49-758.mp4=@Screenrecorder-2023-06-06-14-59-49-758.mp4,0
 Screenrecorder-2023-06-06-14-47-44-302.mp4=@Screenrecorder-2023-06-06-14-47-44-302.mp4,0
 Screenrecorder-2023-06-06-14-59-49-758.mp4=@Screenrecorder-2023-06-06-14-59-49-758.mp4,0
--- a/other/展示材料/Screenrecorder-2023-06-06-14-47-44-302.mp4
+++ b/other/展示材料/Screenrecorder-2023-06-06-14-47-44-302.mp4
--- a/other/展示材料/Screenrecorder-2023-06-06-14-59-49-758.mp4
+++ b/other/展示材料/Screenrecorder-2023-06-06-14-59-49-758.mp4
--- a/other/06_孔维屿_贡献度Excel.xls
+++ b/other/06_孔维屿_贡献度Excel.xls
--- a/doc/精读代码（注释）/周卢东注释/tool/BackupUtils.java
+++ b/doc/精读代码（注释）/周卢东注释/tool/BackupUtils.java
--- a/doc/精读代码（注释）/周卢东注释/tool/DataUtils.java
+++ b/doc/精读代码（注释）/周卢东注释/tool/DataUtils.java
--- a/doc/精读代码（注释）/周卢东注释/tool/GTaskStringUtils.java
+++ b/doc/精读代码（注释）/周卢东注释/tool/GTaskStringUtils.java
--- a/doc/精读代码（注释）/周卢东注释/tool/ResourceParser.java
+++ b/doc/精读代码（注释）/周卢东注释/tool/ResourceParser.java
--- a/doc/精读代码（注释）/闵心诚注释/ui/NoteEditText.java
+++ b/doc/精读代码（注释）/闵心诚注释/ui/NoteEditText.java
--- a/doc/精读代码（注释）/闵心诚注释/ui/NoteItemData.java
+++ b/doc/精读代码（注释）/闵心诚注释/ui/NoteItemData.java
--- a/doc/精读代码（注释）/闵心诚注释/ui/NotesListActivity.java
+++ b/doc/精读代码（注释）/闵心诚注释/ui/NotesListActivity.java
--- a/doc/精读代码（注释）/闵心诚注释/ui/NotesListAdapter.java
+++ b/doc/精读代码（注释）/闵心诚注释/ui/NotesListAdapter.java
--- a/doc/精读代码（注释）/闵心诚注释/ui/NotesListItem.java
+++ b/doc/精读代码（注释）/闵心诚注释/ui/NotesListItem.java
--- a/doc/精读代码（注释）/闵心诚注释/ui/NotesPreferenceActivity.java
+++ b/doc/精读代码（注释）/闵心诚注释/ui/NotesPreferenceActivity.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/AlarmAlertActivity.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/AlarmAlertActivity.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/AlarmInitReceiver.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/AlarmInitReceiver.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/AlarmReceiver.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/AlarmReceiver.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/DateTimePicker.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/DateTimePicker.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/DateTimePickerDialog.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/DateTimePickerDialog.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/DropdownMenu.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/DropdownMenu.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/FoldersListAdapter.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/FoldersListAdapter.java
--- a/doc/精读代码（注释）/张嘉欣注释/ui/NoteEditActivity.java
+++ b/doc/精读代码（注释）/张嘉欣注释/ui/NoteEditActivity.java
--- a/doc/精读代码（注释）/张嘉欣注释/widget/NoteWidgetProvider.java
+++ b/doc/精读代码（注释）/张嘉欣注释/widget/NoteWidgetProvider.java
--- a/doc/精读代码（注释）/张嘉欣注释/widget/NoteWidgetProvider_2x.java
+++ b/doc/精读代码（注释）/张嘉欣注释/widget/NoteWidgetProvider_2x.java
--- a/doc/精读代码（注释）/张嘉欣注释/widget/NoteWidgetProvider_4x.java
+++ b/doc/精读代码（注释）/张嘉欣注释/widget/NoteWidgetProvider_4x.java
--- a/doc/精读代码（注释）/孔维屿注释/data/Contact.java
+++ b/doc/精读代码（注释）/孔维屿注释/data/Contact.java
--- a/doc/精读代码（注释）/孔维屿注释/data/Notes.java
+++ b/doc/精读代码（注释）/孔维屿注释/data/Notes.java
--- a/doc/精读代码（注释）/孔维屿注释/data/NotesDatabaseHelper.java
+++ b/doc/精读代码（注释）/孔维屿注释/data/NotesDatabaseHelper.java
--- a/doc/精读代码（注释）/孔维屿注释/data/NotesProvider.java
+++ b/doc/精读代码（注释）/孔维屿注释/data/NotesProvider.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/data/MetaData.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/data/MetaData.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/data/Node.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/data/Node.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/data/SqlData.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/data/SqlData.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/data/SqlNote.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/data/SqlNote.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/data/Task.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/data/Task.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/data/TaskList.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/data/TaskList.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/exception/ActionFailureException.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/exception/ActionFailureException.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/exception/NetworkFailureException.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/exception/NetworkFailureException.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskASyncTask.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskASyncTask.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskClient.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskClient.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskManager.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskManager.java
--- a/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskSyncService.java
+++ b/doc/精读代码（注释）/孔维屿注释/gtask/remote/GTaskSyncService.java
--- a/doc/精读代码（注释）/孔维屿注释/model/Note.java
+++ b/doc/精读代码（注释）/孔维屿注释/model/Note.java
--- a/doc/精读代码（注释）/孔维屿注释/model/WorkingNote.java
+++ b/doc/精读代码（注释）/孔维屿注释/model/WorkingNote.java
--- a/闵心诚_实践总结报告.docx
+++ b/闵心诚_实践总结报告.docx
--- a/张嘉欣_实践总结报告.docx
+++ b/张嘉欣_实践总结报告.docx
--- a/周卢东_实践总结报告.docx
+++ b/周卢东_实践总结报告.docx
--- a/孔维屿_实践总结报告.docx
+++ b/孔维屿_实践总结报告.docx
--- a/other/MiNote.apk
+++ b/other/MiNote.apk
--- a/other/other.md
+++ b/other/other.md
@ -1 +0,0 @@
 这里存放软件系统的产品海报和宣传PPT等
--- a/other/展示材料/Screenshot_20230607_123318.png
+++ b/other/展示材料/Screenshot_20230607_123318.png
--- a/other/展示材料/Screenshot_20230607_123352.png
+++ b/other/展示材料/Screenshot_20230607_123352.png
--- a/other/展示材料/Screenshot_20230607_123400.png
+++ b/other/展示材料/Screenshot_20230607_123400.png
--- a/other/展示材料/Screenshot_20230607_123408.png
+++ b/other/展示材料/Screenshot_20230607_123408.png
--- a/other/废弃文档.docx
+++ b/other/废弃文档.docx
--- a/src/.gradle/7.5/executionHistory/executionHistory.bin
+++ b/src/.gradle/7.5/executionHistory/executionHistory.bin
--- a/src/.gradle/7.5/executionHistory/executionHistory.lock
+++ b/src/.gradle/7.5/executionHistory/executionHistory.lock
--- a/src/.gradle/7.5/fileHashes/fileHashes.bin
+++ b/src/.gradle/7.5/fileHashes/fileHashes.bin
--- a/src/.gradle/7.5/fileHashes/fileHashes.lock
+++ b/src/.gradle/7.5/fileHashes/fileHashes.lock
--- a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin
+++ b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin
--- a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/.gradle/file-system.probe
+++ b/src/.gradle/file-system.probe
--- a/src/app/build/intermediates/apk/debug/app-debug.apk
+++ b/src/app/build/intermediates/apk/debug/app-debug.apk
--- a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Wed Jun 07 12:31:53 CST 2023
+#Sat Jun 10 00:11:07 CST 2023
 base.0=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex
--- a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.class
+++ b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.class
--- a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.class
+++ b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.class
--- a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity.class
+++ b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity.class
--- a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.dex
+++ b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.dex
--- a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.dex
+++ b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.dex
--- a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity.dex
+++ b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity.dex
--- a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
+++ b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
		`@ -1 +0,0 @@`
			`这里存放软件系统的产品海报和宣传PPT等`