pycalf7qb
/
MINOTES
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Labels Milestones
New Pull Request

gy #18

Merged
pycalf7qb merged 3 commits from GAOYUAN_BRANCH into master 2 years ago
Conversation 0 Commits 3 Files Changed 4
4 changed files with 892 additions and 7 deletions
Show Stats Download Patch File Download Diff File

55
src/data/Contact.java
Unescape View File

@ -25,15 +25,69 @@ import android.util.Log;
import java.util.HashMap;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD:app/src/main/java/net/micode/notes/data/Contact.java
public class Contact {
private static HashMap<String, String> sContactCache;//建立哈希表
private static final String TAG = "Contact";//设置TAG值为'联系'
=======
public class Contact {//连接类
private static HashMap<String, String> sContactCache;//建立哈希表
private static final String TAG = "Contact";//设置TAG的值为'连接'
>>>>>>> 0444a65d4e44c509f57ad301a5a2b59200d62177:src/data/Contact.java
=======
public class Contact { //连接类
private static HashMap<String, String> sContactCache; //定义连接哈希表
private static final String TAG = "Contact"; //设置TAG的值为'连接'
>>>>>>> b12b9a8449498593360310c554053628b31cc8c9
=======
public class Contact { // 定义连接类
private static HashMap<String, String> sContactCache; // 定义连接哈希表
private static final String TAG = "Contact"; // 设置TAG的值为'连接'
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
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"
<<<<<<< HEAD
+ " WHERE min_match = '+')"; //SQL语句
public static String getContact(Context context, String phoneNumber) { //获取连接
if(sContactCache == null) {
sContactCache = new HashMap<String, String>(); //连接哈希表为空时创建连接哈希表
}
if(sContactCache.containsKey(phoneNumber)) {
return sContactCache.get(phoneNumber); //连接哈希表存在电话号码时获取值
}
String selection = CALLER_ID_SELECTION.replace("+",
PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); //将电话号码进行函数处理并代替'+'符号
Cursor cursor = context.getContentResolver().query( //用于查询的结果集
Data.CONTENT_URI, //通话记录uri
new String [] { Phone.DISPLAY_NAME },
selection,
new String[] { phoneNumber },
null); //查询指定号码相关联系人名字
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; //没找到，返回NULL
=======
+ " WHERE min_match = '+')"; // SQL语句
public static String getContact(Context context, String phoneNumber) { // 获取连接
@ -69,6 +123,7 @@ public class Contact { // 定义连接类
} else {
Log.d(TAG, "No contact matched with number:" + phoneNumber); // 日志记录信息
return null; // 没找到，返回NULL
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
}
}

271
src/data/NotesDatabaseHelper.java
Unescape View File

@ -26,6 +26,63 @@ import net.micode.notes.data.Notes.DataColumns;
import net.micode.notes.data.Notes.DataConstants;
import net.micode.notes.data.Notes.NoteColumns;
<<<<<<< HEAD
//引入Notes中接口
public class NotesDatabaseHelper extends SQLiteOpenHelper { //该类为便签SQL表的定义以及操作，便于进行文件夹与便签的各种操作，例如添加或删除的行为
private static final String DB_NAME = "note.db"; //数据库名称
private static final int DB_VERSION = 4; //数据库版本
public interface TABLE { //定义一个数据库表接口
public static final String NOTE = "note"; //便签名
public static final String DATA = "data"; //便签数据
}
private static final String TAG = "NotesDatabaseHelper"; //日志类型
private static NotesDatabaseHelper mInstance; //创建NotesDatabaseHelper类对象
private static final String CREATE_NOTE_TABLE_SQL = //SQL语句，创建便签表，包含ID、最后修改日期、背景颜色、便签数等在Notes类中的内容
"CREATE TABLE " + TABLE.NOTE + "(" +
NoteColumns.ID + " INTEGER PRIMARY KEY," +
NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
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 = //创建数据表的SQL语句
"CREATE TABLE " + TABLE.DATA + "(" +
DataColumns.ID + " INTEGER PRIMARY KEY," +
DataColumns.MIME_TYPE + " TEXT NOT NULL," +
DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
DataColumns.DATA1 + " INTEGER," +
DataColumns.DATA2 + " INTEGER," +
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 " +
TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; //创建查询操作表索引，用于查找
=======
//引入Notes中接口
public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQL表的定义以及操作，易于进行文件夹与便签的各种操作，例如添加或删除的行为
private static final String DB_NAME = "note.db"; // 数据库名称
@ -80,10 +137,21 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " +
TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; // 创建查询操作表索引，用于查找
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Increase folder's note count when move note to the folder
*/
<<<<<<< HEAD
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_update "+
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
" BEGIN " +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
" WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
" END"; //创建触发器，方便进行操作，当移动便签时统计新的父文件夹内便签数量
=======
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER increase_folder_count_on_update "
+
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
@ -92,10 +160,22 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
" WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
" END"; // 创建触发器，方便进行操作，当移动便签时统计新的父文件夹内便签数量
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Decrease folder's note count when move note from folder
*/
<<<<<<< HEAD
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_update " +
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
" BEGIN " +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
" WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
" AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
" END"; //与上一个方法作用相反，统计旧的父文件夹便签数量
=======
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_update "
+
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
@ -105,10 +185,21 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
" AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
" END"; // 与上一个方法作用相反，统计旧的父文件夹便签数量
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Increase folder's note count when insert new note to the folder
*/
<<<<<<< HEAD
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_insert " +
" AFTER INSERT ON " + TABLE.NOTE +
" BEGIN " +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
" WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
" END"; //创建便签时增加统计数量
=======
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert "
+
" AFTER INSERT ON " + TABLE.NOTE +
@ -117,10 +208,22 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
" WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
" END"; // 创建便签时增加统计数量
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Decrease folder's note count when delete note from the folder
*/
<<<<<<< HEAD
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE +
" BEGIN " +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
" WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
" AND " + NoteColumns.NOTES_COUNT + ">0;" +
" END"; //删除时减少数量
=======
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete "
+
" AFTER DELETE ON " + TABLE.NOTE +
@ -130,10 +233,22 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
" AND " + NoteColumns.NOTES_COUNT + ">0;" +
" END"; // 删除时减少数量
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Update note's content when insert data with type {@link DataConstants#NOTE}
*/
<<<<<<< HEAD
private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
"CREATE TRIGGER update_note_content_on_insert " +
" AFTER INSERT ON " + TABLE.DATA +
" WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
" BEGIN" +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END"; //更新便签数据时更改table表内容
=======
private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert "
+
" AFTER INSERT ON " + TABLE.DATA +
@ -143,11 +258,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END"; // 更新便签数据时更改table表内容
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Update note's content when data with {@link DataConstants#NOTE} type has
* changed
*/
<<<<<<< HEAD
private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER update_note_content_on_update " +
" AFTER UPDATE ON " + TABLE.DATA +
" WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
" BEGIN" +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END"; //改变便签数据时更改table表内容
=======
private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update "
+
" AFTER UPDATE ON " + TABLE.DATA +
@ -157,11 +284,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END"; // 改变便签数据时更改table表内容
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Update note's content when data with {@link DataConstants#NOTE} type has
* deleted
*/
<<<<<<< HEAD
private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
"CREATE TRIGGER update_note_content_on_delete " +
" AFTER delete ON " + TABLE.DATA +
" WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
" BEGIN" +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.SNIPPET + "=''" +
" WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
" END"; //删除便签数据时改变table表内容
=======
private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete "
+
" AFTER delete ON " + TABLE.DATA +
@ -171,20 +310,40 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" SET " + NoteColumns.SNIPPET + "=''" +
" WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
" END"; // 删除便签数据时改变table表内容
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Delete datas belong to note which has been deleted
*/
<<<<<<< HEAD
private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
"CREATE TRIGGER delete_data_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE +
" BEGIN" +
" DELETE FROM " + TABLE.DATA +
" WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
" END"; //删除便签时删除便签内容
=======
private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE +
" BEGIN" +
" DELETE FROM " + TABLE.DATA +
" WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
" END"; // 删除便签时删除便签内容
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Delete notes belong to folder which has been deleted
*/
<<<<<<< HEAD
private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
"CREATE TRIGGER folder_delete_notes_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE +
" BEGIN" +
" DELETE FROM " + TABLE.NOTE +
" WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
" END"; //删除文件夹时删除内部的便签
=======
private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete "
+
" AFTER DELETE ON " + TABLE.NOTE +
@ -192,10 +351,35 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
" DELETE FROM " + TABLE.NOTE +
" WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
" END"; // 删除文件夹时删除内部的便签
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* Move notes belong to folder which has been moved to trash folder
*/
<<<<<<< HEAD
private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
"CREATE TRIGGER folder_move_notes_on_trash " +
" AFTER UPDATE ON " + TABLE.NOTE +
" WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
" BEGIN" +
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
" WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
" 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
=======
private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash " +
" AFTER UPDATE ON " + TABLE.NOTE +
" WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
@ -217,6 +401,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
}
private void reCreateNoteTableTriggers(SQLiteDatabase db) { // 数据库对象DB
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
@ -232,17 +417,28 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
<<<<<<< HEAD
} //用于执行SQL语句，运行重新创建便签表触发器函数
private void createSystemFolder(SQLiteDatabase db) { //创建系统级文件夹
ContentValues values = new ContentValues(); //为字典类创建对象
=======
} // 用于执行SQL语句，运行重新创建便签表触发器函数
private void createSystemFolder(SQLiteDatabase db) { // 创建系统级文件夹
ContentValues values = new ContentValues(); // 为字典类创建对象
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* call record foler for call notes
*/
values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
<<<<<<< HEAD
db.insert(TABLE.NOTE, null, values); //为通讯便签创建记录文件夹，并添加键值对
=======
db.insert(TABLE.NOTE, null, values); // 为通讯便签创建记录文件夹，并添加键值对
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* root folder which is default folder
@ -250,7 +446,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
values.clear();
values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
<<<<<<< HEAD
db.insert(TABLE.NOTE, null, values); //创建根文件夹，是默认的、最终的父文件夹
=======
db.insert(TABLE.NOTE, null, values); // 创建根文件夹，是默认的、最终的父文件夹
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* temporary folder which is used for moving note
@ -258,7 +458,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
values.clear();
values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
<<<<<<< HEAD
db.insert(TABLE.NOTE, null, values); //为移动中的便签创建的临时文件夹
=======
db.insert(TABLE.NOTE, null, values); // 为移动中的便签创建的临时文件夹
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* create trash folder
@ -266,6 +470,26 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
values.clear();
values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
<<<<<<< HEAD
db.insert(TABLE.NOTE, null, values); //创建垃圾桶
}
public void createDataTable(SQLiteDatabase db) { //创建数据表
db.execSQL(CREATE_DATA_TABLE_SQL); //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");
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); //删除触发器
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); //重新创建被删除的触发器
=======
db.insert(TABLE.NOTE, null, values); // 创建垃圾桶
}
@ -284,6 +508,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
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); // 重新创建被删除的触发器
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
static synchronized NotesDatabaseHelper getInstance(Context context) {
@ -291,6 +516,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
mInstance = new NotesDatabaseHelper(context);
}
return mInstance;
<<<<<<< HEAD
} //静态同步方法，用于返回NotesDatabaseHelper的对象实例mInstance
@Override
public void onCreate(SQLiteDatabase db) {
createNoteTable(db); //创建便签表
createDataTable(db); //创建数据表
} //用于初始化表
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { //用于检查并升级数据库版本
=======
} // 静态同步方法，用于返回NotesDatabaseHelper的对象实例mInstance
@Override
@ -301,6 +538,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { // 用于检查并升级数据库版本
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
boolean reCreateTriggers = false;
boolean skipV2 = false;
@ -308,22 +546,46 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
upgradeToV2(db);
skipV2 = true; // this upgrade including the upgrade from v2 to v3
oldVersion++;
<<<<<<< HEAD
} //检测到版本为1，升级版本
if (oldVersion == 2 && !skipV2) {
upgradeToV3(db);
reCreateTriggers = true; //重建触发器标志
oldVersion++; //检测到版本为2，升级版本
=======
} // 检测到版本为1，升级版本
if (oldVersion == 2 && !skipV2) {
upgradeToV3(db);
reCreateTriggers = true; // 重建触发器标志
oldVersion++; // 检测到版本为2，升级版本
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
if (oldVersion == 3) {
upgradeToV4(db);
oldVersion++;
<<<<<<< HEAD
} //检测到版本为3，升级版本
=======
} // 检测到版本为3，升级版本
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
if (reCreateTriggers) {
reCreateNoteTableTriggers(db);
reCreateDataTableTriggers(db);
<<<<<<< HEAD
} //进行触发器的重建
if (oldVersion != newVersion) {
throw new IllegalStateException("Upgrade notes database to version " + newVersion
+ "fails"); //版本不匹配则抛出异常
}
}
private void upgradeToV2(SQLiteDatabase db) { //升级版本并重建表
=======
} // 进行触发器的重建
if (oldVersion != newVersion) {
@ -333,6 +595,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
}
private void upgradeToV2(SQLiteDatabase db) { // 升级版本并重建表
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
createNoteTable(db);
@ -353,10 +616,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 该类为便签SQ
values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
db.insert(TABLE.NOTE, null, values);
<<<<<<< HEAD
} //删除不用的触发器，并添加不为空的新列，添加键值对
=======
} // 删除不用的触发器，并添加不为空的新列，添加键值对
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
private void upgradeToV4(SQLiteDatabase db) {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0");
<<<<<<< HEAD
} //添加新的不为空的列
=======
} // 添加新的不为空的列
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}

203
src/data/NotesProvider.java
Unescape View File

@ -36,6 +36,25 @@ import net.micode.notes.data.NotesDatabaseHelper.TABLE;
public class NotesProvider extends ContentProvider {// uri操作相关类，用于对数据库进行操作
private static final UriMatcher mMatcher; // UriMatcher类用于分辨数据操作类型，用于匹配不同的uri
<<<<<<< HEAD
public class NotesProvider extends ContentProvider {
private static final UriMatcher mMatcher; //UriMatcher类用于分辨数据表
private NotesDatabaseHelper mHelper; //建立NotesDatabaseHelper类对象
private static final String TAG = "NotesProvider"; //设置类名值
private static final int URI_NOTE = 1; //设置便签uri
private static final int URI_NOTE_ITEM = 2;
private static final int URI_DATA = 3; //设置数据uri
private static final int URI_DATA_ITEM = 4;
private static final int URI_SEARCH = 5; //设置搜索uri
private static final int URI_SEARCH_SUGGEST = 6;
static {
mMatcher = new UriMatcher(UriMatcher.NO_MATCH); //进行初始化
=======
private NotesDatabaseHelper mHelper; // 建立NotesDatabaseHelper类对象，用于数据库操作
private static final String TAG = "NotesProvider"; // 设置类名标签，用于调试
@ -50,6 +69,7 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
static {
mMatcher = new UriMatcher(UriMatcher.NO_MATCH); // 进行初始化
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
@ -57,12 +77,32 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);
mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);
mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
<<<<<<< HEAD
} //将不同的uri与数值相匹配
=======
} // 将不同的uri与数值相匹配
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* 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
*/ //用0A代表\n，为搜索结果换行
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 + ","
+ "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
+ 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; //...
private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
+ " FROM " + TABLE.NOTE
+ " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
+ " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
+ " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; //检索便签的sql语句，在列表中搜寻。使用Notes类中的接口与变量
=======
*/ // 用0A代表\n，为搜索结果换行
private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
+ NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
@ -77,15 +117,30 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
+ " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
+ " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
+ " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; // 检索便签的sql语句，在列表中搜寻。使用Notes类中的接口与变量
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
@Override
public boolean onCreate() {
mHelper = NotesDatabaseHelper.getInstance(getContext());
<<<<<<< HEAD
return true; //创建NotesDatabaseHelper类并返回成果标识
=======
return true; // 创建NotesDatabaseHelper类并返回成果标识
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
@Override
public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
<<<<<<< HEAD
String sortOrder) { //负责查询数据，接受uri、返回烈、选择、排列方式
Cursor c = null; //创建空游标，表示数据库操作结果集合
SQLiteDatabase db = mHelper.getReadableDatabase(); //获取数据库对象
String id = null;
switch (mMatcher.match(uri)) { //确定uri类型
case URI_NOTE:
c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
sortOrder); //传参，进行标准查询
=======
String sortOrder) { // 负责查询数据，接受uri、返回烈、选择、排列方式
Cursor c = null; // 创建空游标，表示数据库操作结果集合
SQLiteDatabase db = mHelper.getReadableDatabase(); // 获取数据库对象
@ -94,12 +149,17 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
case URI_NOTE:
c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
sortOrder); // 传参，进行标准查询
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
break;
case URI_NOTE_ITEM:
id = uri.getPathSegments().get(1);
c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs, null, null, sortOrder);
<<<<<<< HEAD
break; //传参，对id进行查询
=======
break; // 传参，对id进行查询
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
case URI_DATA:
c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
sortOrder);
@ -111,13 +171,21 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
break;
case URI_SEARCH:
case URI_SEARCH_SUGGEST:
<<<<<<< HEAD
if (sortOrder != null || projection != null) { //检查是否指定排序方式
=======
if (sortOrder != null || projection != null) { // 检查是否指定排序方式
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
throw new IllegalArgumentException(
"do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
}
String searchString = null;
<<<<<<< HEAD
if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { //提取uri中搜索模式
=======
if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { // 提取uri中搜索模式
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
if (uri.getPathSegments().size() > 1) {
searchString = uri.getPathSegments().get(1);
}
@ -132,6 +200,19 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
try {
searchString = String.format("%%%s%%", searchString);
c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
<<<<<<< HEAD
new String[] { searchString }); //在Notes表进行搜索
} catch (IllegalStateException ex) {
Log.e(TAG, "got exception: " + ex.toString()); //日志
}
break;
default:
throw new IllegalArgumentException("Unknown URI " + uri); //抛出异常
}
if (c != null) {
c.setNotificationUri(getContext().getContentResolver(), uri); //在游标查询的数据变化时进行通知
} //通知uri是标识查询结果的uri，setNotificationUri方法可注册通知uri，与对象c相关联
=======
new String[] { searchString }); // 在Notes表进行搜索
} catch (IllegalStateException ex) {
Log.e(TAG, "got exception: " + ex.toString()); // 日志
@ -143,10 +224,27 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
if (c != null) {
c.setNotificationUri(getContext().getContentResolver(), uri); // 在游标查询的数据变化时进行通知
} // 通知uri是标识查询结果的uri，setNotificationUri方法可注册通知uri，与对象c相关联
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
return c;
}
@Override
<<<<<<< HEAD
public Uri insert(Uri uri, ContentValues values) { //uri表示要插入的uri，values表示要插入的数据
SQLiteDatabase db = mHelper.getWritableDatabase(); //打开或创建一个数据库
long dataId = 0, noteId = 0, insertedId = 0;
switch (mMatcher.match(uri)) { //匹配uri
case URI_NOTE:
insertedId = noteId = db.insert(TABLE.NOTE, null, values); //将数据插入到Notes表中
break;
case URI_DATA:
if (values.containsKey(DataColumns.NOTE_ID)) { //检查values是否含有NOTE_ID内容，返回bool值
noteId = values.getAsLong(DataColumns.NOTE_ID); //关联noteId
} else {
Log.d(TAG, "Wrong data format without note id:" + values.toString()); //日志记录
}
insertedId = dataId = db.insert(TABLE.DATA, null, values); //数据库插入新行的id返回到两个变量中
=======
public Uri insert(Uri uri, ContentValues values) { // uri表示要插入的uri，values表示要插入的数据
SQLiteDatabase db = mHelper.getWritableDatabase(); // 打开或创建一个数据库
long dataId = 0, noteId = 0, insertedId = 0;
@ -161,14 +259,21 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
Log.d(TAG, "Wrong data format without note id:" + values.toString()); // 日志记录
}
insertedId = dataId = db.insert(TABLE.DATA, null, values); // 数据库插入新行的id返回到两个变量中
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
break;
default:
throw new IllegalArgumentException("Unknown URI " + uri);
}
// Notify the note uri
<<<<<<< HEAD
if (noteId > 0) { //不为零表示插入成功，
getContext().getContentResolver().notifyChange(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); //通知uri发生变化
=======
if (noteId > 0) { // 不为零表示插入成功，
getContext().getContentResolver().notifyChange(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); // 通知uri发生变化
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
// Notify the data uri
@ -177,6 +282,24 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
}
<<<<<<< HEAD
return ContentUris.withAppendedId(uri, insertedId); //返回新的uri，表示插入位置
}
@Override
public int delete(Uri uri, String selection, String[] selectionArgs) { //表示要删除的uri、SQL中的WHERE与参数
int count = 0; //表示删除记录数
String id = null;
SQLiteDatabase db = mHelper.getWritableDatabase(); //打开数据库
boolean deleteData = false;
switch (mMatcher.match(uri)) { //uri匹配
case URI_NOTE:
selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; //设置WHERE
count = db.delete(TABLE.NOTE, selection, selectionArgs); //删除，并计数
break;
case URI_NOTE_ITEM:
id = uri.getPathSegments().get(1); //获取id
=======
return ContentUris.withAppendedId(uri, insertedId); // 返回新的uri，表示插入位置
}
@ -194,6 +317,7 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
break;
case URI_NOTE_ITEM:
id = uri.getPathSegments().get(1); // 获取id
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
/**
* ID that smaller than 0 is system folder which is not allowed to
* trash
@ -204,6 +328,23 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
}
count = db.delete(TABLE.NOTE,
NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
<<<<<<< HEAD
break; //删除指定id，并计数
case URI_DATA:
count = db.delete(TABLE.DATA, selection, selectionArgs); //删除，并计数
deleteData = true;
break;
case URI_DATA_ITEM:
id = uri.getPathSegments().get(1); //获取id
count = db.delete(TABLE.DATA,
DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
deleteData = true; //删除指定id，并计数
break;
default:
throw new IllegalArgumentException("Unknown URI " + uri); //报错
}
if (count > 0) { //表示有删除操作，通知uri发生变化
=======
break; // 删除指定id，并计数
case URI_DATA:
count = db.delete(TABLE.DATA, selection, selectionArgs); // 删除，并计数
@ -220,11 +361,33 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
}
if (count > 0) { // 表示有删除操作，通知uri发生变化
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
if (deleteData) {
getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
}
getContext().getContentResolver().notifyChange(uri, null);
}
<<<<<<< HEAD
return count; //返回删除的记录数
}
@Override
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { //表示更新的uri、values为新的列值、where以及参数
int count = 0; //更新条数
String id = null;
SQLiteDatabase db = mHelper.getWritableDatabase(); //打开数据库
boolean updateData = false; //设置数据表更新表示
switch (mMatcher.match(uri)) { //匹配uri
case URI_NOTE:
increaseNoteVersion(-1, selection, selectionArgs); //跟新便签
count = db.update(TABLE.NOTE, values, selection, selectionArgs); //更新指定表的行，并计数
break;
case URI_NOTE_ITEM:
id = uri.getPathSegments().get(1); //提取id
increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs); //增加指定的id条件
=======
return count; // 返回删除的记录数
}
@ -244,6 +407,7 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs); // 增加指定的id条件
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
break;
case URI_DATA:
count = db.update(TABLE.DATA, values, selection, selectionArgs);
@ -256,50 +420,89 @@ public class NotesProvider extends ContentProvider {// uri操作相关类，用
updateData = true;
break;
default:
<<<<<<< HEAD
throw new IllegalArgumentException("Unknown URI " + uri); //抛出异常
=======
throw new IllegalArgumentException("Unknown URI " + uri); // 抛出异常
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
if (count > 0) {
if (updateData) {
<<<<<<< HEAD
getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);//通知指定uri数据更改
}
getContext().getContentResolver().notifyChange(uri, null); //通知uri数据更改
=======
getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);// 通知指定uri数据更改
}
getContext().getContentResolver().notifyChange(uri, null); // 通知uri数据更改
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
return count;
}
<<<<<<< HEAD
private String parseSelection(String selection) { //检查selection是否为空
return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); //为空则返回“”
}
private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { //使用数据库更新便签版本
=======
private String parseSelection(String selection) { // 检查selection是否为空
return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); // 为空则返回“”
}
private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { // 使用数据库更新便签版本
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
StringBuilder sql = new StringBuilder(120);
sql.append("UPDATE ");
sql.append(TABLE.NOTE);
sql.append(" SET ");
sql.append(NoteColumns.VERSION);
<<<<<<< HEAD
sql.append("=" + NoteColumns.VERSION + "+1 "); //升级便签版本号
if (id > 0 || !TextUtils.isEmpty(selection)) { //selection不为空或存在id则增加where条件
=======
sql.append("=" + NoteColumns.VERSION + "+1 "); // 升级便签版本号
if (id > 0 || !TextUtils.isEmpty(selection)) { // selection不为空或存在id则增加where条件
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
sql.append(" WHERE ");
}
if (id > 0) {
sql.append(NoteColumns.ID + "=" + String.valueOf(id));
}
if (!TextUtils.isEmpty(selection)) {
<<<<<<< HEAD
String selectString = id > 0 ? parseSelection(selection) : selection; //parseSelection将传入的参数中的占位符替换为实际的值
for (String args : selectionArgs) { //
selectString = selectString.replaceFirst("\\?", args); //replaceFirst选择参数数组中的值替换语句中的占位符
=======
String selectString = id > 0 ? parseSelection(selection) : selection; // parseSelection将传入的参数中的占位符替换为实际的值
for (String args : selectionArgs) { //
selectString = selectString.replaceFirst("\\?", args); // replaceFirst选择参数数组中的值替换语句中的占位符
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
}
sql.append(selectString);
}
<<<<<<< HEAD
mHelper.getWritableDatabase().execSQL(sql.toString()); //执行SQL语句
}
@Override
public String getType(Uri uri) { //获取指定uri的MIME类型
// TODO Auto-generated method stub //表示该方法没有实现
=======
mHelper.getWritableDatabase().execSQL(sql.toString()); // 执行SQL语句
}
@Override
public String getType(Uri uri) { // 获取指定uri的MIME类型
// TODO Auto-generated method stub //表示该方法没有实现
>>>>>>> 17cc1b00f633e1a6fec3efd17e03a80bcf9060a1
return null;
}
}

370
src/ui/NotesListActivity.java
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save