diff --git a/src/Notes-master/src/net/micode/notes/data/Contact.java b/src/Notes-master/src/net/micode/notes/data/Contact.java index a0fc059..7f572c2 100644 --- a/src/Notes-master/src/net/micode/notes/data/Contact.java +++ b/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 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 @@ -101,8 +116,12 @@ 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 diff --git a/src/Notes-master/src/net/micode/notes/data/Notes.java b/src/Notes-master/src/net/micode/notes/data/Notes.java index f3ed7f1..33e4a68 100644 --- a/src/Notes-master/src/net/micode/notes/data/Notes.java +++ b/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 diff --git a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java index fdc1969..cf3d52d 100644 --- a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java +++ b/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 diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java index 9fd64c4..ff89b0a 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java +++ b/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; diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java index 69429b2..5b8126e 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java @@ -208,8 +208,8 @@ public class NotesPreferenceActivity extends PreferenceActivity { } syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));//设置按键可用还是不可用 - - + + // 设置最终同步时间 if (GTaskSyncService.isSyncing()) { lastSyncTimeView.setText(GTaskSyncService.getProgressString()); @@ -302,7 +302,7 @@ public class NotesPreferenceActivity extends PreferenceActivity { }); startActivityForResult(intent, -1);//跳回上一个选项 - dialog.dismiss(); + dialog.dismiss();//关闭一个Dialog对话框 } });