diff --git a/src/Notes-master/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 b/src/Notes-master/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
index 09f70b9..e69de29 100644
--- a/src/Notes-master/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
+++ b/src/Notes-master/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
@@ -1,25 +0,0 @@
-
-q
-java:S1192E"[Define a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''," 5 times.(���
-c
-java:S1192t"HDefine a constant instead of duplicating this literal " BEGIN " 4 times.(��������
-b
-java:S1192�"FDefine a constant instead of duplicating this literal "=old." 6 times.(���������
-c
-java:S1192�"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.(��������
-y
-java:S1192>"^Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0," 11 times.(�ӊ�����
-_
-java:S1192w"IDefine a constant instead of duplicating this literal "  WHERE " 8 times.(�랰
-\
-java:S1192w"FDefine a constant instead of duplicating this literal "=new." 6 times.(�랰
-h
-java:S1192�"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 3 times.(���B
-c
-java:S1192v"HDefine a constant instead of duplicating this literal "   SET " 8 times.(��˓�����
-`
-java:S1192u"JDefine a constant instead of duplicating this literal "  UPDATE " 8 times.(���
-�
-java:S1192A"yDefine a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," 4 times.(�с������
-Y
-java:S1214'"CMove constants defined in this interfaces to another class or enum.(����
\ No newline at end of file
diff --git a/src/Notes-master/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 b/src/Notes-master/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
index 4b516df..e69de29 100644
--- a/src/Notes-master/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
+++ b/src/Notes-master/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
@@ -1,13 +0,0 @@
-
-i
-java:S1192�"MDefine a constant instead of duplicating this literal "Unknown URI " 4 times.(���������
-M
-java:S1153�"1Directly append the argument of String.valueOf().(��ߦ�����
-�
-java:S3008Y"eRename this field "NOTES_SNIPPET_SEARCH_QUERY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(�������
-_
-java:S1659�"CDeclare "noteId" and all following declarations on a separate line.(��ؘ�����
-T
-java:S2130�"8Use "Long.parseLong" for this string-to-long conversion.(���������
-N
-java:S1135�"2Complete the task associated to this TODO comment.(��������
\ No newline at end of file
diff --git a/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f b/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f
index e6b5bb4..e69de29 100644
--- a/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f
+++ b/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f
@@ -1,11 +0,0 @@
-
-t
-java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(���������
-U
-java:S1118":Add a private constructor to hide the implicit public one.(���������
-q
-java:S3252%"VUse static access with "android.provider.ContactsContract$DataColumns" for "MIMETYPE".(���������
-r
-java:S3252&"\Use static access with "android.provider.ContactsContract$DataColumns" for "RAW_CONTACT_ID".(����
-y
-java:S3252C"^Use static access with "android.provider.ContactsContract$ContactsColumns" for "DISPLAY_NAME".(���������
\ No newline at end of file
diff --git a/src/Notes-master/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 b/src/Notes-master/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
index c94f7ad..e69de29 100644
--- a/src/Notes-master/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
+++ b/src/Notes-master/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
@@ -1,13 +0,0 @@
-
-a
-java:S1192L"KDefine a constant instead of duplicating this literal "content://" 4 times.(���
-U
-java:S1118D":Add a private constructor to hide the implicit public one.(��͓�����
-^
-java:S1214V"CMove constants defined in this interfaces to another class or enum.(�⸫�����
-Z
-java:S1214�"CMove constants defined in this interfaces to another class or enum.(����
-V
-java:S1118�":Add a private constructor to hide the implicit public one.(���������
-Q
-java:S1118�":Add a private constructor to hide the implicit public one.(߀��
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
index 841374f..c016945 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
@@ -25,6 +25,7 @@ import android.util.Log;
 
 import java.util.HashMap;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 public class Contact {
@@ -46,45 +47,75 @@ public class Contact {//联系人
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+/*
+*功能描述:创建联系人数据库
+*/
+public class Contact {//联系人
+    private static HashMap<String, String> sContactCache;// sContactCache 是一个静态的 HashMap，用于缓存联系人信息，用于缓存联系人信息的HashMap
+    private static final String TAG = "Contact";// TAG 日志标签
+
+    // 定义字符串CALLER_ID_SELECTION
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     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 "
             + "(SELECT raw_contact_id "
             + " FROM phone_lookup"
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             + " WHERE min_match = '+')";
+=======
+            + " WHERE min_match = '+')";// 定义查询条件的字符串
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
+    /*
+    * 功能描述：用于获取联系人信息。
+    * 输入参数：接受一个上下文参数和一个电话号码参数
+    * 返回结果：返回与该电话号码对应的联系人名字
+    */
     public static String getContact(Context context, String phoneNumber) {
-        if(sContactCache == null) {
-            sContactCache = new HashMap<String, String>();
+        if(sContactCache == null) {// 如果联系人缓存为空
+            sContactCache = new HashMap<String, String>();// 初始化联系人缓存
         }
 
-        if(sContactCache.containsKey(phoneNumber)) {
-            return sContactCache.get(phoneNumber);
+        /*
+        * 查找HashMap中是否已有phoneNumber信息
+        */
+        if(sContactCache.containsKey(phoneNumber)) {// 如果在缓存中找到了电话号码对应的联系人信息
+            return sContactCache.get(phoneNumber);// 直接从缓存中返回联系人信息
         }
 
         String selection = CALLER_ID_SELECTION.replace("+",
-                PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
+                PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));//PhoneNumberUtils.toCallerIDMinMatch() 方法将电话号码转换为最小匹配模式，构建带有电话号码的查询条件
+        /*
+        * 查找数据库中phoneNumber的信息
+        * */
         Cursor cursor = context.getContentResolver().query(
-                Data.CONTENT_URI,
-                new String [] { Phone.DISPLAY_NAME },
-                selection,
-                new String[] { phoneNumber },
-                null);
-
+                Data.CONTENT_URI,// 联系人数据的URI
+                new String [] { Phone.DISPLAY_NAME },// 要查询的字段，这里是联系人名字
+                selection,// 查询条件
+                new String[] { phoneNumber },// 查询条件中的占位符对应的值
+                null);// 不指定排序
+        /*
+        * 判定查询结果，如果查询结果不为空且移动到第一条记录，（moveToFirst()返回第一条记录）
+        * */
         if (cursor != null && cursor.moveToFirst()) {
-            try {
-                String name = cursor.getString(0);
-                sContactCache.put(phoneNumber, name);
-                return name;
-            } catch (IndexOutOfBoundsException e) {
-                Log.e(TAG, " Cursor get string error " + e.toString());
-                return null;
+            try {// 找到相关信息
+                String name = cursor.getString(0);// 获取联系人名字
+                sContactCache.put(phoneNumber, name);// 将联系人名字放入缓存
+                return name;// 返回联系人名字
+
+            } catch (IndexOutOfBoundsException e) {// 捕获IndexOutOfBoundsException异常
+                Log.e(TAG, " Cursor get string error " + e.toString());// 记录异常日志
+                return null;// 返回null
             } finally {
-                cursor.close();
+                cursor.close();// 关闭查询结果的Cursor
             }
+            // 未找到相关信息
         } else {
+<<<<<<< HEAD
             Log.d(TAG, "No contact matched with number:" + phoneNumber);
 =======
 =======
@@ -141,6 +172,9 @@ public class Contact {//联系人
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+            Log.d(TAG, "No contact matched with number:" + phoneNumber);// 记录未找到联系人信息的日志
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
             return null;
         }
     }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
index 10c809a..bd4e940 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
@@ -19,6 +19,7 @@ package net.micode.notes.data;
 import android.net.Uri;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 public class Notes {
     public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";
@@ -33,6 +34,13 @@ public class Notes {
 *功能描述：用于存储便签数据，包含了一条便签的各种属性，如标题、内容、创建时间、修改时间等
 */
 public class Notes {
+=======
+
+/*
+*功能描述：Notes 类中定义一些常量，用于构造便签内容及类型
+*/
+public class Notes {
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public static final String AUTHORITY = "micode_notes"; // 定义内容提供器的权限
     public static final String TAG = "Notes";// 定义日志标签
 
@@ -41,9 +49,12 @@ public class Notes {
     public static final int TYPE_FOLDER   = 1;// 便签类型为文件夹
     public static final int TYPE_SYSTEM   = 2;// 便签类型为系统文件夹
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /**
      * Following IDs are system folders' identifiers
@@ -52,24 +63,45 @@ public class Notes {
      * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
      */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     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;
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
-    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";
-    public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";
-    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";
+    /*
+    * 系统文件夹的标识符
+    * */
+    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;// 垃圾箱文件夹
+
+    /*
+    * 定义设置中的参数常量
+    * */
+    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";// 背景颜色ID
+    public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";// Widget ID
+    public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";// Widget类型
+    public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";// 文件夹ID
+    public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; // 通话日期
 
-    public static final int TYPE_WIDGET_INVALIDE      = -1;
-    public static final int TYPE_WIDGET_2X            = 0;
-    public static final int TYPE_WIDGET_4X            = 1;
+    /*
+    * 定义Widget类型常量
+    * */
+    public static final int TYPE_WIDGET_INVALIDE      = -1;// 无效的Widget类型
+    public static final int TYPE_WIDGET_2X            = 0;// 2x2大小的Widget
+    public static final int TYPE_WIDGET_4X            = 1;// 4x4大小的Widget
 
+    /*
+    * 定义便签数据类型常量
+    * */
     public static class DataConstants {
+<<<<<<< HEAD
         public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
         public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
 =======
@@ -111,12 +143,17 @@ public class Notes {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;// 文本便签数据类型
+        public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;// 电话便签数据类型
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     }
 
     /**
      * Uri to query all notes and folders
      */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
 =======
@@ -125,11 +162,15 @@ public class Notes {
 =======
     public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");// 查询所有便签和文件夹的标识符
 >>>>>>> liuyitao-branch
+=======
+    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");// 查询所有便签和文件夹的标识符
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /**
      * Uri to query data
      */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
 
@@ -145,12 +186,20 @@ public class Notes {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+    public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");// 查询数据的标识符
+
+    /*
+     * 功能描述：定义NoteColumns接口数据的常量，用于创建数据库表头
+     */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public interface NoteColumns {
         /**
          * The unique ID for a row
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String ID = "_id";
 =======
@@ -159,12 +208,16 @@ public class Notes {
 =======
         public static final String ID = "_id";// 行的唯一标识符
 >>>>>>> liuyitao-branch
+=======
+        public static final String ID = "_id";// 行的唯一标识符
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * The parent's id for note or folder
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String PARENT_ID = "parent_id";
 =======
@@ -173,12 +226,16 @@ public class Notes {
 =======
         public static final String PARENT_ID = "parent_id";// 父级的ID
 >>>>>>> liuyitao-branch
+=======
+        public static final String PARENT_ID = "parent_id";// 父级的ID
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Created data for note or folder
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String CREATED_DATE = "created_date";
 =======
@@ -187,12 +244,16 @@ public class Notes {
 =======
         public static final String CREATED_DATE = "created_date";// 创建日期
 >>>>>>> liuyitao-branch
+=======
+        public static final String CREATED_DATE = "created_date";// 创建日期
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Latest modified date
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String MODIFIED_DATE = "modified_date";
 =======
@@ -201,6 +262,9 @@ public class Notes {
 =======
         public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
 >>>>>>> liuyitao-branch
+=======
+        public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
 
         /**
@@ -208,6 +272,7 @@ public class Notes {
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String ALERTED_DATE = "alert_date";
 =======
@@ -216,12 +281,16 @@ public class Notes {
 =======
         public static final String ALERTED_DATE = "alert_date";// 提醒日期
 >>>>>>> liuyitao-branch
+=======
+        public static final String ALERTED_DATE = "alert_date";// 提醒日期
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Folder's name or text content of note
          * <P> Type: TEXT </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String SNIPPET = "snippet";
 =======
@@ -230,12 +299,16 @@ public class Notes {
 =======
         public static final String SNIPPET = "snippet";// 文件夹名称或便签的文本内容
 >>>>>>> liuyitao-branch
+=======
+        public static final String SNIPPET = "snippet";// 文件夹名称或便签的文本内容
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Note's widget id
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String WIDGET_ID = "widget_id";
 =======
@@ -244,12 +317,16 @@ public class Notes {
 =======
         public static final String WIDGET_ID = "widget_id";// 便签的Widget ID
 >>>>>>> liuyitao-branch
+=======
+        public static final String WIDGET_ID = "widget_id";// 便签的Widget ID
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Note's widget type
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String WIDGET_TYPE = "widget_type";
 =======
@@ -258,12 +335,16 @@ public class Notes {
 =======
         public static final String WIDGET_TYPE = "widget_type";// 便签的Widget类型
 >>>>>>> liuyitao-branch
+=======
+        public static final String WIDGET_TYPE = "widget_type";// 便签的Widget类型
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Note's background color's id
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String BG_COLOR_ID = "bg_color_id";
 =======
@@ -272,6 +353,9 @@ public class Notes {
 =======
         public static final String BG_COLOR_ID = "bg_color_id";// 便签的背景颜色ID
 >>>>>>> liuyitao-branch
+=======
+        public static final String BG_COLOR_ID = "bg_color_id";// 便签的背景颜色ID
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * For text note, it doesn't has attachment, for multi-media
@@ -279,6 +363,7 @@ public class Notes {
          * <P> Type: INTEGER </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String HAS_ATTACHMENT = "has_attachment";
 =======
@@ -287,12 +372,16 @@ public class Notes {
 =======
         public static final String HAS_ATTACHMENT = "has_attachment";// 是否有附件
 >>>>>>> liuyitao-branch
+=======
+        public static final String HAS_ATTACHMENT = "has_attachment";// 是否有附件
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Folder's count of notes
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String NOTES_COUNT = "notes_count";
 =======
@@ -301,12 +390,16 @@ public class Notes {
 =======
         public static final String NOTES_COUNT = "notes_count";// 文件夹中的便签数量
 >>>>>>> liuyitao-branch
+=======
+        public static final String NOTES_COUNT = "notes_count";// 文件夹中的便签数量
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * The file type: folder or note
          * <P> Type: INTEGER </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String TYPE = "type";
 =======
@@ -315,12 +408,16 @@ public class Notes {
 =======
         public static final String TYPE = "type";// 文件类型：文件夹或便签
 >>>>>>> liuyitao-branch
+=======
+        public static final String TYPE = "type";// 文件类型：文件夹或便签
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * The last sync id
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String SYNC_ID = "sync_id";
 =======
@@ -329,12 +426,16 @@ public class Notes {
 =======
         public static final String SYNC_ID = "sync_id";// 最后同步的ID
 >>>>>>> liuyitao-branch
+=======
+        public static final String SYNC_ID = "sync_id";// 最后同步的ID
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Sign to indicate local modified or not
          * <P> Type: INTEGER </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String LOCAL_MODIFIED = "local_modified";
 =======
@@ -343,12 +444,16 @@ public class Notes {
 =======
         public static final String LOCAL_MODIFIED = "local_modified";// 标识是否本地修改
 >>>>>>> liuyitao-branch
+=======
+        public static final String LOCAL_MODIFIED = "local_modified";// 标识是否本地修改
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Original parent id before moving into temporary folder
          * <P> Type : INTEGER </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String ORIGIN_PARENT_ID = "origin_parent_id";
 =======
@@ -357,12 +462,16 @@ public class Notes {
 =======
         public static final String ORIGIN_PARENT_ID = "origin_parent_id";// 移动到临时文件夹之前的原始父级ID
 >>>>>>> liuyitao-branch
+=======
+        public static final String ORIGIN_PARENT_ID = "origin_parent_id";// 移动到临时文件夹之前的原始父级ID
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * The gtask id
          * <P> Type : TEXT </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String GTASK_ID = "gtask_id";
 =======
@@ -371,12 +480,16 @@ public class Notes {
 =======
         public static final String GTASK_ID = "gtask_id";// Google任务ID
 >>>>>>> liuyitao-branch
+=======
+        public static final String GTASK_ID = "gtask_id";// Google任务ID
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * The version code
          * <P> Type : INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String VERSION = "version";
     }
@@ -394,12 +507,21 @@ public class Notes {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        public static final String VERSION = "version";// 版本号
+    }
+
+    /*
+    * 功能描述：定义DataColumns接口数据的常量，用于创建数据库表头
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public interface DataColumns {
         /**
          * The unique ID for a row
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String ID = "_id";
 =======
@@ -408,12 +530,16 @@ public class Notes {
 =======
         public static final String ID = "_id";// 标识符
 >>>>>>> liuyitao-branch
+=======
+        public static final String ID = "_id";// 标识符
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * The MIME type of the item represented by this row.
          * <P> Type: Text </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String MIME_TYPE = "mime_type";
 =======
@@ -422,12 +548,16 @@ public class Notes {
 =======
         public static final String MIME_TYPE = "mime_type";// 数据的MIME类型
 >>>>>>> liuyitao-branch
+=======
+        public static final String MIME_TYPE = "mime_type";// 数据的MIME类型
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * The reference id to note that this data belongs to
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String NOTE_ID = "note_id";
 =======
@@ -436,12 +566,16 @@ public class Notes {
 =======
         public static final String NOTE_ID = "note_id";// 数据ID
 >>>>>>> liuyitao-branch
+=======
+        public static final String NOTE_ID = "note_id";// 数据ID
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Created data for note or folder
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String CREATED_DATE = "created_date";
 =======
@@ -450,12 +584,16 @@ public class Notes {
 =======
         public static final String CREATED_DATE = "created_date";// 创建日期
 >>>>>>> liuyitao-branch
+=======
+        public static final String CREATED_DATE = "created_date";// 创建日期
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Latest modified date
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String MODIFIED_DATE = "modified_date";
 =======
@@ -464,12 +602,16 @@ public class Notes {
 =======
         public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
 >>>>>>> liuyitao-branch
+=======
+        public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Data's content
          * <P> Type: TEXT </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String CONTENT = "content";
 =======
@@ -478,6 +620,9 @@ public class Notes {
 =======
         public static final String CONTENT = "content";// 内容
 >>>>>>> liuyitao-branch
+=======
+        public static final String CONTENT = "content";// 内容
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
 
         /**
@@ -486,6 +631,7 @@ public class Notes {
          * <P> Type: INTEGER </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String DATA1 = "data1";
 =======
@@ -494,6 +640,9 @@ public class Notes {
 =======
         public static final String DATA1 = "data1";// 通用数据1
 >>>>>>> liuyitao-branch
+=======
+        public static final String DATA1 = "data1";// 通用数据1
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
@@ -501,6 +650,7 @@ public class Notes {
          * <P> Type: INTEGER </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String DATA2 = "data2";
 =======
@@ -509,6 +659,9 @@ public class Notes {
 =======
         public static final String DATA2 = "data2";// 通用数据2
 >>>>>>> liuyitao-branch
+=======
+        public static final String DATA2 = "data2";// 通用数据2
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
@@ -516,6 +669,7 @@ public class Notes {
          * <P> Type: TEXT </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String DATA3 = "data3";
 =======
@@ -524,6 +678,9 @@ public class Notes {
 =======
         public static final String DATA3 = "data3";// 通用数据3
 >>>>>>> liuyitao-branch
+=======
+        public static final String DATA3 = "data3";// 通用数据3
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
@@ -531,6 +688,7 @@ public class Notes {
          * <P> Type: TEXT </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String DATA4 = "data4";
 =======
@@ -539,6 +697,9 @@ public class Notes {
 =======
         public static final String DATA4 = "data4";// 通用数据4
 >>>>>>> liuyitao-branch
+=======
+        public static final String DATA4 = "data4";// 通用数据4
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
@@ -546,6 +707,7 @@ public class Notes {
          * <P> Type: TEXT </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String DATA5 = "data5";
     }
@@ -563,24 +725,37 @@ public class Notes {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        public static final String DATA5 = "data5";// 通用数据5
+    }
+
+    /*
+    * 功能描述：定义了文本便签的数据结构
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public static final class TextNote implements DataColumns {
         /**
          * Mode to indicate the text in check list mode or not
          * <P> Type: Integer 1:check list mode 0: normal mode </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String MODE = DATA1;
+=======
+        public static final String MODE = DATA1;// 模式
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
-        public static final int MODE_CHECK_LIST = 1;
+        public static final int MODE_CHECK_LIST = 1;// 待办清单模式
 
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";// 内容类型
 
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";// 单个条目的内容类型
 
-        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
+        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");// 查询文本便签的URI
     }
 
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
@@ -602,12 +777,18 @@ public class Notes {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+    /*
+    * 功能描述：定义电话便签的数据结构
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public static final class CallNote implements DataColumns {
         /**
          * Call date for this record
          * <P> Type: INTEGER (long) </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String CALL_DATE = DATA1;
 =======
@@ -616,19 +797,27 @@ public class Notes {
 =======
         public static final String CALL_DATE = DATA1;// 通话日期
 >>>>>>> liuyitao-branch
+=======
+        public static final String CALL_DATE = DATA1;// 通话日期
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
         /**
          * Phone number for this record
          * <P> Type: TEXT </P>
          */
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         public static final String PHONE_NUMBER = DATA3;
+=======
+        public static final String PHONE_NUMBER = DATA3;// 电话号码
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";// 内容类型
 
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";// 单个条目的内容类型
 
+<<<<<<< HEAD
         public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
 =======
 =======
@@ -644,5 +833,8 @@ public class Notes {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");// 查询电话便签的URI
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     }
 }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index ffb00d3..2c079d2 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -16,25 +16,37 @@
 
 package net.micode.notes.data;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+=======
+
+import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。
+import android.content.Context;//加载和访问资源。（android中主要是这两个功能，但是这里具体不清楚）
+import android.database.sqlite.SQLiteDatabase;//主要提供了对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values
+import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 import android.util.Log;
 
+
 import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.DataConstants;
 import net.micode.notes.data.Notes.NoteColumns;
-
+/*
+* 功能描述：数据库操作，用SQLOpenhelper,对一些note和文件进行数据库的操作
+*/
 
 public class NotesDatabaseHelper extends SQLiteOpenHelper {
-    private static final String DB_NAME = "note.db";
+    private static final String DB_NAME = "note.db";// 数据库名
 
-    private static final int DB_VERSION = 4;
+    private static final int DB_VERSION = 4;// 版本号
 
     public interface TABLE {
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
@@ -66,53 +78,73 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        /*
+        * 接口，分成note和data,用于表示数据库中两种表格
+        * */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         public static final String NOTE = "note";
 
         public static final String DATA = "data";
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     private static final String TAG = "NotesDatabaseHelper";
+=======
+    private static final String TAG = "NotesDatabaseHelper";// 日志标签，用于在日志中标识数据库操作的相关信息
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
+    /*
+    * NotesDatabaseHelper 类的实例，用于单例模式的数据库操作，通过 getInstance() 方法获取 NotesDatabaseHelper 的唯一实例
+    * 单例模式是一种设计模式，在数据库操作中使用单例模式可以确保只有一个数据库连接，避免了重复创建和关闭数据库连接可能导致的性能问题
+    */
     private static NotesDatabaseHelper mInstance;
 
+    /*
+    * 创建TABLE.NOTE表格，用于存储便签的相关信息
+    */
     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.ID + " INTEGER PRIMARY KEY," +// 便签ID
+            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," +// 便签的Widget ID
+            NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +// 便签的Widget类型
+            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" +// 便签的版本号
         ")";
 
+    /*
+    * 创建TABLE.DATA表格，用于存储便签中的数据
+    */
     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.CONTENT + " TEXT NOT NULL DEFAULT ''," +
-            DataColumns.DATA1 + " INTEGER," +
-            DataColumns.DATA2 + " INTEGER," +
-            DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
-            DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
-            DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
+            DataColumns.ID + " INTEGER PRIMARY KEY," +// 数据ID
+            DataColumns.MIME_TYPE + " TEXT NOT NULL," +// 数据ID数据的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," +// 数据的附加信息1
+            DataColumns.DATA2 + " INTEGER," +// 数据的附加信息2
+            DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +// 数据的附加信息3
+            DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +// 数据的附加信息4
+            DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +// 数据的附加信息5
         ")";
 
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
@@ -173,6 +205,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+    /*
+     * 创建一个名为 note_id_index 的索引，在 TABLE.DATA 表格的 DataColumns.NOTE_ID 列上创建索引，以提高查询性能
+     */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
         "CREATE INDEX IF NOT EXISTS note_id_index ON " +
         TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
@@ -182,18 +219,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
     * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，增加相应文件夹的便签计数
     * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1
      */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     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 +
@@ -208,18 +251,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
     * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，减少相应文件夹的便签计数
     * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1
     */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     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 +
@@ -235,18 +284,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
     * 在向 TABLE.NOTE 表格插入新便签时，增加相应文件夹的便签计数
     * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1
     */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
         "CREATE TRIGGER increase_folder_count_on_insert " +
         " AFTER INSERT ON " + TABLE.NOTE +
@@ -261,18 +316,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
     * 在从 TABLE.NOTE 表格删除便签时，减少相应文件夹的便签计数
     * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1
     */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
         "CREATE TRIGGER decrease_folder_count_on_delete " +
         " AFTER DELETE ON " + TABLE.NOTE +
@@ -288,18 +349,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
     * 在向 TABLE.DATA 表格插入类型为 DataConstants.NOTE 的数据时，更新对应便签的内容
     * 通过更新 TABLE.NOTE 表格中的 NoteColumns.SNIPPET 列，将其设置为新插入数据的内容
     */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
         "CREATE TRIGGER update_note_content_on_insert " +
         " AFTER INSERT ON " + TABLE.DATA +
@@ -315,18 +382,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
     * 在更新类型为 DataConstants.NOTE 的数据时，更新对应便签的内容
     * 通过触发器在 TABLE.DATA 表格上创建，在数据被更新后将新的内容更新到对应的便签中
     */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
         "CREATE TRIGGER update_note_content_on_update " +
         " AFTER UPDATE ON " + TABLE.DATA +
@@ -342,18 +415,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
      * 在删除类型为 DataConstants.NOTE 的数据时，更新对应便签的内容
      * 通过触发器在 TABLE.DATA 表格上创建，在数据被删除后将对应的便签内容清空
      */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
         "CREATE TRIGGER update_note_content_on_delete " +
         " AFTER delete ON " + TABLE.DATA +
@@ -369,18 +448,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
     * 在删除便签时，同时删除该便签相关的数据
     * 通过触发器在 TABLE.NOTE 表格上创建，在便签被删除后将与该便签相关的数据一并删除
     */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
         "CREATE TRIGGER delete_data_on_delete " +
         " AFTER DELETE ON " + TABLE.NOTE +
@@ -394,18 +479,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
      * 在删除文件夹时，同时删除该文件夹下的所有便签
      * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被删除后将该文件夹下的所有便签一并删除。
      */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
         "CREATE TRIGGER folder_delete_notes_on_delete " +
         " AFTER DELETE ON " + TABLE.NOTE +
@@ -419,18 +510,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
 
     /*
      * 在将文件夹移动到回收站时，同时将该文件夹下的所有便签一并移动到回收站
      * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被移动到回收站后将该文件夹下的所有便签的父文件夹ID更新为回收站的ID
      */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
         "CREATE TRIGGER folder_move_notes_on_trash " +
         " AFTER UPDATE ON " + TABLE.NOTE +
@@ -441,6 +538,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
         " END";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -453,10 +551,16 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     * 构造函数，传入数据库的名称和版本
     */
 >>>>>>> liuyitao-branch
+=======
+    /*
+    * 构造函数，传入数据库的名称和版本
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public NotesDatabaseHelper(Context context) {
         super(context, DB_NAME, null, DB_VERSION);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -469,6 +573,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     * 用于创建存储标签属性的表格
     */
 >>>>>>> liuyitao-branch
+=======
+    /*
+    * 用于创建存储标签属性的表格
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public void createNoteTable(SQLiteDatabase db) {
         db.execSQL(CREATE_NOTE_TABLE_SQL);
         reCreateNoteTableTriggers(db);
@@ -476,6 +585,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         Log.d(TAG, "note table has been created");
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     private void reCreateNoteTableTriggers(SQLiteDatabase db) {
@@ -491,6 +601,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+    /*
+    * 用于重新创建数据库中的触发器
+    */
+    private void reCreateNoteTableTriggers(SQLiteDatabase db) {
+        // 通过执行SQL语句DROP TRIGGER IF EXISTS来删除已存在的触发器，以确保不会重复创建
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         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");
@@ -499,6 +616,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");
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
         db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
@@ -530,6 +648,21 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        // 创建新的触发器
+        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);// 删除文件夹计数的触发器
+        db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);// 在删除时同时删除数据的触发器
+        db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);// 增加文件夹计数的触发器
+        db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);// 在删除时同时删除文件夹中的笔记的触发器
+        db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);// 将笔记移动到垃圾箱的触发器
+    }
+
+    /*
+    *用于创建系统文件夹，插入四个不同类型的文件夹记录到 NoteColumns 表中
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private void createSystemFolder(SQLiteDatabase db) {
         ContentValues values = new ContentValues();
 
@@ -538,6 +671,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         /*
          * 创建通话记录文件夹
@@ -548,6 +682,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          * 创建通话记录文件夹
          */
 >>>>>>> liuyitao-branch
+=======
+        /*
+         * 创建通话记录文件夹
+         */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
         db.insert(TABLE.NOTE, null, values);
@@ -557,6 +696,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         /*
          * 根目录，即默认文件夹
@@ -567,6 +707,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          * 根目录，即默认文件夹
          */
 >>>>>>> liuyitao-branch
+=======
+        /*
+         * 根目录，即默认文件夹
+         */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
@@ -577,6 +722,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         /*
          * 临时目录，用于移动笔记
@@ -587,6 +733,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          * 临时目录，用于移动笔记
          */
 >>>>>>> liuyitao-branch
+=======
+        /*
+         * 临时目录，用于移动笔记
+         */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
@@ -597,6 +748,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         /*
          * 创建垃圾箱
@@ -607,6 +759,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
          * 创建垃圾箱
          */
 >>>>>>> liuyitao-branch
+=======
+        /*
+         * 创建垃圾箱
+         */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
@@ -615,13 +772,20 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+    /*
+     * 用于创建存储标签内容的表格
+     */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public void createDataTable(SQLiteDatabase db) {
-        db.execSQL(CREATE_DATA_TABLE_SQL);
-        reCreateDataTableTriggers(db);
-        db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
+        db.execSQL(CREATE_DATA_TABLE_SQL);// 执行 CREATE_DATA_TABLE_SQL 的 SQL 语句来创建数据表
+        reCreateDataTableTriggers(db);// 调用 reCreateDataTableTriggers() 方法重新创建数据表中的触发器
+        db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);// 执行 CREATE_DATA_NOTE_ID_INDEX_SQL 的 SQL 语句来创建一个索引
         Log.d(TAG, "data table has been created");
     }
 
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
@@ -642,6 +806,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+    /*
+    * 用于重新创建数据表中的触发器
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     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");
@@ -652,11 +821,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     /*
     * 用于获取单例的数据库帮助类对象
     * 解决同一时刻只能有一个线程执行.
@@ -664,9 +836,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     * 但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例
     */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     static synchronized NotesDatabaseHelper getInstance(Context context) {
         if (mInstance == null) {
             mInstance = new NotesDatabaseHelper(context);
@@ -677,6 +852,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     @Override
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     /*
     * 在数据库第一次创建时被调用，用于创建所需的表格和触发器
@@ -687,6 +863,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     * 在数据库第一次创建时被调用，用于创建所需的表格和触发器
     */
 >>>>>>> liuyitao-branch
+=======
+    /*
+    * 在数据库第一次创建时被调用，用于创建所需的表格和触发器
+    */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public void onCreate(SQLiteDatabase db) {
         createNoteTable(db);
         createDataTable(db);
@@ -694,6 +875,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 
     @Override
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         boolean reCreateTriggers = false;
@@ -707,14 +889,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     */
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         boolean reCreateTriggers = false;
+=======
+    /*
+    * 根据旧版本和新版本之间的差异来执行相应的数据库升级操作
+    */
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        boolean reCreateTriggers = false;
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         boolean skipV2 = false;// 是否进行V2升级
         /*
         * 如果旧版本为1，则调用upgradeToV2方法
         */
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         if (oldVersion == 1) {
             upgradeToV2(db);
             skipV2 = true; // this upgrade including the upgrade from v2 to v3
@@ -722,6 +914,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         }
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
         /*
@@ -733,6 +926,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         * 如果旧版本为2且未跳过V2升级，则调用upgradeToV3方法
         */
 >>>>>>> liuyitao-branch
+=======
+        /*
+        * 如果旧版本为2且未跳过V2升级，则调用upgradeToV3方法
+        */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         if (oldVersion == 2 && !skipV2) {
             upgradeToV3(db);
             reCreateTriggers = true;
@@ -740,6 +938,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         }
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
         /*
@@ -751,12 +950,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         * 如果旧版本为3，则调用upgradeToV4方法
         */
 >>>>>>> liuyitao-branch
+=======
+        /*
+        * 如果旧版本为3，则调用upgradeToV4方法
+        */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         if (oldVersion == 3) {
             upgradeToV4(db);
             oldVersion++;
         }
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
         /*
@@ -768,12 +973,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         * 如果需要重新创建触发器，则调用reCreateNoteTableTriggers和reCreateDataTableTriggers方法重新创建触发器
         */
 >>>>>>> liuyitao-branch
+=======
+        /*
+        * 如果需要重新创建触发器，则调用reCreateNoteTableTriggers和reCreateDataTableTriggers方法重新创建触发器
+        */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         if (reCreateTriggers) {
             reCreateNoteTableTriggers(db);
             reCreateDataTableTriggers(db);
         }
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
         /*
@@ -785,6 +996,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         * 如果旧版本和新版本不匹配，则抛出异常
         */
 >>>>>>> liuyitao-branch
+=======
+        /*
+        * 如果旧版本和新版本不匹配，则抛出异常
+        */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         if (oldVersion != newVersion) {
             throw new IllegalStateException("Upgrade notes database to version " + newVersion
                     + "fails");
@@ -793,14 +1009,27 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+    /*
+    * 更新到V2版本
+    * */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private void upgradeToV2(SQLiteDatabase db) {
+        /*
+        * 通过执行SQL语句DROP TABLE IF EXISTS来删除旧的NOTE和DATA表格
+        * */
         db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
         db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
-        createNoteTable(db);
-        createDataTable(db);
+        createNoteTable(db);// 调用createNoteTable和createDataTable方法来创建新的NOTE表格
+        createDataTable(db);// 调用createNoteTable和createDataTable方法来创建新的DATA表格
     }
 
+    /*
+    * 更新到V3版本
+    * */
     private void upgradeToV3(SQLiteDatabase db) {
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
@@ -828,11 +1057,17 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        /*
+        * 执行SQL语句DROP TRIGGER IF EXISTS来移除不再使用的触发器
+        * */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         // 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");
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         // add a column for gtask id
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
@@ -853,6 +1088,17 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+        /*
+        * 执行ALTER TABLE语句向NOTE表格中添加一个新的列GTASK_ID，该列的类型是TEXT，并设置默认值为''
+        * */
+        // add a column for gtask id
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+                + " TEXT NOT NULL DEFAULT ''");
+        /*
+        * 通过ContentValues对象向NOTE表格中插入一条记录，该记录代表垃圾箱系统文件夹
+        * */
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         // add a trash system folder
         ContentValues values = new ContentValues();
         values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
@@ -860,6 +1106,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.insert(TABLE.NOTE, null, values);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     private void upgradeToV4(SQLiteDatabase db) {
@@ -878,5 +1125,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+    /*
+    * 更新到V4版本
+    * */
+    private void upgradeToV4(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+                + " INTEGER NOT NULL DEFAULT 0");// 通过执行ALTER TABLE语句向NOTE表格中添加一个新的列VERSION，该列的类型是INTEGER，并设置默认值为0
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     }
 }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
index 17b96e6..4ba9973 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -37,7 +37,15 @@ import net.micode.notes.data.NotesDatabaseHelper.TABLE;
 <<<<<<< HEAD
 <<<<<<< HEAD
 
+//为存储和获取数据提供接口。可以在不同的应用程序之间共享数据
+//ContentProvider提供的方法
+//query：查询
+//insert：插入
+//update：更新
+//delete：删除
+//getType：得到数据类型
 public class NotesProvider extends ContentProvider {
+    // UriMatcher用于匹配Uri
     private static final UriMatcher mMatcher;
 
     private NotesDatabaseHelper mHelper;
@@ -73,7 +81,12 @@ public class NotesProvider extends ContentProvider {
     static {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+        // 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
         mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        // 把需要匹配Uri路径全部给注册上
         mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
         mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
         mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
@@ -107,6 +120,7 @@ public class NotesProvider extends ContentProvider {
      */
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
@@ -118,6 +132,10 @@ public class NotesProvider extends ContentProvider {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+
+    // 声明 NOTES_SEARCH_PROJECTION
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     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 + ","
@@ -126,6 +144,7 @@ public class NotesProvider extends ContentProvider {
         + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
         + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -138,6 +157,9 @@ public class NotesProvider extends ContentProvider {
     * 查询语句，用于查询搜索结果
     * */
 >>>>>>> liuyitao-branch
+=======
+    // 声明NOTES_SNIPPET_SEARCH_QUERY
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
         + " FROM " + TABLE.NOTE
         + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
@@ -147,6 +169,7 @@ public class NotesProvider extends ContentProvider {
     @Override
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     /*
     *在onCreate()中初始化Context，实例化mHelper
@@ -157,6 +180,10 @@ public class NotesProvider extends ContentProvider {
     *在onCreate()中初始化Context，实例化mHelper
     * */
 >>>>>>> liuyitao-branch
+=======
+    // Context只有在onCreate()中才被初始化
+    // 对mHelper进行实例化
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public boolean onCreate() {
         mHelper = NotesDatabaseHelper.getInstance(getContext());
         return true;
@@ -165,12 +192,19 @@ public class NotesProvider extends ContentProvider {
     @Override
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+    // 查询uri在数据库中对应的位置
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
             String sortOrder) {
         Cursor c = null;
+        // 获取可读数据库
         SQLiteDatabase db = mHelper.getReadableDatabase();
         String id = null;
+        // 匹配查找uri
         switch (mMatcher.match(uri)) {
+            // 对于不同的匹配值，在数据库中查找相应的条目
             case URI_NOTE:
                 c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
                         sortOrder);
@@ -228,6 +262,7 @@ public class NotesProvider extends ContentProvider {
             case URI_SEARCH:
             case URI_SEARCH_SUGGEST:
                 if (sortOrder != null || projection != null) {
+                    // 不合法的参数异常
                     throw new IllegalArgumentException(
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -245,6 +280,11 @@ public class NotesProvider extends ContentProvider {
                     if (uri.getPathSegments().size() > 1) {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+                        // getPathSegments()方法得到一个String的List，
+                        // 在uri.getPathSegments().get(1)为第2个元素
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
                         searchString = uri.getPathSegments().get(1);
                     }
                 } else {
@@ -264,6 +304,7 @@ public class NotesProvider extends ContentProvider {
                 }
                 break;
             default:
+                // 抛出异常
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
         if (c != null) {
@@ -273,13 +314,17 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
+    // 插入一个uri
     public Uri insert(Uri uri, ContentValues values) {
+        // 获得可写的数据库
         SQLiteDatabase db = mHelper.getWritableDatabase();
         long dataId = 0, noteId = 0, insertedId = 0;
         switch (mMatcher.match(uri)) {
+            // 新增一个条目
             case URI_NOTE:
                 insertedId = noteId = db.insert(TABLE.NOTE, null, values);
                 break;
+            // 如果存在，查找NOTE_ID
             case URI_DATA:
                 if (values.containsKey(DataColumns.NOTE_ID)) {
                     noteId = values.getAsLong(DataColumns.NOTE_ID);
@@ -292,6 +337,7 @@ public class NotesProvider extends ContentProvider {
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
         // Notify the note uri
+        // notifyChange获得一个ContextResolver对象并且更新里面的内容
         if (noteId > 0) {
             getContext().getContentResolver().notifyChange(
                     ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
@@ -303,13 +349,17 @@ public class NotesProvider extends ContentProvider {
                     ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
         }
 
+        // 返回插入的uri的路径
         return ContentUris.withAppendedId(uri, insertedId);
     }
 
     @Override
+    // 删除一个uri
     public int delete(Uri uri, String selection, String[] selectionArgs) {
+        //Uri代表要操作的数据，Android上可用的每种资源 -包括 图像、视频片段、音频资源等都可以用Uri来表示
         int count = 0;
         String id = null;
+        // 获得可写的数据库
         SQLiteDatabase db = mHelper.getWritableDatabase();
         boolean deleteData = false;
         switch (mMatcher.match(uri)) {
@@ -451,6 +501,7 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
+    // 更新一个uri
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         int count = 0;
         String id = null;
@@ -490,6 +541,7 @@ public class NotesProvider extends ContentProvider {
         return count;
     }
 
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> liuyitao-branch
@@ -575,12 +627,19 @@ public class NotesProvider extends ContentProvider {
 >>>>>>> liuyitao-branch
 =======
 >>>>>>> liuyitao-branch
+=======
+    // 将字符串解析成规定格式
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private String parseSelection(String selection) {
         return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
     }
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+    //增加一个noteVersion
+>>>>>>> c984adcce551cff51ee11d737f171a1841d04f9b
     private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
         StringBuilder sql = new StringBuilder(120);
         sql.append("UPDATE ");
@@ -603,6 +662,7 @@ public class NotesProvider extends ContentProvider {
             sql.append(selectString);
         }
 
+        // execSQL()方法可以执行insert、delete、update和CREATE TABLE之类有更改行为的SQL语句
         mHelper.getWritableDatabase().execSQL(sql.toString());
     }
 
