Merge pull request '合并master与develop' (#2) from master into d_branch

3 years ago · 7d5bfe5fc3
parent 6c2c567ccc d89b67494c
commit 7d5bfe5fc3
521 changed files with 794 additions and 793 deletions
--- a/doc/ProjectNote.txt
+++ b/doc/ProjectNote.txt
@ -0,0 +1 @@
+xxxxxxxxxxxxxxxxxxxxx
--- a/src/Notes-master1/.gradle/7.3.3/checksums/checksums.lock
+++ b/src/Notes-master1/.gradle/7.3.3/checksums/checksums.lock
--- a/src/Notes-master1/.gradle/7.3.3/checksums/md5-checksums.bin
+++ b/src/Notes-master1/.gradle/7.3.3/checksums/md5-checksums.bin
--- a/src/Notes-master1/.gradle/7.3.3/checksums/sha1-checksums.bin
+++ b/src/Notes-master1/.gradle/7.3.3/checksums/sha1-checksums.bin
--- a/src/Notes-master1/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock
+++ b/src/Notes-master1/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock
--- a/src/Notes-master1/.gradle/7.3.3/dependencies-accessors/gc.properties
+++ b/src/Notes-master1/.gradle/7.3.3/dependencies-accessors/gc.properties
--- a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin
+++ b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin
--- a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock
+++ b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock
--- a/src/Notes-master1/.gradle/7.3.3/fileChanges/last-build.bin
+++ b/src/Notes-master1/.gradle/7.3.3/fileChanges/last-build.bin
--- a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin
+++ b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin
--- a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock
+++ b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock
--- a/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master1/.gradle/7.3.3/gc.properties
+++ b/src/Notes-master1/.gradle/7.3.3/gc.properties
--- a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties
+++ b/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties
--- a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master1/.gradle/file-system.probe
+++ b/src/Notes-master1/.gradle/file-system.probe
--- a/src/Notes-master1/.gradle/vcs-1/gc.properties
+++ b/src/Notes-master1/.gradle/vcs-1/gc.properties
--- a/src/Notes-master1/.idea/.gitignore
+++ b/src/Notes-master1/.idea/.gitignore
--- a/src/Notes-master1/.idea/compiler.xml
+++ b/src/Notes-master1/.idea/compiler.xml
--- a/src/Notes-master1/.idea/gradle.xml
+++ b/src/Notes-master1/.idea/gradle.xml
--- a/src/Notes-master1/.idea/jarRepositories.xml
+++ b/src/Notes-master1/.idea/jarRepositories.xml
--- a/src/Notes-master1/.idea/misc.xml
+++ b/src/Notes-master1/.idea/misc.xml
--- a/src/Notes-master1/app/build.gradle
+++ b/src/Notes-master1/app/build.gradle
--- a/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
+++ b/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
--- a/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ b/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
--- a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
+++ b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
--- a/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json
+++ b/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json
--- a/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
+++ b/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
--- a/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties
+++ b/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties
--- a/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
+++ b/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
--- a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_0/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_0/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_1/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_1/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_2/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_2/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_3/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_252183ad5e35f2d09ebaa17106920e5fd4fd39bdc4c9b475fb17655ef0b0f026_bucket_3/graph.bin
--- a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
+++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
--- a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
--- a/Show More
+++ b/Show More