Merge pull request '合并1' (#33) from develop_zhangshiyi into main

src/Notes-master/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

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

@@ -41,7 +41,7 @@ import java.io.IOException;
 
 
 public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
-    private long mNoteId;
+    private long mNoteId; //文本在数据库存储中的ID号
     private String mSnippet;
     private static final int SNIPPET_PREW_MAX_LEN = 60;
     MediaPlayer mPlayer;