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

@@ -25,8 +25,6 @@ import android.util.Log;
 
 import java.util.HashMap;
 
-<<<<<<< HEAD
-=======
 public class Contact { //ÁªÏµÈË
     private static HashMap<String, String> sContactCache;
     private static final String TAG = "Contact";
@@ -111,7 +109,6 @@ import android.util.Log;
 
 import java.util.HashMap;
 
->>>>>>> dev
 public class Contact {
     private static HashMap<String, String> sContactCache;
     private static final String TAG = "Contact";

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

@@ -17,19 +17,12 @@
 package net.micode.notes.data;
 
 import android.net.Uri;
-
-// Notes 类中定义了很多常量，这些常量大多是int型和string型
 public class Notes {
     public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";
-    //以下三个常量对NoteColumns.TYPE的值进行设置时会用到
-        /**
-     * 帖子类型常量
-     */
-    public static final int TYPE_NOTE     = 0; // 笔记类型
-    public static final int TYPE_FOLDER   = 1; // 文件夹类型
-    public static final int TYPE_SYSTEM   = 2; // 系统类型
-
+    public static final int TYPE_NOTE     = 0;
+    public static final int TYPE_FOLDER   = 1;
+    public static final int TYPE_SYSTEM   = 2;
 
     /**
      * Following IDs are system folders' identifiers
@@ -37,28 +30,21 @@ 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;   // 根文件夹的ID
-    public static final int ID_TEMPARAY_FOLDER = -1;   // 临时文件夹的ID
-    public static final int ID_CALL_RECORD_FOLDER = -2;   // 通话记录文件夹的ID
-    public static final int ID_TRASH_FOLER = -3;   // 垃圾箱文件夹的ID
-
-    /**
-     * 其他常量
-     */
-    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";   // 小部件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";   // 文件夹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;    // 2倍尺寸控件
-    public static final int TYPE_WIDGET_4X            = 1;    // 4倍尺寸控件
-
+    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";
+    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 TYPE_WIDGET_INVALIDE      = -1;
+    public static final int TYPE_WIDGET_2X            = 0;
+    public static final int TYPE_WIDGET_4X            = 1;
 
     public static class DataConstants {
         public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
@@ -68,16 +54,13 @@ public class Notes {
     /**
      * Uri to query all notes and folders
      */
-    //定义查询便签和文件夹的指针
     public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
 
-
     /**
      * Uri to query data
      */
-    //定义查找数据的指针。
     public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
-    // 定义NoteColumns的常量,用于后面创建数据库的表头
+
     public interface NoteColumns {
         /**
          * The unique ID for a row
@@ -182,9 +165,8 @@ public class Notes {
          * <P> Type : INTEGER (long) </P>
          */
         public static final String VERSION = "version";
-        //这些常量主要是定义便签的属性的。
     }
-    // 定义DataColumns的常量,用于后面创建数据库的表头
+
     public interface DataColumns {
         /**
          * The unique ID for a row
@@ -257,7 +239,6 @@ public class Notes {
          * <P> Type: TEXT </P>
          */
         public static final String DATA5 = "data5";
-        //主要是定义存储便签内容数据的
     }
 
     public static final class TextNote implements DataColumns {
@@ -274,7 +255,6 @@ public class Notes {
         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 class CallNote implements DataColumns {
@@ -295,6 +275,5 @@ public class Notes {
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
 
         public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
-        //电话内容的数据结构
     }
 }

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

@@ -15,35 +15,24 @@
  */
 
 package net.micode.notes.data;
-//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。
+
 import android.content.ContentValues;
-//加载和访问资源。
 import android.content.Context;
-//主要提供了对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values
 import android.database.sqlite.SQLiteDatabase;
-//用来管理数据的创建和版本更新
 import android.database.sqlite.SQLiteOpenHelper;
 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和文件进行数据库的操作，比如删除文件后，将文件里的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;
 
-    /**
-     * 表名常量
-     */
-    public interface TABLE {   //接口，分成note和data，在后面的程序里分别使用过
+    public interface TABLE {
         public static final String NOTE = "note";
 
         public static final String DATA = "data";
@@ -53,9 +42,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 
     private static NotesDatabaseHelper mInstance;
 
-        /**
-     * 创建NOTE表的SQL语句
-     */
     private static final String CREATE_NOTE_TABLE_SQL =
         "CREATE TABLE " + TABLE.NOTE + "(" +
             NoteColumns.ID + " INTEGER PRIMARY KEY," +
@@ -75,7 +61,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
             NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
-        ")";  //数据库中需要存储的项目的名称，就相当于创建一个表格的表头的内容。
+        ")";
 
     private static final String CREATE_DATA_TABLE_SQL =
         "CREATE TABLE " + TABLE.DATA + "(" +
@@ -90,7 +76,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
             DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
             DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
-        ")"; //和上面的功能一样，主要是存储的项目不同
+        ")";
 
     private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
         "CREATE INDEX IF NOT EXISTS note_id_index ON " +
@@ -106,7 +92,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
         "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
-        " END";   //在文件夹中移入一个Note之后需要更改的数据的表格。
+        " END";
 
     /**
      * Decrease folder's note count when move note from folder
@@ -119,7 +105,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
         "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
         "  AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
-        " END";  //在文件夹中移出一个Note之后需要更改的数据的表格。
+        " END";
 
     /**
      * Increase folder's note count when insert new note to the folder
@@ -131,7 +117,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
         "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
-        " END";  //在文件夹中插入一个Note之后需要更改的数据的表格。
+        " END";
 
     /**
      * Decrease folder's note count when delete note from the folder
@@ -144,7 +130,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
         "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
         "  AND " + NoteColumns.NOTES_COUNT + ">0;" +
-        " END";  //在文件夹中删除一个Note之后需要更改的数据的表格。
+        " END";
 
     /**
      * Update note's content when insert data with type {@link DataConstants#NOTE}
@@ -157,7 +143,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
         "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
-        " END";  //在文件夹中对一个Note导入新的数据之后需要更改的数据的表格。
+        " END";
 
     /**
      * Update note's content when data with {@link DataConstants#NOTE} type has changed
@@ -170,7 +156,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
         "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
-        " END";  //Note数据被修改后需要更改的数据的表格。
+        " END";
 
     /**
      * Update note's content when data with {@link DataConstants#NOTE} type has deleted
@@ -183,7 +169,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.SNIPPET + "=''" +
         "  WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
-        " END";  //Note数据被删除后需要更改的数据的表格。
+        " END";
 
     /**
      * Delete datas belong to note which has been deleted
@@ -194,7 +180,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         " BEGIN" +
         "  DELETE FROM " + TABLE.DATA +
         "   WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
-        " END"; //删除已删除的便签的数据后需要更改的数据的表格。
+        " END";
 
     /**
      * Delete notes belong to folder which has been deleted
@@ -205,7 +191,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         " BEGIN" +
         "  DELETE FROM " + TABLE.NOTE +
         "   WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
-        " END";  //删除已删除的文件夹的便签后需要更改的数据的表格。
+        " END";
 
     /**
      * Move notes belong to folder which has been moved to trash folder
@@ -218,18 +204,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         "  UPDATE " + TABLE.NOTE +
         "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
         "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
-        " END";  //还原垃圾桶中便签后需要更改的数据的表格。
+        " END";
 
     public NotesDatabaseHelper(Context context) {
         super(context, DB_NAME, null, DB_VERSION);
     }
-    //构造函数，传入数据库的名称和版本
+
     public void createNoteTable(SQLiteDatabase db) {
         db.execSQL(CREATE_NOTE_TABLE_SQL);
         reCreateNoteTableTriggers(db);
         createSystemFolder(db);
         Log.d(TAG, "note table has been created");
-    }   //创建表格（用来存储标签属性）
+    }
 
     private void reCreateNoteTableTriggers(SQLiteDatabase db) {
         db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
@@ -248,8 +234,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
         db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
     }
-    //execSQL是数据库操作的API，主要是更改行为的SQL语句。
-    //在这里主要是用来重新创建上述定义的表格用的，先删除原来有的数据库的触发器再重新创建新的数据库
 
     private void createSystemFolder(SQLiteDatabase db) {
         ContentValues values = new ContentValues();
@@ -284,14 +268,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
         db.insert(TABLE.NOTE, null, values);
-    }//创建几个系统文件夹
+    }
 
     public void createDataTable(SQLiteDatabase db) {
         db.execSQL(CREATE_DATA_TABLE_SQL);
         reCreateDataTableTriggers(db);
         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");
@@ -301,23 +285,20 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         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);
-    }  //同上面的execSQL
+    }
 
     static synchronized NotesDatabaseHelper getInstance(Context context) {
         if (mInstance == null) {
             mInstance = new NotesDatabaseHelper(context);
         }
         return mInstance;
-    }//解决同一时刻只能有一个线程执行.
-    //在写程序库代码时，有时有一个类需要被所有的其它类使用，
-    //但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例
+    }
 
     @Override
     public void onCreate(SQLiteDatabase db) {
         createNoteTable(db);
         createDataTable(db);
     }
-    //实现两个表格（上面创建的两个表格）
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
@@ -350,7 +331,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             throw new IllegalStateException("Upgrade notes database to version " + newVersion
                     + "fails");
         }
-        //数据库版本的更新（数据库内容的更改）
     }
 
     private void upgradeToV2(SQLiteDatabase db) {
@@ -358,7 +338,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
         createNoteTable(db);
         createDataTable(db);
-        //更新到V2版本
     }
 
     private void upgradeToV3(SQLiteDatabase db) {
@@ -374,12 +353,10 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
         db.insert(TABLE.NOTE, null, values);
-        //更新到V3版本
     }
 
     private void upgradeToV4(SQLiteDatabase db) {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
     }
-    //更新到V4版本
 }

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

@@ -33,11 +33,6 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-<<<<<<< HEAD
-
-
-public class NotesProvider extends ContentProvider {
-=======
 //为存储和获取数据提供接口。可以在不同的应用程序之间共享数据
 //ContentProvider提供的方法
 //query：查询
@@ -49,7 +44,6 @@ public class NotesProvider extends ContentProvider {
 
 public class NotesProvider extends ContentProvider {
     // UriMatcher用于匹配Uri
->>>>>>> dev
     private static final UriMatcher mMatcher;
 
     private NotesDatabaseHelper mHelper;
@@ -65,14 +59,10 @@ public class NotesProvider extends ContentProvider {
     private static final int URI_SEARCH_SUGGEST  = 6;
 
     static {
-<<<<<<< HEAD
-        mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-=======
         // 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码
 
         mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         // 把需要匹配Uri路径全部给注册上
->>>>>>> dev
         mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
         mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
         mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
@@ -86,10 +76,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.
      */
-<<<<<<< HEAD
-=======
     // 声明 NOTES_SEARCH_PROJECTION
->>>>>>> dev
     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 + ","
@@ -97,11 +84,7 @@ public class NotesProvider extends ContentProvider {
         + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
         + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
         + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
-<<<<<<< HEAD
-
-=======
     // 声明NOTES_SNIPPET_SEARCH_QUERY
->>>>>>> dev
     private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
         + " FROM " + TABLE.NOTE
         + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
@@ -109,25 +92,14 @@ public class NotesProvider extends ContentProvider {
         + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
 
     @Override
-<<<<<<< HEAD
-=======
     // Context只有在onCreate()中才被初始化
     // 对mHelper进行实例化
->>>>>>> dev
     public boolean onCreate() {
         mHelper = NotesDatabaseHelper.getInstance(getContext());
         return true;
     }
 
     @Override
-<<<<<<< HEAD
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        Cursor c = null;
-        SQLiteDatabase db = mHelper.getReadableDatabase();
-        String id = null;
-        switch (mMatcher.match(uri)) {
-=======
     // 查询uri在数据库中对应的位置
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
             String sortOrder) {
@@ -138,7 +110,6 @@ public class NotesProvider extends ContentProvider {
         // 匹配查找uri
         switch (mMatcher.match(uri)) {
             // 对于不同的匹配值，在数据库中查找相应的条目
->>>>>>> dev
             case URI_NOTE:
                 c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
                         sortOrder);
@@ -160,10 +131,7 @@ public class NotesProvider extends ContentProvider {
             case URI_SEARCH:
             case URI_SEARCH_SUGGEST:
                 if (sortOrder != null || projection != null) {
-<<<<<<< HEAD
-=======
                     // 不合法的参数异常
->>>>>>> dev
                     throw new IllegalArgumentException(
                             "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
                 }
@@ -171,11 +139,8 @@ public class NotesProvider extends ContentProvider {
                 String searchString = null;
                 if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
                     if (uri.getPathSegments().size() > 1) {
-<<<<<<< HEAD
-=======
                         // getPathSegments()方法得到一个String的List，
                         // 在uri.getPathSegments().get(1)为第2个元素
->>>>>>> dev
                         searchString = uri.getPathSegments().get(1);
                     }
                 } else {
@@ -195,10 +160,7 @@ public class NotesProvider extends ContentProvider {
                 }
                 break;
             default:
-<<<<<<< HEAD
-=======
                 // 抛出异常
->>>>>>> dev
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
         if (c != null) {
@@ -208,15 +170,6 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
-<<<<<<< HEAD
-    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;
-=======
     // 插入一个uri
     public Uri insert(Uri uri, ContentValues values) {
         // 获得可写的数据库
@@ -228,7 +181,6 @@ public class NotesProvider extends ContentProvider {
                 insertedId = noteId = db.insert(TABLE.NOTE, null, values);
                 break;
             // 如果存在，查找NOTE_ID
->>>>>>> dev
             case URI_DATA:
                 if (values.containsKey(DataColumns.NOTE_ID)) {
                     noteId = values.getAsLong(DataColumns.NOTE_ID);
@@ -239,11 +191,8 @@ public class NotesProvider extends ContentProvider {
                 break;
             default:
                 throw new IllegalArgumentException("Unknown URI " + uri);
-<<<<<<< HEAD
-=======
                 // Notify the note uri
                 // notifyChange获得一个ContextResolver对象并且更新里面的内容
->>>>>>> dev
         }
         // Notify the note uri
         if (noteId > 0) {
@@ -256,20 +205,11 @@ public class NotesProvider extends ContentProvider {
             getContext().getContentResolver().notifyChange(
                     ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
         }
-<<<<<<< HEAD
-
-=======
         // 返回插入的uri的路径
->>>>>>> dev
         return ContentUris.withAppendedId(uri, insertedId);
     }
 
     @Override
-<<<<<<< HEAD
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        int count = 0;
-        String id = null;
-=======
     // 删除一个uri
     public int delete(Uri uri, String selection, String[] selectionArgs) {
         //Uri代表要操作的数据，Android上可用的每种资源 -包括 图像、视频片段、音频资源等都可以用Uri来表示。
@@ -278,7 +218,6 @@ public class NotesProvider extends ContentProvider {
         String id = null;
         // 获得可写的数据库
 
->>>>>>> dev
         SQLiteDatabase db = mHelper.getWritableDatabase();
         boolean deleteData = false;
         switch (mMatcher.match(uri)) {
@@ -322,11 +261,8 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
-<<<<<<< HEAD
-=======
     // 更新一个uri
 
->>>>>>> dev
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         int count = 0;
         String id = null;
@@ -366,20 +302,13 @@ public class NotesProvider extends ContentProvider {
         return count;
     }
 
-<<<<<<< HEAD
-    private String parseSelection(String selection) {
-=======
     private String parseSelection(String selection) {    // 将字符串解析成规定格式
 
->>>>>>> dev
         return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
     }
 
     private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
-<<<<<<< HEAD
-=======
         //增加一个noteVersion
->>>>>>> dev
         StringBuilder sql = new StringBuilder(120);
         sql.append("UPDATE ");
         sql.append(TABLE.NOTE);
@@ -400,20 +329,13 @@ public class NotesProvider extends ContentProvider {
             }
             sql.append(selectString);
         }
-<<<<<<< HEAD
-
-=======
         // execSQL()方法可以执行insert、delete、update和CREATE TABLE之类有更改行为的SQL语句
->>>>>>> dev
         mHelper.getWritableDatabase().execSQL(sql.toString());
     }
 
     @Override
     public String getType(Uri uri) {
-<<<<<<< HEAD
-=======
 
->>>>>>> dev
         // TODO Auto-generated method stub
         return null;
     }

MiNote/src/net/micode/notes/ui/AlarmAlertActivity.java

@@ -205,228 +205,4 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
             mPlayer = null;
         }
     }
-}/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.view.Window;
-import android.view.WindowManager;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.DataUtils;
-
-import java.io.IOException;
-
-public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
-    private long mNoteId;      //文本在数据库存储中的ID号
-    private String mSnippet;   //闹钟提示时出现的文本片段
-    private long mNoteId;
-    private String mSnippet;
-    private static final int SNIPPET_PREW_MAX_LEN = 60;
-    MediaPlayer mPlayer;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的
-        //onsaveInstanceState方法是用来保存Activity的状态的
-        //能从onCreate的参数savedInsanceState中获得状态数据
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        //界面显示——无标题
-
-        final Window win = getWindow();
-        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-
-        if (!isScreenOn()) {
-            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                    //保持窗体点亮
-                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                    //将窗体点亮
-                    | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
-                    //允许窗体点亮时锁屏
-                    | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
-        }//在手机锁屏后如果到了闹钟提示时间，点亮屏幕
-
-        Intent intent = getIntent();
-
-        try {
-            mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
-            mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
-            //根据ID从数据库中获取标签的内容；
-            //getContentResolver（）是实现数据共享，实例存储。
-            mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
-                    SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
-                    : mSnippet;
-            //判断标签片段是否达到符合长度
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-            return;
-        }
-        /*
-        try
-        {
-        	// 代码区
-        }
-        catch(Exception e)
-        {
-        	// 异常处理
-        }
-                     代码区如果有错误，就会返回所写异常的处理。*/
-
-        /*
-        try
-        {
-        	// 代码区
-        }
-        catch(Exception e)
-        {
-        	// 异常处理
-        }
-                     代码区如果有错误，就会返回所写异常的处理。*/
-        mPlayer = new MediaPlayer();
-        if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
-            showActionDialog();
-            //弹出对话框
-            playAlarmSound();
-            //闹钟提示音激发
-        } else {
-            finish();
-            //完成闹钟动作
-        }
-    }
-
-    private boolean isScreenOn() {
-        //判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
-        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        return pm.isScreenOn();
-    }
-
-    private void playAlarmSound() {
-        //闹钟提示音激发
-        Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
-        //调用系统的铃声管理URI，得到闹钟提示音
-        int silentModeStreams = Settings.System.getInt(getContentResolver(),
-                Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
-
-        if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
-            mPlayer.setAudioStreamType(silentModeStreams);
-        } else {
-            mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
-        }
-        try {
-            mPlayer.setDataSource(this, url);
-            //方法：setDataSource(Context context, Uri uri)
-            //解释：无返回值，设置多媒体数据来源【根据 Uri】
-            mPlayer.prepare();
-            //准备同步
-            mPlayer.setLooping(true);
-            //设置是否循环播放
-            mPlayer.start();
-            //开始播放
-        } catch (IllegalArgumentException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息
-            //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常
-        } catch (SecurityException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IllegalStateException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-
-    private void showActionDialog() {
-        AlertDialog.Builder dialog = new AlertDialog.Builder(this);
-        //AlertDialog的构造方法全部是Protected的
-        //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
-        //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
-        //如这里的dialog就是新建了一个AlertDialog
-        dialog.setTitle(R.string.app_name);
-        //为对话框设置标题
-        dialog.setMessage(mSnippet);
-        //为对话框设置内容
-        dialog.setPositiveButton(R.string.notealert_ok, this);
-        //给对话框添加"Yes"按钮
-        if (isScreenOn()) {
-            dialog.setNegativeButton(R.string.notealert_enter, this);
-        }//对话框添加"No"按钮
-        dialog.show().setOnDismissListener(this);
-    }
-
-    public void onClick(DialogInterface dialog, int which) {
-        switch (which) {
-            //用which来选择click后下一步的操作
-            case DialogInterface.BUTTON_NEGATIVE:
-                //这是取消操作
-                Intent intent = new Intent(this, NoteEditActivity.class);
-                //实现两个类间的数据传输
-                intent.setAction(Intent.ACTION_VIEW);
-                //设置动作属性
-                intent.putExtra(Intent.EXTRA_UID, mNoteId);
-                //实现key-value对
-                //EXTRA_UID为key；mNoteId为键
-                startActivity(intent);
-                //开始动作
-                break;
-            default:
-                //这是确定操作
-                break;
-        }
-    }
-
-    public void onDismiss(DialogInterface dialog) {
-        //忽略
-        stopAlarmSound();
-        //停止闹钟声音
-        finish();
-        //完成该动作
-        stopAlarmSound();
-        finish();
-    }
-
-    private void stopAlarmSound() {
-        if (mPlayer != null) {
-            mPlayer.stop();
-            //停止播放
-            mPlayer.release();
-            //释放MediaPlayer对象
-            mPlayer.stop();
-            mPlayer.release();
-            mPlayer = null;
-        }
-    }
 }

MiNote/src/net/micode/notes/ui/AlarmInitReceiver.java

@@ -33,80 +33,6 @@ public class AlarmInitReceiver extends BroadcastReceiver {
     private static final String [] PROJECTION = new String [] {
             NoteColumns.ID,
             NoteColumns.ALERTED_DATE
-            NoteColumns.ID,
-            NoteColumns.ALERTED_DATE
-    };
-    //对数据库的操作，调用标签ID和闹钟时间
-    private static final int COLUMN_ID                = 0;
-    private static final int COLUMN_ALERTED_DATE      = 1;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        long currentDate = System.currentTimeMillis();
-        //System.currentTimeMillis()产生一个当前的毫秒
-        //这个毫秒其实就是自1970年1月1日0时起的毫秒数
-        Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
-                PROJECTION,
-                NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
-                new String[] { String.valueOf(currentDate) },
-                //将long变量currentDate转化为字符串
-                null);
-        //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
-
-        if (c != null) {
-            if (c.moveToFirst()) {
-                do {
-                    long alertDate = c.getLong(COLUMN_ALERTED_DATE);
-                    Intent sender = new Intent(context, AlarmReceiver.class);
-                    sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
-                    PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
-                    AlarmManager alermManager = (AlarmManager) context
-                            .getSystemService(Context.ALARM_SERVICE);
-                    alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
-                } while (c.moveToNext());
-            }
-            c.close();
-        }
-        //然而通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤
-        //如新建Intent、PendingIntent以及AlarmManager等
-        //这里就是根据数据库里的闹钟时间创建一个闹钟机制
-    }
-}
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.ui;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class AlarmInitReceiver extends BroadcastReceiver {
-
-    private static final String [] PROJECTION = new String [] {
-        NoteColumns.ID,
-        NoteColumns.ALERTED_DATE
     };
     //对数据库的操作，调用标签ID和闹钟时间
     private static final int COLUMN_ID                = 0;

MiNote/src/net/micode/notes/ui/NoteEditActivity.java

@@ -1080,4 +1080,4 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
-}s}s}
+}s