Squashed commit of the following:

commit e5572d51b9
Author: zcx <1078327420@qq.com>
Date:   Sat Dec 23 10:21:14 2023 +0800

    12.23

commit d09e80db11
Author: zcx <1078327420@qq.com>
Date:   Fri Dec 22 20:54:32 2023 +0800

    1

commit 4853527fe5
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 21 21:16:22 2023 +0800

    1

commit b145d72307
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 21 21:14:41 2023 +0800

    1

commit fcc509a830
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 21 10:01:45 2023 +0800

    1

commit 197dfc861e
Author: zcx <1078327420@qq.com>
Date:   Tue Dec 19 11:54:49 2023 +0800

    1

commit ed719ab579
Author: zcx <1078327420@qq.com>
Date:   Tue Dec 19 11:47:13 2023 +0800

    最近标注

commit 48849a21d6
Merge: c7b8dfe d23da33
Author: zcx <1078327420@qq.com>
Date:   Tue Dec 19 07:38:32 2023 +0800

    Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch

    # Conflicts:
    #	doc/实践模板-开源软件泛读、标注和维护报告文档.docx

commit c7b8dfe14a
Author: zcx <1078327420@qq.com>
Date:   Tue Dec 19 07:27:37 2023 +0800

    1

commit 781d628f8f
Author: zcx <1078327420@qq.com>
Date:   Sat Dec 16 08:03:54 2023 +0800

    标注

commit fe88fa8706
Merge: 40a106a 50cfb15
Author: zcx <1078327420@qq.com>
Date:   Sat Dec 16 08:02:00 2023 +0800

    Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch

commit 40a106ab72
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:50:49 2023 +0800

    1

commit a6bf1d5701
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:36:19 2023 +0800

    UI包一部分

commit a99095dbf9
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:25:02 2023 +0800

    data包

commit b7353d6c78
Merge: b5f43d0 0b1994e
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:22:15 2023 +0800

    Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch

    # Conflicts:
    #	.gitignore
    #	doc/实践模板-开源软件泛读、标注和维护报告文档.docx

commit b5f43d0721
Author: zcx <1078327420@qq.com>
Date:   Sun Dec 10 10:38:18 2023 +0800

    1

commit a8c79ccdc5
Author: zcx <1078327420@qq.com>
Date:   Mon Dec 4 21:09:41 2023 +0800

    。

# Conflicts:
#	doc/实践模板-开源软件泛读、标注和维护报告文档.docx
#	src/Notes-master/src/net/micode/notes/data/Contact.java
#	src/Notes-master/src/net/micode/notes/data/Notes.java
#	src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
#	src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java

src/Notes-master/src/net/micode/notes/data/Contact.java

@@ -27,17 +27,23 @@ import android.telephony.PhoneNumberUtils;
 //引用android.telephony.PhoneNumberUtils
 import android.util.Log;//引用android.util.Log
 <<<<<<< HEAD
+<<<<<<< HEAD
  
 import java.util.HashMap;//引用java.util.HashMap
 
 //联系人
 public class Contact { 
 =======
+=======
+>>>>>>> 曾晨曦_branch
 
 import java.util.HashMap;//引用java.util.HashMap
 
 //联系人
 public class Contact {
+<<<<<<< HEAD
+>>>>>>> 曾晨曦_branch
+=======
 >>>>>>> 曾晨曦_branch
     private static HashMap<String, String> sContactCache;
     private static final String TAG = "Contact";
@@ -77,8 +83,13 @@ public class Contact {
         // 判定查询结果
         // moveToFirst()返回第一条
         if (cursor != null && cursor.moveToFirst()) {
+<<<<<<< HEAD
 <<<<<<< HEAD
 		  try {
+=======
+            // 找到相关信息
+            try {
+>>>>>>> 曾晨曦_branch
 =======
             // 找到相关信息
             try {
@@ -89,8 +100,12 @@ public class Contact {
                 // 异常处理
             } catch (IndexOutOfBoundsException e) {
                 Log.e(TAG, " Cursor get string error " + e.toString());
+<<<<<<< HEAD
 <<<<<<< HEAD
 		//输出相关string error错误信息
+=======
+                //输出相关string error错误信息
+>>>>>>> 曾晨曦_branch
 =======
                 //输出相关string error错误信息
 >>>>>>> 曾晨曦_branch
@@ -102,7 +117,11 @@ public class Contact {
         } else {
             Log.d(TAG, "No contact matched with number:" + phoneNumber);
 <<<<<<< HEAD
+<<<<<<< HEAD
+		//输出No contact matched错误信息
+=======
             //输出No contact matched错误信息
+>>>>>>> 曾晨曦_branch
 =======
             //输出No contact matched错误信息
 >>>>>>> 曾晨曦_branch

src/Notes-master/src/net/micode/notes/data/Notes.java

@@ -16,16 +16,24 @@
 
 package net.micode.notes.data;//此类在文件中的位置
 <<<<<<< HEAD
+<<<<<<< HEAD
  
 =======
 
+>>>>>>> 曾晨曦_branch
+=======
+
 >>>>>>> 曾晨曦_branch
 import android.content.ContentUris;//引用android.content.ContentUris
 import android.net.Uri;//引用android.net.Uri
 // Notes 类中定义了很多常量，这些常量大多是int型和string型
 public class Notes {
+<<<<<<< HEAD
 <<<<<<< HEAD
    //定义两个常量
+=======
+    //定义两个常量
+>>>>>>> 曾晨曦_branch
 =======
     //定义两个常量
 >>>>>>> 曾晨曦_branch
@@ -47,6 +55,7 @@ public class Notes {
     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;
+<<<<<<< HEAD
 <<<<<<< HEAD
  
     public static final String INTENT_EXTRA_ALERT_DATE = 
@@ -70,6 +79,8 @@ public class Notes {
  
 //定义使用widget挂件的常量
 =======
+=======
+>>>>>>> 曾晨曦_branch
 
     public static final String INTENT_EXTRA_ALERT_DATE =
             //定义net.micode.notes.alert_date的常量
@@ -91,6 +102,9 @@ public class Notes {
             "net.micode.notes.call_date";
 
     //定义使用widget挂件的常量
+<<<<<<< HEAD
+>>>>>>> 曾晨曦_branch
+=======
 >>>>>>> 曾晨曦_branch
     public static final int TYPE_WIDGET_INVALIDE      = -1;
     public static final int TYPE_WIDGET_2X            = 0;
@@ -104,6 +118,7 @@ public class Notes {
     /**
      * 用于查询所有便笺和文件夹的 URI
      */
+<<<<<<< HEAD
 <<<<<<< HEAD
     public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + 
  
@@ -111,11 +126,16 @@ AUTHORITY + "/note");//定义查询便签和文件夹的指针。
      public static final Uri my_URI = ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI , 10);
    
 =======
+=======
+>>>>>>> 曾晨曦_branch
     public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" +
 
             AUTHORITY + "/note");//定义查询便签和文件夹的指针。
     public static final Uri my_URI = ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI , 10);
 
+<<<<<<< HEAD
+>>>>>>> 曾晨曦_branch
+=======
 >>>>>>> 曾晨曦_branch
     /**
      * 用于查询数据的 URI

src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java

@@ -205,8 +205,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
         "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
+<<<<<<< HEAD
 <<<<<<< HEAD
         " END";。
+=======
+        " END";
+>>>>>>> 曾晨曦_branch
 =======
         " END";
 >>>>>>> 曾晨曦_branch

src/Notes-master/src/net/micode/notes/ui/NotesListItem.java

@@ -57,7 +57,7 @@ public class NotesListItem extends LinearLayout {
             mCheckBox.setVisibility(View.VISIBLE);  //设置可见行为
             mCheckBox.setChecked(checked);//给格子打钩
         } else {
-            mCheckBox.setVisibility(View.GONE);
+            mCheckBox.setVisibility(View.GONE);//将名为mCheckBox的复选框控件设置为不可见
         }
  
         mItemData = data;

src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java

@@ -302,7 +302,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 });
                 startActivityForResult(intent, -1);//跳回上一个选项
                 
-                dialog.dismiss();
+                dialog.dismiss();//关闭一个Dialog对话框
             }
         });