Merge pull request '第八次合并' (#8) from dev into master

README.md

@@ -17,8 +17,8 @@
 
 ## TODO
 - [x] 回收站
-- [ ] BUG修复
+- [x] BUG修复
 - [x] 背景切换
-- [ ] 代码质量分析报告
+- [x] 代码质量分析报告
-- [ ] 需求与设计方案
+- [x] 需求与设计方案
-- [ ] 汇报PPT
+- [x] 汇报PPT

other/展示材料/desktop.ini

@@ -0,0 +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

src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java

@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package net.micode.notes.test;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "net.micode.notes.test";
+  public static final String BUILD_TYPE = "debug";
+}

src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json

@@ -0,0 +1 @@
+{}

src/app/build/intermediates/apk_ide_redirect_file/debugAndroidTest/redirect.txt

@@ -0,0 +1,2 @@
+#- File Locator -
+listingFile=../../../outputs/apk/androidTest/debug/output-metadata.json

src/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out

@@ -0,0 +1 @@
+6

src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties

@@ -0,0 +1 @@
+#Tue Jun 06 12:19:48 CST 2023

src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\res"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\rs\androidTest\debug"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\res"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\rs\androidTest\debug"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>

src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\assets"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\assets"/></dataSet></merger>

src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\jniLibs"/></dataSet></merger>

src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\shaders"/></dataSet></merger>

src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Tue Jun 06 12:12:53 CST 2023
+#Wed Jun 07 12:31:53 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

src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt

@@ -0,0 +1,4 @@
+#Tue Jun 06 12:19:51 CST 2023
+base.0=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
+renamed.0=classes.dex
+path.0=classes.dex