合并

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

@@ -25,6 +25,93 @@ import android.util.Log;
 
 import java.util.HashMap;
 
+<<<<<<< HEAD
+=======
+public class Contact { //联系人
+    private static HashMap<String, String> sContactCache;
+    private static final String TAG = "Contact";
+
+    // 定义字符串CALLER_ID_SELECTION
+    private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL("
+
+            + Phone.NUMBER
+            + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+            + " AND " + Data.RAW_CONTACT_ID + " IN "
+            + "(SELECT raw_contact_id "
+            + " FROM phone_lookup"
+            + " WHERE min_match = '+')";
+
+    // 获取联系人
+    public static String getContact(Context context, String phoneNumber) {
+        if(sContactCache == null) {
+            sContactCache = new HashMap<String, String>();
+        }
+
+        // 查找HashMap中是否已有phoneNumber信息
+        if(sContactCache.containsKey(phoneNumber)) {
+            return sContactCache.get(phoneNumber);
+        }
+
+        String selection = CALLER_ID_SELECTION.replace("+",
+                PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
+        // 查找数据库中phoneNumber的信息
+        Cursor cursor = context.getContentResolver().query(
+                Data.CONTENT_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;
+            } finally {
+                cursor.close();
+            }
+            // 未找到相关信息
+        } else {
+            Log.d(TAG, "No contact matched with number:" + phoneNumber);
+            return 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.data;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Data;
+import android.telephony.PhoneNumberUtils;
+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/NotesProvider.java

@@ -33,9 +33,23 @@ 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：查询
+//insert：插入
+//update：更新
+//delete：删除
+//getType：得到数据类型
+
+
+public class NotesProvider extends ContentProvider {
+    // UriMatcher用于匹配Uri
+>>>>>>> dev
     private static final UriMatcher mMatcher;
 
     private NotesDatabaseHelper mHelper;
@@ -51,7 +65,14 @@ 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);
@@ -65,6 +86,10 @@ 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 + ","
@@ -72,7 +97,11 @@ 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 ?"
@@ -80,18 +109,36 @@ 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) {
+        Cursor c = null;
+        // 获取可读数据库
+        SQLiteDatabase db = mHelper.getReadableDatabase();
+        String id = null;
+        // 匹配查找uri
+        switch (mMatcher.match(uri)) {
+            // 对于不同的匹配值，在数据库中查找相应的条目
+>>>>>>> dev
             case URI_NOTE:
                 c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
                         sortOrder);
@@ -113,6 +160,10 @@ 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");
                 }
@@ -120,6 +171,11 @@ 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 {
@@ -139,6 +195,10 @@ public class NotesProvider extends ContentProvider {
                 }
                 break;
             default:
+<<<<<<< HEAD
+=======
+                // 抛出异常
+>>>>>>> dev
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
         if (c != null) {
@@ -148,13 +208,27 @@ 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) {
+        // 获得可写的数据库
         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
+>>>>>>> dev
             case URI_DATA:
                 if (values.containsKey(DataColumns.NOTE_ID)) {
                     noteId = values.getAsLong(DataColumns.NOTE_ID);
@@ -165,6 +239,11 @@ 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) {
@@ -177,14 +256,29 @@ 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来表示。
+
+        int count = 0;
+        String id = null;
+        // 获得可写的数据库
+
+>>>>>>> dev
         SQLiteDatabase db = mHelper.getWritableDatabase();
         boolean deleteData = false;
         switch (mMatcher.match(uri)) {
@@ -228,6 +322,11 @@ 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;
@@ -267,11 +366,20 @@ 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);
@@ -292,12 +400,20 @@ 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;
     }

README.md

@@ -0,0 +1,2 @@
+# demo
+