Merge branch 'master' of https://bdgit.educoder.net/pf6tfm8hg/cyxgitProject

2 years ago · 92a533f45d
parent 97d555067e cf02bff9e3
commit 92a533f45d
577 changed files with 0 additions and 26 deletions
--- a/.idea/cyxgitProject.iml
+++ b/.idea/cyxgitProject.iml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/cyxgitProject.iml" filepath="$PROJECT_DIR$/.idea/cyxgitProject.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/Notes-master/.idea/.gitignore
+++ b/Notes-master/.idea/.gitignore
@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
--- a/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
--- a/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
--- a/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
--- a/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
--- a/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
--- a/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
--- a/doc/注释/210340003陈禹昕/data/MetaData.txt
+++ b/doc/注释/210340003陈禹昕/data/MetaData.txt
--- a/doc/注释/210340003陈禹昕/data/Node.txt
+++ b/doc/注释/210340003陈禹昕/data/Node.txt
--- a/doc/注释/210340003陈禹昕/data/SqlData.txt
+++ b/doc/注释/210340003陈禹昕/data/SqlData.txt
--- a/doc/注释/210340003陈禹昕/data/SqlNote.txt
+++ b/doc/注释/210340003陈禹昕/data/SqlNote.txt
--- a/doc/注释/210340003陈禹昕/data/Task.txt
+++ b/doc/注释/210340003陈禹昕/data/Task.txt
--- a/doc/注释/210340003陈禹昕/data/TaskList.txt
+++ b/doc/注释/210340003陈禹昕/data/TaskList.txt
--- a/doc/注释/210340003陈禹昕/remote/GTaskASyncTask.txt
+++ b/doc/注释/210340003陈禹昕/remote/GTaskASyncTask.txt
--- a/doc/注释/210340003陈禹昕/remote/GTaskClient.txt
+++ b/doc/注释/210340003陈禹昕/remote/GTaskClient.txt
--- a/doc/注释/210340003陈禹昕/remote/GTaskManager.txt
+++ b/doc/注释/210340003陈禹昕/remote/GTaskManager.txt
--- a/doc/注释/210340003陈禹昕/remote/GTaskSyncService.txt
+++ b/doc/注释/210340003陈禹昕/remote/GTaskSyncService.txt
--- a/doc/注释/210340006杜煜晗/ui包/AlarmAlertActivity.txt
+++ b/doc/注释/210340006杜煜晗/ui包/AlarmAlertActivity.txt
--- a/doc/注释/210340006杜煜晗/ui包/AlarmReceiver.txt
+++ b/doc/注释/210340006杜煜晗/ui包/AlarmReceiver.txt
--- a/doc/注释/210340006杜煜晗/ui包/AlarmlnitReceiver.txt
+++ b/doc/注释/210340006杜煜晗/ui包/AlarmlnitReceiver.txt
--- a/doc/注释/210340006杜煜晗/ui包/DateTimePacker.txt
+++ b/doc/注释/210340006杜煜晗/ui包/DateTimePacker.txt
--- a/doc/注释/210340006杜煜晗/ui包/DateTimePackerDialog.txt
+++ b/doc/注释/210340006杜煜晗/ui包/DateTimePackerDialog.txt
--- a/doc/注释/210340006杜煜晗/ui包/DropdownMenu.txt
+++ b/doc/注释/210340006杜煜晗/ui包/DropdownMenu.txt
--- a/doc/注释/210340006杜煜晗/ui包/FoldersListAdapter.txt
+++ b/doc/注释/210340006杜煜晗/ui包/FoldersListAdapter.txt
--- a/doc/注释/210340006杜煜晗/ui包/NoteEditActivity.txt
+++ b/doc/注释/210340006杜煜晗/ui包/NoteEditActivity.txt
--- a/doc/注释/210340006杜煜晗/ui包/NoteEditText.txt
+++ b/doc/注释/210340006杜煜晗/ui包/NoteEditText.txt
--- a/doc/注释/210340006杜煜晗/ui包/NoteItemData.txt
+++ b/doc/注释/210340006杜煜晗/ui包/NoteItemData.txt
--- a/doc/注释/210340006杜煜晗/ui包/NotesListActivity.txt
+++ b/doc/注释/210340006杜煜晗/ui包/NotesListActivity.txt
--- a/doc/注释/210340006杜煜晗/ui包/NotesListAdapter.txt
+++ b/doc/注释/210340006杜煜晗/ui包/NotesListAdapter.txt
--- a/doc/注释/210340006杜煜晗/ui包/NotesListItem.txt
+++ b/doc/注释/210340006杜煜晗/ui包/NotesListItem.txt
--- a/doc/注释/210340006杜煜晗/ui包/NotesPreferenceActivity.txt
+++ b/doc/注释/210340006杜煜晗/ui包/NotesPreferenceActivity.txt
--- a/doc/注释/210340038张卓杨/tool类/BackupUtils.txt
+++ b/doc/注释/210340038张卓杨/tool类/BackupUtils.txt
--- a/doc/注释/210340038张卓杨/tool类/DataUtils.txt
+++ b/doc/注释/210340038张卓杨/tool类/DataUtils.txt
--- a/doc/注释/210340038张卓杨/tool类/GTaskStringUtils.txt
+++ b/doc/注释/210340038张卓杨/tool类/GTaskStringUtils.txt
--- a/doc/注释/210340038张卓杨/tool类/ResourceParser.txt
+++ b/doc/注释/210340038张卓杨/tool类/ResourceParser.txt
--- a/doc/注释/210340038张卓杨/widget类/NoteWidgetProvider.txt
+++ b/doc/注释/210340038张卓杨/widget类/NoteWidgetProvider.txt
--- a/doc/注释/210340038张卓杨/widget类/NoteWidgetProvider_2x.txt
+++ b/doc/注释/210340038张卓杨/widget类/NoteWidgetProvider_2x.txt
--- a/doc/注释/210340038张卓杨/widget类/NoteWidgetProvider_4x.txt
+++ b/doc/注释/210340038张卓杨/widget类/NoteWidgetProvider_4x.txt
--- a/src/Notes-master/.gradle/7.5/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/7.5/checksums/checksums.lock
--- a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
+++ b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
--- a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
+++ b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
--- a/src/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
+++ b/src/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
--- a/src/Notes-master/.gradle/7.5/dependencies-accessors/gc.properties
+++ b/src/Notes-master/.gradle/7.5/dependencies-accessors/gc.properties
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/7.5/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/7.5/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/7.5/gc.properties
+++ b/src/Notes-master/.gradle/7.5/gc.properties
--- a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master/.gradle/buildOutputCleanup/cache.properties
+++ b/src/Notes-master/.gradle/buildOutputCleanup/cache.properties
--- a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master/.gradle/file-system.probe
+++ b/src/Notes-master/.gradle/file-system.probe
--- a/src/Notes-master/.gradle/vcs-1/gc.properties
+++ b/src/Notes-master/.gradle/vcs-1/gc.properties
--- a/src/Notes-master/.idea/.gitignore
+++ b/src/Notes-master/.idea/.gitignore
--- a/src/Notes-master/.idea/Notes-master.iml
+++ b/src/Notes-master/.idea/Notes-master.iml
--- a/src/Notes-master/.idea/compiler.xml
+++ b/src/Notes-master/.idea/compiler.xml
--- a/src/Notes-master/.idea/deploymentTargetDropDown.xml
+++ b/src/Notes-master/.idea/deploymentTargetDropDown.xml
--- a/src/Notes-master/.idea/gradle.xml
+++ b/src/Notes-master/.idea/gradle.xml
--- a/src/Notes-master/.idea/jarRepositories.xml
+++ b/src/Notes-master/.idea/jarRepositories.xml
--- a/src/Notes-master/.idea/misc.xml
+++ b/src/Notes-master/.idea/misc.xml
--- a/src/Notes-master/.idea/modules.xml
+++ b/src/Notes-master/.idea/modules.xml
--- a/src/Notes-master/.idea/sonarlint/issuestore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88
+++ b/src/Notes-master/.idea/sonarlint/issuestore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88
--- a/src/Notes-master/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master/.idea/sonarlint/issuestore/index.pb
--- a/src/Notes-master/.idea/sonarlint/securityhotspotstore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88
+++ b/src/Notes-master/.idea/sonarlint/securityhotspotstore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88
--- a/src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb
+++ b/src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb
--- a/src/Notes-master/.idea/vcs.xml
+++ b/src/Notes-master/.idea/vcs.xml
--- a/src/Notes-master/app/build.gradle
+++ b/src/Notes-master/app/build.gradle
--- a/src/Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
+++ b/src/Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
--- a/src/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ b/src/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
--- a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
+++ b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
--- a/src/Notes-master/app/build/intermediates/apk/debug/output-metadata.json
+++ b/src/Notes-master/app/build/intermediates/apk/debug/output-metadata.json
--- a/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
+++ b/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
--- a/src/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties
+++ b/src/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties
--- a/src/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
+++ b/src/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
--- a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_0/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_0/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_1/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_1/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_2/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_2/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_3/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_3/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_4/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_4/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_5/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_594fae76091fdcd7b4b34d48d23c18dff82b8195d8de763695f0fda7931b0323_bucket_5/graph.bin
--- a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/src/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out
+++ b/src/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out
--- a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
+++ b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
--- a/Show More
+++ b/Show More