Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	build/intermediates/apk/debug/sjw_Project-debug.apk
#	build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
#	build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
#	build/intermediates/dex/debug/mergeDexDebug/classes.dex
#	build/intermediates/dex_archive_input_jar_hashes/debug/out
#	build/intermediates/dex_number_of_buckets_file/debug/out
#	build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	build/intermediates/incremental/mergeDebugAssets/merger.xml
#	build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	build/intermediates/incremental/mergeDebugShaders/merger.xml
#	build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
#	build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
#	build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
#	build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
#	build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
#	build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
#	build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
#	build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
#	build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
#	build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
#	build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
#	build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
#	build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
#	build/intermediates/signing_config_versions/debug/signing-config-versions.json
#	build/intermediates/source_set_path_map/debug/file-map.txt
#	build/outputs/logs/manifest-merger-debug-report.txt
#	build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	local.properties

.gitignore

@@ -0,0 +1 @@
+/.gradle/

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Mar 31 14:24:01 CST 2023
-gradle.version=7.4
+#Sat Apr 15 08:14:44 CST 2023
+gradle.version=8.0

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/misc.xml

@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

README.md

@@ -1,2 +1,3 @@
 #小米便签项目
-11
+sbh提交测试
+112356

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 
@@ -35,4 +35,5 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    namespace 'net.micode.notes'
 }

gradle.properties

@@ -0,0 +1,3 @@
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Feb 28 20:30:00 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

src/main/AndroidManifest.xml

@@ -16,7 +16,6 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.micode.notes"
     android:versionCode="1"
     android:versionName="0.1" >
 

src/main/java/net/micode/notes/data/Contact.java

@@ -26,27 +26,34 @@ import android.util.Log;
 import java.util.HashMap;
 
 public class Contact {
+    // 声明一个名为sContactCache的静态HashMap，用于缓存电话号码对应的联系人名称
     private static HashMap<String, String> sContactCache;
     private static final String TAG = "Contact";
 
+    // 声明一个名为CALLER_ID_SELECTION的常量字符串，用于构建查询选择器
     private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
-    + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
-    + " AND " + Data.RAW_CONTACT_ID + " IN "
+            + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+            + " AND " + Data.RAW_CONTACT_ID + " IN "
             + "(SELECT raw_contact_id "
             + " FROM phone_lookup"
             + " WHERE min_match = '+')";
 
+    // 声明一个名为getContact的静态方法，用于查询与电话号码匹配的联系人名称
     public static String getContact(Context context, String phoneNumber) {
+        // 如果sContactCache为空，则创建一个新的HashMap
         if(sContactCache == null) {
             sContactCache = new HashMap<String, String>();
         }
 
+        // 如果sContactCache中已经缓存了该电话号码的联系人名称，则直接返回缓存的名称
         if(sContactCache.containsKey(phoneNumber)) {
             return sContactCache.get(phoneNumber);
         }
 
+        // 使用PhoneNumberUtils.toCallerIDMinMatch方法将电话号码转换为最小匹配模式，并使用该模式构建一个查询选择器
         String selection = CALLER_ID_SELECTION.replace("+",
                 PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
+        // 使用ContentResolver查询联系人数据，并返回与电话号码匹配的第一个联系人的名称
         Cursor cursor = context.getContentResolver().query(
                 Data.CONTENT_URI,
                 new String [] { Phone.DISPLAY_NAME },
@@ -54,6 +61,7 @@ public class Contact {
                 new String[] { phoneNumber },
                 null);
 
+        // 如果找到匹配的联系人，则将其名称缓存到sContactCache中，并返回该名称
         if (cursor != null && cursor.moveToFirst()) {
             try {
                 String name = cursor.getString(0);
@@ -66,6 +74,7 @@ public class Contact {
                 cursor.close();
             }
         } else {
+            // 如果没有找到匹配的联系人，则返回null
             Log.d(TAG, "No contact matched with number:" + phoneNumber);
             return null;
         }

src/main/java/net/micode/notes/data/Notes.java

@@ -18,6 +18,7 @@ package net.micode.notes.data;
 
 import android.net.Uri;
 public class Notes {
+    // 定义笔记类型的常量
     public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";
     public static final int TYPE_NOTE     = 0;
@@ -30,11 +31,13 @@ public class Notes {
      * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
      * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
      */
+    // 定义系统文件夹的常量
     public static final int ID_ROOT_FOLDER = 0;
     public static final int ID_TEMPARAY_FOLDER = -1;
     public static final int ID_CALL_RECORD_FOLDER = -2;
     public static final int ID_TRASH_FOLER = -3;
 
+    // 定义 Intent extras 的常量
     public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
     public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";
     public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";
@@ -42,6 +45,7 @@ public class Notes {
     public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";
     public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";
 
+    // 定义 widget 类型的常量
     public static final int TYPE_WIDGET_INVALIDE      = -1;
     public static final int TYPE_WIDGET_2X            = 0;
     public static final int TYPE_WIDGET_4X            = 1;
@@ -54,6 +58,7 @@ public class Notes {
     /**
      * Uri to query all notes and folders
      */
+    // 定义查询所有笔记和文件夹的 Uri 常量
     public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
 
     /**
@@ -61,6 +66,7 @@ public class Notes {
      */
     public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
 
+    // 定义笔记表的列名
     public interface NoteColumns {
         /**
          * The unique ID for a row
@@ -167,6 +173,7 @@ public class Notes {
         public static final String VERSION = "version";
     }
 
+    // 定义数据表的列名
     public interface DataColumns {
         /**
          * The unique ID for a row
@@ -241,6 +248,7 @@ public class Notes {
         public static final String DATA5 = "data5";
     }
 
+    // 定义文本笔记的内部类
     public static final class TextNote implements DataColumns {
         /**
          * Mode to indicate the text in check list mode or not
@@ -257,6 +265,7 @@ public class Notes {
         public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
     }
 
+    // 定义电话笔记的内部类
     public static final class CallNote implements DataColumns {
         /**
          * Call date for this record

src/main/java/net/micode/notes/data/NotesDatabaseHelper.java

@@ -28,10 +28,12 @@ import net.micode.notes.data.Notes.NoteColumns;
 
 
 public class NotesDatabaseHelper extends SQLiteOpenHelper {
+    // 定义数据库名称和版本号常量
     private static final String DB_NAME = "note.db";
 
     private static final int DB_VERSION = 4;
 
+    // 定义笔记表和数据表的名称常量
     public interface TABLE {
         public static final String NOTE = "note";
 
@@ -42,34 +44,36 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 
     private static NotesDatabaseHelper mInstance;
 
+    // 定义创建笔记表和数据表的 SQL 语句常量
     private static final String CREATE_NOTE_TABLE_SQL =
         "CREATE TABLE " + TABLE.NOTE + "(" +
             NoteColumns.ID + " INTEGER PRIMARY KEY," +
-            NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-            NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-            NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
-            NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
-            NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
-            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
+            NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +    // 父笔记的 ID
+            NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +     // 提醒时间
+            NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +      // 背景颜色 ID
+            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +     // 创建时间
+            NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +        // 是否有附件
+            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +    // 修改时间
+            NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +      // 子笔记数量
+            NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +        // 摘要信息
+            NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +     // 笔记类型
+            NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +        // 小组件 ID
+            NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +     // 小组件类型
+            NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +      // 同步 ID
+            NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +       // 本地修改
+            NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +     // 原始父笔记的 ID
+            NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +       // Google 任务 ID
+            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +       // 版本号
         ")";
 
+    // 定义创建数据表的 SQL 语句常量
     private static final String CREATE_DATA_TABLE_SQL =
         "CREATE TABLE " + TABLE.DATA + "(" +
             DataColumns.ID + " INTEGER PRIMARY KEY," +
-            DataColumns.MIME_TYPE + " TEXT NOT NULL," +
-            DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
-            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+            DataColumns.MIME_TYPE + " TEXT NOT NULL," +     // MIME 类型
+            DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +      // 所属笔记的 ID
+            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +      // 创建时间
+            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +    // 修改时间
             DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
             DataColumns.DATA1 + " INTEGER," +
             DataColumns.DATA2 + " INTEGER," +
@@ -78,6 +82,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
         ")";
 
+    // 创建数据表中 note_id 列的索引
     private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
         "CREATE INDEX IF NOT EXISTS note_id_index ON " +
         TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
@@ -85,6 +90,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     /**
      * Increase folder's note count when move note to the folder
      */
+    // 当将笔记移到文件夹中时，增加文件夹的笔记计数
     private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
         "CREATE TRIGGER increase_folder_count_on_update "+
         " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
@@ -97,6 +103,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     /**
      * Decrease folder's note count when move note from folder
      */
+    // 当将笔记从文件夹中移出时，减少文件夹的笔记计数
     private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
         "CREATE TRIGGER decrease_folder_count_on_update " +
         " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
@@ -110,6 +117,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     /**
      * Increase folder's note count when insert new note to the folder
      */
+    // 当向文件夹中插入新笔记时，增加文件夹的笔记计数
     private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
         "CREATE TRIGGER increase_folder_count_on_insert " +
         " AFTER INSERT ON " + TABLE.NOTE +
@@ -124,12 +132,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
     private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
         "CREATE TRIGGER decrease_folder_count_on_delete " +
-        " AFTER DELETE ON " + TABLE.NOTE +
+        " AFTER DELETE ON " + TABLE.NOTE +  // 在Note表中删除一条记录后触发
         " BEGIN " +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
-        "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
-        "  AND " + NoteColumns.NOTES_COUNT + ">0;" +
+        "  UPDATE " + TABLE.NOTE +  // 更新Note表中的一条记录
+        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +  // 将记录的NOTES_COUNT字段减1
+        "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +     // 更新父ID为指定ID的记录
+        "  AND " + NoteColumns.NOTES_COUNT + ">0;" +        // 仅在记录的NOTES_COUNT字段大于0时更新
         " END";
 
     /**
@@ -137,17 +145,20 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
     private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
         "CREATE TRIGGER update_note_content_on_insert " +
-        " AFTER INSERT ON " + TABLE.DATA +
-        " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+        " AFTER INSERT ON " + TABLE.DATA +  // 在Data表中插入一条记录后触发
+        " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +    // 仅在新记录的MIME_TYPE字段为"note"时触发
         " BEGIN" +
-        "  UPDATE " + TABLE.NOTE +
-        "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
-        "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
+        "  UPDATE " + TABLE.NOTE +  // 更新Note表中的一条记录
+        "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +       // 将记录的CONTENT字段设置为新记录的CONTENT字段
+        "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +     // 更新指定ID的记录
         " END";
 
     /**
      * Update note's content when data with {@link DataConstants#NOTE} type has changed
      */
+    /**
+     * 当类型为 {@link DataConstants#NOTE} 的数据被更改时，更新笔记的内容
+     */
     private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
         "CREATE TRIGGER update_note_content_on_update " +
         " AFTER UPDATE ON " + TABLE.DATA +
@@ -161,6 +172,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     /**
      * Update note's content when data with {@link DataConstants#NOTE} type has deleted
      */
+    /**
+     * 当类型为 {@link DataConstants#NOTE} 的数据被删除时，更新笔记的内容
+     */
     private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
         "CREATE TRIGGER update_note_content_on_delete " +
         " AFTER delete ON " + TABLE.DATA +
@@ -174,6 +188,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     /**
      * Delete datas belong to note which has been deleted
      */
+    /**
+     * 当笔记被删除时，删除属于该笔记的数据
+     */
     private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
         "CREATE TRIGGER delete_data_on_delete " +
         " AFTER DELETE ON " + TABLE.NOTE +
@@ -185,6 +202,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     /**
      * Delete notes belong to folder which has been deleted
      */
+    /**
+     * 当文件夹被删除时，删除属于该文件夹的笔记
+     */
     private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
         "CREATE TRIGGER folder_delete_notes_on_delete " +
         " AFTER DELETE ON " + TABLE.NOTE +
@@ -196,6 +216,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     /**
      * Move notes belong to folder which has been moved to trash folder
      */
+    /**
+     * 当文件夹被移动到回收站时，将属于该文件夹的笔记一同移动到回收站
+     */
     private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
         "CREATE TRIGGER folder_move_notes_on_trash " +
         " AFTER UPDATE ON " + TABLE.NOTE +
@@ -206,6 +229,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
         " END";
 
+    // NotesDatabaseHelper的构造函数
     public NotesDatabaseHelper(Context context) {
         super(context, DB_NAME, null, DB_VERSION);
     }
@@ -217,7 +241,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         Log.d(TAG, "note table has been created");
     }
 
+    // 创建笔记表和数据表
     private void reCreateNoteTableTriggers(SQLiteDatabase db) {
+        // 删除旧的触发器
         db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
         db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
         db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
@@ -226,6 +252,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
         db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
 
+        // 创建新的触发器
         db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
         db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
         db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
@@ -241,6 +268,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         /**
          * call record foler for call notes
          */
+        // 创建一个名为 "call record" 的文件夹，用于存放电话记录
         values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
         db.insert(TABLE.NOTE, null, values);
@@ -248,6 +276,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         /**
          * root folder which is default folder
          */
+        // 创建一个名为 "root" 的文件夹，作为默认文件夹
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
@@ -256,6 +285,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         /**
          * temporary folder which is used for moving note
          */
+        // 创建一个名为 "temp" 的文件夹，用于临时存放笔记
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
@@ -264,6 +294,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         /**
          * create trash folder
          */
+        // 创建一个名为 "trash" 的文件夹，用于存放被删除的笔记
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
@@ -271,22 +302,28 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public void createDataTable(SQLiteDatabase db) {
+        // 创建名为 "data" 的表格
         db.execSQL(CREATE_DATA_TABLE_SQL);
+        // 重新创建触发器
         reCreateDataTableTriggers(db);
+        // 在 note_id 字段上创建索引
         db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
         Log.d(TAG, "data table has been created");
     }
 
     private void reCreateDataTableTriggers(SQLiteDatabase db) {
+        // 删除旧的触发器
         db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
         db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
         db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
 
+        // 创建新的触发器
         db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
         db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
         db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
     }
 
+    // 定义创建数据库帮助类的构造函数
     static synchronized NotesDatabaseHelper getInstance(Context context) {
         if (mInstance == null) {
             mInstance = new NotesDatabaseHelper(context);
@@ -305,28 +342,34 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         boolean reCreateTriggers = false;
         boolean skipV2 = false;
 
+        // 如果当前版本是 1，则执行将版本升级到 2 的操作
         if (oldVersion == 1) {
             upgradeToV2(db);
             skipV2 = true; // this upgrade including the upgrade from v2 to v3
+            // 这个升级包含了从版本 2 升级到版本 3 的操作
             oldVersion++;
         }
 
+        // 如果当前版本是 2 且之前没有跳过版本 2 的升级，则执行将版本升级到 3 的操作
         if (oldVersion == 2 && !skipV2) {
             upgradeToV3(db);
             reCreateTriggers = true;
             oldVersion++;
         }
 
+        // 如果当前版本是 3，则执行将版本升级到 4 的操作
         if (oldVersion == 3) {
             upgradeToV4(db);
             oldVersion++;
         }
 
+        // 如果需要重新创建触发器，则执行重新创建笔记表和数据表的触发器的操作
         if (reCreateTriggers) {
             reCreateNoteTableTriggers(db);
             reCreateDataTableTriggers(db);
         }
 
+        // 如果当前版本与目标版本不一致，则抛出异常
         if (oldVersion != newVersion) {
             throw new IllegalStateException("Upgrade notes database to version " + newVersion
                     + "fails");
@@ -334,21 +377,26 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     }
 
     private void upgradeToV2(SQLiteDatabase db) {
+        // 删除旧的笔记表和数据表
         db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
         db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
+        // 创建新的笔记表和数据表
         createNoteTable(db);
         createDataTable(db);
     }
 
     private void upgradeToV3(SQLiteDatabase db) {
         // drop unused triggers
+        // 删除未使用的触发器
         db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
         db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
         db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
         // add a column for gtask id
+        // 添加一个名为 gtask_id 的列
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
                 + " TEXT NOT NULL DEFAULT ''");
         // add a trash system folder
+        // 添加一个回收站系统文件夹
         ContentValues values = new ContentValues();
         values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
@@ -356,6 +404,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     }
 
     private void upgradeToV4(SQLiteDatabase db) {
+        // 添加一个名为 version 的列
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
     }

src/main/java/net/micode/notes/data/NotesProvider.java

@@ -36,12 +36,14 @@ import net.micode.notes.data.NotesDatabaseHelper.TABLE;
 
 
 public class NotesProvider extends ContentProvider {
+//  定义类并声明 mMatcher 和 mHelper 变量
     private static final UriMatcher mMatcher;
 
     private NotesDatabaseHelper mHelper;
 
     private static final String TAG = "NotesProvider";
 
+    // 定义不同类型的查询的常量
     private static final int URI_NOTE            = 1;
     private static final int URI_NOTE_ITEM       = 2;
     private static final int URI_DATA            = 3;
@@ -50,6 +52,7 @@ public class NotesProvider extends ContentProvider {
     private static final int URI_SEARCH          = 5;
     private static final int URI_SEARCH_SUGGEST  = 6;
 
+    // 定义 UriMatcher 用于匹配不同类型的查询
     static {
         mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
@@ -65,6 +68,7 @@ public class NotesProvider extends ContentProvider {
      * x'0A' represents the '\n' character in sqlite. For title and content in the search result,
      * we will trim '\n' and white space in order to show more information.
      */
+//    定义搜索结果查询语句
     private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
         + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
         + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
@@ -79,39 +83,51 @@ public class NotesProvider extends ContentProvider {
         + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
         + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
 
+    // onCreate() 方法会在 ContentProvider 被创建时调用
     @Override
     public boolean onCreate() {
+        // 初始化数据库操作类
         mHelper = NotesDatabaseHelper.getInstance(getContext());
         return true;
     }
 
+    // 处理查询请求
     @Override
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
             String sortOrder) {
         Cursor c = null;
         SQLiteDatabase db = mHelper.getReadableDatabase();
         String id = null;
+        // 根据 UriMatcher 匹配到对应的查询类型
         switch (mMatcher.match(uri)) {
             case URI_NOTE:
+                // 查询所有笔记，使用默认的排序方式
                 c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
                         sortOrder);
                 break;
             case URI_NOTE_ITEM:
+                // 查询指定 ID 的笔记
                 id = uri.getPathSegments().get(1);
                 c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
                         + parseSelection(selection), selectionArgs, null, null, sortOrder);
                 break;
             case URI_DATA:
+                // 查询所有的 data，使用默认的排序方式
                 c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
                         sortOrder);
                 break;
             case URI_DATA_ITEM:
+                // 根据 id 查询单个 data
                 id = uri.getPathSegments().get(1);
                 c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
                         + parseSelection(selection), selectionArgs, null, null, sortOrder);
                 break;
+                // 查询搜索结果
             case URI_SEARCH:
+                // 执行全文搜索
+                // 查询搜索建议结果
             case URI_SEARCH_SUGGEST:
+                // 提供搜索建议
                 if (sortOrder != null || projection != null) {
                     throw new IllegalArgumentException(
                             "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
@@ -142,20 +158,28 @@ public class NotesProvider extends ContentProvider {
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
         if (c != null) {
+            // 通知 ContentResolver 数据变更
             c.setNotificationUri(getContext().getContentResolver(), uri);
         }
         return c;
     }
 
+    // 处理插入请求
     @Override
     public Uri insert(Uri uri, ContentValues values) {
+        // 获取可写数据库实例
+        // 根据 UriMatcher 匹配到对应的表，执行插入操作
         SQLiteDatabase db = mHelper.getWritableDatabase();
+        // 初始化变量
         long dataId = 0, noteId = 0, insertedId = 0;
+        // 根据 URI 匹配不同的操作
         switch (mMatcher.match(uri)) {
             case URI_NOTE:
+                // 插入笔记
                 insertedId = noteId = db.insert(TABLE.NOTE, null, values);
                 break;
             case URI_DATA:
+                // 插入数据
                 if (values.containsKey(DataColumns.NOTE_ID)) {
                     noteId = values.getAsLong(DataColumns.NOTE_ID);
                 } else {
@@ -164,35 +188,45 @@ public class NotesProvider extends ContentProvider {
                 insertedId = dataId = db.insert(TABLE.DATA, null, values);
                 break;
             default:
+                // 如果 URI 不匹配，则抛出异常
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
         // Notify the note uri
+        // 通知笔记 URI 已更改
         if (noteId > 0) {
             getContext().getContentResolver().notifyChange(
                     ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
         }
 
         // Notify the data uri
+        // 通知数据 URI 已更改
         if (dataId > 0) {
             getContext().getContentResolver().notifyChange(
                     ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
         }
 
+        // 返回新插入数据的 URI
         return ContentUris.withAppendedId(uri, insertedId);
     }
 
+    // 处理删除请求
     @Override
     public int delete(Uri uri, String selection, String[] selectionArgs) {
+        // 根据 UriMatcher 匹配到对应的表，执行删除操作
+        // 初始化变量
         int count = 0;
         String id = null;
+        // 获取可写数据库实例
         SQLiteDatabase db = mHelper.getWritableDatabase();
         boolean deleteData = false;
         switch (mMatcher.match(uri)) {
             case URI_NOTE:
+                // 删除所有笔记
                 selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
                 count = db.delete(TABLE.NOTE, selection, selectionArgs);
                 break;
             case URI_NOTE_ITEM:
+                // 删除指定 ID 的笔记
                 id = uri.getPathSegments().get(1);
                 /**
                  * ID that smaller than 0 is system folder which is not allowed to
@@ -206,6 +240,7 @@ public class NotesProvider extends ContentProvider {
                         NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
                 break;
             case URI_DATA:
+                // 删除数据
                 count = db.delete(TABLE.DATA, selection, selectionArgs);
                 deleteData = true;
                 break;
@@ -216,35 +251,46 @@ public class NotesProvider extends ContentProvider {
                 deleteData = true;
                 break;
             default:
+                // 如果 URI 不匹配，则抛出异常
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
+        // 通知笔记 URI 已更改
         if (count > 0) {
             if (deleteData) {
                 getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
             }
+            // 通知数据 URI 已更改
             getContext().getContentResolver().notifyChange(uri, null);
         }
+        // 返回删除的记录数
         return count;
     }
 
+    // 处理更新请求
     @Override
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        // 根据 UriMatcher 匹配到对应的表，执行更新操作
+        // 初始化变量
         int count = 0;
         String id = null;
+        // 获取可写数据库实例
         SQLiteDatabase db = mHelper.getWritableDatabase();
         boolean updateData = false;
         switch (mMatcher.match(uri)) {
             case URI_NOTE:
+                // 更新所有笔记
                 increaseNoteVersion(-1, selection, selectionArgs);
                 count = db.update(TABLE.NOTE, values, selection, selectionArgs);
                 break;
             case URI_NOTE_ITEM:
+                // 更新指定 ID 的笔记
                 id = uri.getPathSegments().get(1);
                 increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
                 count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
                         + parseSelection(selection), selectionArgs);
                 break;
             case URI_DATA:
+                // 更新数据
                 count = db.update(TABLE.DATA, values, selection, selectionArgs);
                 updateData = true;
                 break;
@@ -255,36 +301,46 @@ public class NotesProvider extends ContentProvider {
                 updateData = true;
                 break;
             default:
+                // 如果 URI 不匹配，则抛出异常
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
 
         if (count > 0) {
+            // 通知笔记 URI 已更改
             if (updateData) {
                 getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
             }
+            // 通知数据 URI 已更改
             getContext().getContentResolver().notifyChange(uri, null);
         }
+        // 返回更新的记录数
         return count;
     }
 
+    // 解析选择条件，如果有的话
     private String parseSelection(String selection) {
         return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
     }
 
+    // 增加笔记版本号
     private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
+//        定义了一个私有方法 increaseNoteVersion，接受三个参数：id，selection 和 selectionArgs。
         StringBuilder sql = new StringBuilder(120);
         sql.append("UPDATE ");
         sql.append(TABLE.NOTE);
         sql.append(" SET ");
         sql.append(NoteColumns.VERSION);
         sql.append("=" + NoteColumns.VERSION + "+1 ");
+//        创建一个 StringBuilder 对象 sql，并向其添加一些字符串来构建 SQL 查询语句，用于更新笔记版本。具体来说，它将 TABLE.NOTE 表中的 NoteColumns.VERSION 字段的值增加 1。
 
         if (id > 0 || !TextUtils.isEmpty(selection)) {
             sql.append(" WHERE ");
         }
+//        如果 id 大于 0 或者 selection 不为空，则向 sql 中添加字符串 " WHERE "。
         if (id > 0) {
             sql.append(NoteColumns.ID + "=" + String.valueOf(id));
         }
+//        如果 id 大于 0，则向 sql 中添加一个条件，即 NoteColumns.ID 等于 id。
         if (!TextUtils.isEmpty(selection)) {
             String selectString = id > 0 ? parseSelection(selection) : selection;
             for (String args : selectionArgs) {
@@ -293,9 +349,13 @@ public class NotesProvider extends ContentProvider {
             sql.append(selectString);
         }
 
+//        如果 selection 不为空，则向 sql 中添加一个条件，即根据 selection 中的内容来构建查询语句。
+//        如果 id 大于 0，则先使用 parseSelection 方法对 selection 进行解析，否则直接使用 selection。然后使用 selectionArgs 中的参数值来替换 selectString 中的占位符，最后将结果添加到 sql 中。
         mHelper.getWritableDatabase().execSQL(sql.toString());
+//        调用 mHelper 对象的 getWritableDatabase 方法获取可写的数据库，并使用 execSQL 方法执行 sql 中的查询语句。
     }
 
+    // 获取 URI 对应数据的 MIME 类型
     @Override
     public String getType(Uri uri) {
         // TODO Auto-generated method stub

src/main/java/net/micode/notes/widget/NoteWidgetProvider.java

@@ -33,20 +33,24 @@ import net.micode.notes.ui.NoteEditActivity;
 import net.micode.notes.ui.NotesListActivity;
 
 public abstract class NoteWidgetProvider extends AppWidgetProvider {
+    // 从数据库查询时要获取的列名数组
     public static final String [] PROJECTION = new String [] {
         NoteColumns.ID,
         NoteColumns.BG_COLOR_ID,
         NoteColumns.SNIPPET
     };
 
+    // 列名数组中每个列名对应的索引
     public static final int COLUMN_ID           = 0;
     public static final int COLUMN_BG_COLOR_ID  = 1;
     public static final int COLUMN_SNIPPET      = 2;
 
+    // 日志标签
     private static final String TAG = "NoteWidgetProvider";
 
     @Override
     public void onDeleted(Context context, int[] appWidgetIds) {
+        // 在数据库中更新 widget ID 为无效值
         ContentValues values = new ContentValues();
         values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
         for (int i = 0; i < appWidgetIds.length; i++) {
@@ -57,6 +61,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
         }
     }
 
+    // 从数据库查询给定 widget ID 对应的笔记信息
     private Cursor getNoteWidgetInfo(Context context, int widgetId) {
         return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
                 PROJECTION,
@@ -65,21 +70,27 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
                 null);
     }
 
+    // 更新所有的 note widget
     protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
         update(context, appWidgetManager, appWidgetIds, false);
     }
 
+    // 更新所有的 note widget
+    // privacyMode 为 true 时，更新为隐私模式，不显示具体信息
     private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
             boolean privacyMode) {
         for (int i = 0; i < appWidgetIds.length; i++) {
             if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) {
+                // 初始化背景颜色和内容摘要
                 int bgId = ResourceParser.getDefaultBgId(context);
                 String snippet = "";
+                // 初始化 intent
                 Intent intent = new Intent(context, NoteEditActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
                 intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]);
                 intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType());
 
+                // 从数据库中查询对应的笔记信息
                 Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]);
                 if (c != null && c.moveToFirst()) {
                     if (c.getCount() > 1) {
@@ -87,19 +98,24 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
                         c.close();
                         return;
                     }
+                    // 更新内容摘要和背景颜色
                     snippet = c.getString(COLUMN_SNIPPET);
                     bgId = c.getInt(COLUMN_BG_COLOR_ID);
+                    // 设置 intent 的参数
                     intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID));
                     intent.setAction(Intent.ACTION_VIEW);
                 } else {
+                    // 如果查询不到笔记信息，则显示默认摘要和新增笔记的相关信息
                     snippet = context.getResources().getString(R.string.widget_havenot_content);
                     intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
                 }
 
+                // 关闭 cursor
                 if (c != null) {
                     c.close();
                 }
 
+                // 创建 RemoteViews 对象，更新 UI
                 RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId());
                 rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId));
                 intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId);
@@ -108,25 +124,31 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
                  */
                 PendingIntent pendingIntent = null;
                 if (privacyMode) {
+                    // 隐私模式下显示提示信息，点击后跳转到笔记列表页
                     rv.setTextViewText(R.id.widget_text,
                             context.getString(R.string.widget_under_visit_mode));
                     pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent(
                             context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
                 } else {
+                    // 显示笔记内容摘要，点击后跳转到笔记编辑页
                     rv.setTextViewText(R.id.widget_text, snippet);
                     pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent,
                             PendingIntent.FLAG_UPDATE_CURRENT);
                 }
 
                 rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
+                // 更新 widget
                 appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
             }
         }
     }
 
+    // 获取 widget 的类型
     protected abstract int getBgResourceId(int bgId);
 
+    // 获取对应的布局 ID
     protected abstract int getLayoutId();
 
+    // 获取对应的背景资源 ID
     protected abstract int getWidgetType();
 }

src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java

@@ -25,23 +25,34 @@ import net.micode.notes.tool.ResourceParser;
 
 
 public class NoteWidgetProvider_2x extends NoteWidgetProvider {
+    // 声明一个名为NoteWidgetProvider_2x的Java类，它继承自NoteWidgetProvider类
+    // NoteWidgetProvider_2x类将重写NoteWidgetProvider类的一些方法，以自定义部件的行为
+
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        // 覆盖父类的onUpdate方法，当系统需要更新小部件时将调用该方法
+        // 在这个实现中，它调用了父类的update方法，该方法实际上执行了更新小部件的工作
         super.update(context, appWidgetManager, appWidgetIds);
     }
 
     @Override
     protected int getLayoutId() {
+        // 覆盖父类的getLayoutId方法，返回应该用于显示小部件的布局文件的资源ID
+        // 在这种情况下，它返回R.layout.widget_2x，这是一个占据两个单元格的主屏幕网格的小部件的布局文件
         return R.layout.widget_2x;
     }
 
     @Override
     protected int getBgResourceId(int bgId) {
+        // 覆盖父类的getBgResourceId方法，根据背景ID返回应该用于小部件的背景图像的资源ID
+        // 它在名为ResourceParser.WidgetBgResources的帮助类中查找适当的资源ID，该类包含了2x小部件背景ID到资源ID的映射
         return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
     }
 
     @Override
     protected int getWidgetType() {
+        // 覆盖父类的getWidgetType方法，返回一个整数常量，用于标识小部件的类型
+        // 在这种情况下，它返回Notes.TYPE_WIDGET_2X，这可能表示这是一个用于显示笔记的小部件，并且它是2x大小的
         return Notes.TYPE_WIDGET_2X;
     }
 }

src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java

@@ -25,22 +25,33 @@ import net.micode.notes.tool.ResourceParser;
 
 
 public class NoteWidgetProvider_4x extends NoteWidgetProvider {
+    // 声明一个名为NoteWidgetProvider_4x的Java类，它继承自NoteWidgetProvider类
+    // NoteWidgetProvider_4x类将重写NoteWidgetProvider类的一些方法，以自定义部件的行为
+
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        // 覆盖父类的onUpdate方法，当系统需要更新小部件时将调用该方法
+        // 在这个实现中，它调用了父类的update方法，该方法实际上执行了更新小部件的工作
         super.update(context, appWidgetManager, appWidgetIds);
     }
 
     protected int getLayoutId() {
+        // 覆盖父类的getLayoutId方法，返回应该用于显示小部件的布局文件的资源ID
+        // 在这种情况下，它返回R.layout.widget_4x，这是一个占据四个单元格的主屏幕网格的小部件的布局文件
         return R.layout.widget_4x;
     }
 
     @Override
     protected int getBgResourceId(int bgId) {
+        // 覆盖父类的getBgResourceId方法，根据背景ID返回应该用于小部件的背景图像的资源ID
+        // 它在名为ResourceParser.WidgetBgResources的帮助类中查找适当的资源ID，该类包含了4x小部件背景ID到资源ID的映射
         return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
     }
 
     @Override
     protected int getWidgetType() {
+        // 覆盖父类的getWidgetType方法，返回一个整数常量，用于标识小部件的类型
+        // 在这种情况下，它返回Notes.TYPE_WIDGET_4X，这可能表示这是一个用于显示笔记的小部件，并且它是4x大小的
         return Notes.TYPE_WIDGET_4X;
     }
-}
+}