();
+ }
+
+ if(sContactCache.containsKey(phoneNumber)) /**查找cache中是否有phoneNumber对应的联系人信息**/{
+ return sContactCache.get(phoneNumber);
+ }
+
+ String selection = CALLER_ID_SELECTION.replace("+",
+ PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));/**toCallerIDMinMatch是安卓自带的号码匹配工具，截取查询号码的后7位作为匹配依据**/
+ Cursor cursor = context.getContentResolver().query(
+ Data.CONTENT_URI,
+ new String [] { Phone.DISPLAY_NAME },/**这个参数告诉查询要返回的列（Column），Contacts Provider提供了联系人的ID和联系人的NAME等内容，在这里，我们只需要NAME，所以提供这个参数DISPLAY_NAME**/
+ selection,/**selection，设置条件，相当于SQL语句中的where**/
+ new String[] { phoneNumber },
+ null);
+
+ if (cursor != null && cursor.moveToFirst()) {/**若数据库存在，则游标移动到游标所表示的信息元组的第一行开始**/
+ try {/**联系人姓名，并将相关信息存入cache中**/
+ 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;/**引入的util.log就是java自带的日志输出工具，而log.e则代表error，显示的颜色为红色**/
+ } finally {
+ cursor.close();/**关闭cursor游标**/
+ }
+ } else {
+ Log.d(TAG, "No contact matched with number:" + phoneNumber);
+ return null;
+ }
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java
new file mode 100644
index 0000000..e148c0f
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java
@@ -0,0 +1,279 @@
+/*
+ * 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.net.Uri;
+public class Notes {
+ public static final String AUTHORITY = "micode_notes";
+ public static final String TAG = "Notes";
+ public static final int TYPE_NOTE = 0;
+ public static final int TYPE_FOLDER = 1;
+ public static final int TYPE_SYSTEM = 2;
+
+ /**
+ * 下面的id是系统文件夹的标识符
+ * {@link Notes#ID_ROOT_FOLDER } 是默认文件夹
+ * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
+ * {@link Notes#ID_CALL_RECORD_FOLDER} 是存储通话记录
+ */
+ 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;
+ public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
+ }
+
+ /**
+ Uri查询所有笔记和文件夹
+ */
+ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
+
+ /**
+ * Uri用于查询数据
+ */
+ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
+
+ public interface NoteColumns {
+ /**
+ *一行的唯一ID
+ * Type: INTEGER (long)
+ */
+ public static final String ID = "_id";
+
+ /**
+ * *笔记或文件夹的父id
+ * Type: INTEGER (long)
+ */
+ public static final String PARENT_ID = "parent_id";
+
+ /**
+ *为笔记或文件夹创建数据
+ * Type: INTEGER (long)
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ *最新修改日期
+ * Type: INTEGER (long)
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+
+ /**
+ *警报日期
+ * Type: INTEGER (long)
+ */
+ public static final String ALERTED_DATE = "alert_date";
+
+ /**
+ *文件夹的名称或文本内容的说明
+ * Type: TEXT
+ */
+ public static final String SNIPPET = "snippet";
+
+ /**
+ * Note的小部件id
+ * Type: INTEGER (long)
+ */
+ public static final String WIDGET_ID = "widget_id";
+
+ /**
+ * Note的小部件类型
+ * Type: INTEGER (long)
+ */
+ public static final String WIDGET_TYPE = "widget_type";
+
+ /**
+ *笔记的背景颜色的id
+ * Type: INTEGER (long)
+ */
+ public static final String BG_COLOR_ID = "bg_color_id";
+
+ /**
+ *对于文本笔记，它没有附件，对于多媒体
+ *注意，它至少有一个附件
+ * Type: INTEGER
+ */
+ public static final String HAS_ATTACHMENT = "has_attachment";
+
+ /**
+ *文件夹的注释计数
+ * Type: INTEGER (long)
+ */
+ public static final String NOTES_COUNT = "notes_count";
+
+ /**
+ *文件类型:文件夹或便签
+ * Type: INTEGER
+ */
+ public static final String TYPE = "type";
+
+ /**
+ *最后一个同步id
+ * Type: INTEGER (long)
+ */
+ public static final String SYNC_ID = "sync_id";
+
+ /**
+ *符号表示本地是否被修改
+ * Type: INTEGER
+ */
+ public static final String LOCAL_MODIFIED = "local_modified";
+
+ /**
+ *移动到临时文件夹前的原始父id
+ * Type : INTEGER
+ */
+ public static final String ORIGIN_PARENT_ID = "origin_parent_id";
+
+ /**
+ * gtask id
+ * Type : TEXT
+ */
+ public static final String GTASK_ID = "gtask_id";
+
+ /**
+ * The version code
+ * * Type : INTEGER (long)
+ */
+ public static final String VERSION = "version";
+ }
+
+ public interface DataColumns {
+ /**
+ *一行的唯一ID
+ * Type: INTEGER (long)
+ */
+ public static final String ID = "_id";
+
+ /**
+ *由这一行表示的项目的MIME类型。
+ * Type: Text
+ */
+ public static final String MIME_TYPE = "mime_type";
+
+ /**
+ *该数据所属的引用id
+ * Type: INTEGER (long)
+ */
+ public static final String NOTE_ID = "note_id";
+
+ /**
+ *为笔记或文件夹创建数据
+ * Type: INTEGER (long)
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ *最新修改日期
+ * Type: INTEGER (long)
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+ /**
+ *数据内容
+ * Type: TEXT
+ */
+ public static final String CONTENT = "content";
+
+
+ /**
+ *泛型数据列，含义是{@link #MIMETYPE}特定的，用于
+ 整数数据类型
+ * Type: INTEGER
+ */
+ public static final String DATA1 = "data1";
+
+ /**
+ *泛型数据列，含义是{@link #MIMETYPE}特定的，用于
+ 整数数据类型
+ * Type: INTEGER
+ */
+ public static final String DATA2 = "data2";
+
+ /**
+ *泛型数据列，含义是{@link #MIMETYPE}特定的，用于
+ * TEXT数据类型
+ * Type: TEXT
+ */
+ public static final String DATA3 = "data3";
+
+ /**
+ *泛型数据列，含义是{@link #MIMETYPE}特定的，用于
+ * TEXT数据类型
+ * Type: TEXT
+ */
+ public static final String DATA4 = "data4";
+
+ /**
+ *泛型数据列，含义是{@link #MIMETYPE}特定的，用于
+ * TEXT数据类型
+ * Type: TEXT
+ */
+ public static final String DATA5 = "data5";
+ }
+
+ public static final class TextNote implements DataColumns {
+ /**
+ *模式，表示文本是否处于检查列表模式
+ * Type: Integer 1:check list mode 0: normal mode
+ */
+ public static final String MODE = DATA1;
+
+ public static final int MODE_CHECK_LIST = 1;
+
+ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
+
+ 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 {
+ /**
+ *此记录的呼叫日期
+ * Type: INTEGER (long)
+ */
+ public static final String CALL_DATE = DATA1;
+
+ /**
+ *此记录的电话号码
+ * Type: TEXT
+ */
+ public static final String PHONE_NUMBER = DATA3;
+
+ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
+
+ 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");
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
new file mode 100644
index 0000000..2ebd68e
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -0,0 +1,365 @@
+/*
+ * 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;/**1.数据库操作，SQLOpenhelper,对一些note和文件进行数据库的操作。比如删除文件后，将文件里的note也相应删除**/
+
+
+import android.content.ContentValues;
+import android.content.Context;
+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;
+
+
+public class NotesDatabaseHelper extends SQLiteOpenHelper {/**2.继承于SQLiteOpenHelper的类NotesDatabaseHelper，用于实现对便签或者 文件的数据库操作，例如删除便签**/
+
+ private static final String DB_NAME = "note.db";/**2.定义数据库的名称为“note.db”**/
+
+ private static final int DB_VERSION = 4;
+
+ public interface TABLE {/**1.接口，分成note和data，在后面的程序里分别使用过**/
+ public static final String NOTE = "note";/**2.数据库中创建的note表信息**/
+
+ public static final String DATA = "data";
+ }
+
+ private static final String TAG = "NotesDatabaseHelper";
+
+ private static NotesDatabaseHelper mInstance;
+
+ private static final String CREATE_NOTE_TABLE_SQL = /**1.SQL的触发器是一个能由系统自动执行对数据库修改的语句，由文件的增加事件触发。文件夹中移入一个Note之后需要更改的数据的表格。**/
+ "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 =/**3. 创建SQL的data表。下面是表头**/
+ "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 =/**1.文件夹移除note时触发垃圾回收**/
+ "CREATE INDEX IF NOT EXISTS note_id_index ON " +
+ TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
+
+ /**
+ * Increase folder's note count when move note to the folder
+ */
+ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =/**4. 构建一条SQL语句，实现当note移动到文件夹中时，文件夹的数量增加的功能**/
+ "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_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_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_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";
+
+ /**
+ *当插入类型为{@link DataConstants# note}的数据时，更新note的内容
+ */
+ 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";
+
+ /**
+ *当{@link DataConstants# note}类型的数据发生变化时更新note的内容
+ */
+ 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";
+
+ /**
+ *当{@link DataConstants# note}类型的数据被删除时，更新note的内容
+ */
+ 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";
+
+ /**
+ *删除属于已删除笔记的数据
+ */
+ 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 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_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.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");
+ db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
+
+ db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
+ db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
+ 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);
+ }
+
+ private void createSystemFolder(SQLiteDatabase db) {
+ ContentValues values = new ContentValues();
+
+ /**
+ *通话记录文件夹用于通话记录
+ */
+ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ *根文件夹，这是默认文件夹
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ *用于移动笔记的临时文件夹
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ *创建垃圾文件夹
+ */
+ values.clear();
+ 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) {/**1.创建表格（用来存储标签内容）
+**/
+ 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) {/**2. 重构数据库的data表单的触发器，防止定义冲突**/
+ 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);
+ }
+
+ static synchronized NotesDatabaseHelper getInstance(Context context) {
+ if (mInstance == null) {
+ mInstance = new NotesDatabaseHelper(context);
+ }
+ return mInstance;
+ }/**1.如果NotesDatabaseHelper的实例创建失败，那就重新建一个，重新分配内从空间**/
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ createNoteTable(db);
+ createDataTable(db);
+ }/**5. 在对象生命周期开始的时候，onCreate被系统调用，所以这里重写这个函数，生成两个数据库表单，一个是便签表单，另一个是数据表单**/
+
+ @Override/**1.数据库版本的更新，包括数据库内容的更改**/
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ boolean reCreateTriggers = false;
+ boolean skipV2 = false;
+
+ if (oldVersion == 1) {
+ upgradeToV2(db);
+ skipV2 = true; // this upgrade including the upgrade from v2 to v3
+ oldVersion++;
+ }
+
+ if (oldVersion == 2 && !skipV2) {
+ upgradeToV3(db);
+ reCreateTriggers = true;
+ oldVersion++;
+ }
+
+ if (oldVersion == 3) {
+ upgradeToV4(db);
+ oldVersion++;
+ }
+
+ if (reCreateTriggers) {
+ reCreateNoteTableTriggers(db);
+ reCreateDataTableTriggers(db);
+ }
+
+ if (oldVersion != newVersion) {
+ throw new IllegalStateException("Upgrade notes database to version " + newVersion
+ + "fails");
+ }
+ }
+
+ private void upgradeToV2(SQLiteDatabase db) {
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
+ createNoteTable(db);
+ createDataTable(db);
+ }
+
+ private void upgradeToV3(SQLiteDatabase db) {
+ // drop unused triggers
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
+ // add a column for gtask id
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+ + " TEXT NOT NULL DEFAULT ''");
+ // add a trash system folder
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+ }
+
+ private void upgradeToV4(SQLiteDatabase db) {
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ + " INTEGER NOT NULL DEFAULT 0");
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java
new file mode 100644
index 0000000..6897999
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -0,0 +1,320 @@
+package net.micode.notes.data;
+
+import android.app.SearchManager;
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+
+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;
+//为存储和获取数据提供接口。可以在不同的应用程序之间共享数据
+//ContentProvider提供的方法
+//query：查询
+//insert：插入
+//update：更新
+//delete：删除
+//getType：得到数据类型
+public class NotesProvider extends ContentProvider {
+ // UriMatcher用于匹配Uri
+ private static final UriMatcher mMatcher;
+
+ private NotesDatabaseHelper mHelper;
+
+ private static final String TAG = "NotesProvider";
+
+ private static final int URI_NOTE = 1;
+ private static final int URI_NOTE_ITEM = 2;
+ private static final int URI_DATA = 3;
+ private static final int URI_DATA_ITEM = 4;
+
+ private static final int URI_SEARCH = 5;
+ private static final int URI_SEARCH_SUGGEST = 6;
+
+ static {
+ // 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码
+ mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+ // 把需要匹配Uri路径全部给注册上
+ mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
+ mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
+ mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
+ mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM);
+ 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);
+ }
+
+ /**
+ * 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.
+ */
+ // 声明 NOTES_SEARCH_PROJECTION
+ 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;
+ // 声明NOTES_SNIPPET_SEARCH_QUERY
+ 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;
+
+ @Override
+ // Context只有在onCreate()中才被初始化
+ // 对mHelper进行实例化
+ public boolean onCreate() {
+ mHelper = NotesDatabaseHelper.getInstance(getContext());
+ return true;
+ }
+
+ @Override
+ // 查询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)) {
+ // 对于不同的匹配值，在数据库中查找相应的条目
+ case URI_NOTE:
+ c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ 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);
+ break;
+ case URI_DATA:
+ c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ break;
+ case URI_DATA_ITEM:
+ id = uri.getPathSegments().get(1);
+ c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs, null, null, sortOrder);
+ break;
+ case URI_SEARCH:
+ case URI_SEARCH_SUGGEST:
+ if (sortOrder != null || projection != null) {
+ // 不合法的参数异常
+ throw new IllegalArgumentException(
+ "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
+ }
+
+ String searchString = null;
+ if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
+ if (uri.getPathSegments().size() > 1) {
+ // getPathSegments()方法得到一个String的List，
+ // 在uri.getPathSegments().get(1)为第2个元素
+ searchString = uri.getPathSegments().get(1);
+ }
+ } else {
+ searchString = uri.getQueryParameter("pattern");
+ }
+
+ if (TextUtils.isEmpty(searchString)) {
+ return null;
+ }
+
+ try {
+ searchString = String.format("%%%s%%", searchString);
+ c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
+ new String[] { searchString });
+ } 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);
+ }
+ return c;
+ }
+
+ @Override
+ // 插入一个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
+ case URI_DATA:
+ if (values.containsKey(DataColumns.NOTE_ID)) {
+ noteId = values.getAsLong(DataColumns.NOTE_ID);
+ } else {
+ Log.d(TAG, "Wrong data format without note id:" + values.toString());
+ }
+ insertedId = dataId = db.insert(TABLE.DATA, null, values);
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+ // Notify the note uri
+ // notifyChange获得一个ContextResolver对象并且更新里面的内容
+ if (noteId > 0) {
+ getContext().getContentResolver().notifyChange(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
+ }
+
+ // Notify the data uri
+ if (dataId > 0) {
+ getContext().getContentResolver().notifyChange(
+ ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
+ }
+
+ // 返回插入的uri的路径
+ return ContentUris.withAppendedId(uri, insertedId);
+ }
+
+ @Override
+ // 删除一个uri
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ //Uri代表要操作的数据，Android上可用的每种资源 -包括 图像、视频片段、音频资源等都可以用Uri来表示。
+ int count = 0;
+ String id = null;
+ // 获得可写的数据库
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ boolean deleteData = false;
+ switch (mMatcher.match(uri)) {
+ case URI_NOTE:
+ selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
+ count = db.delete(TABLE.NOTE, selection, selectionArgs);
+ break;
+ case URI_NOTE_ITEM:
+ id = uri.getPathSegments().get(1);
+ /**
+ * ID that smaller than 0 is system folder which is not allowed to
+ * trash
+ */
+ long noteId = Long.valueOf(id);
+ if (noteId <= 0) {
+ break;
+ }
+ count = db.delete(TABLE.NOTE,
+ NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+ break;
+ case URI_DATA:
+ count = db.delete(TABLE.DATA, selection, selectionArgs);
+ deleteData = true;
+ break;
+ case URI_DATA_ITEM:
+ id = uri.getPathSegments().get(1);
+ count = db.delete(TABLE.DATA,
+ DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+ deleteData = true;
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+ if (count > 0) {
+ if (deleteData) {
+ getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+ }
+ getContext().getContentResolver().notifyChange(uri, null);
+ }
+ return count;
+ }
+
+ @Override
+ // 更新一个uri
+ public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ int count = 0;
+ String id = null;
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ boolean updateData = false;
+ switch (mMatcher.match(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);
+ increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
+ count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs);
+ break;
+ case URI_DATA:
+ count = db.update(TABLE.DATA, values, selection, selectionArgs);
+ updateData = true;
+ break;
+ case URI_DATA_ITEM:
+ id = uri.getPathSegments().get(1);
+ count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs);
+ updateData = true;
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+
+ if (count > 0) {
+ if (updateData) {
+ getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+ }
+ getContext().getContentResolver().notifyChange(uri, null);
+ }
+ return count;
+ }
+
+ // 将字符串解析成规定格式
+ private String parseSelection(String selection) {
+ return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
+ }
+
+ //增加一个noteVersion
+ private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
+ StringBuilder sql = new StringBuilder(120);
+ sql.append("UPDATE ");
+ sql.append(TABLE.NOTE);
+ sql.append(" SET ");
+ sql.append(NoteColumns.VERSION);
+ sql.append("=" + NoteColumns.VERSION + "+1 ");
+
+ if (id > 0 || !TextUtils.isEmpty(selection)) {
+ sql.append(" WHERE ");
+ }
+ if (id > 0) {
+ sql.append(NoteColumns.ID + "=" + String.valueOf(id));
+ }
+ if (!TextUtils.isEmpty(selection)) {
+ String selectString = id > 0 ? parseSelection(selection) : selection;
+ for (String args : selectionArgs) {
+ selectString = selectString.replaceFirst("\\?", args);
+ }
+ sql.append(selectString);
+ }
+
+ // execSQL()方法可以执行insert、delete、update和CREATE TABLE之类有更改行为的SQL语句
+ mHelper.getWritableDatabase().execSQL(sql.toString());
+ }
+
+ @Override
+ public String getType(Uri uri) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
new file mode 100644
index 0000000..f53bf4c
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
@@ -0,0 +1,124 @@
+/*
+ * 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.gtask.data;
+
+import android.database.Cursor;
+import android.util.Log;
+
+import net.micode.notes.tool.GTaskStringUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+
+public class MetaData extends Task {
+ /*
+ * 功能描述：得到类的简写名称存入字符串TAG中
+ * 实现过程：调用getSimpleName ()函数
+ */
+ private final static String TAG = MetaData.class.getSimpleName();
+ private String mRelatedGid = null;
+ /*
+ * 功能描述：设置数据，即生成元数据库
+ * 实现过程：调用JSONObject库函数put ()，Task类中的setNotes ()和setName ()函数
+ * 参数注解：
+ */
+ public void setMeta(String gid, JSONObject metaInfo)
+ {
+ //对函数块进行注释
+ try {
+ metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
+ /*
+ * 将这对键值放入metaInfo这个jsonobject对象中
+ */
+ } catch (JSONException e) {
+ Log.e(TAG, "failed to put related gid");
+ /*
+ * 输出错误信息
+ */
+ }
+ setNotes(metaInfo.toString());
+ setName(GTaskStringUtils.META_NOTE_NAME);
+ }
+ /*
+ * 功能描述：获取相关联的Gid
+ */
+ public String getRelatedGid() {
+ return mRelatedGid;
+ }
+ /*
+ * 功能描述：判断当前数据是否为空，若为空则返回真即值得保存
+ */
+ @Override
+ public boolean isWorthSaving() {
+ return getNotes() != null;
+ }
+ /*
+ * 功能描述：使用远程json数据对象设置元数据内容
+ * 实现过程：调用父类Task中的setContentByRemoteJSON ()函数，并
+ * 参数注解：
+ */
+ @Override
+ public void setContentByRemoteJSON(JSONObject js) {
+ super.setContentByRemoteJSON(js);
+ if (getNotes() != null) {
+ try {
+ JSONObject metaInfo = new JSONObject(getNotes().trim());
+ mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
+ } catch (JSONException e) {
+ Log.w(TAG, "failed to get related gid");
+ /*
+ * 输出警告信息
+ */
+ mRelatedGid = null;
+ }
+ }
+ }
+ /*
+ * 功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常
+ */
+ @Override
+ public void setContentByLocalJSON(JSONObject js) {
+ // this function should not be called
+ throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
+ /*
+ * 传递非法参数异常
+ */
+ }
+ /*
+ * 功能描述：从元数据内容中获取本地json对象，一般不会用到，若用到，则抛出异常
+ */
+ @Override
+ public JSONObject getLocalJSONFromContent() {
+ throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
+ /*
+ * 传递非法参数异常
+ */
+ }
+ /*
+ * 功能描述：获取同步动作状态，一般不会用到，若用到，则抛出异常
+ */
+ @Override
+ public int getSyncAction(Cursor c) {
+ throw new IllegalAccessError("MetaData:getSyncAction should not be called");
+ /*
+ * 传递非法参数异常
+ */
+ }
+
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java
new file mode 100644
index 0000000..47f7461
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java
@@ -0,0 +1,90 @@
+package net.micode.notes.gtask.data;
+
+import android.database.Cursor;
+
+import org.json.JSONObject;
+
+/**
+ * 应该是同步操作的基础数据类型，定义了相关指示同步操作的常量
+ * 关键字：abstract
+ */
+public abstract class Node {
+ //定义了各种用于表征同步状态的常量
+ public static final int SYNC_ACTION_NONE = 0;// 本地和云端都无可更新内容（即本地和云端内容一致）
+
+ public static final int SYNC_ACTION_ADD_REMOTE = 1;// 需要在远程云端增加内容
+
+ public static final int SYNC_ACTION_ADD_LOCAL = 2;// 需要在本地增加内容
+
+ public static final int SYNC_ACTION_DEL_REMOTE = 3;// 需要在远程云端删除内容
+
+ public static final int SYNC_ACTION_DEL_LOCAL = 4;// 需要在本地删除内容
+
+ public static final int SYNC_ACTION_UPDATE_REMOTE = 5;// 需要将本地内容更新到远程云端
+
+ public static final int SYNC_ACTION_UPDATE_LOCAL = 6;// 需要将远程云端内容更新到本地
+
+ public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;// 同步出现冲突
+
+ public static final int SYNC_ACTION_ERROR = 8;// 同步出现错误
+
+ private String mGid;
+
+ private String mName;
+
+ private long mLastModified;//记录最后一次修改时间
+
+ private boolean mDeleted;//表征是否被删除
+
+ public Node() {
+ mGid = null;
+ mName = "";
+ mLastModified = 0;
+ mDeleted = false;
+ }
+
+ public abstract JSONObject getCreateAction(int actionId);
+
+ public abstract JSONObject getUpdateAction(int actionId);
+
+ public abstract void setContentByRemoteJSON(JSONObject js);
+
+ public abstract void setContentByLocalJSON(JSONObject js);
+
+ public abstract JSONObject getLocalJSONFromContent();
+
+ public abstract int getSyncAction(Cursor c);
+
+ public void setGid(String gid) {
+ this.mGid = gid;
+ }
+
+ public void setName(String name) {
+ this.mName = name;
+ }
+
+ public void setLastModified(long lastModified) {
+ this.mLastModified = lastModified;
+ }
+
+ public void setDeleted(boolean deleted) {
+ this.mDeleted = deleted;
+ }
+
+ public String getGid() {
+ return this.mGid;
+ }
+
+ public String getName() {
+ return this.mName;
+ }
+
+ public long getLastModified() {
+ return this.mLastModified;
+ }
+
+ public boolean getDeleted() {
+ return this.mDeleted;
+ }
+
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
new file mode 100644
index 0000000..dea514a
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
@@ -0,0 +1,236 @@
+/*
+ * 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.gtask.data;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.NotesDatabaseHelper.TABLE;
+import net.micode.notes.gtask.exception.ActionFailureException;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+public class SqlData {
+ private static final String TAG = SqlData.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;//为mDataId置初始值-99999
+
+
+ /**
+ * 来自Notes类中定义的DataColumn中的一些常量
+ */
+
+ // 集合了interface DataColumns中所有SF常量
+ public static final String[] PROJECTION_DATA = new String[] {
+ DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
+ DataColumns.DATA3
+ };
+
+ /**
+ * 以下五个变量作为sql表中5列的编号
+ */
+ public static final int DATA_ID_COLUMN = 0;
+
+ public static final int DATA_MIME_TYPE_COLUMN = 1;
+
+ public static final int DATA_CONTENT_COLUMN = 2;
+
+ public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
+
+ public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
+
+ private ContentResolver mContentResolver;
+ //判断是否直接用Content生成，是为true，否则为false
+ private boolean mIsCreate;
+
+ private long mDataId;
+
+ private String mDataMimeType;
+
+ private String mDataContent;
+
+ private long mDataContentData1;
+
+ private String mDataContentData3;
+
+ private ContentValues mDiffDataValues;
+
+ /*
+ * 功能描述：构造函数，用于初始化数据
+ * 参数注解：mContentResolver用于获取ContentProvider提供的数据
+ * 参数注解： mIsCreate表征当前数据是用哪种方式创建（两种构造函数的参数不同）
+ * 参数注解：
+ */
+ public SqlData(Context context) {
+ mContentResolver = context.getContentResolver();
+ mIsCreate = true;
+ mDataId = INVALID_ID;//mDataId置初始值-99999
+ mDataMimeType = DataConstants.NOTE;
+ mDataContent = "";
+ mDataContentData1 = 0;
+ mDataContentData3 = "";
+ mDiffDataValues = new ContentValues();
+ }
+
+
+ /*
+ * 功能描述：构造函数，初始化数据
+ * 参数注解：mContentResolver用于获取ContentProvider提供的数据
+ * 参数注解： mIsCreate表征当前数据是用哪种方式创建（两种构造函数的参数不同）
+ * 参数注解：
+ */
+ public SqlData(Context context, Cursor c) {
+ mContentResolver = context.getContentResolver();
+ mIsCreate = false;
+ loadFromCursor(c);
+ mDiffDataValues = new ContentValues();
+ }
+
+ /*
+ * 功能描述：从光标处加载数据
+ * 从当前的光标处将五列的数据加载到该类的对象
+ */
+ private void loadFromCursor(Cursor c) {
+ mDataId = c.getLong(DATA_ID_COLUMN);
+ mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
+ mDataContent = c.getString(DATA_CONTENT_COLUMN);
+ mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
+ mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
+ }
+
+
+ /*
+ * 功能描述：设置用于共享的数据，并提供异常抛出与处理机制
+ * 参数注解：
+ */
+ public void setContent(JSONObject js) throws JSONException {
+ //如果传入的JSONObject对象中有DataColumns.ID这一项，则设置，否则设为INVALID_ID
+ long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
+ if (mIsCreate || mDataId != dataId) {
+ mDiffDataValues.put(DataColumns.ID, dataId);
+ }
+ mDataId = dataId;
+
+ String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
+ : DataConstants.NOTE;
+ if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
+ mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
+ }
+ mDataMimeType = dataMimeType;
+
+ String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
+ if (mIsCreate || !mDataContent.equals(dataContent)) {
+ mDiffDataValues.put(DataColumns.CONTENT, dataContent);
+ }
+ mDataContent = dataContent;
+
+ long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
+ if (mIsCreate || mDataContentData1 != dataContentData1) {
+ mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
+ }
+ mDataContentData1 = dataContentData1;
+
+ String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
+ if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
+ mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
+ }
+ mDataContentData3 = dataContentData3;
+ }
+
+
+ /*
+ * 功能描述：获取共享的数据内容，并提供异常抛出与处理机制
+ * 参数注解：
+ */
+ public JSONObject getContent() throws JSONException {
+ if (mIsCreate) {
+ Log.e(TAG, "it seems that we haven't created this in database yet");
+ return null;
+ }
+ //创建JSONObject对象。并将相关数据放入其中，并返回。
+ JSONObject js = new JSONObject();
+ js.put(DataColumns.ID, mDataId);
+ js.put(DataColumns.MIME_TYPE, mDataMimeType);
+ js.put(DataColumns.CONTENT, mDataContent);
+ js.put(DataColumns.DATA1, mDataContentData1);
+ js.put(DataColumns.DATA3, mDataContentData3);
+ return js;
+ }
+
+ /*
+ * 功能描述：commit函数用于把当前造作所做的修改保存到数据库
+ * 参数注解：
+ */
+ public void commit(long noteId, boolean validateVersion, long version) {
+
+ if (mIsCreate) {
+ if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
+ mDiffDataValues.remove(DataColumns.ID);
+ }
+
+ mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
+ Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
+ try {
+ mDataId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Get note id error :" + e.toString());
+ throw new ActionFailureException("create note failed");
+ }
+ } else {
+ if (mDiffDataValues.size() > 0) {
+ int result = 0;
+ if (!validateVersion) {
+ result = mContentResolver.update(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
+ } else {
+ result = mContentResolver.update(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
+ " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
+ + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
+ String.valueOf(noteId), String.valueOf(version)
+ });
+ }
+ if (result == 0) {
+ Log.w(TAG, "there is no update. maybe user updates note when syncing");
+ }
+ }
+ }
+
+ mDiffDataValues.clear();
+ mIsCreate = false;
+ }
+
+ /*
+ * 功能描述：获取当前id
+ * 实现过程：
+ * 参数注解：
+ */
+ public long getId() {
+ return mDataId;
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
new file mode 100644
index 0000000..2a9304d
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
@@ -0,0 +1,606 @@
+/*
+ * 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.gtask.data;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.exception.ActionFailureException;
+import net.micode.notes.tool.GTaskStringUtils;
+import net.micode.notes.tool.ResourceParser;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+
+/*
+ * Description：用于支持小米便签最底层的数据库相关操作，和sqldata的关系上是父集关系，即note是data的子父集。
+ * 和SqlData相比，SqlNote算是真正意义上的数据了。
+ */
+
+
+
+public class SqlNote {
+ private static final String TAG = SqlNote.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;
+ // 集合了interface NoteColumns中所有SF常量（17个）
+ public static final String[] PROJECTION_NOTE = new String[] {
+ NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
+ NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
+ NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
+ NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
+ NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
+ NoteColumns.VERSION
+ };
+
+ //以下设置17个列的编号
+ public static final int ID_COLUMN = 0;
+
+ public static final int ALERTED_DATE_COLUMN = 1;
+
+ public static final int BG_COLOR_ID_COLUMN = 2;
+
+ public static final int CREATED_DATE_COLUMN = 3;
+
+ public static final int HAS_ATTACHMENT_COLUMN = 4;
+
+ public static final int MODIFIED_DATE_COLUMN = 5;
+
+ public static final int NOTES_COUNT_COLUMN = 6;
+
+ public static final int PARENT_ID_COLUMN = 7;
+
+ public static final int SNIPPET_COLUMN = 8;
+
+ public static final int TYPE_COLUMN = 9;
+
+ public static final int WIDGET_ID_COLUMN = 10;
+
+ public static final int WIDGET_TYPE_COLUMN = 11;
+
+ public static final int SYNC_ID_COLUMN = 12;
+
+ public static final int LOCAL_MODIFIED_COLUMN = 13;
+
+ public static final int ORIGIN_PARENT_ID_COLUMN = 14;
+
+ public static final int GTASK_ID_COLUMN = 15;
+
+ public static final int VERSION_COLUMN = 16;
+
+ //一下定义了17个内部的变量，其中12个可以由content中获得，5个需要初始化为0或者new
+ private Context mContext;
+
+ private ContentResolver mContentResolver;
+
+ private boolean mIsCreate;
+
+ private long mId;
+
+ private long mAlertDate;
+
+ private int mBgColorId;
+
+ private long mCreatedDate;
+
+ private int mHasAttachment;
+
+ private long mModifiedDate;
+
+ private long mParentId;
+
+ private String mSnippet;
+
+ private int mType;
+
+ private int mWidgetId;
+
+ private int mWidgetType;
+
+ private long mOriginParent;
+
+ private long mVersion;
+
+ private ContentValues mDiffNoteValues;
+
+ private ArrayList mDataList;
+
+ /*
+ * 功能描述：构造函数
+ * 参数注解： mIsCreate用于标示构造方式
+ * 参数注解：
+ * Made By CuiCan
+ */
+ //构造函数只有context，对所有的变量进行初始化
+ public SqlNote(Context context) {
+ mContext = context;
+ mContentResolver = context.getContentResolver();
+ mIsCreate = true;
+ mId = INVALID_ID;
+ mAlertDate = 0;
+ mBgColorId = ResourceParser.getDefaultBgId(context);
+ mCreatedDate = System.currentTimeMillis();//调用系统函数获得创建时间
+ mHasAttachment = 0;
+ mModifiedDate = System.currentTimeMillis();//最后一次修改时间初始化为创建时间
+ mParentId = 0;
+ mSnippet = "";
+ mType = Notes.TYPE_NOTE;
+ mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
+ mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+ mOriginParent = 0;
+ mVersion = 0;
+ mDiffNoteValues = new ContentValues();
+ mDataList = new ArrayList();
+ }
+
+
+ /*
+ * 功能描述：构造函数
+ * 参数注解： mIsCreate用于标示构造方式
+ * 参数注解：
+ * Made By CuiCan
+ */
+ //构造函数有context和一个数据库的cursor，多数变量通过cursor指向的一条记录直接进行初始化
+ public SqlNote(Context context, Cursor c) {
+ mContext = context;
+ mContentResolver = context.getContentResolver();
+ mIsCreate = false;
+ loadFromCursor(c);
+ mDataList = new ArrayList();
+ //
+ if (mType == Notes.TYPE_NOTE)
+ loadDataContent();
+ mDiffNoteValues = new ContentValues();
+ }
+
+
+ /*
+ * 功能描述：构造函数
+ * 参数注解： mIsCreate用于标示构造方式
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public SqlNote(Context context, long id) {
+ mContext = context;
+ mContentResolver = context.getContentResolver();
+ mIsCreate = false;
+ loadFromCursor(id);
+ mDataList = new ArrayList();
+ if (mType == Notes.TYPE_NOTE)
+ loadDataContent();
+ mDiffNoteValues = new ContentValues();
+
+ }
+
+ /*
+ * 功能描述：通过id从光标处加载数据
+ * Made By CuiCan
+ */
+ private void loadFromCursor(long id) {
+ Cursor c = null;
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
+ new String[] {
+ String.valueOf(id)
+ }, null);//通过id获得对应的ContentResolver中的cursor
+ if (c != null) {
+ c.moveToNext();
+ loadFromCursor(c);//然后加载数据进行初始化，这样函数
+ //SqlNote(Context context, long id)与SqlNote(Context context, long id)的实现方式基本相同
+ } else {
+ Log.w(TAG, "loadFromCursor: cursor = null");
+ }
+ } finally {
+ if (c != null)
+ c.close();
+ }
+ }
+
+ /*
+ * 功能描述：通过游标从光标处加载数据
+ * Made By CuiCan
+ */
+ private void loadFromCursor(Cursor c) {
+ //直接从一条记录中的获得以下变量的初始值
+ mId = c.getLong(ID_COLUMN);
+ mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
+ mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
+ mCreatedDate = c.getLong(CREATED_DATE_COLUMN);
+ mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN);
+ mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN);
+ mParentId = c.getLong(PARENT_ID_COLUMN);
+ mSnippet = c.getString(SNIPPET_COLUMN);
+ mType = c.getInt(TYPE_COLUMN);
+ mWidgetId = c.getInt(WIDGET_ID_COLUMN);
+ mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
+ mVersion = c.getLong(VERSION_COLUMN);
+ }
+
+ /*
+ * 功能描述：通过content机制获取共享数据并加载到数据库当前游标处
+ * 参数注解：
+ * Made By CuiCan
+ */
+ private void loadDataContent() {
+ Cursor c = null;
+ mDataList.clear();
+ try {
+ c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
+ "(note_id=?)", new String[] {
+ String.valueOf(mId)
+ }, null);
+ if (c != null) {
+ if (c.getCount() == 0) {
+ Log.w(TAG, "it seems that the note has not data");
+ return;
+ }
+ while (c.moveToNext()) {
+ SqlData data = new SqlData(mContext, c);
+ mDataList.add(data);
+ }
+ } else {
+ Log.w(TAG, "loadDataContent: cursor = null");
+ }
+ } finally {
+ if (c != null)
+ c.close();
+ }
+ }
+
+ /*
+ * 功能描述：设置通过content机制用于共享的数据信息
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public boolean setContent(JSONObject js) {
+ try {
+ JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+ Log.w(TAG, "cannot set system folder");
+ } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+ // for folder we can only update the snnipet and type
+ String snippet = note.has(NoteColumns.SNIPPET) ? note
+ .getString(NoteColumns.SNIPPET) : "";
+ if (mIsCreate || !mSnippet.equals(snippet)) {
+ mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+ }
+ mSnippet = snippet;
+
+ int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
+ : Notes.TYPE_NOTE;
+ if (mIsCreate || mType != type) {
+ mDiffNoteValues.put(NoteColumns.TYPE, type);
+ }
+ mType = type;
+ } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
+ JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+ long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
+ if (mIsCreate || mId != id) {
+ mDiffNoteValues.put(NoteColumns.ID, id);
+ }
+ mId = id;
+
+ long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
+ .getLong(NoteColumns.ALERTED_DATE) : 0;
+ if (mIsCreate || mAlertDate != alertDate) {
+ mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
+ }
+ mAlertDate = alertDate;
+
+ int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
+ .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
+ if (mIsCreate || mBgColorId != bgColorId) {
+ mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
+ }
+ mBgColorId = bgColorId;
+ long createDate = note.has(NoteColumns.CREATED_DATE) ? note
+ .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
+ if (mIsCreate || mCreatedDate != createDate) {
+ mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
+ }
+ mCreatedDate = createDate;
+
+ int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
+ .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
+ if (mIsCreate || mHasAttachment != hasAttachment) {
+ mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
+ }
+ mHasAttachment = hasAttachment;
+
+ long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
+ .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
+ if (mIsCreate || mModifiedDate != modifiedDate) {
+ mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
+ }
+ mModifiedDate = modifiedDate;
+
+ long parentId = note.has(NoteColumns.PARENT_ID) ? note
+ .getLong(NoteColumns.PARENT_ID) : 0;
+ if (mIsCreate || mParentId != parentId) {
+ mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
+ }
+ mParentId = parentId;
+
+ String snippet = note.has(NoteColumns.SNIPPET) ? note
+ .getString(NoteColumns.SNIPPET) : "";
+ if (mIsCreate || !mSnippet.equals(snippet)) {
+ mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+ }
+ mSnippet = snippet;
+
+ int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
+ : Notes.TYPE_NOTE;
+ if (mIsCreate || mType != type) {
+ mDiffNoteValues.put(NoteColumns.TYPE, type);
+ }
+ mType = type;
+
+ int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
+ : AppWidgetManager.INVALID_APPWIDGET_ID;
+ if (mIsCreate || mWidgetId != widgetId) {
+ mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
+ }
+ mWidgetId = widgetId;
+
+ int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
+ .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
+ if (mIsCreate || mWidgetType != widgetType) {
+ mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
+ }
+ mWidgetType = widgetType;
+
+ long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
+ .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
+ if (mIsCreate || mOriginParent != originParent) {
+ mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
+ }
+ mOriginParent = originParent;
+
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ SqlData sqlData = null;
+ if (data.has(DataColumns.ID)) {
+ long dataId = data.getLong(DataColumns.ID);
+ for (SqlData temp : mDataList) {
+ if (dataId == temp.getId()) {
+ sqlData = temp;
+ }
+ }
+ }
+
+ if (sqlData == null) {
+ sqlData = new SqlData(mContext);
+ mDataList.add(sqlData);
+ }
+
+ sqlData.setContent(data);
+ }
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+
+ /*
+ * 功能描述：获取content机制提供的数据并加载到note中
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public JSONObject getContent() {
+ try {
+ JSONObject js = new JSONObject();
+
+ if (mIsCreate) {
+ Log.e(TAG, "it seems that we haven't created this in database yet");
+ return null;
+ }
+
+ JSONObject note = new JSONObject();
+ if (mType == Notes.TYPE_NOTE) {//类型为note时
+ note.put(NoteColumns.ID, mId);
+ note.put(NoteColumns.ALERTED_DATE, mAlertDate);
+ note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
+ note.put(NoteColumns.CREATED_DATE, mCreatedDate);
+ note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
+ note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
+ note.put(NoteColumns.PARENT_ID, mParentId);
+ note.put(NoteColumns.SNIPPET, mSnippet);
+ note.put(NoteColumns.TYPE, mType);
+ note.put(NoteColumns.WIDGET_ID, mWidgetId);
+ note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
+ note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
+ js.put(GTaskStringUtils.META_HEAD_NOTE, note);
+
+ JSONArray dataArray = new JSONArray();
+ for (SqlData sqlData : mDataList) {
+ JSONObject data = sqlData.getContent();
+ if (data != null) {
+ dataArray.put(data);
+ }
+ }
+ js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
+ } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {//类型为文件夹或者
+ note.put(NoteColumns.ID, mId);
+ note.put(NoteColumns.TYPE, mType);
+ note.put(NoteColumns.SNIPPET, mSnippet);
+ js.put(GTaskStringUtils.META_HEAD_NOTE, note);
+ }
+
+ return js;
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /*
+ * 功能描述：给当前id设置父id
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public void setParentId(long id) {
+ mParentId = id;
+ mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
+ }
+
+ /*
+ * 功能描述：给当前id设置Gtaskid
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public void setGtaskId(String gid) {
+ mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
+ }
+
+ /*
+ * 功能描述：给当前id设置同步id
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public void setSyncId(long syncId) {
+ mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
+ }
+
+ /*
+ * 功能描述：初始化本地修改，即撤销所有当前修改
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public void resetLocalModified() {
+ mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
+ }
+
+ /*
+ * 功能描述：获得当前id
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public long getId() {
+ return mId;
+ }
+
+ /*
+ * 功能描述：获得当前id的父id
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public long getParentId() {
+ return mParentId;
+ }
+
+ /*
+ * 功能描述：获取小片段即用于显示的部分便签内容
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public String getSnippet() {
+ return mSnippet;
+ }
+
+ /*
+ * 功能描述：判断是否为便签类型
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public boolean isNoteType() {
+ return mType == Notes.TYPE_NOTE;
+ }
+
+ /*
+ * 功能描述：commit函数用于把当前造作所做的修改保存到数据库
+ * 参数注解：
+ * Made By CuiCan
+ */
+ public void commit(boolean validateVersion) {
+ if (mIsCreate) {
+ if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
+ mDiffNoteValues.remove(NoteColumns.ID);
+ }
+
+ Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
+ try {
+ mId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Get note id error :" + e.toString());
+ throw new ActionFailureException("create note failed");
+ }
+ if (mId == 0) {
+ throw new IllegalStateException("Create thread id failed");
+ }
+
+ if (mType == Notes.TYPE_NOTE) {
+ for (SqlData sqlData : mDataList) {//直接使用sqldata中的实现
+ sqlData.commit(mId, false, -1);
+ }
+ }
+ } else {
+ if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
+ Log.e(TAG, "No such note");
+ throw new IllegalStateException("Try to update note with invalid id");
+ }
+ if (mDiffNoteValues.size() > 0) {
+ mVersion ++;
+ int result = 0;
+ if (!validateVersion) {//构造字符串
+ result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ + NoteColumns.ID + "=?)", new String[] {
+ String.valueOf(mId)
+ });
+ } else {
+ result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
+ new String[] {
+ String.valueOf(mId), String.valueOf(mVersion)
+ });
+ }
+ if (result == 0) {
+ Log.w(TAG, "there is no update. maybe user updates note when syncing");
+ }
+ }
+
+ if (mType == Notes.TYPE_NOTE) {
+ for (SqlData sqlData : mDataList) {
+ sqlData.commit(mId, validateVersion, mVersion);
+ }
+ }
+ }
+
+ // refresh local info
+ loadFromCursor(mId);
+ if (mType == Notes.TYPE_NOTE)
+ loadDataContent();
+
+ mDiffNoteValues.clear();
+ mIsCreate = false;
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java
new file mode 100644
index 0000000..ff4b8c5
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java
@@ -0,0 +1,354 @@
+/*
+ * 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.gtask.data;
+
+import android.database.Cursor;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.exception.ActionFailureException;
+import net.micode.notes.tool.GTaskStringUtils;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class Task extends Node {
+ private static final String TAG = Task.class.getSimpleName();
+
+ private boolean mCompleted;//是否完成
+
+ private String mNotes;
+
+ private JSONObject mMetaInfo;//将在实例中存储数据的类型
+
+ private Task mPriorSibling;//对应的优先兄弟Task的指针（待完善）
+
+ private TaskList mParent;//所在的任务列表的指针
+
+ public Task() {
+ super();
+ mCompleted = false;
+ mNotes = null;
+ mPriorSibling = null;//TaskList中当前Task前面的Task的指针
+ mParent = null;//当前Task所在的TaskList
+ mMetaInfo = null;
+ }
+
+ public JSONObject getCreateAction(int actionId) {
+ JSONObject js = new JSONObject();
+
+ try {
+ // action_type
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
+
+ // action_id
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // index
+ js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
+
+ // entity_delta
+ JSONObject entity = new JSONObject();
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
+ entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
+ GTaskStringUtils.GTASK_JSON_TYPE_TASK);
+ if (getNotes() != null) {
+ entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
+ }
+ js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
+
+ // parent_id
+ if (mParent!= null) {
+ js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
+ }
+
+ // dest_parent_type
+ js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE,
+ GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
+
+ // list_id
+ if (mParent!= null) {
+ js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
+ }
+
+ // prior_sibling_id
+ if (mPriorSibling != null) {
+ js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
+ }
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to generate task-create jsonobject");
+ }
+
+ return js;
+ }
+
+ public JSONObject getUpdateAction(int actionId) {
+ JSONObject js = new JSONObject();
+
+ try {
+ // action_type
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
+
+ // action_id
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // id
+ js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
+
+ // entity_delta
+ JSONObject entity = new JSONObject();
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ if (getNotes() != null) {
+ entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
+ }
+ entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
+ js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to generate task-update jsonobject");
+ }
+
+ return js;
+ }
+
+ public void setContentByRemoteJSON(JSONObject js) {
+ if (js != null) {
+ try {
+ // id
+ if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
+ setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
+ }
+
+ // last_modified
+ if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
+ setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
+ }
+
+ // name
+ if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
+ setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
+ }
+
+ // notes
+ if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) {
+ setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
+ }
+
+ // deleted
+ if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) {
+ setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
+ }
+
+ // completed
+ if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
+ setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to get task content from jsonobject");
+ }
+ }
+ }
+
+ public void setContentByLocalJSON(JSONObject js) { //��metadata����ʵʩ
+ if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
+ || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
+ Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
+ }
+
+ try {
+ JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+
+ if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
+ Log.e(TAG, "invalid type");
+ return;
+ }
+
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
+ setName(data.getString(DataColumns.CONTENT));
+ break;
+ }
+ }
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+ }
+
+ public JSONObject getLocalJSONFromContent() {
+ String name = getName();
+ try {
+ if (mMetaInfo == null) {
+ // new task created from web
+ if (name == null) {
+ Log.w(TAG, "the note seems to be an empty one");
+ return null;
+ }
+
+ JSONObject js = new JSONObject();
+ JSONObject note = new JSONObject();
+ JSONArray dataArray = new JSONArray();
+ JSONObject data = new JSONObject();
+ data.put(DataColumns.CONTENT, name);
+ dataArray.put(data);
+ js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
+ note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
+ js.put(GTaskStringUtils.META_HEAD_NOTE, note);
+ return js;
+ } else {
+ // synced task
+ JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
+ data.put(DataColumns.CONTENT, getName());
+ break;
+ }
+ }
+
+ note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
+ return mMetaInfo;
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public void setMetaInfo(MetaData metaData) {
+ if (metaData != null && metaData.getNotes() != null) {
+ try {
+ mMetaInfo = new JSONObject(metaData.getNotes());
+ } catch (JSONException e) {
+ Log.w(TAG, e.toString());
+ mMetaInfo = null;
+ }
+ }
+ }
+
+ public int getSyncAction(Cursor c) {
+ try {
+ JSONObject noteInfo = null;
+ if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
+ noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ }
+
+ if (noteInfo == null) {
+ Log.w(TAG, "it seems that note meta has been deleted");
+ return SYNC_ACTION_UPDATE_REMOTE;
+ }
+
+ if (!noteInfo.has(NoteColumns.ID)) {
+ Log.w(TAG, "remote note id seems to be deleted");
+ return SYNC_ACTION_UPDATE_LOCAL;
+ }
+
+ // validate the note id now
+ if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
+ Log.w(TAG, "note id doesn't match");
+ return SYNC_ACTION_UPDATE_LOCAL;
+ }
+
+ if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
+ // there is no local update
+ if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+ // no update both side
+ return SYNC_ACTION_NONE;
+ } else {
+ // apply remote to local
+ return SYNC_ACTION_UPDATE_LOCAL;
+ }
+ } else {
+ // validate gtask id
+ if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
+ Log.e(TAG, "gtask id doesn't match");
+ return SYNC_ACTION_ERROR;
+ }
+ if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+ // local modification only
+ return SYNC_ACTION_UPDATE_REMOTE;
+ } else {
+ return SYNC_ACTION_UPDATE_CONFLICT;
+ }
+ }
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+
+ return SYNC_ACTION_ERROR;
+ }
+
+ public boolean isWorthSaving() {
+ return mMetaInfo != null || (getName() != null && getName().trim().length() > 0)
+ || (getNotes() != null && getNotes().trim().length() > 0);
+ }
+
+ public void setCompleted(boolean completed) {
+ this.mCompleted = completed;
+ }
+
+ public void setNotes(String notes) {
+ this.mNotes = notes;
+ }
+
+ public void setPriorSibling(Task priorSibling) {
+ this.mPriorSibling = priorSibling;
+ }
+
+ public void setParent(TaskList parent) {
+ this.mParent = parent;
+ }
+
+ public boolean getCompleted() {
+ return this.mCompleted;
+ }
+
+ public String getNotes() {
+ return this.mNotes;
+ }
+
+ public Task getPriorSibling() {
+ return this.mPriorSibling;
+ }
+
+ public TaskList getParent() {
+ return this.mParent;
+ }
+
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
new file mode 100644
index 0000000..5a7b09a
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
@@ -0,0 +1,399 @@
+/*
+ * 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.gtask.data;
+
+import android.database.Cursor;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.exception.ActionFailureException;
+import net.micode.notes.tool.GTaskStringUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class TaskList extends Node {
+ private static final String TAG = TaskList.class.getSimpleName();//tag标记
+
+ private int mIndex;//当前TaskList的指针
+
+ private ArrayList mChildren;//类中主要的保存数据的单元，用来实现一个以Task为元素的ArrayList
+
+ public TaskList() {
+ super();
+ mChildren = new ArrayList();
+ mIndex = 1;
+ }
+
+ /* (non-Javadoc)
+ * @see net.micode.notes.gtask.data.Node#getCreateAction(int)
+ * 生成并返回一个包含了一定数据的JSONObject实体
+ */
+ public JSONObject getCreateAction(int actionId) {
+ JSONObject js = new JSONObject();
+
+ try {
+ // action_type
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
+
+ // action_id
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // index
+ js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
+
+ // entity_delta
+ JSONObject entity = new JSONObject();//entity实体
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
+ entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
+ GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
+ js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to generate tasklist-create jsonobject");
+ }
+
+ return js;
+ }
+
+ /* (non-Javadoc)
+ * @see net.micode.notes.gtask.data.Node#getUpdateAction(int)
+ * 生成并返回一个包含了一定数据的JSONObject实体
+ */
+ public JSONObject getUpdateAction(int actionId) {
+ JSONObject js = new JSONObject();
+
+ try {
+ // action_type
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
+
+ // action_id
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // id
+ js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
+
+ // entity_delta
+ JSONObject entity = new JSONObject();
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
+ js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to generate tasklist-update jsonobject");
+ }
+
+ return js;
+ }
+
+ public void setContentByRemoteJSON(JSONObject js) {
+ if (js != null) {
+ try {
+ // id
+ if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
+ setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
+ }
+
+ // last_modified
+ if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
+ setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
+ }
+
+ // name
+ if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
+ setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
+ }
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to get tasklist content from jsonobject");
+ }
+ }
+ }
+
+ public void setContentByLocalJSON(JSONObject js) {
+ if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
+ Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
+ }
+
+ try {
+ JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+
+ if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+ String name = folder.getString(NoteColumns.SNIPPET);
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
+ } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+ if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
+ else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
+ + GTaskStringUtils.FOLDER_CALL_NOTE);
+ else
+ Log.e(TAG, "invalid system folder");
+ } else {
+ Log.e(TAG, "error type");
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+ }
+
+ public JSONObject getLocalJSONFromContent() {
+ try {
+ JSONObject js = new JSONObject();
+ JSONObject folder = new JSONObject();
+
+ String folderName = getName();
+ if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX))
+ folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(),
+ folderName.length());
+ folder.put(NoteColumns.SNIPPET, folderName);
+ if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT)
+ || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE))
+ folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ else
+ folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
+
+ js.put(GTaskStringUtils.META_HEAD_NOTE, folder);
+
+ return js;
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public int getSyncAction(Cursor c) {
+ try {
+ if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
+ // there is no local update
+ if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+ // no update both side
+ return SYNC_ACTION_NONE;
+ } else {
+ // apply remote to local
+ return SYNC_ACTION_UPDATE_LOCAL;
+ }
+ } else {
+ // validate gtask id
+ if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
+ Log.e(TAG, "gtask id doesn't match");
+ return SYNC_ACTION_ERROR;
+ }
+ if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+ // local modification only
+ return SYNC_ACTION_UPDATE_REMOTE;
+ } else {
+ // for folder conflicts, just apply local modification
+ return SYNC_ACTION_UPDATE_REMOTE;
+ }
+ }
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+
+ return SYNC_ACTION_ERROR;
+ }
+
+ /**
+ * @return
+ * 功能：获得TaskList的大小，即mChildren的大小
+ */
+ public int getChildTaskCount() {
+ return mChildren.size();
+ }
+
+ /**
+ * @param task
+ * @return 返回值为是否成功添加任务。
+ * 功能：在当前任务表末尾添加新的任务。
+ */
+ public boolean addChildTask(Task task) {
+ boolean ret = false;
+ if (task != null && !mChildren.contains(task)) {
+ ret = mChildren.add(task);
+ if (ret) {
+ // need to set prior sibling and parent
+ task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
+ .get(mChildren.size() - 1));
+ task.setParent(this);
+ //注意：每一次ArrayList的变化都要紧跟相关Task中PriorSibling的更改
+ //，接下来几个函数都有相关操作
+ }
+ }
+ return ret;
+ }
+
+ /**
+ * @param task
+ * @param index
+ * @return
+ * 功能：在当前任务表的指定位置添加新的任务。
+ */
+ public boolean addChildTask(Task task, int index) {
+ if (index < 0 || index > mChildren.size()) {
+ Log.e(TAG, "add child task: invalid index");
+ return false;
+ }
+
+ int pos = mChildren.indexOf(task);
+ if (task != null && pos == -1) {
+ mChildren.add(index, task);
+
+ // update the task list
+ Task preTask = null;
+ Task afterTask = null;
+ if (index != 0)
+ preTask = mChildren.get(index - 1);
+ if (index != mChildren.size() - 1)
+ afterTask = mChildren.get(index + 1);
+
+ task.setPriorSibling(preTask);
+ if (afterTask != null)
+ afterTask.setPriorSibling(task);
+ }
+
+ return true;
+ }
+
+ /**
+ * @param task
+ * @return 返回删除是否成功
+ * 功能：删除TaskList中的一个Task
+ */
+ public boolean removeChildTask(Task task) {
+ boolean ret = false;
+ int index = mChildren.indexOf(task);
+ if (index != -1) {
+ ret = mChildren.remove(task);
+
+ if (ret) {
+ // reset prior sibling and parent
+ task.setPriorSibling(null);
+ task.setParent(null);
+
+ // update the task list
+ if (index != mChildren.size()) {
+ mChildren.get(index).setPriorSibling(
+ index == 0 ? null : mChildren.get(index - 1));
+ }
+ }
+ }
+ return ret;
+ }
+
+ /**
+ * @param task
+ * @param index
+ * @return
+ * 功能：将当前TaskList中含有的某个Task移到index位置
+ */
+ public boolean moveChildTask(Task task, int index) {
+
+ if (index < 0 || index >= mChildren.size()) {
+ Log.e(TAG, "move child task: invalid index");
+ return false;
+ }
+
+ int pos = mChildren.indexOf(task);
+ if (pos == -1) {
+ Log.e(TAG, "move child task: the task should in the list");
+ return false;
+ }
+
+ if (pos == index)
+ return true;
+ return (removeChildTask(task) && addChildTask(task, index));
+ //利用已实现好的功能完成当下功能；
+ }
+
+ /**
+ * @param gid
+ * @return返回寻找结果
+ * 功能：按gid寻找Task
+ */
+ public Task findChildTaskByGid(String gid) {
+ for (int i = 0; i < mChildren.size(); i++) {
+ Task t = mChildren.get(i);
+ if (t.getGid().equals(gid)) {
+ return t;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @param task
+ * @return
+ * 功能：返回指定Task的index
+ */
+ public int getChildTaskIndex(Task task) {
+ return mChildren.indexOf(task);
+ }
+
+ /**
+ * @param index
+ * @return
+ * 功能：返回指定index的Task
+ */
+ public Task getChildTaskByIndex(int index) {
+ if (index < 0 || index >= mChildren.size()) {
+ Log.e(TAG, "getTaskByIndex: invalid index");
+ return null;
+ }
+ return mChildren.get(index);
+ }
+
+ /**
+ * @param gid
+ * @return
+ * 功能：返回指定gid的Task
+ */
+ public Task getChilTaskByGid(String gid) {
+ for (Task task : mChildren) {//一种常见的ArrayList的遍历方法（四种，见精读笔记）
+ if (task.getGid().equals(gid))
+ return task;
+ }
+ return null;
+ }
+
+ public ArrayList getChildTaskList() {
+ return this.mChildren;
+ }
+
+ public void setIndex(int index) {
+ this.mIndex = index;
+ }
+
+ public int getIndex() {
+ return this.mIndex;
+ }
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
new file mode 100644
index 0000000..59bb859
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
@@ -0,0 +1,40 @@
+/*
+ * 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.gtask.exception;
+
+public class ActionFailureException extends RuntimeException {
+ private static final long serialVersionUID = 4425249765923293627L;
+
+ public ActionFailureException() {
+ super();
+ }
+ /*
+ * 在JAVA类中使用super来引用父类的成分，用this来引用当前对象.
+ * 如果一个类从另外一个类继承，我们new这个子类的实例对象的时候，这个子类对象里面会有一个父类对象。
+ * 怎么去引用里面的父类对象呢？使用super来引用
+ * 也就是说，此处super()以及super (paramString)可认为是Exception ()和Exception (paramString)
+
+ */
+
+ public ActionFailureException(String paramString) {
+ super(paramString);
+ }
+
+ public ActionFailureException(String paramString, Throwable paramThrowable) {
+ super(paramString, paramThrowable);
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
new file mode 100644
index 0000000..2111ae9
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
@@ -0,0 +1,41 @@
+/*
+ * 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.gtask.exception;
+/*
+ * Description：支持小米便签运行过程中的网络异常处理。
+ */
+
+public class NetworkFailureException extends Exception {
+ private static final long serialVersionUID = 2107610287180234136L;
+
+ public NetworkFailureException() {
+ super();
+ }
+ /*
+ * 在JAVA类中使用super来引用父类的成分，用this来引用当前对象.
+ * 如果一个类从另外一个类继承，我们new这个子类的实例对象的时候，这个子类对象里面会有一个父类对象。
+ * 怎么去引用里面的父类对象呢？使用super来引用
+ * 也就是说，此处super()以及super (paramString)可认为是Exception ()和Exception (paramString)
+ */
+ public NetworkFailureException(String paramString) {
+ super(paramString);
+ }
+
+ public NetworkFailureException(String paramString, Throwable paramThrowable) {
+ super(paramString, paramThrowable);
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
new file mode 100644
index 0000000..6b93f27
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -0,0 +1,142 @@
+
+/*
+ * 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.gtask.remote;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+
+import net.micode.notes.R;
+import net.micode.notes.ui.NotesListActivity;
+import net.micode.notes.ui.NotesPreferenceActivity;
+
+/*异步操作类，实现GTask的异步操作过程
+ * 主要方法：
+ * private void showNotification(int tickerId, String content) 向用户提示当前同步的状态，是一个用于交互的方法
+ * protected Integer doInBackground(Void... unused) 此方法在后台线程执行，完成任务的主要工作，通常需要较长的时间
+ * protected void onProgressUpdate(String... progress) 可以使用进度条增加用户体验度。 此方法在主线程执行，用于显示任务执行的进度。
+ * protected void onPostExecute(Integer result) 相当于Handler 处理UI的方式，在这里面可以使用在doInBackground 得到的结果处理操作UI
+ */
+
+public class GTaskASyncTask extends AsyncTask {
+
+ private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
+
+ public interface OnCompleteListener {
+ void onComplete();
+ }
+
+ private Context mContext;
+
+ private NotificationManager mNotifiManager;
+
+ private GTaskManager mTaskManager;
+
+ private OnCompleteListener mOnCompleteListener;
+
+ public GTaskASyncTask(Context context, OnCompleteListener listener) {
+ mContext = context;
+ mOnCompleteListener = listener;
+ mNotifiManager = (NotificationManager) mContext
+ .getSystemService(Context.NOTIFICATION_SERVICE);
+ mTaskManager = GTaskManager.getInstance();
+ }
+
+ public void cancelSync() {
+ mTaskManager.cancelSync();
+ }
+
+ public void publishProgess(String message) {// 发布进度单位，系统将会调用onProgressUpdate()方法更新这些值
+ publishProgress(new String[] {
+ message
+ });
+ }
+
+ private void showNotification(int tickerId, String content) {
+ Notification notification = new Notification(R.drawable.notification, mContext
+ .getString(tickerId), System.currentTimeMillis());
+ notification.defaults = Notification.DEFAULT_LIGHTS;
+ notification.flags = Notification.FLAG_AUTO_CANCEL;
+ PendingIntent pendingIntent;//一个描述了想要启动一个Activity、Broadcast或是Service的意图
+ if (tickerId != R.string.ticker_success) {
+ pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+ NotesPreferenceActivity.class), 0);
+
+ } else {
+ pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+ NotesListActivity.class), 0);
+ }
+ // notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+ // pendingIntent);
+ notification = new Notification.Builder(mContext)
+ .setContentIntent(pendingIntent)
+ .setTicker(mContext.getString(R.string.app_name))
+ .setContentTitle(mContext.getString(R.string.app_name))
+ .setContentText(content)
+ .setWhen(System.currentTimeMillis())
+ .setSmallIcon(R.drawable.icon_app)
+ .build();
+ notification.icon = R.drawable.icon_app;
+ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+ }
+
+ @Override
+ protected Integer doInBackground(Void... unused) {
+ publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
+ .getSyncAccountName(mContext)));
+ return mTaskManager.sync(mContext, this);
+ }
+
+ @Override
+ protected void onProgressUpdate(String... progress) {
+ showNotification(R.string.ticker_syncing, progress[0]);
+ if (mContext instanceof GTaskSyncService) { //instanceof 判断mContext是否是GTaskSyncService的实例
+ ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
+ }
+ }
+
+ @Override
+ protected void onPostExecute(Integer result) { //用于在执行完后台任务后更新UI,显示结果
+ if (result == GTaskManager.STATE_SUCCESS) {
+ showNotification(R.string.ticker_success, mContext.getString(
+ R.string.success_sync_account, mTaskManager.getSyncAccount()));
+ NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); //设置最新同步的时间
+ } else if (result == GTaskManager.STATE_NETWORK_ERROR) {
+ showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
+ } else if (result == GTaskManager.STATE_INTERNAL_ERROR) {
+ showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal));
+ } else if (result == GTaskManager.STATE_SYNC_CANCELLED) {
+ showNotification(R.string.ticker_cancel, mContext
+ .getString(R.string.error_sync_cancelled));
+ } //几种不同情况下的结果显示
+ if (mOnCompleteListener != null) {
+ new Thread(new Runnable() { //这里好像是方法内的一个线程，但是并不太懂什么意思
+
+ public void run() { //完成后的操作，使用onComplete()将所有值都重新初始化，相当于完成一次操作
+ mOnCompleteListener.onComplete();
+ }
+ }).start();
+ }
+ }
+}
+
+
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
new file mode 100644
index 0000000..95a4cf6
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -0,0 +1,674 @@
+/*
+ * 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.gtask.remote;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerFuture;
+import android.app.Activity;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.gtask.data.Node;
+import net.micode.notes.gtask.data.Task;
+import net.micode.notes.gtask.data.TaskList;
+import net.micode.notes.gtask.exception.ActionFailureException;
+import net.micode.notes.gtask.exception.NetworkFailureException;
+import net.micode.notes.tool.GTaskStringUtils;
+import net.micode.notes.ui.NotesPreferenceActivity;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.cookie.Cookie;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+
+
+
+/*
+ * 主要功能：实现GTASK的登录操作，进行GTASK任务的创建，创建任务列表，从网络上获取任务和任务列表的内容
+ * 主要使用类或技术：accountManager JSONObject HttpParams authToken Gid
+ */
+public class GTaskClient {
+ private static final String TAG = GTaskClient.class.getSimpleName();
+
+ private static final String GTASK_URL = "https://mail.google.com/tasks/"; //这个是指定的URL
+
+ private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig";
+
+ private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig";
+
+ private static GTaskClient mInstance = null;
+
+ private DefaultHttpClient mHttpClient;
+
+ private String mGetUrl;
+
+ private String mPostUrl;
+
+ private long mClientVersion;
+
+ private boolean mLoggedin;
+
+ private long mLastLoginTime;
+
+ private int mActionId;
+
+ private Account mAccount;
+
+ private JSONArray mUpdateArray;
+
+ private GTaskClient() {
+ mHttpClient = null;
+ mGetUrl = GTASK_GET_URL;
+ mPostUrl = GTASK_POST_URL;
+ mClientVersion = -1;
+ mLoggedin = false;
+ mLastLoginTime = 0;
+ mActionId = 1;
+ mAccount = null;
+ mUpdateArray = null;
+ }
+
+ /*用来获取的实例化对象
+ * 使用 getInstance()
+ * 返回mInstance这个实例化对象
+ */
+ public static synchronized GTaskClient getInstance() {
+ if (mInstance == null) {
+ mInstance = new GTaskClient();
+ }
+ return mInstance;
+ }
+
+ /*用来实现登录操作的函数，传入的参数是一个Activity
+ * 设置登录操作限制时间，如果超时则需要重新登录
+ * 有两种登录方式，使用用户自己的URL登录或者使用谷歌官方的URL登录
+ * 返回true或者false，即最后是否登陆成功
+ */
+ public boolean login(Activity activity) {
+ // we suppose that the cookie would expire after 5 minutes
+ // then we need to re-login
+ //判断距离最后一次登录操作是否超过5分钟
+ final long interval = 1000 * 60 * 5;
+ if (mLastLoginTime + interval < System.currentTimeMillis()) {
+ mLoggedin = false;
+ }
+
+ // need to re-login after account switch 重新登录操作
+ if (mLoggedin
+ && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
+ .getSyncAccountName(activity))) {
+ mLoggedin = false;
+ }
+
+ //如果没超过时间，则不需要重新登录
+ if (mLoggedin) {
+ Log.d(TAG, "already logged in");
+ return true;
+ }
+
+ mLastLoginTime = System.currentTimeMillis();//更新最后登录时间，改为系统当前的时间
+ String authToken = loginGoogleAccount(activity, false);//判断是否登录到谷歌账户
+ if (authToken == null) {
+ Log.e(TAG, "login google account failed");
+ return false;
+ }
+
+ // login with custom domain if necessary
+ //尝试使用用户自己的域名登录
+ if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() //将用户账号名改为统一格式（小写）后判断是否为一个谷歌账号地址
+ .endsWith("googlemail.com"))) {
+ StringBuilder url = new StringBuilder(GTASK_URL).append("a/");
+ int index = mAccount.name.indexOf('@') + 1;
+ String suffix = mAccount.name.substring(index);
+ url.append(suffix + "/");
+ mGetUrl = url.toString() + "ig"; //设置用户对应的getUrl
+ mPostUrl = url.toString() + "r/ig"; //设置用户对应的postUrl
+
+ if (tryToLoginGtask(activity, authToken)) {
+ mLoggedin = true;
+ }
+ }
+
+ // try to login with google official url
+ //如果用户账户无法登录，则使用谷歌官方的URI进行登录
+ if (!mLoggedin) {
+ mGetUrl = GTASK_GET_URL;
+ mPostUrl = GTASK_POST_URL;
+ if (!tryToLoginGtask(activity, authToken)) {
+ return false;
+ }
+ }
+
+ mLoggedin = true;
+ return true;
+ }
+
+ /*具体实现登录谷歌账户的方法
+ * 使用令牌机制
+ * 使用AccountManager来管理注册账号
+ * 返回值是账号的令牌
+ */
+ private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
+ String authToken; //令牌，是登录操作保证安全性的一个方法
+ AccountManager accountManager = AccountManager.get(activity);//AccountManager这个类给用户提供了集中注册账号的接口
+ Account[] accounts = accountManager.getAccountsByType("com.google");//获取全部以com.google结尾的account
+
+ if (accounts.length == 0) {
+ Log.e(TAG, "there is no available google account");
+ return null;
+ }
+
+ String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
+ Account account = null;
+ //遍历获得的accounts信息，寻找已经记录过的账户信息
+ for (Account a : accounts) {
+ if (a.name.equals(accountName)) {
+ account = a;
+ break;
+ }
+ }
+ if (account != null) {
+ mAccount = account;
+ } else {
+ Log.e(TAG, "unable to get an account with the same name in the settings");
+ return null;
+ }
+
+ // get the token now
+ //获取选中账号的令牌
+ AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account,
+ "goanna_mobile", null, activity, null, null);
+ try {
+ Bundle authTokenBundle = accountManagerFuture.getResult();
+ authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
+ //如果是invalidateToken，那么需要调用invalidateAuthToken(String, String)方法废除这个无效token
+ if (invalidateToken) {
+ accountManager.invalidateAuthToken("com.google", authToken);
+ loginGoogleAccount(activity, false);
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "get auth token failed");
+ authToken = null;
+ }
+
+ return authToken;
+ }
+
+ //尝试登陆Gtask，这只是一个预先判断令牌是否是有效以及是否能登上GTask的方法,而不是具体实现登陆的方法
+ private boolean tryToLoginGtask(Activity activity, String authToken) {
+ if (!loginGtask(authToken)) {
+ // maybe the auth token is out of authTokedate, now let's invalidate the
+ // token and try again
+ //删除过一个无效的authToken，申请一个新的后再次尝试登陆
+ authToken = loginGoogleAccount(activity, true);
+ if (authToken == null) {
+ Log.e(TAG, "login google account failed");
+ return false;
+ }
+
+ if (!loginGtask(authToken)) {
+ Log.e(TAG, "login gtask failed");
+ return false;
+ }
+ }
+ return true;
+ }
+
+ //实现登录GTask的具体操作
+ private boolean loginGtask(String authToken) {
+ int timeoutConnection = 10000;
+ int timeoutSocket = 15000; //socket是一种通信连接实现数据的交换的端口
+ HttpParams httpParameters = new BasicHttpParams(); //实例化一个新的HTTP参数类
+ HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);//设置连接超时时间
+ HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);//设置设置端口超时时间
+ mHttpClient = new DefaultHttpClient(httpParameters);
+ BasicCookieStore localBasicCookieStore = new BasicCookieStore(); //设置本地cookie
+ mHttpClient.setCookieStore(localBasicCookieStore);
+ HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
+
+ // login gtask
+ try {
+ String loginUrl = mGetUrl + "?auth=" + authToken; //设置登录的url
+ HttpGet httpGet = new HttpGet(loginUrl); //通过登录的uri实例化网页上资源的查找
+ HttpResponse response = null;
+ response = mHttpClient.execute(httpGet);
+
+ // get the cookie now
+ //获取CookieStore里存放的cookie,看如果存有“GTL(不知道什么意思)”，则说明有验证成功的有效的cookie
+ List cookies = mHttpClient.getCookieStore().getCookies();
+ boolean hasAuthCookie = false;
+ for (Cookie cookie : cookies) {
+ if (cookie.getName().contains("GTL")) {
+ hasAuthCookie = true;
+ }
+ }
+ if (!hasAuthCookie) {
+ Log.w(TAG, "it seems that there is no auth cookie");
+ }
+
+ // get the client version
+ //获取client的内容，具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容，也就是gtask_url的内容
+ String resString = getResponseContent(response.getEntity());
+ String jsBegin = "_setup(";
+ String jsEnd = ")}";
+ int begin = resString.indexOf(jsBegin);
+ int end = resString.lastIndexOf(jsEnd);
+ String jsString = null;
+ if (begin != -1 && end != -1 && begin < end) {
+ jsString = resString.substring(begin + jsBegin.length(), end);
+ }
+ JSONObject js = new JSONObject(jsString);
+ mClientVersion = js.getLong("v");
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ return false;
+ } catch (Exception e) {
+ // simply catch all exceptions
+ Log.e(TAG, "httpget gtask_url failed");
+ return false;
+ }
+
+ return true;
+ }
+
+ private int getActionId() {
+ return mActionId++;
+ }
+
+ /*实例化创建一个用于向网络传输数据的对象
+ * 使用HttpPost类
+ * 返回一个httpPost实例化对象，但里面还没有内容
+ */
+ private HttpPost createHttpPost() {
+ HttpPost httpPost = new HttpPost(mPostUrl);
+ httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+ httpPost.setHeader("AT", "1");
+ return httpPost;
+ }
+
+ /*通过URL获取响应后返回的数据，也就是网络上的数据和资源
+ * 使用getContentEncoding()获取网络上的资源和数据
+ * 返回值就是获取到的资源
+ */
+ private String getResponseContent(HttpEntity entity) throws IOException {
+ String contentEncoding = null;
+ if (entity.getContentEncoding() != null) {//通过URL得到HttpEntity对象，如果不为空则使用getContent（）方法创建一个流将数据从网络都过来
+ contentEncoding = entity.getContentEncoding().getValue();
+ Log.d(TAG, "encoding: " + contentEncoding);
+ }
+
+ InputStream input = entity.getContent();
+ if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {//GZIP是使用DEFLATE进行压缩数据的另一个压缩库
+ input = new GZIPInputStream(entity.getContent());
+ } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {//DEFLATE是一个无专利的压缩算法，它可以实现无损数据压缩
+ Inflater inflater = new Inflater(true);
+ input = new InflaterInputStream(entity.getContent(), inflater);
+ }
+
+ try {
+ InputStreamReader isr = new InputStreamReader(input);
+ BufferedReader br = new BufferedReader(isr);//是一个包装类，它可以包装字符流，将字符流放入缓存里，先把字符读到缓存里，到缓存满了时候，再读入内存，是为了提供读的效率而设计的
+ StringBuilder sb = new StringBuilder();
+
+ while (true) {
+ String buff = br.readLine();
+ if (buff == null) {
+ return sb.toString();
+ }
+ sb = sb.append(buff);
+ }
+ } finally {
+ input.close();
+ }
+ }
+
+ /*通过JSON发送请求
+ * 请求的具体内容在json的实例化对象js中然后传入
+ * 利用UrlEncodedFormEntity entity和httpPost.setEntity(entity)方法把js中的内容放置到httpPost中
+ * 执行请求后使用getResponseContent方法得到返回的数据和资源
+ * 将资源再次放入json后返回
+ */
+ private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
+ if (!mLoggedin) {//未登录
+ Log.e(TAG, "please login first");
+ throw new ActionFailureException("not logged in");
+ }
+
+ //实例化一个httpPost的对象用来向服务器传输数据，在这里就是发送请求，而请求的内容在js里
+ HttpPost httpPost = createHttpPost();
+ try {
+ LinkedList list = new LinkedList();
+ list.add(new BasicNameValuePair("r", js.toString()));
+ UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); //UrlEncodedFormEntity()的形式比较单一，是普通的键值对
+ httpPost.setEntity(entity);
+
+ // execute the post
+ //执行这个请求
+ HttpResponse response = mHttpClient.execute(httpPost);
+ String jsString = getResponseContent(response.getEntity());
+ return new JSONObject(jsString);
+
+ } catch (ClientProtocolException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new NetworkFailureException("postRequest failed");
+ } catch (IOException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new NetworkFailureException("postRequest failed");
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("unable to convert response content to jsonobject");
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("error occurs when posting request");
+ }
+ }
+
+ /*创建单个任务
+ * 传入参数是一个.gtask.data.Task包里Task类的对象
+ * 利用json获取Task里的内容,并且创建相应的jsPost
+ * 利用postRequest得到任务的返回信息
+ * 使用task.setGid设置task的new_ID
+ */
+ public void createTask(Task task) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+
+ // action_list
+ actionList.put(task.getCreateAction(getActionId()));
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // client_version
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ // post
+ JSONObject jsResponse = postRequest(jsPost);
+ JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
+ GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
+ task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("create task: handing jsonobject failed");
+ }
+ }
+
+ /*
+ * 创建一个任务列表，与createTask几乎一样，区别就是最后设置的是tasklist的gid
+ */
+ public void createTaskList(TaskList tasklist) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+
+ // action_list
+ actionList.put(tasklist.getCreateAction(getActionId()));
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // client version
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ // post
+ JSONObject jsResponse = postRequest(jsPost);
+ JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
+ GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
+ tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("create tasklist: handing jsonobject failed");
+ }
+ }
+
+ /*
+ * 同步更新操作
+ * 使用JSONObject进行数据存储，使用jsPost.put，Put的信息包括UpdateArray和ClientVersion
+ * 使用postRequest发送这个jspost,进行处理
+ */
+ public void commitUpdate() throws NetworkFailureException {
+ if (mUpdateArray != null) {
+ try {
+ JSONObject jsPost = new JSONObject();
+
+ // action_list
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray);
+
+ // client_version
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ postRequest(jsPost);
+ mUpdateArray = null;
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("commit update: handing jsonobject failed");
+ }
+ }
+ }
+
+ /*
+ * 添加更新的事项
+ * 调用commitUpdate()实现
+ */
+ public void addUpdateNode(Node node) throws NetworkFailureException {
+ if (node != null) {
+ // too many update items may result in an error
+ // set max to 10 items
+ if (mUpdateArray != null && mUpdateArray.length() > 10) {
+ commitUpdate();
+ }
+
+ if (mUpdateArray == null)
+ mUpdateArray = new JSONArray();
+ mUpdateArray.put(node.getUpdateAction(getActionId()));
+ }
+ }
+
+ /*
+ * 移动task,比如讲task移动到不同的task列表中去
+ * 通过getGid获取task所属列表的gid
+ * 通过JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值，从而达到移动的目的
+ * 最后还是通过postRequest进行更新后的发送
+ */
+ public void moveTask(Task task, TaskList preParent, TaskList curParent)
+ throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+ JSONObject action = new JSONObject();
+
+ // action_list
+ action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE);
+ action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
+ action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid());
+ if (preParent == curParent && task.getPriorSibling() != null) {
+ // put prioring_sibing_id only if moving within the tasklist and
+ // it is not the first one
+ //设置优先级ID，只有当移动是发生在文件中
+ action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
+ }
+ action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); //设置移动前所属列表
+ action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); //设置当前所属列表
+ if (preParent != curParent) {
+ // put the dest_list only if moving between tasklists
+ action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
+ }
+ actionList.put(action);
+ //最后将ACTION_LIST加入到jsPost中
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // client_version
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ postRequest(jsPost);
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("move task: handing jsonobject failed");
+ }
+ }
+
+ /*
+ * 删除操作节点
+ * 还是利用JSON
+ * 删除过后使用postRequest发送删除后的结果
+ */
+ public void deleteNode(Node node) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+
+ // action_list
+ node.setDeleted(true);
+ actionList.put(node.getUpdateAction(getActionId())); //这里会获取到删除操作的ID，加入到actionLiast中
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // client_version
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ postRequest(jsPost);
+ mUpdateArray = null;
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("delete node: handing jsonobject failed");
+ }
+ }
+
+ /*
+ * 获取任务列表
+ * 首先通过GetURI使用getResponseContent从网上获取数据
+ * 然后筛选出"_setup("到)}的部分，并且从中获取GTASK_JSON_LISTS的内容返回
+ */
+ public JSONArray getTaskLists() throws NetworkFailureException {
+ if (!mLoggedin) {
+ Log.e(TAG, "please login first");
+ throw new ActionFailureException("not logged in");
+ }
+
+ try {
+ HttpGet httpGet = new HttpGet(mGetUrl);
+ HttpResponse response = null;
+ response = mHttpClient.execute(httpGet);
+
+ // get the task list
+ //筛选工作，把筛选出的字符串放入jsString
+ String resString = getResponseContent(response.getEntity());
+ String jsBegin = "_setup(";
+ String jsEnd = ")}";
+ int begin = resString.indexOf(jsBegin);
+ int end = resString.lastIndexOf(jsEnd);
+ String jsString = null;
+ if (begin != -1 && end != -1 && begin < end) {
+ jsString = resString.substring(begin + jsBegin.length(), end);
+ }
+ JSONObject js = new JSONObject(jsString);
+ //获取GTASK_JSON_LISTS
+ return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS);
+ } catch (ClientProtocolException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new NetworkFailureException("gettasklists: httpget failed");
+ } catch (IOException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new NetworkFailureException("gettasklists: httpget failed");
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("get task lists: handing jasonobject failed");
+ }
+ }
+
+ /*
+ * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务
+ */
+ public JSONArray getTaskList(String listGid) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+ JSONObject action = new JSONObject();
+
+ // action_list
+ action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
+ action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
+ action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); //这里设置为传入的listGid
+ action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
+ actionList.put(action);
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // client_version
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ JSONObject jsResponse = postRequest(jsPost);
+ return jsResponse.getJSONArray(GTaskStringUtils.GTASK_JSON_TASKS);
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("get task list: handing jsonobject failed");
+ }
+ }
+
+ public Account getSyncAccount() {
+ return mAccount;
+ }
+
+ //重置更新的内容
+ public void resetUpdateArray() {
+ mUpdateArray = null;
+ }
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
new file mode 100644
index 0000000..f87aa23
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -0,0 +1,894 @@
+/*
+ * 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.gtask.remote;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.util.Log;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.data.MetaData;
+import net.micode.notes.gtask.data.Node;
+import net.micode.notes.gtask.data.SqlNote;
+import net.micode.notes.gtask.data.Task;
+import net.micode.notes.gtask.data.TaskList;
+import net.micode.notes.gtask.exception.ActionFailureException;
+import net.micode.notes.gtask.exception.NetworkFailureException;
+import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.GTaskStringUtils;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+
+
+public class GTaskManager {
+ private static final String TAG = GTaskManager.class.getSimpleName();
+ public static final int STATE_SUCCESS = 0;
+ public static final int STATE_NETWORK_ERROR = 1;
+ public static final int STATE_INTERNAL_ERROR = 2;
+ public static final int STATE_SYNC_IN_PROGRESS = 3;
+ public static final int STATE_SYNC_CANCELLED = 4;
+ private static GTaskManager mInstance = null;
+
+ private Activity mActivity;
+ private Context mContext;
+ private ContentResolver mContentResolver;
+ private boolean mSyncing;
+ private boolean mCancelled;
+ private HashMap mGTaskListHashMap;
+ private HashMap mGTaskHashMap;
+ private HashMap mMetaHashMap;
+ private TaskList mMetaList;
+ private HashSet mLocalDeleteIdMap;
+ private HashMap mGidToNid;
+ private HashMap mNidToGid;
+
+ private GTaskManager() { //对象初始化函数
+ mSyncing = false; //正在同步,flase代表未执行
+ mCancelled = false; //全局标识，flase代表可以执行
+ mGTaskListHashMap = new HashMap(); //<>代表Java的泛型,就是创建一个用类型作为参数的类。
+ mGTaskHashMap = new HashMap();
+ mMetaHashMap = new HashMap();
+ mMetaList = null;
+ mLocalDeleteIdMap = new HashSet();
+ mGidToNid = new HashMap(); //GoogleID to NodeID??
+ mNidToGid = new HashMap(); //NodeID to GoogleID???通过hashmap散列表建立映射
+ }
+
+ /**
+ * 包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
+ * 功能：类初始化函数
+ * @author TTS
+ * @return GtaskManger
+ */
+ public static synchronized GTaskManager getInstance() { //可能运行在多线程环境下，使用语言级同步--synchronized
+ if (mInstance == null) {
+ mInstance = new GTaskManager();
+ }
+ return mInstance;
+ }
+
+ /**
+ * 包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
+ * @author TTS
+ * @param activity
+ */
+ public synchronized void setActivityContext(Activity activity) {
+ // used for getting auth token
+ mActivity = activity;
+ }
+
+ /**
+ * 核心函数
+ * 功能：实现了本地同步操作和远端同步操作
+ * @author TTS
+ * @param context-----获取上下文
+ * @param asyncTask-------用于同步的异步操作类
+ * @return int
+ */
+ public int sync(Context context, GTaskASyncTask asyncTask) { //核心函数
+ if (mSyncing) {
+ Log.d(TAG, "Sync is in progress"); //创建日志文件（调试信息），debug
+ return STATE_SYNC_IN_PROGRESS;
+ }
+ mContext = context;
+ mContentResolver = mContext.getContentResolver();
+ mSyncing = true;
+ mCancelled = false;
+ mGTaskListHashMap.clear();
+ mGTaskHashMap.clear();
+ mMetaHashMap.clear();
+ mLocalDeleteIdMap.clear();
+ mGidToNid.clear();
+ mNidToGid.clear();
+
+ try {
+ GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client--客户机
+ client.resetUpdateArray(); //JSONArray类型，reset即置为NULL
+
+ // login google task
+ if (!mCancelled) {
+ if (!client.login(mActivity)) {
+ throw new NetworkFailureException("login google task failed");
+ }
+ }
+
+ // get the task list from google
+ asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
+ initGTaskList(); //获取Google上的JSONtasklist转为本地TaskList
+
+ // do content sync work
+ asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
+ syncContent();
+ } catch (NetworkFailureException e) { //分为两种异常，此类异常为网络异常
+ Log.e(TAG, e.toString()); //创建日志文件（调试信息），error
+ return STATE_NETWORK_ERROR;
+ } catch (ActionFailureException e) { //此类异常为操作异常
+ Log.e(TAG, e.toString());
+ return STATE_INTERNAL_ERROR;
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ return STATE_INTERNAL_ERROR;
+ } finally {
+ mGTaskListHashMap.clear();
+ mGTaskHashMap.clear();
+ mMetaHashMap.clear();
+ mLocalDeleteIdMap.clear();
+ mGidToNid.clear();
+ mNidToGid.clear();
+ mSyncing = false;
+ }
+
+ return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
+ }
+
+ /**
+ *功能：初始化GtaskList，获取Google上的JSONtasklist转为本地TaskList。
+ *获得的数据存储在mMetaList，mGTaskListHashMap，mGTaskHashMap
+ *@author TTS
+ *@exception NetworkFailureException
+ *@return void
+ */
+ private void initGTaskList() throws NetworkFailureException {
+ if (mCancelled)
+ return;
+ GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例，client应指远端客户机
+ try {
+ //Json对象是Name Value对(即子元素)的无序集合，相当于一个Map对象。JsonObject类是bantouyan-json库对Json对象的抽象，提供操纵Json对象的各种方法。
+ //其格式为{"key1":value1,"key2",value2....};key 必须是字符串。
+ //因为ajax请求不刷新页面，但配合js可以实现局部刷新，因此json常常被用来作为异步请求的返回对象使用。
+ JSONArray jsTaskLists = client.getTaskLists(); //原注释为get task list------lists？？？
+
+ // init meta list first
+ mMetaList = null; //TaskList类型
+ for (int i = 0; i < jsTaskLists.length(); i++) {
+ JSONObject object = jsTaskLists.getJSONObject(i); //JSONObject与JSONArray一个为对象，一个为数组。此处取出单个JASONObject
+ String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
+ String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
+
+ if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
+ mMetaList = new TaskList(); //MetaList意为元表,Tasklist类型，此处为初始化
+ mMetaList.setContentByRemoteJSON(object); //将JSON中部分数据复制到自己定义的对象中相对应的数据：name->mname...
+
+ // load meta data
+ JSONArray jsMetas = client.getTaskList(gid); //原注释为get action_list------list？？？
+ for (int j = 0; j < jsMetas.length(); j++) {
+ object = (JSONObject) jsMetas.getJSONObject(j);
+ MetaData metaData = new MetaData(); //继承自Node
+ metaData.setContentByRemoteJSON(object);
+ if (metaData.isWorthSaving()) { //if not worth to save，metadata将不加入mMetaList
+ mMetaList.addChildTask(metaData);
+ if (metaData.getGid() != null) {
+ mMetaHashMap.put(metaData.getRelatedGid(), metaData);
+ }
+ }
+ }
+ }
+ }
+
+ // create meta list if not existed
+ if (mMetaList == null) {
+ mMetaList = new TaskList();
+ mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
+ + GTaskStringUtils.FOLDER_META);
+ GTaskClient.getInstance().createTaskList(mMetaList);
+ }
+
+ // init task list
+ for (int i = 0; i < jsTaskLists.length(); i++) {
+ JSONObject object = jsTaskLists.getJSONObject(i);
+ String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); //通过getString函数传入本地某个标志数据的名称，获取其在远端的名称。
+ String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
+
+ if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
+ && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
+ + GTaskStringUtils.FOLDER_META)) {
+ TaskList tasklist = new TaskList(); //继承自Node
+ tasklist.setContentByRemoteJSON(object);
+ mGTaskListHashMap.put(gid, tasklist);
+ mGTaskHashMap.put(gid, tasklist); //为什么加两遍？？？
+
+ // load tasks
+ JSONArray jsTasks = client.getTaskList(gid);
+ for (int j = 0; j < jsTasks.length(); j++) {
+ object = (JSONObject) jsTasks.getJSONObject(j);
+ gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
+ Task task = new Task();
+ task.setContentByRemoteJSON(object);
+ if (task.isWorthSaving()) {
+ task.setMetaInfo(mMetaHashMap.get(gid));
+ tasklist.addChildTask(task);
+ mGTaskHashMap.put(gid, task);
+ }
+ }
+ }
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("initGTaskList: handing JSONObject failed");
+ }
+ }
+
+ /**
+ * 功能：本地内容同步操作
+ * @throws NetworkFailureException
+ * @return 无返回值
+ */
+ private void syncContent() throws NetworkFailureException { //本地内容同步操作
+ int syncType;
+ Cursor c = null; //数据库指针
+ String gid; //GoogleID??
+ Node node; //Node包含Sync_Action的不同类型
+
+ mLocalDeleteIdMap.clear(); //HashSet类型
+
+ if (mCancelled) {
+ return;
+ }
+
+ // for local deleted note
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
+ "(type<>? AND parent_id=?)", new String[] {
+ String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
+ }, null);
+ if (c != null) {
+ while (c.moveToNext()) {
+ gid = c.getString(SqlNote.GTASK_ID_COLUMN);
+ node = mGTaskHashMap.get(gid);
+ if (node != null) {
+ mGTaskHashMap.remove(gid);
+ doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c);
+ }
+
+ mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
+ }
+ } else {
+ Log.w(TAG, "failed to query trash folder");
+ }
+ } finally {
+ if (c != null) {
+ c.close();
+ c = null;
+ }
+ }
+
+ // sync folder first
+ syncFolder();
+
+ // for note existing in database
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
+ "(type=? AND parent_id<>?)", new String[] {
+ String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER)
+ }, NoteColumns.TYPE + " DESC");
+ if (c != null) {
+ while (c.moveToNext()) {
+ gid = c.getString(SqlNote.GTASK_ID_COLUMN);
+ node = mGTaskHashMap.get(gid);
+ if (node != null) {
+ mGTaskHashMap.remove(gid);
+ mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); //通过hashmap建立联系
+ mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); //通过hashmap建立联系
+ syncType = node.getSyncAction(c);
+ } else {
+ if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
+ // local add
+ syncType = Node.SYNC_ACTION_ADD_REMOTE;
+ } else {
+ // remote delete
+ syncType = Node.SYNC_ACTION_DEL_LOCAL;
+ }
+ }
+ doContentSync(syncType, node, c);
+ }
+ } else {
+ Log.w(TAG, "failed to query existing note in database");
+ }
+
+ } finally {
+ if (c != null) {
+ c.close();
+ c = null;
+ }
+ }
+
+ // go through remaining items
+ Iterator> iter = mGTaskHashMap.entrySet().iterator(); //Iterator迭代器
+ while (iter.hasNext()) {
+ Map.Entry entry = iter.next();
+ node = entry.getValue();
+ doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
+ }
+
+ // mCancelled can be set by another thread, so we neet to check one by //thread----线程
+ // one
+ // clear local delete table
+ if (!mCancelled) {
+ if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
+ throw new ActionFailureException("failed to batch-delete local deleted notes");
+ }
+ }
+
+ // refresh local sync id
+ if (!mCancelled) {
+ GTaskClient.getInstance().commitUpdate();
+ refreshLocalSyncId();
+ }
+
+ }
+
+ /**
+ * 功能：
+ * @author TTS
+ * @throws NetworkFailureException
+ */
+ private void syncFolder() throws NetworkFailureException {
+ Cursor c = null;
+ String gid;
+ Node node;
+ int syncType;
+
+ if (mCancelled) {
+ return;
+ }
+
+ // for root folder
+ try {
+ c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
+ Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null);
+ if (c != null) {
+ c.moveToNext();
+ gid = c.getString(SqlNote.GTASK_ID_COLUMN);
+ node = mGTaskHashMap.get(gid);
+ if (node != null) {
+ mGTaskHashMap.remove(gid);
+ mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER);
+ mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid);
+ // for system folder, only update remote name if necessary
+ if (!node.getName().equals(
+ GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
+ doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
+ } else {
+ doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
+ }
+ } else {
+ Log.w(TAG, "failed to query root folder");
+ }
+ } finally {
+ if (c != null) {
+ c.close();
+ c = null;
+ }
+ }
+
+ // for call-note folder
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
+ new String[] {
+ String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
+ }, null);
+ if (c != null) {
+ if (c.moveToNext()) {
+ gid = c.getString(SqlNote.GTASK_ID_COLUMN);
+ node = mGTaskHashMap.get(gid);
+ if (node != null) {
+ mGTaskHashMap.remove(gid);
+ mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER);
+ mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid);
+ // for system folder, only update remote name if
+ // necessary
+ if (!node.getName().equals(
+ GTaskStringUtils.MIUI_FOLDER_PREFFIX
+ + GTaskStringUtils.FOLDER_CALL_NOTE))
+ doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
+ } else {
+ doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
+ }
+ }
+ } else {
+ Log.w(TAG, "failed to query call note folder");
+ }
+ } finally {
+ if (c != null) {
+ c.close();
+ c = null;
+ }
+ }
+
+ // for local existing folders
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
+ "(type=? AND parent_id<>?)", new String[] {
+ String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)
+ }, NoteColumns.TYPE + " DESC");
+ if (c != null) {
+ while (c.moveToNext()) {
+ gid = c.getString(SqlNote.GTASK_ID_COLUMN);
+ node = mGTaskHashMap.get(gid);
+ if (node != null) {
+ mGTaskHashMap.remove(gid);
+ mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
+ mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
+ syncType = node.getSyncAction(c);
+ } else {
+ if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
+ // local add
+ syncType = Node.SYNC_ACTION_ADD_REMOTE;
+ } else {
+ // remote delete
+ syncType = Node.SYNC_ACTION_DEL_LOCAL;
+ }
+ }
+ doContentSync(syncType, node, c);
+ }
+ } else {
+ Log.w(TAG, "failed to query existing folder");
+ }
+ } finally {
+ if (c != null) {
+ c.close();
+ c = null;
+ }
+ }
+
+ // for remote add folders
+ Iterator> iter = mGTaskListHashMap.entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry entry = iter.next();
+ gid = entry.getKey();
+ node = entry.getValue();
+ if (mGTaskHashMap.containsKey(gid)) {
+ mGTaskHashMap.remove(gid);
+ doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
+ }
+ }
+
+ if (!mCancelled)
+ GTaskClient.getInstance().commitUpdate();
+ }
+
+ /**
+ * 功能：syncType分类，addLocalNode，addRemoteNode，deleteNode，updateLocalNode，updateRemoteNode
+ * @author TTS
+ * @param syncType
+ * @param node
+ * @param c
+ * @throws NetworkFailureException
+ */
+ private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
+ }
+
+ MetaData meta;
+ switch (syncType) {
+ case Node.SYNC_ACTION_ADD_LOCAL:
+ addLocalNode(node);
+ break;
+ case Node.SYNC_ACTION_ADD_REMOTE:
+ addRemoteNode(node, c);
+ break;
+ case Node.SYNC_ACTION_DEL_LOCAL:
+ meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN));
+ if (meta != null) {
+ GTaskClient.getInstance().deleteNode(meta);
+ }
+ mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
+ break;
+ case Node.SYNC_ACTION_DEL_REMOTE:
+ meta = mMetaHashMap.get(node.getGid());
+ if (meta != null) {
+ GTaskClient.getInstance().deleteNode(meta);
+ }
+ GTaskClient.getInstance().deleteNode(node);
+ break;
+ case Node.SYNC_ACTION_UPDATE_LOCAL:
+ updateLocalNode(node, c);
+ break;
+ case Node.SYNC_ACTION_UPDATE_REMOTE:
+ updateRemoteNode(node, c);
+ break;
+ case Node.SYNC_ACTION_UPDATE_CONFLICT:
+ // merging both modifications maybe a good idea
+ // right now just use local update simply
+ updateRemoteNode(node, c);
+ break;
+ case Node.SYNC_ACTION_NONE:
+ break;
+ case Node.SYNC_ACTION_ERROR:
+ default:
+ throw new ActionFailureException("unkown sync action type");
+ }
+ }
+
+ /**
+ * 功能：本地增加Node
+ * @author TTS
+ * @param node
+ * @throws NetworkFailureException
+ */
+ private void addLocalNode(Node node) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
+ }
+
+ SqlNote sqlNote;
+ if (node instanceof TaskList) {
+ if (node.getName().equals(
+ GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) {
+ sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER);
+ } else if (node.getName().equals(
+ GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) {
+ sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER);
+ } else {
+ sqlNote = new SqlNote(mContext);
+ sqlNote.setContent(node.getLocalJSONFromContent());
+ sqlNote.setParentId(Notes.ID_ROOT_FOLDER);
+ }
+ } else {
+ sqlNote = new SqlNote(mContext);
+ JSONObject js = node.getLocalJSONFromContent();
+ try {
+ if (js.has(GTaskStringUtils.META_HEAD_NOTE)) {
+ JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ if (note.has(NoteColumns.ID)) {
+ long id = note.getLong(NoteColumns.ID);
+ if (DataUtils.existInNoteDatabase(mContentResolver, id)) {
+ // the id is not available, have to create a new one
+ note.remove(NoteColumns.ID);
+ }
+ }
+ }
+
+ if (js.has(GTaskStringUtils.META_HEAD_DATA)) {
+ JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ if (data.has(DataColumns.ID)) {
+ long dataId = data.getLong(DataColumns.ID);
+ if (DataUtils.existInDataDatabase(mContentResolver, dataId)) {
+ // the data id is not available, have to create
+ // a new one
+ data.remove(DataColumns.ID);
+ }
+ }
+ }
+
+ }
+ } catch (JSONException e) {
+ Log.w(TAG, e.toString());
+ e.printStackTrace();
+ }
+ sqlNote.setContent(js);
+
+ Long parentId = mGidToNid.get(((Task) node).getParent().getGid());
+ if (parentId == null) {
+ Log.e(TAG, "cannot find task's parent id locally");
+ throw new ActionFailureException("cannot add local node");
+ }
+ sqlNote.setParentId(parentId.longValue());
+ }
+
+ // create the local node
+ sqlNote.setGtaskId(node.getGid());
+ sqlNote.commit(false);
+
+ // update gid-nid mapping
+ mGidToNid.put(node.getGid(), sqlNote.getId());
+ mNidToGid.put(sqlNote.getId(), node.getGid());
+
+ // update meta
+ updateRemoteMeta(node.getGid(), sqlNote);
+ }
+
+ /**
+ * 功能：update本地node
+ * @author TTS
+ * @param node
+ * ----同步操作的基础数据类型
+ * @param c
+ * ----Cursor
+ * @throws NetworkFailureException
+ */
+ private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
+ }
+
+ SqlNote sqlNote;
+ // update the note locally
+ sqlNote = new SqlNote(mContext, c);
+ sqlNote.setContent(node.getLocalJSONFromContent());
+
+ Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid())
+ : new Long(Notes.ID_ROOT_FOLDER);
+ if (parentId == null) {
+ Log.e(TAG, "cannot find task's parent id locally");
+ throw new ActionFailureException("cannot update local node");
+ }
+ sqlNote.setParentId(parentId.longValue());
+ sqlNote.commit(true);
+
+ // update meta info
+ updateRemoteMeta(node.getGid(), sqlNote);
+ }
+
+ /**
+ * 功能：远程增加Node
+ * 需要updateRemoteMeta
+ * @author TTS
+ * @param node
+ * ----同步操作的基础数据类型
+ * @param c
+ * --Cursor
+ * @throws NetworkFailureException
+ */
+ private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
+ }
+
+ SqlNote sqlNote = new SqlNote(mContext, c); //从本地mContext中获取内容
+ Node n;
+
+ // update remotely
+ if (sqlNote.isNoteType()) {
+ Task task = new Task();
+ task.setContentByLocalJSON(sqlNote.getContent());
+
+ String parentGid = mNidToGid.get(sqlNote.getParentId());
+ if (parentGid == null) {
+ Log.e(TAG, "cannot find task's parent tasklist"); //调试信息
+ throw new ActionFailureException("cannot add remote task");
+ }
+ mGTaskListHashMap.get(parentGid).addChildTask(task); //在本地生成的GTaskList中增加子结点
+
+ //登录远程服务器，创建Task
+ GTaskClient.getInstance().createTask(task);
+ n = (Node) task;
+
+ // add meta
+ updateRemoteMeta(task.getGid(), sqlNote);
+ } else {
+ TaskList tasklist = null;
+
+ // we need to skip folder if it has already existed
+ String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX;
+ if (sqlNote.getId() == Notes.ID_ROOT_FOLDER)
+ folderName += GTaskStringUtils.FOLDER_DEFAULT;
+ else if (sqlNote.getId() == Notes.ID_CALL_RECORD_FOLDER)
+ folderName += GTaskStringUtils.FOLDER_CALL_NOTE;
+ else
+ folderName += sqlNote.getSnippet();
+
+ //iterator迭代器，通过统一的接口迭代所有的map元素
+ Iterator> iter = mGTaskListHashMap.entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry entry = iter.next();
+ String gid = entry.getKey();
+ TaskList list = entry.getValue();
+
+ if (list.getName().equals(folderName)) {
+ tasklist = list;
+ if (mGTaskHashMap.containsKey(gid)) {
+ mGTaskHashMap.remove(gid);
+ }
+ break;
+ }
+ }
+
+ // no match we can add now
+ if (tasklist == null) {
+ tasklist = new TaskList();
+ tasklist.setContentByLocalJSON(sqlNote.getContent());
+ GTaskClient.getInstance().createTaskList(tasklist);
+ mGTaskListHashMap.put(tasklist.getGid(), tasklist);
+ }
+ n = (Node) tasklist;
+ }
+
+ // update local note
+ sqlNote.setGtaskId(n.getGid());
+ sqlNote.commit(false);
+ sqlNote.resetLocalModified();
+ sqlNote.commit(true);
+
+ // gid-id mapping //创建id间的映射
+ mGidToNid.put(n.getGid(), sqlNote.getId());
+ mNidToGid.put(sqlNote.getId(), n.getGid());
+ }
+
+ /**
+ * 功能：更新远端的Node，包含meta更新(updateRemoteMeta)
+ * @author TTS
+ * @param node
+ * ----同步操作的基础数据类型
+ * @param c
+ * --Cursor
+ * @throws NetworkFailureException
+ */
+ private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
+ }
+
+ SqlNote sqlNote = new SqlNote(mContext, c);
+
+ // update remotely
+ node.setContentByLocalJSON(sqlNote.getContent());
+ GTaskClient.getInstance().addUpdateNode(node); //GTaskClient用途为从本地登陆远端服务器
+
+ // update meta
+ updateRemoteMeta(node.getGid(), sqlNote);
+
+ // move task if necessary
+ if (sqlNote.isNoteType()) {
+ Task task = (Task) node;
+ TaskList preParentList = task.getParent();
+ //preParentList为通过node获取的父节点列表
+
+ String curParentGid = mNidToGid.get(sqlNote.getParentId());
+ //curParentGid为通过光标在数据库中找到sqlNote的mParentId，再通过mNidToGid由long类型转为String类型的Gid
+
+ if (curParentGid == null) {
+ Log.e(TAG, "cannot find task's parent tasklist");
+ throw new ActionFailureException("cannot update remote task");
+ }
+ TaskList curParentList = mGTaskListHashMap.get(curParentGid);
+ //通过HashMap找到对应Gid的TaskList
+
+ if (preParentList != curParentList) { //?????????????
+ preParentList.removeChildTask(task);
+ curParentList.addChildTask(task);
+ GTaskClient.getInstance().moveTask(task, preParentList, curParentList);
+ }
+ }
+
+ // clear local modified flag
+ sqlNote.resetLocalModified();
+ //commit到本地数据库
+ sqlNote.commit(true);
+ }
+
+ /**
+ * 功能：升级远程meta。 meta---元数据----计算机文件系统管理数据---管理数据的数据。
+ * @author TTS
+ * @param gid
+ * ---GoogleID为String类型
+ * @param sqlNote
+ * ---同步前的数据库操作，故使用类SqlNote
+ * @throws NetworkFailureException
+ */
+ private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
+ if (sqlNote != null && sqlNote.isNoteType()) {
+ MetaData metaData = mMetaHashMap.get(gid);
+ if (metaData != null) {
+ metaData.setMeta(gid, sqlNote.getContent());
+ GTaskClient.getInstance().addUpdateNode(metaData);
+ } else {
+ metaData = new MetaData();
+ metaData.setMeta(gid, sqlNote.getContent());
+ mMetaList.addChildTask(metaData);
+ mMetaHashMap.put(gid, metaData);
+ GTaskClient.getInstance().createTask(metaData);
+ }
+ }
+ }
+
+ /**
+ * 功能：刷新本地，给sync的ID对应上最后更改过的对象
+ * @author TTS
+ * @return void
+ * @throws NetworkFailureException
+ */
+ private void refreshLocalSyncId() throws NetworkFailureException {
+ if (mCancelled) {
+ return;
+ }
+
+ // get the latest gtask list //获取最近的（最晚的）gtask list
+ mGTaskHashMap.clear();
+ mGTaskListHashMap.clear();
+ mMetaHashMap.clear();
+ initGTaskList();
+
+ Cursor c = null;
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
+ "(type<>? AND parent_id<>?)", new String[] {
+ String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
+ }, NoteColumns.TYPE + " DESC"); //query语句：五个参数，NoteColumns.TYPE + " DESC"-----为按类型递减顺序返回查询结果。new String[] {String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)}------为选择参数。"(type<>? AND parent_id<>?)"-------指明返回行过滤器。SqlNote.PROJECTION_NOTE--------应返回的数据列的名字。Notes.CONTENT_NOTE_URI--------contentProvider包含所有数据集所对应的uri
+ if (c != null) {
+ while (c.moveToNext()) {
+ String gid = c.getString(SqlNote.GTASK_ID_COLUMN);
+ Node node = mGTaskHashMap.get(gid);
+ if (node != null) {
+ mGTaskHashMap.remove(gid);
+ ContentValues values = new ContentValues(); //在ContentValues中创建键值对。准备通过contentResolver写入数据
+ values.put(NoteColumns.SYNC_ID, node.getLastModified());
+ mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, //进行批量更改，选择参数为NULL，应该可以用insert替换，参数分别为表名和需要更新的value对象。
+ c.getLong(SqlNote.ID_COLUMN)), values, null, null);
+ } else {
+ Log.e(TAG, "something is missed");
+ throw new ActionFailureException(
+ "some local items don't have gid after sync");
+ }
+ }
+ } else {
+ Log.w(TAG, "failed to query local note to refresh sync id");
+ }
+ } finally {
+ if (c != null) {
+ c.close();
+ c = null;
+ }
+ }
+ }
+
+ /**
+ * 功能：获取同步账号,mAccount.name
+ * @author TTS
+ * @return String
+ */
+ public String getSyncAccount() {
+ return GTaskClient.getInstance().getSyncAccount().name;
+ }
+
+ /**
+ * 功能：取消同步，置mCancelled为true
+ * @author TTS
+ */
+ public void cancelSync() {
+ mCancelled = true;
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
new file mode 100644
index 0000000..0aca15e
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -0,0 +1,148 @@
+/*
+ * 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.gtask.remote;
+
+import android.app.Activity;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+
+
+/*
+ * Service是在一段不定的时间运行在后台，不和用户交互的应用组件
+ * 主要方法：
+ * private void startSync() 启动一个同步工作
+ * private void cancelSync() 取消同步
+ * public void onCreate()
+ * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分，相当于重启service（比如在被暂停之后），而不是创建一个新的service
+ * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service
+ * public IBinder onBind()
+ * public void sendBroadcast(String msg) 发送同步的相关通知
+ * public static void startSync(Activity activity)
+ * public static void cancelSync(Context context)
+ * public static boolean isSyncing() 判读是否在进行同步
+ * public static String getProgressString() 获取当前进度的信息
+ */
+
+public class GTaskSyncService extends Service {
+ public final static String ACTION_STRING_NAME = "sync_action_type";
+
+ public final static int ACTION_START_SYNC = 0;
+
+ public final static int ACTION_CANCEL_SYNC = 1;
+
+ public final static int ACTION_INVALID = 2;
+
+ public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service";
+
+ public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing";
+
+ public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg";
+
+ private static GTaskASyncTask mSyncTask = null;
+
+ private static String mSyncProgress = "";
+
+ //开始一个同步的工作
+ private void startSync() {
+ if (mSyncTask == null) {
+ mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
+ public void onComplete() {
+ mSyncTask = null;
+ sendBroadcast("");
+ stopSelf();
+ }
+ });
+ sendBroadcast("");
+ mSyncTask.execute(); //这个函数让任务是以单线程队列方式或线程池队列方式运行
+ }
+ }
+
+
+ private void cancelSync() {
+ if (mSyncTask != null) {
+ mSyncTask.cancelSync();
+ }
+ }
+
+ @Override
+ public void onCreate() { //初始化一个service
+ mSyncTask = null;
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ Bundle bundle = intent.getExtras();
+ if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
+ switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
+ //两种情况，开始同步或者取消同步
+ case ACTION_START_SYNC:
+ startSync();
+ break;
+ case ACTION_CANCEL_SYNC:
+ cancelSync();
+ break;
+ default:
+ break;
+ }
+ return START_STICKY; //等待新的intent来是这个service继续运行
+ }
+ return super.onStartCommand(intent, flags, startId);
+ }
+
+ @Override
+ public void onLowMemory() {
+ if (mSyncTask != null) {
+ mSyncTask.cancelSync();
+ }
+ }
+
+ public IBinder onBind(Intent intent) { //不知道干吗用的
+ return null;
+ }
+
+ public void sendBroadcast(String msg) {
+ mSyncProgress = msg;
+ Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); //创建一个新的Intent
+ intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); //附加INTENT中的相应参数的值
+ intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
+ sendBroadcast(intent); //发送这个通知
+ }
+
+ public static void startSync(Activity activity) {//执行一个service，service的内容里的同步动作就是开始同步
+ GTaskManager.getInstance().setActivityContext(activity);
+ Intent intent = new Intent(activity, GTaskSyncService.class);
+ intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC);
+ activity.startService(intent);
+ }
+
+ public static void cancelSync(Context context) {//执行一个service，service的内容里的同步动作就是取消同步
+ Intent intent = new Intent(context, GTaskSyncService.class);
+ intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
+ context.startService(intent);
+ }
+
+ public static boolean isSyncing() {
+ return mSyncTask != null;
+ }
+
+ public static String getProgressString() {
+ return mSyncProgress;
+ }
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java
new file mode 100644
index 0000000..a59dcf4
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java
@@ -0,0 +1,257 @@
+/*
+ * 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.model;
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.Notes.TextNote;
+
+import java.util.ArrayList;
+
+
+
+public class Note {
+ // private ContentValues mNoteDiffValues;
+ ContentValues mNoteDiffValues;//
+ private NoteData mNoteData;
+ private static final String TAG = "Note";
+
+ /**
+ * Create a new note id for adding a new note to databases
+ */
+ public static synchronized long getNewNoteId(Context context, long folderId) {
+ // Create a new note in the database
+ ContentValues values = new ContentValues();
+ long createdTime = System.currentTimeMillis();
+ values.put(NoteColumns.CREATED_DATE, createdTime);
+ values.put(NoteColumns.MODIFIED_DATE, createdTime);
+ values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
+ values.put(NoteColumns.LOCAL_MODIFIED, 1);
+ values.put(NoteColumns.PARENT_ID, folderId);//将数据写入数据库表格
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
+ //ContentResolver()主要是实现外部应用对ContentProvider中的数据
+ //进行添加、删除、修改和查询操作
+ long noteId = 0;
+ try {
+ noteId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Get note id error :" + e.toString());
+ noteId = 0;
+ }//try-catch异常处理
+ if (noteId == -1) {
+ throw new IllegalStateException("Wrong note id:" + noteId);
+ }
+ return noteId;
+ }
+
+ public Note() {
+ mNoteDiffValues = new ContentValues();
+ mNoteData = new NoteData();
+ }//定义两个变量用来存储便签的数据，一个是存储便签属性、一个是存储便签内容
+
+ public void setNoteValue(String key, String value) {
+ mNoteDiffValues.put(key, value);
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ }//设置数据库表格的标签属性数据
+
+ public void setTextData(String key, String value) {
+ mNoteData.setTextData(key, value);
+ }//设置数据库表格的标签文本内容的数据
+
+ public void setTextDataId(long id) {
+ mNoteData.setTextDataId(id);
+ }//设置文本数据的ID
+
+ public long getTextDataId() {
+ return mNoteData.mTextDataId;
+ }//得到文本数据的ID
+
+ public void setCallDataId(long id) {
+ mNoteData.setCallDataId(id);
+ }//设置电话号码数据的ID
+
+ public void setCallData(String key, String value) {
+ mNoteData.setCallData(key, value);
+ }//得到电话号码数据的ID
+
+ public boolean isLocalModified() {
+ return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
+ }//判断是否是本地修改
+
+ public boolean syncNote(Context context, long noteId) {
+ if (noteId <= 0) {
+ throw new IllegalArgumentException("Wrong note id:" + noteId);
+ }
+
+ if (!isLocalModified()) {
+ return true;
+ }
+
+ /**
+ * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and
+ * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
+ * note data info
+ */
+ if (context.getContentResolver().update(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
+ null) == 0) {
+ Log.e(TAG, "Update note error, should not happen");
+ // Do not return, fall through
+ }
+ mNoteDiffValues.clear();
+
+ if (mNoteData.isLocalModified()
+ && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
+ return false;
+ }
+
+ return true;
+ }//判断数据是否同步
+
+ private class NoteData {//定义一个基本的便签内容的数据类，主要包含文本数据和电话号码数据
+ private long mTextDataId;
+
+ private ContentValues mTextDataValues;//文本数据
+
+ private long mCallDataId;
+
+ private ContentValues mCallDataValues;//电话号码数据
+
+ private static final String TAG = "NoteData";
+
+ public NoteData() {
+ mTextDataValues = new ContentValues();
+ mCallDataValues = new ContentValues();
+ mTextDataId = 0;
+ mCallDataId = 0;
+ }
+ //下面是上述几个函数的具体实现
+ boolean isLocalModified() {
+ return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
+ }
+
+ void setTextDataId(long id) {
+ if(id <= 0) {
+ throw new IllegalArgumentException("Text data id should larger than 0");
+ }
+ mTextDataId = id;
+ }
+
+ void setCallDataId(long id) {
+ if (id <= 0) {
+ throw new IllegalArgumentException("Call data id should larger than 0");
+ }
+ mCallDataId = id;
+ }
+
+ void setCallData(String key, String value) {
+ mCallDataValues.put(key, value);
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ }
+
+ void setTextData(String key, String value) {
+ mTextDataValues.put(key, value);
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ }
+ //下面函数的作用是将新的数据通过Uri的操作存储到数据库
+ Uri pushIntoContentResolver(Context context, long noteId) {
+ /**
+ * Check for safety
+ */
+ if (noteId <= 0) {
+ throw new IllegalArgumentException("Wrong note id:" + noteId);
+ }//判断数据是否合法
+
+ ArrayList operationList = new ArrayList();
+ ContentProviderOperation.Builder builder = null;//数据库的操作列表
+
+ if(mTextDataValues.size() > 0) {
+ mTextDataValues.put(DataColumns.NOTE_ID, noteId);
+ if (mTextDataId == 0) {
+ mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
+ mTextDataValues);
+ try {
+ setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Insert new text data fail with noteId" + noteId);
+ mTextDataValues.clear();
+ return null;
+ }
+ } else {
+ builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mTextDataId));
+ builder.withValues(mTextDataValues);
+ operationList.add(builder.build());
+ }
+ mTextDataValues.clear();
+ }//把文本数据存入DataColumns
+
+ if(mCallDataValues.size() > 0) {
+ mCallDataValues.put(DataColumns.NOTE_ID, noteId);
+ if (mCallDataId == 0) {
+ mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
+ mCallDataValues);
+ try {
+ setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Insert new call data fail with noteId" + noteId);
+ mCallDataValues.clear();
+ return null;
+ }
+ } else {
+ builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mCallDataId));
+ builder.withValues(mCallDataValues);
+ operationList.add(builder.build());
+ }
+ mCallDataValues.clear();
+ }//把电话号码数据存入DataColumns
+
+ if (operationList.size() > 0) {
+ try {
+ ContentProviderResult[] results = context.getContentResolver().applyBatch(
+ Notes.AUTHORITY, operationList);
+ return (results == null || results.length == 0 || results[0] == null) ? null
+ : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
+ } catch (RemoteException e) {
+ Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+ return null;
+ } catch (OperationApplicationException e) {
+ Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+ return null;
+ }
+ }//存储过程中的异常处理
+ return null;
+ }
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java
new file mode 100644
index 0000000..e086c1a
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -0,0 +1,406 @@
+/*
+ * 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.model;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.Notes.TextNote;
+import net.micode.notes.tool.ResourceParser.NoteBgResources;
+
+
+public class WorkingNote {
+ // Note for the working note
+ private Note mNote;
+ // Note Id
+ private long mNoteId;
+ // Note content
+ private String mContent;
+ // Note mode
+ private int mMode;
+
+ private long mAlertDate;
+ private long mModifiedDate;
+ private int mBgColorId;
+ private int mWidgetId;
+ private int mWidgetType;
+ private long mFolderId;
+ private Context mContext;
+
+ private static final String TAG = "WorkingNote";
+
+ private boolean mIsDeleted;
+
+ private NoteSettingChangedListener mNoteSettingStatusListener;
+
+ // 声明 DATA_PROJECTION字符串数组
+ public static final String[] DATA_PROJECTION = new String[] {
+ DataColumns.ID,
+ DataColumns.CONTENT,
+ DataColumns.MIME_TYPE,
+ DataColumns.DATA1,
+ DataColumns.DATA2,
+ DataColumns.DATA3,
+ DataColumns.DATA4,
+ };
+
+ // 声明 NOTE_PROJECTION字符串数组
+ public static final String[] NOTE_PROJECTION = new String[] {
+ NoteColumns.PARENT_ID,
+ NoteColumns.ALERTED_DATE,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.WIDGET_ID,
+ NoteColumns.WIDGET_TYPE,
+ NoteColumns.MODIFIED_DATE
+ };
+
+ private static final int DATA_ID_COLUMN = 0;
+ private static final int DATA_CONTENT_COLUMN = 1;
+ private static final int DATA_MIME_TYPE_COLUMN = 2;
+ private static final int DATA_MODE_COLUMN = 3;
+ private static final int NOTE_PARENT_ID_COLUMN = 0;
+ private static final int NOTE_ALERTED_DATE_COLUMN = 1;
+ private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
+ private static final int NOTE_WIDGET_ID_COLUMN = 3;
+ private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
+ private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
+
+ // New note construct
+ public WorkingNote(Context context, long folderId) {
+ mContext = context;
+ mAlertDate = 0;
+ mModifiedDate = System.currentTimeMillis();
+ mFolderId = folderId;
+ mNote = new Note();
+ mNoteId = 0;
+ mIsDeleted = false;
+ mMode = 0;
+ mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+ }
+
+ // WorkingNote的构造函数
+ // Existing note construct
+ private WorkingNote(Context context, long noteId, long folderId) {
+ mContext = context;
+ mNoteId = noteId;
+ mFolderId = folderId;
+ mIsDeleted = false;
+ mNote = new Note();
+ loadNote();
+ }
+
+ // 加载Note
+ // 通过数据库调用query函数找到第一个条目
+ private void loadNote() {
+ Cursor cursor = mContext.getContentResolver().query(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
+ null, null);
+
+ // 若存在，储存相应信息
+ if (cursor != null) {
+ if (cursor.moveToFirst()) {
+ mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
+ mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
+ mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
+ mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
+ mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
+ mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
+ }
+ cursor.close();
+ // 若不存在，报错
+ } else {
+ Log.e(TAG, "No note with id:" + mNoteId);
+ throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
+ }
+ loadNoteData();
+ }
+
+ // 加载NoteData
+ private void loadNoteData() {
+ Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
+ DataColumns.NOTE_ID + "=?", new String[] {
+ String.valueOf(mNoteId)
+ }, null);
+
+ if (cursor != null) {
+ // 查到信息不为空
+ if (cursor.moveToFirst()) { // 查看第一项是否存在
+ do {
+ String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
+ if (DataConstants.NOTE.equals(type)) {
+ mContent = cursor.getString(DATA_CONTENT_COLUMN);
+ mMode = cursor.getInt(DATA_MODE_COLUMN);
+ mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
+ } else if (DataConstants.CALL_NOTE.equals(type)) {
+ mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
+ } else {
+ Log.d(TAG, "Wrong note type with type:" + type);
+ }
+ } while (cursor.moveToNext());//查阅所有项,直到为空
+ }
+ cursor.close();
+ } else {
+ Log.e(TAG, "No data with id:" + mNoteId);
+ throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
+ }
+ }
+
+ // 创建空的Note
+ // 传参：context，文件夹id，widget，背景颜色
+ public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
+ int widgetType, int defaultBgColorId) {
+ WorkingNote note = new WorkingNote(context, folderId);
+ // 设定相关属性
+ note.setBgColorId(defaultBgColorId);
+ note.setWidgetId(widgetId);
+ note.setWidgetType(widgetType);
+ return note;
+ }
+
+ public static WorkingNote load(Context context, long id) {
+ return new WorkingNote(context, id, 0);
+ }
+
+ // 保存Note
+ public synchronized boolean saveNote() {
+ if (isWorthSaving()) { //是否值得保存
+ if (!existInDatabase()) { // 是否存在数据库中
+ if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
+ Log.e(TAG, "Create new note fail with id:" + mNoteId);
+ return false;
+ }
+ }
+
+ mNote.syncNote(mContext, mNoteId);
+
+ /**
+ * Update widget content if there exist any widget of this note
+ */
+ if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
+ && mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onWidgetChanged();
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ // 是否在数据库中存在
+ public boolean existInDatabase() {
+ return mNoteId > 0;
+ }
+
+ // 是否值得保存
+ private boolean isWorthSaving() {
+ // 被删除，或（不在数据库中 内容为空），或 本地已保存过
+ if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
+ || (existInDatabase() && !mNote.isLocalModified())) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+
+ // 设置mNoteSettingStatusListener
+ public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
+ mNoteSettingStatusListener = l;
+ }
+
+ // 设置AlertDate
+ // 若 mAlertDate与data不同，则更改mAlertDate并设定NoteValue
+ public void setAlertDate(long date, boolean set) {
+ if (date != mAlertDate) {
+ mAlertDate = date;
+ mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
+ }
+ if (mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onClockAlertChanged(date, set);
+ }
+ }
+
+ // 设定删除标记
+ public void markDeleted(boolean mark) {
+ // 设定标记
+ mIsDeleted = mark;
+ if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onWidgetChanged();
+ // 调用mNoteSettingStatusListener的 onWidgetChanged方法
+ }
+ }
+
+ // 设定背景颜色
+ public void setBgColorId(int id) {
+ if (id != mBgColorId) { //设定条件 id != mBgColorId
+ mBgColorId = id;
+ if (mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onBackgroundColorChanged();
+ }
+ mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
+ }
+ }
+
+ // 设定检查列表模式
+ // 参数：mode
+ public void setCheckListMode(int mode) {
+ if (mMode != mode) { //设定条件 mMode != mode
+ if (mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
+ }
+ mMode = mode;
+ mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
+ }
+ }
+
+
+ // 设定WidgetType
+ // 参数：type
+ public void setWidgetType(int type) {
+ if (type != mWidgetType) {//设定条件 type != mWidgetType
+ mWidgetType = type;
+ mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
+ // 调用Note的setNoteValue方法更改WidgetType
+ }
+ }
+
+ // 设定WidgetId
+ // 参数：id
+ public void setWidgetId(int id) {
+ if (id != mWidgetId) {//设定条件 id != mWidgetId
+ mWidgetId = id;
+ mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
+ // 调用Note的setNoteValue方法更改WidgetId
+ }
+ }
+
+ // 设定WorkingTex
+ // 参数：更改的text
+ public void setWorkingText(String text) {
+ if (!TextUtils.equals(mContent, text)) {//设定条件 mContent, text内容不同
+ mContent = text;
+ mNote.setTextData(DataColumns.CONTENT, mContent);
+ // 调用Note的setTextData方法更改WorkingText
+ }
+ }
+
+ // 转变mNote的CallData及CallNote信息
+ // 参数：String phoneNumber, long callDate
+ public void convertToCallNote(String phoneNumber, long callDate) {
+ mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
+ mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
+ mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
+ }
+
+ // 判断是否有时钟题型
+ public boolean hasClockAlert() {
+ return (mAlertDate > 0 ? true : false);
+ }
+
+ // 获取Content
+ public String getContent() {
+ return mContent;
+ }
+
+ // 获取AlertDate
+ public long getAlertDate() {
+ return mAlertDate;
+ }
+
+ // 获取ModifiedDate
+ public long getModifiedDate() {
+ return mModifiedDate;
+ }
+
+ // 获取背景颜色来源id
+ public int getBgColorResId() {
+ return NoteBgResources.getNoteBgResource(mBgColorId);
+ }
+
+ // 获取背景颜色id
+ public int getBgColorId() {
+ return mBgColorId;
+ }
+
+ // 获取标题背景颜色id
+ public int getTitleBgResId() {
+ return NoteBgResources.getNoteTitleBgResource(mBgColorId);
+ }
+
+ // 获取CheckListMode
+ public int getCheckListMode() {
+ return mMode;
+ }
+
+ // 获取便签id
+ public long getNoteId() {
+ return mNoteId;
+ }
+
+ // 获取文件夹id
+ public long getFolderId() {
+ return mFolderId;
+ }
+
+ // 获取WidgetId
+ public int getWidgetId() {
+ return mWidgetId;
+ }
+
+ // 获取WidgetType
+ public int getWidgetType() {
+ return mWidgetType;
+ }
+
+ // 创建接口 NoteSettingChangedListener,便签更新监视
+ // 为NoteEditActivity提供接口
+ // 提供函数有
+ public interface NoteSettingChangedListener {
+ /**
+ * Called when the background color of current note has just changed
+ */
+ void onBackgroundColorChanged();
+
+ /**
+ * Called when user set clock
+ */
+ void onClockAlertChanged(long date, boolean set);
+
+ /**
+ * Call when user create note from widget
+ */
+ void onWidgetChanged();
+
+ /**
+ * Call when switch between check list mode and normal mode
+ * @param oldMode is previous mode before change
+ * @param newMode is new mode
+ */
+ void onCheckListModeChanged(int oldMode, int newMode);
+ }
+}
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 97%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
index 2a14982..4cb4f63 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
@@ -59,6 +59,8 @@ public class DataUtils {
}
try {
ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
+ //数据库事务，数据库事务是由一组数据库操作序列组成，事务作为一个整体被执行
+
if (results == null || results.length == 0 || results[0] == null) {
Log.d(TAG, "delete notes failed, ids:" + ids.toString());
return false;
@@ -95,7 +97,7 @@ public class DataUtils {
builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
operationList.add(builder.build());
}
-
+//将ids里包含的每一列的数据逐次加入到operationList中，等待最后的批量处理
try {
ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
if (results == null || results.length == 0 || results[0] == null) {
@@ -250,7 +252,7 @@ public class DataUtils {
+ CallNote.PHONE_NUMBER + ",?)",
new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
null);
-
+ //通过数据库操作，查询条件是（callDate和phoneNumber匹配传入参数的值）
if (cursor != null) {
if (cursor.moveToFirst()) {
try {
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
new file mode 100644
index 0000000..727d8ca
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
@@ -0,0 +1,99 @@
+//简介：定义了很多的静态字符串，目的就是为了提供jsonObject中相应字符串的"key"。把这些静态的定义单独写到了一个类里面，这是非常好的编程规范
+
+package net.micode.notes.tool;
+
+public class GTaskStringUtils {
+
+ public final static String GTASK_JSON_ACTION_ID = "action_id";
+
+ public final static String GTASK_JSON_ACTION_LIST = "action_list";
+
+ public final static String GTASK_JSON_ACTION_TYPE = "action_type";
+
+ public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";
+
+ public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";
+
+ public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";
+
+ public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update";
+
+ public final static String GTASK_JSON_CREATOR_ID = "creator_id";
+
+ public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";
+
+ public final static String GTASK_JSON_CLIENT_VERSION = "client_version";
+
+ public final static String GTASK_JSON_COMPLETED = "completed";
+
+ public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";
+
+ public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";
+
+ public final static String GTASK_JSON_DELETED = "deleted";
+
+ public final static String GTASK_JSON_DEST_LIST = "dest_list";
+
+ public final static String GTASK_JSON_DEST_PARENT = "dest_parent";
+
+ public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";
+
+ public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";
+
+ public final static String GTASK_JSON_ENTITY_TYPE = "entity_type";
+
+ public final static String GTASK_JSON_GET_DELETED = "get_deleted";
+
+ public final static String GTASK_JSON_ID = "id";
+
+ public final static String GTASK_JSON_INDEX = "index";
+
+ public final static String GTASK_JSON_LAST_MODIFIED = "last_modified";
+
+ public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";
+
+ public final static String GTASK_JSON_LIST_ID = "list_id";
+
+ public final static String GTASK_JSON_LISTS = "lists";
+
+ public final static String GTASK_JSON_NAME = "name";
+
+ public final static String GTASK_JSON_NEW_ID = "new_id";
+
+ public final static String GTASK_JSON_NOTES = "notes";
+
+ public final static String GTASK_JSON_PARENT_ID = "parent_id";
+
+ public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";
+
+ public final static String GTASK_JSON_RESULTS = "results";
+
+ public final static String GTASK_JSON_SOURCE_LIST = "source_list";
+
+ public final static String GTASK_JSON_TASKS = "tasks";
+
+ public final static String GTASK_JSON_TYPE = "type";
+
+ public final static String GTASK_JSON_TYPE_GROUP = "GROUP";
+
+ public final static String GTASK_JSON_TYPE_TASK = "TASK";
+
+ public final static String GTASK_JSON_USER = "user";
+
+ public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";
+
+ public final static String FOLDER_DEFAULT = "Default";
+
+ public final static String FOLDER_CALL_NOTE = "Call_Note";
+
+ public final static String FOLDER_META = "METADATA";
+
+ public final static String META_HEAD_GTASK_ID = "meta_gid";
+
+ public final static String META_HEAD_NOTE = "meta_note";
+
+ public final static String META_HEAD_DATA = "meta_data";
+
+ public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";
+
+}
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 88%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
index 1ad3ad6..0467d90 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
@@ -1,21 +1,20 @@
-/*
- * 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.tool;
+/*简介：字面意义是资源分析器，实际上就是获取资源并且在程序中使用，比如颜色图片等
+ * 实现方法：主要利用R.java这个类，其中包括
+ * R.id 组件资源引用
+ * R.drawable 图片资源 （被使用）
+ * R.layout 布局资源
+ * R.menu 菜单资源
+ * R.String 文字资源
+ * R.style 主题资源 （被使用）
+ * 在按顺序设置好相应的id后，就可以编写简单的getXXX函数获取需要的资源
+ *
+ * 特殊的变量 ：
+ * @BG_DEFAULT_COLOR 默认背景颜色（黄）
+ * BG_DEFAULT_FONT_SIZE 默认文本大小（中）
+ */
import android.content.Context;
import android.preference.PreferenceManager;
@@ -161,7 +160,7 @@ public class ResourceParser {
R.style.TextAppearanceLarge,
R.style.TextAppearanceSuper
};
-
+ //这里有一个容错的函数，防止输入的id大于资源总量，若如此，则自动返回默认的设置结果
public static int getTexAppearanceResource(int id) {
/**
* HACKME: Fix bug of store the resource id in shared preference.
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 64%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..5bf372d 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -39,58 +23,81 @@ import net.micode.notes.tool.DataUtils;
import java.io.IOException;
-
public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
- private long mNoteId;
- private String mSnippet;
+ private long mNoteId; //文本在数据库存储中的ID号
+ 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)
+ {
+ // 异常处理
+ }
+ 代码区如果有错误，就会返回所写异常的处理。*/
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);
@@ -101,12 +108,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
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();
@@ -121,38 +135,58 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
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();
+ //完成该动作
}
private void stopAlarmSound() {
if (mPlayer != null) {
mPlayer.stop();
+ //停止播放
mPlayer.release();
+ //释放MediaPlayer对象
mPlayer = null;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 71%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..4163ccd 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -31,21 +15,25 @@ import net.micode.notes.data.Notes.NoteColumns;
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()) {
@@ -61,5 +49,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
}
c.close();
}
+ //然而通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤
+ //如新建Intent、PendingIntent以及AlarmManager等
+ //这里就是根据数据库里的闹钟时间创建一个闹钟机制
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 88%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..037119f 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -28,3 +28,5 @@ public class AlarmReceiver extends BroadcastReceiver {
context.startActivity(intent);
}
}
+//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
+//作用还需要深究但是对于setClass和addFlags的
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 68%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..d6ad95e 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -1,19 +1,3 @@
-/*
- * 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 java.util.Calendar;
@@ -32,35 +16,47 @@ import android.text.format.DateUtils;
public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
private Calendar mDate = Calendar.getInstance();
+ //创建一个Calendar类型的变量 mDate，方便时间的操作
private boolean mIs24HourView;
private OnDateTimeSetListener mOnDateTimeSetListener;
+ //声明一个时间日期滚动选择控件 mOnDateTimeSetListener
private DateTimePicker mDateTimePicker;
+ //DateTimePicker控件，控件一般用于让用户可以从日期列表中选择单个值。
+ //运行时，单击控件边上的下拉箭头，会显示为两个部分：一个下拉列表，一个用于选择日期的
public interface OnDateTimeSetListener {
void OnDateTimeSet(AlertDialog dialog, long date);
}
public DateTimePickerDialog(Context context, long date) {
+ //对该界面对话框的实例化
super(context);
+ //对数据库的操作
mDateTimePicker = new DateTimePicker(context);
setView(mDateTimePicker);
+ //添加一个子视图
mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
public void onDateTimeChanged(DateTimePicker view, int year, int month,
- int dayOfMonth, int hourOfDay, int minute) {
+ int dayOfMonth, int hourOfDay, int minute) {
mDate.set(Calendar.YEAR, year);
mDate.set(Calendar.MONTH, month);
mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
mDate.set(Calendar.MINUTE, minute);
+ //将视图中的各选项设置为系统当前时间
updateTitle(mDate.getTimeInMillis());
}
});
mDate.setTimeInMillis(date);
+ //得到系统时间
mDate.set(Calendar.SECOND, 0);
+ //将秒数设置为0
mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
setButton(context.getString(R.string.datetime_dialog_ok), this);
setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
+ //设置按钮
set24HourView(DateFormat.is24HourFormat(this.getContext()));
+ //时间标准化打印
updateTitle(mDate.getTimeInMillis());
}
@@ -70,21 +66,22 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
mOnDateTimeSetListener = callBack;
- }
+ }//将时间日期滚动选择控件实例化
private void updateTitle(long date) {
int flag =
- DateUtils.FORMAT_SHOW_YEAR |
- DateUtils.FORMAT_SHOW_DATE |
- DateUtils.FORMAT_SHOW_TIME;
+ DateUtils.FORMAT_SHOW_YEAR |
+ DateUtils.FORMAT_SHOW_DATE |
+ DateUtils.FORMAT_SHOW_TIME;
flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
- }
+ }//android开发中常见日期管理工具类（API）——DateUtils：按照上下午显示时间
public void onClick(DialogInterface arg0, int arg1) {
if (mOnDateTimeSetListener != null) {
mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
}
- }
+ }//第一个参数arg0是接收到点击事件的对话框
+ //第二个参数arg1是该对话框上的按钮
}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 65%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..c831a9b 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -1,19 +1,3 @@
-/*
- * 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.content.Context;
@@ -30,14 +14,18 @@ import net.micode.notes.R;
public class DropdownMenu {
private Button mButton;
private PopupMenu mPopupMenu;
+ //声明一个下拉菜单
private Menu mMenu;
public DropdownMenu(Context context, Button button, int menuId) {
mButton = button;
mButton.setBackgroundResource(R.drawable.dropdown_icon);
+ //设置这个view的背景
mPopupMenu = new PopupMenu(context, mButton);
mMenu = mPopupMenu.getMenu();
mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
+ //MenuInflater是用来实例化Menu目录下的Menu布局文件
+ //根据ID来确认menu的内容选项
mButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
mPopupMenu.show();
@@ -48,14 +36,14 @@ public class DropdownMenu {
public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
if (mPopupMenu != null) {
mPopupMenu.setOnMenuItemClickListener(listener);
- }
+ }//设置菜单的监听
}
public MenuItem findItem(int id) {
return mMenu.findItem(id);
- }
+ }//对于菜单选项的初始化，根据索引搜索菜单需要的选项
public void setTitle(CharSequence title) {
mButton.setText(title);
- }
-}
+ }//布局文件，设置标题
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 72%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..b6867fb 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -1,19 +1,3 @@
-/*
- * 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.content.Context;
@@ -30,10 +14,14 @@ import net.micode.notes.data.Notes.NoteColumns;
public class FoldersListAdapter extends CursorAdapter {
+ //CursorAdapter是Cursor和ListView的接口
+ //FoldersListAdapter继承了CursorAdapter的类
+ //主要作用是便签数据库和用户的交互
+ //这里就是用folder（文件夹）的形式展现给用户
public static final String [] PROJECTION = {
- NoteColumns.ID,
- NoteColumns.SNIPPET
- };
+ NoteColumns.ID,
+ NoteColumns.SNIPPET
+ };//调用数据库中便签的ID和片段
public static final int ID_COLUMN = 0;
public static final int NAME_COLUMN = 1;
@@ -41,12 +29,13 @@ public class FoldersListAdapter extends CursorAdapter {
public FoldersListAdapter(Context context, Cursor c) {
super(context, c);
// TODO Auto-generated constructor stub
- }
+ }//数据库操作
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
+ //ViewGroup是容器
return new FolderListItem(context);
- }
+ }//创建一个文件夹，对于各文件夹中子标签的初始化
@Override
public void bindView(View view, Context context, Cursor cursor) {
@@ -55,20 +44,22 @@ public class FoldersListAdapter extends CursorAdapter {
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
((FolderListItem) view).bind(folderName);
}
- }
+ }//将各个布局文件绑定起来
public String getFolderName(Context context, int position) {
Cursor cursor = (Cursor) getItem(position);
return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
- }
+ }//根据数据库中标签的ID得到标签的各项内容
private class FolderListItem extends LinearLayout {
private TextView mName;
public FolderListItem(Context context) {
super(context);
+ //操作数据库
inflate(context, R.layout.folder_list_item, this);
+ //根据布局文件的名字等信息将其找出来
mName = (TextView) findViewById(R.id.tv_folder_name);
}
@@ -77,4 +68,4 @@ public class FoldersListAdapter extends CursorAdapter {
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/LoginActivity.java
new file mode 100644
index 0000000..097f902
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/LoginActivity.java
@@ -0,0 +1,61 @@
+package net.micode.notes.ui;
+
+import java.util.*;
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Button;
+import android.os.Bundle;
+import android.widget.Toast;
+import net.micode.notes.R;
+
+public class LoginActivity extends Activity{
+ private EditText accountEdit;
+ private EditText passwordEdit;
+ private Button login;
+ private Button cancel;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState){
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_login);
+ accountEdit = (EditText) findViewById(R.id.account);
+ passwordEdit = (EditText) findViewById(R.id.password);
+ login = (Button) findViewById(R.id.login);
+ cancel = (Button) findViewById(R.id.cancel);
+ cancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Toast.makeText(LoginActivity.this,R.string .app_already_quit ,Toast.LENGTH_LONG).show();
+ finish();
+ }
+
+ }
+ );
+ login.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ String account = accountEdit.getText().toString();
+ String password = passwordEdit.getText().toString();
+
+
+ if(account.equals("xcy") && password.equals("123456")){
+ ProgressDialog progressDialog = new ProgressDialog(LoginActivity.this);
+ progressDialog.setTitle(R.string.Loading);
+ progressDialog.setMessage("Loading...");
+ progressDialog.setCancelable(true);
+ progressDialog.show();;
+ Intent intent = new Intent(LoginActivity.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }else {
+ Toast.makeText(LoginActivity.this, R.string.invalid,Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+ }
+
+
+}
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 76%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index a674d7a..0faa62e 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -74,6 +58,8 @@ import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
+ //该类主要是针对标签的编辑
+ //继承了系统内部许多和监听有关的类
private class HeadViewHolder {
public TextView tvModified;
@@ -83,7 +69,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public ImageView ibSetBgColor;
}
-
+ //使用Map实现数据存储
private static final Map sBgSelectorBtnsMap = new HashMap();
static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -91,6 +77,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
+ //put函数是将指定值和指定键相连
}
private static final Map sBgSelectorSelectionMap = new HashMap();
@@ -100,6 +87,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
+ //put函数是将指定值和指定键相连
}
private static final Map sFontSizeBtnsMap = new HashMap();
@@ -108,6 +96,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
+ //put函数是将指定值和指定键相连
}
private static final Map sFontSelectorSelectionMap = new HashMap();
@@ -116,6 +105,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
+ //put函数是将指定值和指定键相连
}
private static final String TAG = "NoteEditActivity";
@@ -123,20 +113,23 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private HeadViewHolder mNoteHeaderHolder;
private View mHeadViewPanel;
-
+ //私有化一个界面操作mHeadViewPanel，对表头的操作
private View mNoteBgColorSelector;
-
+ //私有化一个界面操作mNoteBgColorSelector，对背景颜色的操作
private View mFontSizeSelector;
-
+ //私有化一个界面操作mFontSizeSelector，对标签字体的操作
private EditText mNoteEditor;
-
+ //声明编辑控件，对文本操作
private View mNoteEditorPanel;
-
- private WorkingNote mWorkingNote;
-
+ //私有化一个界面操作mNoteEditorPanel，文本编辑的控制板
+ //private WorkingNote mWorkingNote;
+ public WorkingNote mWorkingNote;
+ //对模板WorkingNote的初始化
private SharedPreferences mSharedPrefs;
+ //私有化SharedPreferences的数据存储方式
+ //它的本质是基于XML文件存储key-value键值对数据
private int mFontSizeId;
-
+ //用于操作字体的大小
private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
@@ -145,7 +138,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
private LinearLayout mEditTextList;
-
+ //线性布局
private String mUserQuery;
private Pattern mPattern;
@@ -153,7 +146,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(R.layout.note_edit);
-
+ //对数据库的访问操作
if (savedInstanceState == null && !initActivityState(getIntent())) {
finish();
return;
@@ -176,7 +169,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return;
}
Log.d(TAG, "Restoring from killed activity");
- }
+ }//为防止内存不足时程序的终止，在这里有一个保存现场的函数
}
private boolean initActivityState(Intent intent) {
@@ -188,34 +181,42 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
mUserQuery = "";
-
+ //如果用户实例化标签时，系统并未给出标签ID
/**
* Starting from the searched result
*/
+ //根据键值查找ID
if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
}
-
+ //如果ID在数据库中未找到
if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
Intent jump = new Intent(this, NotesListActivity.class);
startActivity(jump);
+ //程序将跳转到上面声明的intent——jump
showToast(R.string.error_note_not_exist);
finish();
return false;
- } else {
+ }
+ //ID在数据库中找到
+ else {
mWorkingNote = WorkingNote.load(this, noteId);
if (mWorkingNote == null) {
Log.e(TAG, "load note failed with note id" + noteId);
+ //打印出红色的错误信息
finish();
return false;
}
}
+ //setSoftInputMode——软键盘输入模式
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
| WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
} else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
- // New note
+ // intent.getAction()
+ // 大多用于broadcast发送广播时给机制（intent）设置一个action，就是一个字符串
+ // 用户可以通过receive（接受）intent，通过 getAction得到的字符串，来决定做什么
long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID);
@@ -223,7 +224,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Notes.TYPE_WIDGET_INVALIDE);
int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
ResourceParser.getDefaultBgId(this));
-
+ // intent.getInt（Long、String）Extra是对各变量的语法分析
// Parse call-record note
String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
@@ -240,15 +241,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
finish();
return false;
}
+ //将电话号码与手机的号码簿相关
} else {
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
widgetType, bgResId);
mWorkingNote.convertToCallNote(phoneNumber, callDate);
+ //
}
} else {
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
bgResId);
- }
+ }//创建一个新的WorkingNote
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
@@ -269,8 +272,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
private void initNoteScreen() {
+ //对界面的初始化操作
mNoteEditor.setTextAppearance(this, TextAppearanceResources
.getTexAppearanceResource(mFontSizeId));
+ //设置外观
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(mWorkingNote.getContent());
} else {
@@ -294,18 +299,21 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
showAlertHeader();
}
-
+ //设置闹钟的显示
private void showAlertHeader() {
if (mWorkingNote.hasClockAlert()) {
long time = System.currentTimeMillis();
if (time > mWorkingNote.getAlertDate()) {
mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
- } else {
+ }
+ //如果系统时间大于了闹钟设置的时间，那么闹钟失效
+ else {
mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
}
mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
+ //显示闹钟开启的图标
} else {
mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
@@ -329,26 +337,29 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (!mWorkingNote.existInDatabase()) {
saveNote();
}
+ //在创建一个新的标签时，先在数据库中匹配
+ //如果不存在，那么先在数据库中存储
outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
}
@Override
+ //MotionEvent是对屏幕触控的传递机制
public boolean dispatchTouchEvent(MotionEvent ev) {
if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mNoteBgColorSelector, ev)) {
mNoteBgColorSelector.setVisibility(View.GONE);
return true;
- }
+ }//颜色选择器在屏幕上可见
if (mFontSizeSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mFontSizeSelector, ev)) {
mFontSizeSelector.setVisibility(View.GONE);
return true;
- }
+ }//字体大小选择器在屏幕上可见
return super.dispatchTouchEvent(ev);
}
-
+ //对屏幕触控的坐标进行操作
private boolean inRangeOfView(View view, MotionEvent ev) {
int []location = new int[2];
view.getLocationOnScreen(location);
@@ -357,9 +368,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (ev.getX() < x
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
- || ev.getY() > (y + view.getHeight())) {
- return false;
- }
+ || ev.getY() > (y + view.getHeight()))
+ //如果触控的位置超出了给定的范围，返回false
+ {
+ return false;
+ }
return true;
}
@@ -377,13 +390,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
for (int id : sBgSelectorBtnsMap.keySet()) {
ImageView iv = (ImageView) findViewById(id);
iv.setOnClickListener(this);
- }
+ }//对标签各项属性内容的初始化
mFontSizeSelector = findViewById(R.id.font_size_selector);
for (int id : sFontSizeBtnsMap.keySet()) {
View view = findViewById(id);
view.setOnClickListener(this);
- };
+ };//对字体大小的选择
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
/**
@@ -405,7 +418,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
clearSettingState();
}
-
+ //和桌面小工具的同步
private void updateWidget() {
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -418,7 +431,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- mWorkingNote.getWidgetId()
+ mWorkingNote.getWidgetId()
});
sendBroadcast(intent);
@@ -430,7 +443,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (id == R.id.btn_set_bg_color) {
mNoteBgColorSelector.setVisibility(View.VISIBLE);
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
+ - View.VISIBLE);
} else if (sBgSelectorBtnsMap.containsKey(id)) {
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.GONE);
@@ -450,7 +463,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
mFontSizeSelector.setVisibility(View.GONE);
}
- }
+ }//************************存在问题
@Override
public void onBackPressed() {
@@ -481,6 +494,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
+ //对选择菜单的准备
public boolean onPrepareOptionsMenu(Menu menu) {
if (isFinishing()) {
return true;
@@ -489,6 +503,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
menu.clear();
if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
getMenuInflater().inflate(R.menu.call_note_edit, menu);
+ // MenuInflater是用来实例化Menu目录下的Menu布局文件的
} else {
getMenuInflater().inflate(R.menu.note_edit, menu);
}
@@ -506,45 +521,71 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
+ /*
+ * 函数功能：动态改变菜单选项内容
+ * 函数实现：如下注释
+ */
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
+ //根据菜单的id来编剧相关项目
case R.id.menu_new_note:
+ //创建一个新的便签
createNewNote();
break;
case R.id.menu_delete:
+ //删除便签
AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ //创建关于删除操作的对话框
builder.setTitle(getString(R.string.alert_title_delete));
+ // 设置标签的标题为alert_title_delete
builder.setIcon(android.R.drawable.ic_dialog_alert);
+ //设置对话框图标
builder.setMessage(getString(R.string.alert_message_delete_note));
+ //设置对话框内容
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
+ //建立按键监听器
public void onClick(DialogInterface dialog, int which) {
+ //点击所触发事件
deleteCurrentNote();
+ // 删除单签便签
finish();
}
});
+ //添加“YES”按钮
builder.setNegativeButton(android.R.string.cancel, null);
+ //添加“NO”的按钮
builder.show();
+ //显示对话框
break;
case R.id.menu_font_size:
+ //字体大小的编辑
mFontSizeSelector.setVisibility(View.VISIBLE);
+ // 将字体选择器置为可见
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+ // 通过id找到相应的大小
break;
case R.id.menu_list_mode:
+ //选择列表模式
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0);
break;
case R.id.menu_share:
+ //菜单共享
getWorkingText();
sendTo(this, mWorkingNote.getContent());
+ // 用sendto函数将运行文本发送到遍历的本文内
break;
case R.id.menu_send_to_desktop:
+ //发送到桌面
sendToDesktop();
break;
case R.id.menu_alert:
+ //创建提醒器
setReminder();
break;
case R.id.menu_delete_remind:
+ //删除日期提醒
mWorkingNote.setAlertDate(0, false);
break;
default:
@@ -553,111 +594,170 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return true;
}
+ /*
+ * 函数功能：建立事件提醒器
+ * 函数实现：如下注释
+ */
private void setReminder() {
DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+ // 建立修改时间日期的对话框
d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
public void OnDateTimeSet(AlertDialog dialog, long date) {
mWorkingNote.setAlertDate(date , true);
+ //选择提醒的日期
}
});
+ //建立时间日期的监听器
d.show();
+ //显示对话框
}
/**
* Share note to apps that support {@link Intent#ACTION_SEND} action
* and {@text/plain} type
*/
+ /*
+ * 函数功能：共享便签
+ * 函数实现：如下注释
+ */
private void sendTo(Context context, String info) {
Intent intent = new Intent(Intent.ACTION_SEND);
+ //建立intent链接选项
intent.putExtra(Intent.EXTRA_TEXT, info);
+ //将需要传递的便签信息放入text文件中
intent.setType("text/plain");
+ //编辑连接器的类型
context.startActivity(intent);
+ //在acti中进行链接
}
+ /*
+ * 函数功能：创建一个新的便签
+ * 函数实现：如下注释
+ */
private void createNewNote() {
// Firstly, save current editing notes
+ //保存当前便签
saveNote();
// For safety, start a new NoteEditActivity
finish();
Intent intent = new Intent(this, NoteEditActivity.class);
+ //设置链接器
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ //该活动定义为创建或编辑
intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+ //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中
startActivity(intent);
+ //开始activity并链接
}
+ /*
+ * 函数功能：删除当前便签
+ * 函数实现：如下注释
+ */
private void deleteCurrentNote() {
if (mWorkingNote.existInDatabase()) {
+ //假如当前运行的便签内存有数据
HashSet ids = new HashSet();
long id = mWorkingNote.getNoteId();
if (id != Notes.ID_ROOT_FOLDER) {
ids.add(id);
+ //如果不是头文件夹建立一个hash表把便签id存起来
} else {
Log.d(TAG, "Wrong note id, should not happen");
+ //否则报错
}
if (!isSyncMode()) {
+ //在非同步模式情况下
+ //删除操作
if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
Log.e(TAG, "Delete Note error");
}
} else {
+ //同步模式
+ //移动至垃圾文件夹的操作
if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens");
}
}
}
mWorkingNote.markDeleted(true);
+ //将这些标签的删除标记置为true
}
+ /*
+ * 函数功能：判断是否为同步模式
+ * 函数实现：直接看NotesPreferenceActivity中同步名称是否为空
+ */
private boolean isSyncMode() {
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
+ /*
+ * 函数功能：设置提醒时间
+ * 函数实现：如下注释
+ */
public void onClockAlertChanged(long date, boolean set) {
/**
* User could set clock to an unsaved note, so before setting the
* alert clock, we should save the note first
*/
if (!mWorkingNote.existInDatabase()) {
+ //首先保存已有的便签
saveNote();
}
if (mWorkingNote.getNoteId() > 0) {
Intent intent = new Intent(this, AlarmReceiver.class);
intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+ //若有有运行的便签就是建立一个链接器将标签id都存在uri中
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
+ //设置提醒管理器
showAlertHeader();
if(!set) {
alarmManager.cancel(pendingIntent);
} else {
alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
}
+ //如果用户设置了时间，就通过提醒管理器设置一个监听事项
} else {
/**
* There is the condition that user has input nothing (the note is
* not worthy saving), we have no note id, remind the user that he
* should input something
*/
+ //没有运行的便签就报错
Log.e(TAG, "Clock alert setting error");
showToast(R.string.error_note_empty_for_clock);
}
}
+ /*
+ * 函数功能：Widget发生改变的所触发的事件
+ */
public void onWidgetChanged() {
- updateWidget();
+ updateWidget();//更新Widget
}
+ /*
+ * 函数功能： 删除编辑文本框所触发的事件
+ * 函数实现：如下注释
+ */
public void onEditTextDelete(int index, String text) {
int childCount = mEditTextList.getChildCount();
if (childCount == 1) {
return;
}
-
+ //没有编辑框的话直接返回
for (int i = index + 1; i < childCount; i++) {
((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
.setIndex(i - 1);
+ //通过id把编辑框存在便签编辑框中
}
mEditTextList.removeViewAt(index);
+ //删除特定位置的视图
NoteEditText edit = null;
if(index == 0) {
edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
@@ -666,69 +766,101 @@ public class NoteEditActivity extends Activity implements OnClickListener,
edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
R.id.et_edit_text);
}
+ //通过id把编辑框存在空的NoteEditText中
int length = edit.length();
edit.append(text);
- edit.requestFocus();
- edit.setSelection(length);
+ edit.requestFocus();//请求优先完成该此 编辑
+ edit.setSelection(length);//定位到length位置处的条目
}
+ /*
+ * 函数功能：进入编辑文本框所触发的事件
+ * 函数实现：如下注释
+ */
public void onEditTextEnter(int index, String text) {
/**
* Should not happen, check for debug
*/
if(index > mEditTextList.getChildCount()) {
Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
+ //越界把偶偶
}
View view = getListItem(text, index);
mEditTextList.addView(view, index);
+ //建立一个新的视图并添加到编辑文本框内
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
- edit.requestFocus();
- edit.setSelection(0);
+ edit.requestFocus();//请求优先操作
+ edit.setSelection(0);//定位到起始位置
for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
.setIndex(i);
+ //遍历子文本框并设置对应对下标
}
}
+ /*
+ * 函数功能：切换至列表模式
+ * 函数实现：如下注释
+ */
private void switchToListMode(String text) {
mEditTextList.removeAllViews();
String[] items = text.split("\n");
int index = 0;
+ //清空所有视图，初始化下标
for (String item : items) {
if(!TextUtils.isEmpty(item)) {
mEditTextList.addView(getListItem(item, index));
index++;
+ //遍历所有文本单元并添加到文本框中
}
}
mEditTextList.addView(getListItem("", index));
mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
+ //优先请求此操作
mNoteEditor.setVisibility(View.GONE);
+ //便签编辑器不可见
mEditTextList.setVisibility(View.VISIBLE);
+ //将文本编辑框置为可见
}
+ /*
+ * 函数功能：获取高亮效果的反馈情况
+ * 函数实现：如下注释
+ */
private Spannable getHighlightQueryResult(String fullText, String userQuery) {
SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
+ //新建一个效果选项
if (!TextUtils.isEmpty(userQuery)) {
mPattern = Pattern.compile(userQuery);
+ //将用户的询问进行解析
Matcher m = mPattern.matcher(fullText);
+ //建立一个状态机检查Pattern并进行匹配
int start = 0;
while (m.find(start)) {
spannable.setSpan(
new BackgroundColorSpan(this.getResources().getColor(
R.color.user_query_highlight)), m.start(), m.end(),
Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ //设置背景颜色
start = m.end();
+ //跟新起始位置
}
}
return spannable;
}
+ /*
+ * 函数功能：获取列表项
+ * 函数实现：如下注释
+ */
private View getListItem(String item, int index) {
View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
+ //创建一个视图
final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ //创建一个文本编辑框并设置可见性
CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -739,12 +871,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
});
+ //建立一个打钩框并设置监听器
if (item.startsWith(TAG_CHECKED)) {
+ //选择勾选
cb.setChecked(true);
edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
item = item.substring(TAG_CHECKED.length(), item.length()).trim();
} else if (item.startsWith(TAG_UNCHECKED)) {
+ //选择不勾选
cb.setChecked(false);
edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
@@ -753,61 +888,94 @@ public class NoteEditActivity extends Activity implements OnClickListener,
edit.setOnTextViewChangeListener(this);
edit.setIndex(index);
edit.setText(getHighlightQueryResult(item, mUserQuery));
+ //运行编辑框的监听器对该行为作出反应，并设置下标及文本内容
return view;
}
+ /*
+ * 函数功能：便签内容发生改变所 触发的事件
+ * 函数实现：如下注释
+ */
public void onTextChange(int index, boolean hasText) {
if (index >= mEditTextList.getChildCount()) {
Log.e(TAG, "Wrong index, should not happen");
return;
+ //越界报错
}
if(hasText) {
mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
} else {
mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
}
+ //如果内容不为空则将其子编辑框可见性置为可见，否则不可见
}
+ /*
+ * 函数功能：检查模式和列表模式的切换
+ * 函数实现：如下注释
+ */
public void onCheckListModeChanged(int oldMode, int newMode) {
if (newMode == TextNote.MODE_CHECK_LIST) {
switchToListMode(mNoteEditor.getText().toString());
+ //检查模式切换到列表模式
} else {
if (!getWorkingText()) {
mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
""));
}
+ //若是获取到文本就改变其检查标记
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
mEditTextList.setVisibility(View.GONE);
mNoteEditor.setVisibility(View.VISIBLE);
+ //修改文本编辑器的内容和可见性
}
}
+ /*
+ * 函数功能：设置勾选选项表并返回是否勾选的标记
+ * 函数实现：如下注释
+ */
private boolean getWorkingText() {
boolean hasChecked = false;
+ //初始化check标记
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 若模式为CHECK_LIST
StringBuilder sb = new StringBuilder();
+ //创建可变字符串
for (int i = 0; i < mEditTextList.getChildCount(); i++) {
View view = mEditTextList.getChildAt(i);
+ //遍历所有子编辑框的视图
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
if (!TextUtils.isEmpty(edit.getText())) {
+ //若文本不为空
if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
+ //该选项框已打钩
sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
hasChecked = true;
+ //扩展字符串为已打钩并把标记置true
} else {
sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
+ //扩展字符串添加未打钩
}
}
}
mWorkingNote.setWorkingText(sb.toString());
+ //利用编辑好的字符串设置运行便签的内容
} else {
mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+ // 若不是该模式直接用编辑器中的内容设置运行中标签的内容
}
return hasChecked;
}
+ /*
+ * 函数功能：保存便签
+ * 函数实现：如下注释
+ */
private boolean saveNote() {
getWorkingText();
boolean saved = mWorkingNote.saveNote();
+ //运行 getWorkingText()之后保存
if (saved) {
/**
* There are two modes from List view to edit view, open one note,
@@ -816,11 +984,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
* new node requires to the top of the list. This code
* {@link #RESULT_OK} is used to identify the create/edit state
*/
+ //如英文注释所说链接RESULT_OK是为了识别保存的2种情况，一是创建后保存，二是修改后保存
setResult(RESULT_OK);
}
return saved;
}
+ /*
+ * 函数功能：将便签发送至桌面
+ * 函数实现：如下注释
+ */
private void sendToDesktop() {
/**
* Before send message to home, we should make sure that current
@@ -829,12 +1002,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
if (!mWorkingNote.existInDatabase()) {
saveNote();
+ //若不存在数据也就是新的标签就保存起来先
}
if (mWorkingNote.getNoteId() > 0) {
+ //若是有内容
Intent sender = new Intent();
Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
+ //建立发送到桌面的连接器
shortcutIntent.setAction(Intent.ACTION_VIEW);
+ //链接为一个视图
shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
sender.putExtra(Intent.EXTRA_SHORTCUT_NAME,
@@ -842,9 +1019,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
sender.putExtra("duplicate", true);
+ //将便签的相关信息都添加到要发送的文件里
sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+ //设置sneder的行为是发送
showToast(R.string.info_note_enter_desktop);
sendBroadcast(sender);
+ //显示到桌面
} else {
/**
* There is the condition that user has input nothing (the note is
@@ -853,21 +1033,35 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
Log.e(TAG, "Send to desktop error");
showToast(R.string.error_note_empty_for_send_to_desktop);
+ //空便签直接报错
}
}
+ /*
+ * 函数功能：编辑小图标的标题
+ * 函数实现：如下注释
+ */
private String makeShortcutIconTitle(String content) {
content = content.replace(TAG_CHECKED, "");
content = content.replace(TAG_UNCHECKED, "");
return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
SHORTCUT_ICON_TITLE_MAX_LEN) : content;
+ //直接设置为content中的内容并返回，有勾选和未勾选2种
}
+ /*
+ * 函数功能：显示提示的视图
+ * 函数实现：根据下标显示对应的提示
+ */
private void showToast(int resId) {
showToast(resId, Toast.LENGTH_SHORT);
}
+ /*
+ * 函数功能：持续显示提示的视图
+ * 函数实现：根据下标和持续的时间（duration）编辑提示视图并显示
+ */
private void showToast(int resId, int duration) {
Toast.makeText(this, resId, duration).show();
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 74%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..9dde13c 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -1,19 +1,3 @@
-/*
- * 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.content.Context;
@@ -28,20 +12,20 @@ import net.micode.notes.tool.DataUtils;
public class NoteItemData {
static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.ALERTED_DATE,
- NoteColumns.BG_COLOR_ID,
- NoteColumns.CREATED_DATE,
- NoteColumns.HAS_ATTACHMENT,
- NoteColumns.MODIFIED_DATE,
- NoteColumns.NOTES_COUNT,
- NoteColumns.PARENT_ID,
- NoteColumns.SNIPPET,
- NoteColumns.TYPE,
- NoteColumns.WIDGET_ID,
- NoteColumns.WIDGET_TYPE,
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.CREATED_DATE,
+ NoteColumns.HAS_ATTACHMENT,
+ NoteColumns.MODIFIED_DATE,
+ NoteColumns.NOTES_COUNT,
+ NoteColumns.PARENT_ID,
+ NoteColumns.SNIPPET,
+ NoteColumns.TYPE,
+ NoteColumns.WIDGET_ID,
+ NoteColumns.WIDGET_TYPE,
};
-
+ //常量标记和数据就不一一标记了，意义翻译基本就知道
private static final int ID_COLUMN = 0;
private static final int ALERTED_DATE_COLUMN = 1;
private static final int BG_COLOR_ID_COLUMN = 2;
@@ -75,8 +59,9 @@ public class NoteItemData {
private boolean mIsOnlyOneItem;
private boolean mIsOneNoteFollowingFolder;
private boolean mIsMultiNotesFollowingFolder;
-
- public NoteItemData(Context context, Cursor cursor) {
+ //初始化NoteItemData，主要利用光标cursor获取的东西
+ public NoteItemData(Context context, Cursor cursor) {
+ //getxxx为转换格式
mId = cursor.getLong(ID_COLUMN);
mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
@@ -92,10 +77,11 @@ public class NoteItemData {
mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+ //初始化电话号码的信息
mPhoneNumber = "";
if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
- if (!TextUtils.isEmpty(mPhoneNumber)) {
+ if (!TextUtils.isEmpty(mPhoneNumber)) {//mphonenumber里有符合字符串，则用contart功能连接
mName = Contact.getContact(context, mPhoneNumber);
if (mName == null) {
mName = mPhoneNumber;
@@ -108,32 +94,35 @@ public class NoteItemData {
}
checkPostion(cursor);
}
-
+ ///根据鼠标的位置设置标记，和位置
private void checkPostion(Cursor cursor) {
+ //初始化几个标记，cursor具体功能笔记中已提到，不一一叙述
mIsLastItem = cursor.isLast() ? true : false;
mIsFirstItem = cursor.isFirst() ? true : false;
mIsOnlyOneItem = (cursor.getCount() == 1);
+ //初始化“多重子文件”“单一子文件”2个标记
mIsMultiNotesFollowingFolder = false;
mIsOneNoteFollowingFolder = false;
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
+ //主要是设置上诉2标记
+ if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {
+ if (cursor.moveToPrevious()) {//获取光标位置后看上一行
if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
+ || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;
+ mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
} else {
- mIsOneNoteFollowingFolder = true;
+ mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
}
}
- if (!cursor.moveToNext()) {
+ if (!cursor.moveToNext()) {//若不能再往下走则报错
throw new IllegalStateException("cursor move to previous but can't move back");
}
}
}
}
-
+ ///以下都是获取标记没什么好说的，不过倒数第二个需要说明下，很具体看下面
public boolean isOneFollowingFolder() {
return mIsOneNoteFollowingFolder;
}
@@ -214,6 +203,7 @@ public class NoteItemData {
return (mAlertDate > 0);
}
+ //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空，则isCallRecord为true
public boolean isCallRecord() {
return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
}
@@ -221,4 +211,4 @@ public class NoteItemData {
public static int getNoteType(Cursor cursor) {
return cursor.getInt(TYPE_COLUMN);
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
new file mode 100644
index 0000000..1bd02be
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -0,0 +1,1018 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.appwidget.AppWidgetManager;
+import android.content.AsyncQueryHandler;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.ActionMode;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Display;
+import android.view.HapticFeedbackConstants;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnCreateContextMenuListener;
+import android.view.View.OnTouchListener;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.remote.GTaskSyncService;
+import net.micode.notes.model.WorkingNote;
+import net.micode.notes.tool.BackupUtils;
+import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.ResourceParser;
+import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
+import net.micode.notes.widget.NoteWidgetProvider_2x;
+import net.micode.notes.widget.NoteWidgetProvider_4x;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashSet;
+//主界面，一进入就是这个界面
+/**
+ * @author k
+ *
+ */
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { //没有用特定的标签加注释。。。感觉没有什么用
+ private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
+
+ private int mode=-1; /*首页背景切换*/
+
+ private static final int FOLDER_LIST_QUERY_TOKEN = 1;
+
+ private static final int MENU_FOLDER_DELETE = 0;
+
+ private static final int MENU_FOLDER_VIEW = 1;
+
+ private static final int MENU_FOLDER_CHANGE_NAME = 2;
+
+ private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; //单行超过80个字符
+
+ private enum ListEditState {
+ NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
+ };
+
+ private ListEditState mState;
+
+ private BackgroundQueryHandler mBackgroundQueryHandler;
+
+ private NotesListAdapter mNotesListAdapter;
+
+ private ListView mNotesListView;
+
+ private Button mAddNewNote;
+
+ private boolean mDispatch;
+
+ private int mOriginY;
+
+ private int mDispatchY;
+
+ private TextView mTitleBar;
+
+ private long mCurrentFolderId;
+
+ private ContentResolver mContentResolver;
+
+ private ModeCallback mModeCallBack;
+
+ private static final String TAG = "NotesListActivity";
+
+ public static final int NOTES_LISTVIEW_SCROLL_RATE = 30;
+
+ private NoteItemData mFocusNoteDataItem;
+
+ private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
+
+ private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>"
+ + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR ("
+ + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND "
+ + NoteColumns.NOTES_COUNT + ">0)";
+
+ private final static int REQUEST_CODE_OPEN_NODE = 102;
+ private final static int REQUEST_CODE_NEW_NODE = 103;
+
+ @Override
+ // 创建类
+ protected void onCreate(final Bundle savedInstanceState) { //需要是final类型 根据程序上下文环境，Java关键字final有“这是无法改变的”或者“终态的”含义，它可以修饰非抽象类、非抽象类成员方法和变量。你可能出于两种理解而需要阻止改变：设计或效率。
+ // final类不能被继承，没有子类，final类中的方法默认是final的。
+ //final方法不能被子类的方法覆盖，但可以被继承。
+ //final成员变量表示常量，只能被赋值一次，赋值后值不再改变。
+ //final不能用于修饰构造方法。
+ super.onCreate(savedInstanceState); // 调用父类的onCreate函数
+ setContentView(R.layout.note_list);
+ getWindow().setBackgroundDrawableResource(R.drawable.grassland);
+ initResources();
+
+ /**
+ * Insert an introduction when user firstly use this application
+ */
+ setAppInfoFromRawRes();
+ }
+
+ @Override
+ // 返回一些子模块完成的数据交给主Activity处理
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ // 结果值 和 要求值 符合要求
+ if (resultCode == RESULT_OK
+ && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
+ mNotesListAdapter.changeCursor(null);
+ } else {
+ super.onActivityResult(requestCode, resultCode, data);
+ // 调用 Activity 的onActivityResult（）
+ }
+ }
+
+ private void setAppInfoFromRawRes() {
+ // Android平台给我们提供了一个SharedPreferences类，它是一个轻量级的存储类，特别适合用于保存软件配置参数。
+ SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+ if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
+ StringBuilder sb = new StringBuilder();
+ InputStream in = null;
+ try {
+ // 把资源文件放到应用程序的/raw/raw下，那么就可以在应用中使用getResources获取资源后,
+ // 以openRawResource方法（不带后缀的资源文件名）打开这个文件。
+ in = getResources().openRawResource(R.raw.introduction);
+ if (in != null) {
+ InputStreamReader isr = new InputStreamReader(in);
+ BufferedReader br = new BufferedReader(isr);
+ char [] buf = new char[1024]; // 自行定义的数值，使用者不知道有什么意义
+ int len = 0;
+ while ((len = br.read(buf)) > 0) {
+ sb.append(buf, 0, len);
+ }
+ } else {
+ Log.e(TAG, "Read introduction file error");
+ return;
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return;
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+
+ // 创建空的WorkingNote
+ WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
+ AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
+ ResourceParser.RED);
+ note.setWorkingText(sb.toString());
+ if (note.saveNote()) {
+ // 更新保存note的信息
+ sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
+ } else {
+ Log.e(TAG, "Save introduction note error");
+ return;
+ }
+ }
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ startAsyncNotesListQuery();
+ }
+
+ // 初始化资源
+ private void initResources() {
+ mContentResolver = this.getContentResolver(); // 获取应用程序的数据，得到类似数据表的东西
+ mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+
+ // findViewById 是安卓编程的定位函数，主要是引用.R文件里的引用名
+ mNotesListView = (ListView) findViewById(R.id.notes_list); // 绑定XML中的ListView，作为Item的容器
+ mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
+ null, false);
+ mNotesListView.setOnItemClickListener(new OnListItemClickListener());
+ mNotesListView.setOnItemLongClickListener(this);
+ mNotesListAdapter = new NotesListAdapter(this);
+ mNotesListView.setAdapter(mNotesListAdapter);
+ mAddNewNote = (Button) findViewById(R.id.btn_new_note);// 在activity中要获取该按钮
+ mAddNewNote.setOnClickListener(this);
+ mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
+ mDispatch = false;
+ mDispatchY = 0;
+ mOriginY = 0;
+ mTitleBar = (TextView) findViewById(R.id.tv_title_bar);
+ mState = ListEditState.NOTE_LIST;
+ mModeCallBack = new ModeCallback();
+ }
+
+ // 继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener
+ private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
+ private DropdownMenu mDropDownMenu;
+ private ActionMode mActionMode;
+ private MenuItem mMoveMenu;
+
+ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+ getMenuInflater().inflate(R.menu.note_list_options, menu);
+ menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
+ mMoveMenu = menu.findItem(R.id.move);
+ if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
+ || DataUtils.getUserFolderCount(mContentResolver) == 0) {
+ mMoveMenu.setVisible(false);
+ } else {
+ mMoveMenu.setVisible(true);
+ mMoveMenu.setOnMenuItemClickListener(this);
+ }
+ mActionMode = mode;
+ mNotesListAdapter.setChoiceMode(true);
+ mNotesListView.setLongClickable(false);
+ mAddNewNote.setVisibility(View.GONE);
+
+ View customView = LayoutInflater.from(NotesListActivity.this).inflate(
+ R.layout.note_list_dropdown_menu, null);
+ mode.setCustomView(customView);
+ mDropDownMenu = new DropdownMenu(NotesListActivity.this,
+ (Button) customView.findViewById(R.id.selection_menu),
+ R.menu.note_list_dropdown);
+ mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
+ public boolean onMenuItemClick(final MenuItem item) {
+ mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
+ updateMenu();
+ return true;
+ }
+
+ });
+ return true;
+ }
+
+ // 更新菜单
+ private void updateMenu() {
+ int selectedCount = mNotesListAdapter.getSelectedCount();
+ // Update dropdown menu
+ String format = getResources().getString(R.string.menu_select_title, selectedCount);
+ mDropDownMenu.setTitle(format); // 更改标题
+ MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
+ if (item != null) {
+ if (mNotesListAdapter.isAllSelected()) {
+ item.setChecked(true);
+ item.setTitle(R.string.menu_deselect_all);
+ } else {
+ item.setChecked(false);
+ item.setTitle(R.string.menu_select_all);
+ }
+ }
+ }
+
+ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void onDestroyActionMode(ActionMode mode) {
+ mNotesListAdapter.setChoiceMode(false);
+ mNotesListView.setLongClickable(true);
+ mAddNewNote.setVisibility(View.VISIBLE);
+ }
+
+ public void finishActionMode() {
+ mActionMode.finish();
+ }
+
+ public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
+ boolean checked) {
+ mNotesListAdapter.setCheckedItem(position, checked);
+ updateMenu();
+ }
+
+ public boolean onMenuItemClick(MenuItem item) {
+ if (mNotesListAdapter.getSelectedCount() == 0) {
+ Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none),
+ Toast.LENGTH_SHORT).show();
+ return true;
+ }
+
+ switch (item.getItemId()) {
+ case R.id.delete:
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(getString(R.string.alert_title_delete));
+ builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setMessage(getString(R.string.alert_message_delete_notes,
+ mNotesListAdapter.getSelectedCount()));
+ builder.setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int which) {
+ batchDelete();
+ }
+ });
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.show();
+ break;
+ case R.id.move:
+ startQueryDestinationFolders();
+ break;
+ default:
+ return false;
+ }
+ return true;
+ }
+ }
+
+ private class NewNoteOnTouchListener implements OnTouchListener {
+
+ public boolean onTouch(View v, MotionEvent event) {
+ switch (event.getAction()) {
+ case MotionEvent.ACTION_DOWN: {
+ Display display = getWindowManager().getDefaultDisplay();
+ int screenHeight = display.getHeight();
+ int newNoteViewHeight = mAddNewNote.getHeight();
+ int start = screenHeight - newNoteViewHeight;
+ int eventY = start + (int) event.getY();
+ /**
+ * Minus TitleBar's height
+ */
+ if (mState == ListEditState.SUB_FOLDER) {
+ eventY -= mTitleBar.getHeight();
+ start -= mTitleBar.getHeight();
+ }
+ /**
+ * HACKME:When click the transparent part of "New Note" button, dispatch
+ * the event to the list view behind this button. The transparent part of
+ * "New Note" button could be expressed by formula y=-0.12x+94锛圲nit:pixel锛�
+ * and the line top of the button. The coordinate based on left of the "New
+ * Note" button. The 94 represents maximum height of the transparent part.
+ * Notice that, if the background of the button changes, the formula should
+ * also change. This is very bad, just for the UI designer's strong requirement.
+ */
+ if (event.getY() < (event.getX() * (-0.12) + 94)) {
+ View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
+ - mNotesListView.getFooterViewsCount());
+ if (view != null && view.getBottom() > start
+ && (view.getTop() < (start + 94))) {
+ mOriginY = (int) event.getY();
+ mDispatchY = eventY;
+ event.setLocation(event.getX(), mDispatchY);
+ mDispatch = true;
+ return mNotesListView.dispatchTouchEvent(event);
+ }
+ }
+ break;
+ }
+ case MotionEvent.ACTION_MOVE: {
+ if (mDispatch) {
+ mDispatchY += (int) event.getY() - mOriginY;
+ event.setLocation(event.getX(), mDispatchY);
+ return mNotesListView.dispatchTouchEvent(event);
+ }
+ break;
+ }
+ default: {
+ if (mDispatch) {
+ event.setLocation(event.getX(), mDispatchY);
+ mDispatch = false;
+ return mNotesListView.dispatchTouchEvent(event);
+ }
+ break;
+ }
+ }
+ return false;
+ }
+
+ };
+
+ private void startAsyncNotesListQuery() {
+ String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
+ : NORMAL_SELECTION;
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
+ String.valueOf(mCurrentFolderId)
+ }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }
+
+ private final class BackgroundQueryHandler extends AsyncQueryHandler {
+ public BackgroundQueryHandler(ContentResolver contentResolver) {
+ super(contentResolver);
+ }
+
+ @Override
+ protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+ switch (token) {
+ case FOLDER_NOTE_LIST_QUERY_TOKEN:
+ mNotesListAdapter.changeCursor(cursor);
+ break;
+ case FOLDER_LIST_QUERY_TOKEN:
+ if (cursor != null && cursor.getCount() > 0) {
+ showFolderListMenu(cursor);
+ } else {
+ Log.e(TAG, "Query folder failed");
+ }
+ break;
+ default:
+ return;
+ }
+ }
+ }
+
+ private void showFolderListMenu(Cursor cursor) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(R.string.menu_title_select_folder);
+ final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
+ builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+
+ public void onClick(DialogInterface dialog, int which) {
+ DataUtils.batchMoveToFolder(mContentResolver,
+ mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
+ Toast.makeText(
+ NotesListActivity.this,
+ getString(R.string.format_move_notes_to_folder,
+ mNotesListAdapter.getSelectedCount(),
+ adapter.getFolderName(NotesListActivity.this, which)),
+ Toast.LENGTH_SHORT).show();
+ mModeCallBack.finishActionMode();
+ }
+ });
+ builder.show();
+ }
+
+ private void createNewNote() {
+ Intent intent = new Intent(this, NoteEditActivity.class);
+ intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
+ this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
+ }
+
+ private void batchDelete() {
+ new AsyncTask>() {
+ protected HashSet doInBackground(Void... unused) {
+ HashSet widgets = mNotesListAdapter.getSelectedWidget();
+ if (!isSyncMode()) {
+ // if not synced, delete notes directly
+ if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
+ .getSelectedItemIds())) {
+ } else {
+ Log.e(TAG, "Delete notes error, should not happens");
+ }
+ } else {
+ // in sync mode, we'll move the deleted note into the trash
+ // folder
+ if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
+ .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
+ Log.e(TAG, "Move notes to trash folder error, should not happens");
+ }
+ }
+ return widgets;
+ }
+
+ @Override
+ protected void onPostExecute(HashSet widgets) {
+ if (widgets != null) {
+ for (AppWidgetAttribute widget : widgets) {
+ if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+ updateWidget(widget.widgetId, widget.widgetType);
+ }
+ }
+ }
+ mModeCallBack.finishActionMode();
+ }
+ }.execute();
+ }
+
+ private void deleteFolder(long folderId) {
+ if (folderId == Notes.ID_ROOT_FOLDER) {
+ Log.e(TAG, "Wrong folder id, should not happen " + folderId);
+ return;
+ }
+
+ HashSet ids = new HashSet();
+ ids.add(folderId);
+ HashSet widgets = DataUtils.getFolderNoteWidget(mContentResolver,
+ folderId);
+ if (!isSyncMode()) {
+ // if not synced, delete folder directly
+ DataUtils.batchDeleteNotes(mContentResolver, ids);
+ } else {
+ // in sync mode, we'll move the deleted folder into the trash folder
+ DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
+ }
+ if (widgets != null) {
+ for (AppWidgetAttribute widget : widgets) {
+ if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+ updateWidget(widget.widgetId, widget.widgetType);
+ }
+ }
+ }
+ }
+
+ private void openNode(NoteItemData data) {
+ Intent intent = new Intent(this, NoteEditActivity.class);
+ intent.setAction(Intent.ACTION_VIEW);
+ intent.putExtra(Intent.EXTRA_UID, data.getId());
+ this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
+ }
+
+ private void openFolder(NoteItemData data) {
+ mCurrentFolderId = data.getId();
+ startAsyncNotesListQuery();
+ if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
+ mState = ListEditState.CALL_RECORD_FOLDER;
+ mAddNewNote.setVisibility(View.GONE);
+ } else {
+ mState = ListEditState.SUB_FOLDER;
+ }
+ if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
+ mTitleBar.setText(R.string.call_record_folder_name);
+ } else {
+ mTitleBar.setText(data.getSnippet());
+ }
+ mTitleBar.setVisibility(View.VISIBLE);
+ }
+
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.btn_new_note:
+ createNewNote();
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void showSoftInput() {
+ InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (inputMethodManager != null) {
+ inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+ }
+ }
+
+ private void hideSoftInput(View view) {
+ InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
+
+ private void showCreateOrModifyFolderDialog(final boolean create) {
+ final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
+ final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
+ showSoftInput();
+ if (!create) {
+ if (mFocusNoteDataItem != null) {
+ etName.setText(mFocusNoteDataItem.getSnippet());
+ builder.setTitle(getString(R.string.menu_folder_change_name));
+ } else {
+ Log.e(TAG, "The long click data item is null");
+ return;
+ }
+ } else {
+ etName.setText("");
+ builder.setTitle(this.getString(R.string.menu_create_folder));
+ }
+
+ builder.setPositiveButton(android.R.string.ok, null);
+ builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ hideSoftInput(etName);
+ }
+ });
+
+ final Dialog dialog = builder.setView(view).show();
+ final Button positive = (Button)dialog.findViewById(android.R.id.button1);
+ positive.setOnClickListener(new OnClickListener() {
+ public void onClick(View v) {
+ hideSoftInput(etName);
+ String name = etName.getText().toString();
+ if (DataUtils.checkVisibleFolderName(mContentResolver, name)) {
+ Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name),
+ Toast.LENGTH_LONG).show();
+ etName.setSelection(0, etName.length());
+ return;
+ }
+ if (!create) {
+ if (!TextUtils.isEmpty(name)) {
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.SNIPPET, name);
+ values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
+ values.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
+ + "=?", new String[] {
+ String.valueOf(mFocusNoteDataItem.getId())
+ });
+ }
+ } else if (!TextUtils.isEmpty(name)) {
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.SNIPPET, name);
+ values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
+ mContentResolver.insert(Notes.CONTENT_NOTE_URI, values);
+ }
+ dialog.dismiss();
+ }
+ });
+
+ if (TextUtils.isEmpty(etName.getText())) {
+ positive.setEnabled(false);
+ }
+ /**
+ * When the name edit text is null, disable the positive button
+ */
+ etName.addTextChangedListener(new TextWatcher() {
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ if (TextUtils.isEmpty(etName.getText())) {
+ positive.setEnabled(false);
+ } else {
+ positive.setEnabled(true);
+ }
+ }
+
+ public void afterTextChanged(Editable s) {
+ // TODO Auto-generated method stub
+
+ }
+ });
+ }
+
+ /* (non-Javadoc)
+ * @see android.app.Activity#onBackPressed()
+ * 按返回键时根据情况更改类中的数据
+ */
+ @Override
+ public void onBackPressed() { switch (mState) {
+ case SUB_FOLDER:
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ mState = ListEditState.NOTE_LIST;
+ startAsyncNotesListQuery();
+ mTitleBar.setVisibility(View.GONE);
+ break;
+ case CALL_RECORD_FOLDER:
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ mState = ListEditState.NOTE_LIST;
+ mAddNewNote.setVisibility(View.VISIBLE);
+ mTitleBar.setVisibility(View.GONE);
+ startAsyncNotesListQuery();
+ break;
+ case NOTE_LIST:
+ super.onBackPressed();
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * @param appWidgetId
+ * @param appWidgetType
+ * 根据不同类型的widget更新插件，通过intent传送数据
+ */
+ private void updateWidget(int appWidgetId, int appWidgetType) {
+ Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+ if (appWidgetType == Notes.TYPE_WIDGET_2X) {
+ intent.setClass(this, NoteWidgetProvider_2x.class);
+ } else if (appWidgetType == Notes.TYPE_WIDGET_4X) {
+ intent.setClass(this, NoteWidgetProvider_4x.class);
+ } else {
+ Log.e(TAG, "Unspported widget type");
+ return;
+ }
+
+ intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
+ appWidgetId
+ });
+
+ sendBroadcast(intent);
+ setResult(RESULT_OK, intent);
+ }
+
+ /**
+ * 声明监听器，建立菜单，包括名称，视图，删除操作，更改名称操作；
+ */
+ private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
+ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+ if (mFocusNoteDataItem != null) {
+ menu.setHeaderTitle(mFocusNoteDataItem.getSnippet());
+ menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view);
+ menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete);
+ menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name);
+ }
+ }
+ };
+
+ @Override
+ public void onContextMenuClosed(Menu menu) {
+ if (mNotesListView != null) {
+ mNotesListView.setOnCreateContextMenuListener(null);
+ }
+ super.onContextMenuClosed(menu);
+ }
+
+ /* (non-Javadoc)
+ * @see android.app.Activity#onContextItemSelected(android.view.MenuItem)
+ * 针对menu中不同的选择进行不同的处理，里面详细注释
+ */
+ @Override
+ public boolean onContextItemSelected(MenuItem item) {
+ if (mFocusNoteDataItem == null) {
+ Log.e(TAG, "The long click data item is null");
+ return false;
+ }
+ switch (item.getItemId()) {
+ case MENU_FOLDER_VIEW:
+ openFolder(mFocusNoteDataItem);//打开对应文件
+ break;
+ case MENU_FOLDER_DELETE:
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);//设置确认是否删除的对话框
+ builder.setTitle(getString(R.string.alert_title_delete));
+ builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setMessage(getString(R.string.alert_message_delete_folder));
+ builder.setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ deleteFolder(mFocusNoteDataItem.getId());
+ }
+ });
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.show();//显示对话框
+ break;
+ case MENU_FOLDER_CHANGE_NAME:
+ showCreateOrModifyFolderDialog(false);
+ break;
+ default:
+ break;
+ }
+
+ return true;
+ }
+
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ menu.clear();
+ if (mState == ListEditState.NOTE_LIST) {
+ getMenuInflater().inflate(R.menu.note_list, menu);
+ // set sync or sync_cancel
+ menu.findItem(R.id.menu_sync).setTitle(
+ GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
+ } else if (mState == ListEditState.SUB_FOLDER) {
+ getMenuInflater().inflate(R.menu.sub_folder, menu);
+ } else if (mState == ListEditState.CALL_RECORD_FOLDER) {
+ getMenuInflater().inflate(R.menu.call_record_folder, menu);
+ } else {
+ Log.e(TAG, "Wrong state:" + mState);
+ }
+ if(mode==-1)
+ menu.findItem(R.id.menu_grassland).setVisible(false);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_grassland:{
+ mode=-1;
+ getWindow().setBackgroundDrawableResource(R.drawable.grassland);
+ break;
+ }
+ case R.id.menu_cauc:{
+ mode=1;
+ getWindow().setBackgroundDrawableResource(R.drawable.cauc);
+ break;
+ }
+
+ case R.id.menu_new_folder: {
+ showCreateOrModifyFolderDialog(true);
+ break;
+ }
+ case R.id.menu_export_text: {
+ exportNoteToText();
+ break;
+ }
+ case R.id.menu_sync: {
+ if (isSyncMode()) {
+ if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
+ GTaskSyncService.startSync(this);
+ } else {
+ GTaskSyncService.cancelSync(this);
+ }
+ } else {
+ startPreferenceActivity();
+ }
+ break;
+ }
+ case R.id.menu_setting: {
+ startPreferenceActivity();
+ break;
+ }
+ case R.id.menu_new_note: {
+ createNewNote();
+ break;
+ }
+ case R.id.menu_search:
+ onSearchRequested();
+ break;
+ default:
+ break;
+ }
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see android.app.Activity#onSearchRequested()
+ * 直接调用startSearch函数
+ */
+ @Override
+ public boolean onSearchRequested() {
+ startSearch(null, false, null /* appData */, false);
+ return true;
+ }
+
+ /**
+ * 函数功能：实现将便签导出到文本功能
+ */
+ private void exportNoteToText() {
+ final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
+ new AsyncTask() {
+
+ @Override
+ protected Integer doInBackground(Void... unused) {
+ return backup.exportToText();
+ }
+
+ @Override
+ protected void onPostExecute(Integer result) {
+ if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(NotesListActivity.this
+ .getString(R.string.failed_sdcard_export));
+ builder.setMessage(NotesListActivity.this
+ .getString(R.string.error_sdcard_unmounted));
+ builder.setPositiveButton(android.R.string.ok, null);
+ builder.show();
+ } else if (result == BackupUtils.STATE_SUCCESS) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(NotesListActivity.this
+ .getString(R.string.success_sdcard_export));
+ builder.setMessage(NotesListActivity.this.getString(
+ R.string.format_exported_file_location, backup
+ .getExportedTextFileName(), backup.getExportedTextFileDir()));
+ builder.setPositiveButton(android.R.string.ok, null);
+ builder.show();
+ } else if (result == BackupUtils.STATE_SYSTEM_ERROR) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(NotesListActivity.this
+ .getString(R.string.failed_sdcard_export));
+ builder.setMessage(NotesListActivity.this
+ .getString(R.string.error_sdcard_export));
+ builder.setPositiveButton(android.R.string.ok, null);
+ builder.show();
+ }
+ }
+
+ }.execute();
+ }
+
+ /**
+ * @return
+ * 功能：判断是否正在同步
+ */
+ private boolean isSyncMode() {
+ return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
+ }
+
+ /**
+ * 功能：跳转到PreferenceActivity界面
+ */
+ private void startPreferenceActivity() {
+ Activity from = getParent() != null ? getParent() : this;
+ Intent intent = new Intent(from, NotesPreferenceActivity.class);
+ from.startActivityIfNeeded(intent, -1);
+ }
+
+ /**
+ * @author k
+ * 函数功能：实现对便签列表项的点击事件（短按）
+ */
+ private class OnListItemClickListener implements OnItemClickListener {
+
+ public void onItemClick(AdapterView parent, View view, int position, long id) {
+ if (view instanceof NotesListItem) {
+ NoteItemData item = ((NotesListItem) view).getItemData();
+ if (mNotesListAdapter.isInChoiceMode()) {
+ if (item.getType() == Notes.TYPE_NOTE) {
+ position = position - mNotesListView.getHeaderViewsCount();
+ mModeCallBack.onItemCheckedStateChanged(null, position, id,
+ !mNotesListAdapter.isSelectedItem(position));
+ }
+ return;
+ }
+
+ switch (mState) {
+ case NOTE_LIST:
+ if (item.getType() == Notes.TYPE_FOLDER
+ || item.getType() == Notes.TYPE_SYSTEM) {
+ openFolder(item);
+ } else if (item.getType() == Notes.TYPE_NOTE) {
+ openNode(item);
+ } else {
+ Log.e(TAG, "Wrong note type in NOTE_LIST");
+ }
+ break;
+ case SUB_FOLDER:
+ case CALL_RECORD_FOLDER:
+ if (item.getType() == Notes.TYPE_NOTE) {
+ openNode(item);
+ } else {
+ Log.e(TAG, "Wrong note type in SUB_FOLDER");
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 查询目标文件
+ */
+ private void startQueryDestinationFolders() {
+ String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
+ selection = (mState == ListEditState.NOTE_LIST) ? selection:
+ "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
+
+ mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
+ null,
+ Notes.CONTENT_NOTE_URI,
+ FoldersListAdapter.PROJECTION,
+ selection,
+ new String[] {
+ String.valueOf(Notes.TYPE_FOLDER),
+ String.valueOf(Notes.ID_TRASH_FOLER),
+ String.valueOf(mCurrentFolderId)
+ },
+ NoteColumns.MODIFIED_DATE + " DESC");
+ }
+
+ /* (non-Javadoc)
+ * @see android.widget.AdapterView.OnItemLongClickListener#onItemLongClick(android.widget.AdapterView, android.view.View, int, long)
+ * 长按某一项时进行的操作
+ * 如果长按的是便签，则通过ActionMode菜单实现；如果长按的是文件夹，则通过ContextMenu菜单实现；
+ * 具体ActionMOde菜单和ContextMenu菜单的详细见精度笔记
+ */
+ public boolean onItemLongClick(AdapterView parent, View view, int position, long id) {
+ if (view instanceof NotesListItem) {
+ mFocusNoteDataItem = ((NotesListItem) view).getItemData();
+ if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
+ if (mNotesListView.startActionMode(mModeCallBack) != null) {
+ mModeCallBack.onItemCheckedStateChanged(null, position, id, true);
+ mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+ } else {
+ Log.e(TAG, "startActionMode fails");
+ }
+ } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
+ mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
+ }
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
new file mode 100644
index 0000000..bf1f825
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -0,0 +1,262 @@
+/*
+ * 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.content.Context;
+import android.database.Cursor;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
+
+import net.micode.notes.data.Notes;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+
+/*
+ * 便签表连接，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁。
+ * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+ */
+public class NotesListAdapter extends CursorAdapter {
+ private static final String TAG = "NotesListAdapter";
+ private Context mContext;
+ private HashMap mSelectedIndex;
+ private int mNotesCount; //便签数
+ private boolean mChoiceMode; //选择模式标记
+
+ /*
+ * 桌面widget的属性，包括编号和类型
+ */
+ public static class AppWidgetAttribute {
+ public int widgetId;
+ public int widgetType;
+ };
+
+ /*
+ * 函数功能：初始化便签链接器
+ * 函数实现：根据传进来的内容设置相关变量
+ */
+ public NotesListAdapter(Context context) {
+ super(context, null); //父类对象置空
+ mSelectedIndex = new HashMap(); //新建选项下标的hash表
+ mContext = context;
+ mNotesCount = 0;
+ }
+
+ @Override
+ /*
+ * 函数功能：新建一个视图来存储光标所指向的数据
+ * 函数实现：使用兄弟类NotesListItem新建一个项目选项
+ */
+ public View newView(Context context, Cursor cursor, ViewGroup parent) {
+ return new NotesListItem(context);
+ }
+
+ /*
+ * 函数功能：将已经存在的视图和鼠标指向的数据进行捆绑
+ */
+ @Override
+ public void bindView(View view, Context context, Cursor cursor) {
+ if (view instanceof NotesListItem) {
+ //若view是NotesListItem的一个实例
+ NoteItemData itemData = new NoteItemData(context, cursor);
+ ((NotesListItem) view).bind(context, itemData, mChoiceMode,
+ isSelectedItem(cursor.getPosition()));
+ //则新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起
+ }
+ }
+
+ /*
+ * 函数功能：设置勾选框
+ */
+ public void setCheckedItem(final int position, final boolean checked) {
+ mSelectedIndex.put(position, checked);
+ //根据定位和是否勾选设置下标
+ notifyDataSetChanged();
+ //在修改后刷新activity
+ }
+
+ /*
+ * 函数功能：判断单选按钮是否勾选
+ */
+ public boolean isInChoiceMode() {
+ return mChoiceMode;
+ }
+
+ /*
+ * 函数功能：设置单项选项框
+ * 函数实现：重置下标并且根据参数mode设置选项
+ */
+ public void setChoiceMode(boolean mode) {
+ mSelectedIndex.clear();
+ mChoiceMode = mode;
+ }
+
+ /*
+ * 函数功能：选择全部选项
+ */
+ public void selectAll(boolean checked) {
+ Cursor cursor = getCursor();
+ //获取光标位置
+ for (int i = 0; i < getCount(); i++) {
+ if (cursor.moveToPosition(i)) {
+ if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {
+ setCheckedItem(i, checked);
+ }
+ }
+ }
+ //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
+ }
+
+ /*
+ * 函数功能：建立选择项的下标列表
+ */
+ public HashSet getSelectedItemIds() {
+ HashSet itemSet = new HashSet();
+ //建立hash表
+ for (Integer position : mSelectedIndex.keySet()) {
+ //遍历所有的关键
+ if (mSelectedIndex.get(position) == true) {
+ //若光标位置可用
+ Long id = getItemId(position);
+ if (id == Notes.ID_ROOT_FOLDER) {
+ //原文件不需要添加
+ Log.d(TAG, "Wrong item id, should not happen");
+ } else {
+ itemSet.add(id);
+ }
+ //则将id该下标假如选项集合中
+
+ }
+ }
+
+ return itemSet;
+ }
+
+ /*
+ * 函数功能：建立桌面Widget的选项表
+ */
+ public HashSet getSelectedWidget() {
+ HashSet itemSet = new HashSet();
+ for (Integer position : mSelectedIndex.keySet()) {
+ if (mSelectedIndex.get(position) == true) {
+ Cursor c = (Cursor) getItem(position);
+ //以上4句和getSelectedItemIds一样，不再重复
+ if (c != null) {
+ //光标位置可用的话就建立新的Widget属性并编辑下标和类型，最后添加到选项集中
+ AppWidgetAttribute widget = new AppWidgetAttribute();
+ NoteItemData item = new NoteItemData(mContext, c);
+ widget.widgetId = item.getWidgetId();
+ widget.widgetType = item.getWidgetType();
+ itemSet.add(widget);
+ /**
+ * Don't close cursor here, only the adapter could close it
+ */
+ } else {
+ Log.e(TAG, "Invalid cursor");
+ return null;
+ }
+ }
+ }
+ return itemSet;
+ }
+
+ /*
+ * 函数功能：获取选项个数
+ */
+ public int getSelectedCount() {
+ Collection values = mSelectedIndex.values();
+ //首先获取选项下标的值
+ if (null == values) {
+ return 0;
+ }
+ Iterator iter = values.iterator();
+ //初始化叠加器
+ int count = 0;
+ while (iter.hasNext()) {
+ if (true == iter.next()) {
+ //若value值为真计数+1
+ count++;
+ }
+ }
+ return count;
+ }
+
+ /*
+ * 函数功能：判断是否全部选中
+ */
+ public boolean isAllSelected() {
+ int checkedCount = getSelectedCount();
+ return (checkedCount != 0 && checkedCount == mNotesCount);
+ //获取选项数看是否等于便签的个数
+ }
+
+ /*
+ * 函数功能：判断是否为选项表
+ * 函数实现：通过传递的下标来确定
+ */
+ public boolean isSelectedItem(final int position) {
+ if (null == mSelectedIndex.get(position)) {
+ return false;
+ }
+ return mSelectedIndex.get(position);
+ }
+
+ @Override
+ /*
+ * 函数功能：在activity内容发生局部变动的时候回调该函数计算便签的数量
+ */
+ protected void onContentChanged() {
+ super.onContentChanged();
+ //执行基类函数
+ calcNotesCount();
+ }
+
+ @Override
+ /*
+ * 函数功能：在activity光标发生局部变动的时候回调该函数计算便签的数量
+ */
+ public void changeCursor(Cursor cursor) {
+ super.changeCursor(cursor);
+ //执行基类函数
+ calcNotesCount();
+ }
+
+ /*
+ * 函数功能：计算便签数量
+ */
+ private void calcNotesCount() {
+ mNotesCount = 0;
+ for (int i = 0; i < getCount(); i++) {
+ //获取总数同时遍历
+ Cursor c = (Cursor) getItem(i);
+ if (c != null) {
+ if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
+ mNotesCount++;
+ //若该位置不为空并且文本类型为便签就+1
+ }
+ } else {
+ Log.e(TAG, "Invalid cursor");
+ return;
+ }
+ //否则报错
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
new file mode 100644
index 0000000..5cee1b2
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -0,0 +1,132 @@
+/*
+ * 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.content.Context;
+import android.text.format.DateUtils;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
+
+
+//创建便签列表项目选项
+public class NotesListItem extends LinearLayout {
+ private ImageView mAlert;//闹钟图片
+ private TextView mTitle; //标题
+ private TextView mTime; //时间
+ private TextView mCallName; //人名
+ private NoteItemData mItemData; //标签数据
+ private CheckBox mCheckBox; //打钩框
+
+ /*初始化基本信息*/
+ public NotesListItem(Context context) {
+ super(context); //super()它的主要作用是调整调用父类构造函数的顺序
+ inflate(context, R.layout.note_item, this);//Inflate可用于将一个xml中定义的布局控件找出来,这里的xml是r。layout
+ //findViewById用于从contentView中查找指定ID的View，转换出来的形式根据需要而定;
+ mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
+ mTitle = (TextView) findViewById(R.id.tv_title);
+ mTime = (TextView) findViewById(R.id.tv_time);
+ mCallName = (TextView) findViewById(R.id.tv_name);
+ mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
+ }
+ ///根据data的属性对各个控件的属性的控制，主要是可见性Visibility，内容setText，格式setTextAppearance
+ public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
+ if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
+ mCheckBox.setVisibility(View.VISIBLE); ///设置可见行为可见
+ mCheckBox.setChecked(checked); ///格子打钩
+ } else {
+ mCheckBox.setVisibility(View.GONE);
+ }
+
+ mItemData = data;
+ ///设置控件属性，一共三种情况，由data的id和父id是否与保存到文件夹的id一致来决定
+ if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
+ mCallName.setVisibility(View.GONE);
+ mAlert.setVisibility(View.VISIBLE);
+ //设置该textview的style
+ mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
+ //settext为设置内容
+ mTitle.setText(context.getString(R.string.call_record_folder_name)
+ + context.getString(R.string.format_folder_files_count, data.getNotesCount()));
+ mAlert.setImageResource(R.drawable.call_record);
+ } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) {
+ mCallName.setVisibility(View.VISIBLE);
+ mCallName.setText(data.getCallName());
+ mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
+ mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
+ ///关于闹钟的设置
+ if (data.hasAlert()) {
+ mAlert.setImageResource(R.drawable.clock);//图片来源的设置
+ mAlert.setVisibility(View.VISIBLE);
+ } else {
+ mAlert.setVisibility(View.GONE);
+ }
+ } else {
+ mCallName.setVisibility(View.GONE);
+ mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
+ ///设置title格式
+ if (data.getType() == Notes.TYPE_FOLDER) {
+ mTitle.setText(data.getSnippet()
+ + context.getString(R.string.format_folder_files_count,
+ data.getNotesCount()));
+ mAlert.setVisibility(View.GONE);
+ } else {
+ mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
+ if (data.hasAlert()) {
+ mAlert.setImageResource(R.drawable.clock);///设置图片来源
+ mAlert.setVisibility(View.VISIBLE);
+ } else {
+ mAlert.setVisibility(View.GONE);
+ }
+ }
+ }
+ ///设置内容，获取相关时间，从data里编辑的日期中获取
+ mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
+
+ setBackground(data);
+ }
+ //根据data的文件属性来设置背景
+ private void setBackground(NoteItemData data) {
+ int id = data.getBgColorId();
+ //，若是note型文件，则4种情况，对于4种不同情况的背景来源
+ if (data.getType() == Notes.TYPE_NOTE) {
+ //单个数据并且只有一个子文件夹
+ if (data.isSingle() || data.isOneFollowingFolder()) {
+ setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id));
+ } else if (data.isLast()) {//是最后一个数据
+ setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
+ } else if (data.isFirst() || data.isMultiFollowingFolder()) {//是一个数据并有多个子文件夹
+ setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id));
+ } else {
+ setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
+ }
+ } else {
+ //若不是note直接调用文件夹的背景来源
+ setBackgroundResource(NoteItemBgResources.getFolderBgRes());
+ }
+ }
+ public NoteItemData getItemData() {
+ return mItemData;
+ }
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
new file mode 100644
index 0000000..1b69811
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -0,0 +1,516 @@
+/*
+ * 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.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.text.TextUtils;
+import android.text.format.DateFormat;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.remote.GTaskSyncService;
+
+/*
+ *该类功能：NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+ * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+ */
+public class NotesPreferenceActivity extends PreferenceActivity {
+ public static final String PREFERENCE_NAME = "notes_preferences";
+ //优先名
+ public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
+ //同步账号
+ public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
+ //同步时间
+ public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
+
+ private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
+ //同步密码
+ private static final String AUTHORITIES_FILTER_KEY = "authorities";
+ //本地密码
+ private PreferenceCategory mAccountCategory;
+ //账户分组
+ private GTaskReceiver mReceiver;
+ //同步任务接收器
+ private Account[] mOriAccounts;
+ //账户
+ private boolean mHasAddedAccount;
+ //账户的hash标记
+
+ @Override
+ /*
+ *函数功能：创建一个activity，在函数里要完成所有的正常静态设置
+ *参数：Bundle icicle：存放了 activity 当前的状态
+ */
+ protected void onCreate(Bundle icicle) {
+ //先执行父类的创建函数
+ super.onCreate(icicle);
+
+ /* using the app icon for navigation */
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+ //给左上角图标的左边加上一个返回的图标
+
+ addPreferencesFromResource(R.xml.preferences);
+ //添加xml来源并显示 xml
+ mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
+ //根据同步账户关键码来初始化分组
+ mReceiver = new GTaskReceiver();
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
+ registerReceiver(mReceiver, filter);
+ //初始化同步组件
+
+ mOriAccounts = null;
+ View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
+ //获取listvivew，ListView的作用:用于列出所有选择
+ getListView().addHeaderView(header, null, true);
+ //在listview组件上方添加其他组件
+ }
+
+ @Override
+ /*
+ * 函数功能：activity交互功能的实现，用于接受用户的输入
+ */
+ protected void onResume() {
+ //先执行父类 的交互实现
+ super.onResume();
+
+ // need to set sync account automatically if user has added a new
+ // account
+ if (mHasAddedAccount) {
+ //若用户新加了账户则自动设置同步账户
+ Account[] accounts = getGoogleAccounts();
+ //获取google同步账户
+ if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
+ //若原账户不为空且当前账户有增加
+ for (Account accountNew : accounts) {
+ boolean found = false;
+ for (Account accountOld : mOriAccounts) {
+ if (TextUtils.equals(accountOld.name, accountNew.name)) {
+ //更新账户
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ setSyncAccount(accountNew.name);
+ //若是没有找到旧的账户，那么同步账号中就只添加新账户
+ break;
+ }
+ }
+ }
+ }
+
+ refreshUI();
+ //刷新标签界面
+ }
+
+ @Override
+ /*
+ * 函数功能：删除一个activity
+ */
+ protected void onDestroy() {
+ if (mReceiver != null) {
+ unregisterReceiver(mReceiver);
+ //注销接收器
+ }
+ super.onDestroy();
+ //执行父类的销毁动作
+ }
+
+ /*
+ * 函数功能：重新设置账户信息
+ */
+ private void loadAccountPreference() {
+ mAccountCategory.removeAll();
+ //销毁所有的分组
+ Preference accountPref = new Preference(this);
+ //建立首选项
+ final String defaultAccount = getSyncAccountName(this);
+ accountPref.setTitle(getString(R.string.preferences_account_title));
+ accountPref.setSummary(getString(R.string.preferences_account_summary));
+ //设置首选项的大标题和小标题
+ accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+ public boolean onPreferenceClick(Preference preference) {
+ //建立监听器
+ if (!GTaskSyncService.isSyncing()) {
+ if (TextUtils.isEmpty(defaultAccount)) {
+ // the first time to set account
+ //若是第一次建立账户显示选择账户提示对话框
+ showSelectAccountAlertDialog();
+ } else {
+ // if the account has already been set, we need to promp
+ // user about the risk
+ //若是已经建立则显示修改对话框并进行修改操作
+ showChangeAccountConfirmAlertDialog();
+ }
+ } else {
+ //若在没有同步的情况下，则在toast中显示不能修改
+ Toast.makeText(NotesPreferenceActivity.this,
+ R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
+ .show();
+ }
+ return true;
+ }
+ });
+
+ //根据新建首选项编辑新的账户分组
+ mAccountCategory.addPreference(accountPref);
+ }
+
+ /*
+ *函数功能：设置按键的状态和最后同步的时间
+ */
+ private void loadSyncButton() {
+ Button syncButton = (Button) findViewById(R.id.preference_sync_button);
+ TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
+ //获取同步按钮控件和最终同步时间的的窗口
+ // set button state
+ //设置按钮的状态
+ if (GTaskSyncService.isSyncing()) {
+ //若是在同步状态下
+ syncButton.setText(getString(R.string.preferences_button_sync_cancel));
+ syncButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
+ }
+ });
+ //设置按钮显示的文本为“取消同步”以及监听器
+ } else {
+ syncButton.setText(getString(R.string.preferences_button_sync_immediately));
+ syncButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ GTaskSyncService.startSync(NotesPreferenceActivity.this);
+ }
+ });
+ //若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
+ }
+ syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
+ //设置按键可用还是不可用
+
+ // set last sync time
+ // 设置最终同步时间
+ if (GTaskSyncService.isSyncing()) {
+ //若是在同步的情况下
+ lastSyncTimeView.setText(GTaskSyncService.getProgressString());
+ lastSyncTimeView.setVisibility(View.VISIBLE);
+ // 根据当前同步服务器设置时间显示框的文本以及可见性
+ } else {
+ //若是非同步情况
+ long lastSyncTime = getLastSyncTime(this);
+ if (lastSyncTime != 0) {
+ lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time,
+ DateFormat.format(getString(R.string.preferences_last_sync_time_format),
+ lastSyncTime)));
+ lastSyncTimeView.setVisibility(View.VISIBLE);
+ //则根据最后同步时间的信息来编辑时间显示框的文本内容和可见性
+ } else {
+ //若时间为空直接设置为不可见状态
+ lastSyncTimeView.setVisibility(View.GONE);
+ }
+ }
+ }
+ /*
+ *函数功能：刷新标签界面
+ *函数实现：调用上文设置账号和设置按键两个函数来实现
+ */
+ private void refreshUI() {
+ loadAccountPreference();
+ loadSyncButton();
+ }
+
+ /*
+ * 函数功能：显示账户选择的对话框并进行账户的设置
+ */
+ private void showSelectAccountAlertDialog() {
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+ //创建一个新的对话框
+
+ View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
+ TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
+ titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
+ TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
+ subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
+ //设置标题以及子标题的内容
+ dialogBuilder.setCustomTitle(titleView);
+ dialogBuilder.setPositiveButton(null, null);
+ //设置对话框的自定义标题，建立一个YES的按钮
+ Account[] accounts = getGoogleAccounts();
+ String defAccount = getSyncAccountName(this);
+ //获取同步账户信息
+ mOriAccounts = accounts;
+ mHasAddedAccount = false;
+
+ if (accounts.length > 0) {
+ //若账户不为空
+ CharSequence[] items = new CharSequence[accounts.length];
+ final CharSequence[] itemMapping = items;
+ int checkedItem = -1;
+ int index = 0;
+ for (Account account : accounts) {
+ if (TextUtils.equals(account.name, defAccount)) {
+ checkedItem = index;
+ //在账户列表中查询到所需账户
+ }
+ items[index++] = account.name;
+ }
+ dialogBuilder.setSingleChoiceItems(items, checkedItem,
+ //在对话框建立一个单选的复选框
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ setSyncAccount(itemMapping[which].toString());
+ dialog.dismiss();
+ //取消对话框
+ refreshUI();
+ }
+ //设置点击后执行的事件，包括检录新同步账户和刷新标签界面
+ });
+ //建立对话框网络版的监听器
+ }
+
+ View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
+ dialogBuilder.setView(addAccountView);
+ //给新加账户对话框设置自定义样式
+
+ final AlertDialog dialog = dialogBuilder.show();
+ //显示对话框
+ addAccountView.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ mHasAddedAccount = true;
+ //将新加账户的hash置true
+ Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
+ //建立网络建立组件
+ intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
+ "gmail-ls"
+ });
+ startActivityForResult(intent, -1);
+ //跳回上一个选项
+ dialog.dismiss();
+ }
+ });
+ //建立新加账户对话框的监听器
+ }
+
+ /*
+ * 函数功能：显示账户选择对话框和相关账户操作
+ */
+ private void showChangeAccountConfirmAlertDialog() {
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+ //创建一个新的对话框
+ View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
+ TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
+ titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
+ getSyncAccountName(this)));
+ TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
+ subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
+ //根据同步修改的账户信息设置标题以及子标题的内容
+ dialogBuilder.setCustomTitle(titleView);
+ //设置对话框的自定义标题
+ CharSequence[] menuItemArray = new CharSequence[] {
+ getString(R.string.preferences_menu_change_account),
+ getString(R.string.preferences_menu_remove_account),
+ getString(R.string.preferences_menu_cancel)
+ };
+ //定义一些标记字符串
+ dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
+ //设置对话框要显示的一个list，用于显示几个命令时,即change，remove，cancel
+ public void onClick(DialogInterface dialog, int which) {
+ //按键功能，由which来决定
+ if (which == 0) {
+ //进入账户选择对话框
+ showSelectAccountAlertDialog();
+ } else if (which == 1) {
+ //删除账户并且跟新便签界面
+ removeSyncAccount();
+ refreshUI();
+ }
+ }
+ });
+ dialogBuilder.show();
+ //显示对话框
+ }
+
+ /*
+ *函数功能：获取谷歌账户
+ *函数实现：通过账户管理器直接获取
+ */
+ private Account[] getGoogleAccounts() {
+ AccountManager accountManager = AccountManager.get(this);
+ return accountManager.getAccountsByType("com.google");
+ }
+
+ /*
+ * 函数功能：设置同步账户
+ */
+ private void setSyncAccount(String account) {
+ if (!getSyncAccountName(this).equals(account)) {
+ //假如该账号不在同步账号列表中
+ SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
+ SharedPreferences.Editor editor = settings.edit();
+ //编辑共享的首选项
+ if (account != null) {
+ editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
+ } else {
+ editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
+ }
+ //将该账号加入到首选项中
+
+ editor.commit();
+ //提交修改的数据
+
+
+ setLastSyncTime(this, 0);
+ //将最后同步时间清零
+
+ // clean up local gtask related info
+ new Thread(new Runnable() {
+ public void run() {
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.GTASK_ID, "");
+ values.put(NoteColumns.SYNC_ID, 0);
+ getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
+ }
+ }).start();
+ //重置当地同步任务的信息
+
+ Toast.makeText(NotesPreferenceActivity.this,
+ getString(R.string.preferences_toast_success_set_accout, account),
+ Toast.LENGTH_SHORT).show();
+ //将toast的文本信息置为“设置账户成功”并显示出来
+ }
+ }
+ /*
+ * 函数功能：删除同步账户
+ */
+ private void removeSyncAccount() {
+ SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
+ SharedPreferences.Editor editor = settings.edit();
+ //设置共享首选项
+
+ if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
+ editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);
+ //假如当前首选项中有账户就删除
+ }
+ if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) {
+ editor.remove(PREFERENCE_LAST_SYNC_TIME);
+ //删除当前首选项中有账户时间
+ }
+ editor.commit();
+ //提交更新后的数据
+
+ // clean up local gtask related info
+ new Thread(new Runnable() {
+ public void run() {
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.GTASK_ID, "");
+ values.put(NoteColumns.SYNC_ID, 0);
+ getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
+ }
+ }).start();
+ //重置当地同步任务的信息
+ }
+
+ /*
+ * 函数功能：获取同步账户名称
+ * 函数实现：通过共享的首选项里的信息直接获取
+ */
+ public static String getSyncAccountName(Context context) {
+ SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
+ Context.MODE_PRIVATE);
+ return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
+ }
+
+ /*
+ * 函数功能：设置最终同步的时间
+ */
+ public static void setLastSyncTime(Context context, long time) {
+ SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
+ Context.MODE_PRIVATE);
+ SharedPreferences.Editor editor = settings.edit();
+ // 从共享首选项中找到相关账户并获取其编辑器
+ editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
+ editor.commit();
+ //编辑最终同步时间并提交更新
+ }
+ /*
+ * 函数功能：获取最终同步时间
+ * 函数实现：通过共享的首选项里的信息直接获取
+ */
+ public static long getLastSyncTime(Context context) {
+ SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
+ Context.MODE_PRIVATE);
+ return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
+ }
+
+ /*
+ * 函数功能：接受同步信息
+ * 函数实现：继承BroadcastReceiver
+ */
+ private class GTaskReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ refreshUI();
+ if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
+ //获取随广播而来的Intent中的同步服务的数据
+ TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
+ syncStatus.setText(intent
+ .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
+ //通过获取的数据在设置系统的状态
+ }
+
+ }
+ }
+
+ /*
+ * 函数功能：处理菜单的选项
+ * 参数:MenuItem菜单选项
+ */
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ //根据选项的id选择，这里只有一个主页
+ case android.R.id.home:
+ Intent intent = new Intent(this, NotesListActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ startActivity(intent);
+ return true;
+ //在主页情况下在创建连接组件intent，发出清空的信号并开始一个相应的activity
+ default:
+ return false;
+ }
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
new file mode 100644
index 0000000..9d0ee58
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
@@ -0,0 +1,134 @@
+/*
+ * 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.widget;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.tool.ResourceParser;
+import net.micode.notes.ui.NoteEditActivity;
+import net.micode.notes.ui.NotesListActivity;
+
+//提供注释小插件
+public abstract class NoteWidgetProvider extends AppWidgetProvider {
+ public static final String [] PROJECTION = new String [] {
+ NoteColumns.ID,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.SNIPPET
+ };
+
+ public static final int COLUMN_ID = 0;
+ public static final int COLUMN_BG_COLOR_ID = 1;
+ public static final int COLUMN_SNIPPET = 2;
+
+ private static final String TAG = "NoteWidgetProvider";
+
+ @Override
+ //删除信息
+ public void onDeleted(Context context, int[] appWidgetIds) {
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+ for (int i = 0; i < appWidgetIds.length; i++) {
+ context.getContentResolver().update(Notes.CONTENT_NOTE_URI,
+ values,
+ NoteColumns.WIDGET_ID + "=?",
+ new String[] { String.valueOf(appWidgetIds[i])});
+ }
+ }
+ //调用插件信息
+ private Cursor getNoteWidgetInfo(Context context, int widgetId) {
+ return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
+ PROJECTION,
+ NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?",
+ new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) },
+ null);
+ }
+ //更新信息
+ protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ update(context, appWidgetManager, appWidgetIds, false);
+ }
+
+ private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
+ boolean privacyMode) {
+ for (int i = 0; i < appWidgetIds.length; i++) {
+ if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) {
+ int bgId = ResourceParser.getDefaultBgId(context);
+ String snippet = "";
+ Intent intent = new Intent(context, NoteEditActivity.class);
+ intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]);
+ intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType());
+
+ Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]);
+ if (c != null && c.moveToFirst()) {
+ if (c.getCount() > 1) {
+ Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]);
+ c.close();
+ return;
+ }
+ snippet = c.getString(COLUMN_SNIPPET);
+ bgId = c.getInt(COLUMN_BG_COLOR_ID);
+ intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID));
+ intent.setAction(Intent.ACTION_VIEW);
+ } else {
+ snippet = context.getResources().getString(R.string.widget_havenot_content);
+ intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ }
+
+ if (c != null) {
+ c.close();
+ }
+
+ RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId());
+ rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId));
+ intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId);
+ /**
+ * Generate the pending intent to start host for the widget
+ */
+ PendingIntent pendingIntent = null;
+ if (privacyMode) {
+ rv.setTextViewText(R.id.widget_text,
+ context.getString(R.string.widget_under_visit_mode));
+ pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent(
+ context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+ } else {
+ rv.setTextViewText(R.id.widget_text, snippet);
+ pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent,
+ PendingIntent.FLAG_UPDATE_CURRENT);
+ }
+
+ rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
+ appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
+ }
+ }
+ }
+
+ protected abstract int getBgResourceId(int bgId);
+
+ protected abstract int getLayoutId();
+
+ protected abstract int getWidgetType();
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
new file mode 100644
index 0000000..722e8fc
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
@@ -0,0 +1,49 @@
+/*
+ * 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.widget;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.tool.ResourceParser;
+
+
+//2倍大小的插件
+public class NoteWidgetProvider_2x extends NoteWidgetProvider {
+ @Override
+ //重写更新方法
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ super.update(context, appWidgetManager, appWidgetIds);
+ }
+ //重写刷新Id方法
+ @Override
+ protected int getLayoutId() {
+ return R.layout.widget_2x;
+ }
+
+ @Override
+ protected int getBgResourceId(int bgId) {
+ return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
+ }
+ //重写插件方法
+ @Override
+ protected int getWidgetType() {
+ return Notes.TYPE_WIDGET_2X;
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
new file mode 100644
index 0000000..de4fe2c
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -0,0 +1,47 @@
+/*
+ * 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.widget;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.tool.ResourceParser;
+
+//4倍大小的插件
+public class NoteWidgetProvider_4x extends NoteWidgetProvider {
+ //重写更新方法
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ super.update(context, appWidgetManager, appWidgetIds);
+ }
+
+ protected int getLayoutId() {
+ return R.layout.widget_4x;
+ }
+
+ @Override
+ protected int getBgResourceId(int bgId) {
+ return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
+ }
+
+ @Override
+ protected int getWidgetType() {
+ return Notes.TYPE_WIDGET_4X;
+ }
+}
diff --git a/src/Notes-master3/app/src/main/res/color/primary_text_dark.xml b/src/Notes-master3/Notes-master3/app/src/main/res/color/primary_text_dark.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/color/primary_text_dark.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/color/primary_text_dark.xml
diff --git a/src/Notes-master3/app/src/main/res/color/secondary_text_dark.xml b/src/Notes-master3/Notes-master3/app/src/main/res/color/secondary_text_dark.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/color/secondary_text_dark.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/color/secondary_text_dark.xml
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/cauc.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/cauc.png
new file mode 100644
index 0000000..c521cd4
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/cauc.png differ
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/clock.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/clock.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/clock.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/clock.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/delete.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/delete.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/delete.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/delete.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/grassland.jpg b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/grassland.jpg
new file mode 100644
index 0000000..7eb2c50
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/grassland.jpg differ
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/ikun.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/ikun.png
new file mode 100644
index 0000000..316b7ef
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/ikun.png differ
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/notification.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/notification.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/notification.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/notification.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/selected.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/selected.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/selected.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/selected.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/src/Notes-master3/app/src/main/res/drawable/new_note.xml b/src/Notes-master3/Notes-master3/app/src/main/res/drawable/new_note.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable/new_note.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable/new_note.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/account_dialog_title.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/account_dialog_title.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/account_dialog_title.xml
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/layout/activity_login.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..0a3d4b8
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/res/layout/add_account_text.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/add_account_text.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/add_account_text.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/add_account_text.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/datetime_picker.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/datetime_picker.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/datetime_picker.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/datetime_picker.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/folder_list_item.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/folder_list_item.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/folder_list_item.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/folder_list_item.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_edit.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_edit.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_item.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_item.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_item.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_item.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_list.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list.xml
similarity index 95%
rename from src/Notes-master3/app/src/main/res/layout/note_list.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list.xml
index 6b25d38..82f4bb5 100644
--- a/src/Notes-master3/app/src/main/res/layout/note_list.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list.xml
@@ -18,8 +18,9 @@
+ android:layout_height="fill_parent">
+
+
浏览网页
打开地图
+
+
+
+ Background: grassland
新建文件夹
导出文本
同步
diff --git a/src/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml
diff --git a/src/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/src/Notes-master3/app/src/main/res/values/arrays.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/arrays.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values/arrays.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/arrays.xml
diff --git a/src/Notes-master3/app/src/main/res/values/colors.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/colors.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values/colors.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/colors.xml
diff --git a/src/Notes-master3/app/src/main/res/values/dimens.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/dimens.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values/dimens.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/dimens.xml
diff --git a/src/Notes-master3/app/src/main/res/values/strings.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/strings.xml
similarity index 89%
rename from src/Notes-master3/app/src/main/res/values/strings.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/strings.xml
index 55df868..fb4c936 100644
--- a/src/Notes-master3/app/src/main/res/values/strings.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
-->
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
Notes
Notes 2x2
Notes 4x4
@@ -39,6 +39,12 @@
/MIUI/notes/
notes_%s.txt
+
+
+ Background: grassland
+ Background: cauc
+
+
(%d)
New Folder
Export text
@@ -125,9 +131,16 @@
Text in your notes
Notes
set
- cancel
+ cancel
+ 账户
+ 密码
+ 登录
+ 取消
+ 正在登陆.....
+ 无效账号
+ app_already_quit
- %1$s result for \"%2$s \"%1$s result for \"%2$s \"%1$s results for \"%2$s \"
diff --git a/src/Notes-master3/app/src/main/res/values/styles.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/styles.xml
similarity index 97%
rename from src/Notes-master3/app/src/main/res/values/styles.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/styles.xml
index d750e65..ad0d90d 100644
--- a/src/Notes-master3/app/src/main/res/values/styles.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/values/styles.xml
@@ -64,6 +64,6 @@
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/res/xml/preferences.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/preferences.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/preferences.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/preferences.xml
diff --git a/src/Notes-master3/app/src/main/res/xml/searchable.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/searchable.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/searchable.xml
diff --git a/src/Notes-master3/app/src/main/res/xml/widget_2x_info.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_2x_info.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/widget_2x_info.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_2x_info.xml
diff --git a/src/Notes-master3/app/src/main/res/xml/widget_4x_info.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_4x_info.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/widget_4x_info.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_4x_info.xml
diff --git a/src/Notes-master3/Notes-master3/build.gradle b/src/Notes-master3/Notes-master3/build.gradle
new file mode 100644
index 0000000..201f8ad
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/build.gradle
@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ google()
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:7.4.1'
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ jcenter()
+ }
+}
diff --git a/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.jar b/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e708b1c
Binary files /dev/null and b/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.properties b/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..d8f2192
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 27 22:35:50 CST 2023
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/src/Notes-master3/Notes-master3/gradlew b/src/Notes-master3/Notes-master3/gradlew
new file mode 100644
index 0000000..4f906e0
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+# https://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.
+#
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=`expr $i + 1`
+ done
+ case $i in
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/src/Notes-master3/Notes-master3/gradlew.bat b/src/Notes-master3/Notes-master3/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/Notes-master3/import-summary.txt b/src/Notes-master3/Notes-master3/import-summary.txt
similarity index 100%
rename from src/Notes-master3/import-summary.txt
rename to src/Notes-master3/Notes-master3/import-summary.txt
diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/Notes-master3/local.properties
similarity index 91%
rename from src/Notes-master3/local.properties
rename to src/Notes-master3/Notes-master3/local.properties
index 52eeac6..250aa63 100644
--- a/src/Notes-master3/local.properties
+++ b/src/Notes-master3/Notes-master3/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Fri Apr 21 16:03:21 CST 2023
+#Mon Jun 05 21:53:07 CST 2023
sdk.dir=C\:\\Users\\13293\\AppData\\Local\\Android\\Sdk
diff --git a/src/Notes-master3/settings.gradle b/src/Notes-master3/Notes-master3/settings.gradle
similarity index 100%
rename from src/Notes-master3/settings.gradle
rename to src/Notes-master3/Notes-master3/settings.gradle
diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk
deleted file mode 100644
index bf2a834..0000000
Binary files a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
deleted file mode 100644
index a54964f..0000000
Binary files a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
deleted file mode 100644
index edea4cd..0000000
Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
deleted file mode 100644
index 3f0e0c6..0000000
Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
deleted file mode 100644
index db7e089..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ /dev/null
@@ -1,96 +0,0 @@
-#Fri Apr 21 16:04:15 CST 2023
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
deleted file mode 100644
index 6997e5d..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- - -%s
- - --%s
- - --%s
- - --%s
-
- - Messaging
- - Email
- #335b5b5b 33sp 26sp 20sp 17sp 14sp Notes Notes 2x2 Notes 4x4 No associated note found, click to create associated note. Privacy mode，can not see note content ... Add note Delete reminder successfully Set reminder Expired yyyyMMdd MMMd kk:mm Got it Take a look Call Send email Browse web Open map /MIUI/notes/ notes_%s.txt (%d) New Folder Export text Sync Cancel syncing Settings Search Delete Move to folder %d selected Nothing selected, the operation is invalid Select all Deselect all Font size Small Medium Large Super Enter check list Leave check list View folder Delete folder Change folder name The folder %1$s exist, please rename Share Send to home Remind me Delete reminder Select folder Parent folder Note added to home Confirm to delete folder and its notes? Delete selected notes Confirm to delete the selected %d notes? Confirm to delete this note? Have moved selected %1$d notes to %2$s folder SD card busy, not available now Export failed, please check SD card The note is not exist Sorry, can not set clock on empty note Sorry, can not send and empty note to home Export successful Export fail Export text file (%1$s) to SD (%2$s) directory Syncing notes... Sync is successful Sync is failed Sync is canceled Sync is successful with account %1$s Sync failed, please check network and account settings Sync failed, internal error occurs Sync is canceled Logging into %1$s... Getting remote note list... Synchronize local notes with Google Task... Settings Sync account Sync notes with google task Last sync time %1$s yyyy-MM-dd hh:mm:ss Add account Change sync account Remove sync account Cancel Sync immediately Cancel syncing Current account %1$s All sync related information will be deleted, which may result in duplicated items sometime Sync notes Please select a google account. Local notes will be synced with google task. Cannot change the account because sync is in progress %1$s has been set as the sync account New note background color random Delete Call notes Input name Searching Notes Search notes Text in your notes Notes set cancel
- %1$s result for \"%2$s \"%1$s results for \"%2$s \"
- - 短信
- - 邮件
- 便签 便签2x2 便签4x4 没有关联内容，点击新建便签。 访客模式下，便签内容不可见 ... 新建便签 成功删除提醒 创建提醒 已过期 yyyyMMdd MM月dd日 kk:mm 知道了 查看 呼叫电话 发送邮件 浏览网页 打开地图 新建文件夹 导出文本 同步 取消同步 设置 搜索 删除 移动到文件夹 选中了 %d 项 没有选中项，操作无效 全选 取消全选 文字大小 小 正常 大 超大 进入清单模式 退出清单模式 查看文件夹 刪除文件夹 修改文件夹名称 文件夹 %1$s 已存在，请重新命名 分享 发送到桌面 提醒我 删除提醒 选择文件夹 上一级文件夹 已添加到桌面 删除 确认要删除所选的 %d 条便签吗? 确认要删除该条便签吗? 确认删除文件夹及所包含的便签吗？ 已将所选 %1$d 条便签移到 %2$s 文件夹 SD卡被占用，不能操作 导出文本时发生错误，请检查SD卡 要查看的便签不存在 不能为空便签设置闹钟提醒 不能将空便签发送到桌面 导出成功 导出失败 已将文本文件(%1$s)输出至SD卡(%2$s)目录 同步便签... 同步成功 同步失败 同步已取消 与%1$s同步成功 同步失败，请检查网络和帐号设置 同步失败，发生内部错误 同步已取消 登录%1$s... 正在获取服务器便签列表... 正在同步本地便签... 设置 同步账号 与google task同步便签记录 上次同步于 %1$s 添加账号 更换账号 删除账号 取消 立即同步 取消同步 当前帐号 %1$s 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 同步便签 请选择google帐号，便签将与该帐号的google task内容同步。 正在同步中，不能修改同步帐号 同步帐号已设置为%1$s 新建便签背景颜色随机 删除 通话便签 请输入名称 正在搜索便签 搜索便签 便签中的文字 便签 设置 取消
- %1$s 条符合“%2$s ”的搜索结果
- - 短信
- - 郵件
- 便簽 便簽2x2 便簽4x4 沒有關聯內容，點擊新建便簽。 訪客模式下，便籤內容不可見 ... 新建便簽 成功刪除提醒 創建提醒 已過期 yyyyMMdd MM月dd日 kk:mm 知道了 查看 呼叫電話 發送郵件 浏覽網頁 打開地圖 已將所選 %1$d 便籤移到 %2$s 文件夾 新建文件夾 導出文本 同步 取消同步 設置 搜尋 刪除 移動到文件夾 選中了 %d 項 沒有選中項，操作無效 全選 取消全選 文字大小 小 正常 大 超大 進入清單模式 退出清單模式 查看文件夾 刪除文件夾 修改文件夾名稱 文件夾 %1$s 已存在，請重新命名 分享 發送到桌面 提醒我 刪除提醒 選擇文件夾 上一級文件夾 已添加到桌面 刪除 确认要刪除所選的 %d 條便籤嗎? 确认要删除該條便籤嗎? 確認刪除檔夾及所包含的便簽嗎？ SD卡被佔用，不能操作 導出TXT時發生錯誤，請檢查SD卡 要查看的便籤不存在 不能爲空便籤設置鬧鐘提醒 不能將空便籤發送到桌面 導出成功 導出失敗 已將文本文件(%1$s)導出至SD(%2$s)目錄 同步便簽... 同步成功 同步失敗 同步已取消 與%1$s同步成功 同步失敗，請檢查網絡和帳號設置 同步失敗，發生內部錯誤 同步已取消 登陸%1$s... 正在獲取服務器便籤列表... 正在同步本地便籤... 設置 同步賬號 与google task同步便簽記錄 上次同步于 %1$s 添加賬號 更換賬號 刪除賬號 取消 立即同步 取消同步 當前帳號 %1$s 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 同步便簽 請選擇google帳號，便簽將與該帳號的google task內容同步。 正在同步中，不能修改同步帳號 同步帳號已設置為%1$s 新建便籤背景顏色隨機 刪除 通話便籤 請輸入名稱 正在搜索便籤 搜索便籤 便籤中的文字 便籤 設置 取消
- %1$s 條符合”%2$s “的搜尋結果
-21
-22 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-23 android:minSdkVersion="14"
-23-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
-24 android:targetSdkVersion="33" />
-24-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-25
-26 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
-37 android:debuggable="true"
-38 android:icon="@drawable/icon_app"
-38-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
-39 android:label="@string/app_name"
-39-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
-40 android:testOnly="true" >
-41 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
-42 android:name="net.micode.notes.ui.NotesListActivity"
-42-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
-43 android:configChanges="keyboardHidden|orientation|screenSize"
-43-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
-44 android:exported="true"
-44-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
-45 android:launchMode="singleTop"
-45-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
-46 android:theme="@style/NoteTheme"
-46-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
-47 android:uiOptions="splitActionBarWhenNarrow"
-47-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
-48 android:windowSoftInputMode="adjustPan" >
-48-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
-49
-49-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
-50
-54
-55 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
-56 android:name="net.micode.notes.ui.NoteEditActivity"
-56-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
-57 android:configChanges="keyboardHidden|orientation|screenSize"
-57-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
-58 android:exported="true"
-58-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
-59 android:launchMode="singleTop"
-59-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
-60 android:theme="@style/NoteTheme" >
-60-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
-61
-61-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
-61-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
-62
-69
-69-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
-70
-77
-77-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
-78
-82
-83 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
-84 android:name="android.app.searchable"
-84-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
-85 android:resource="@xml/searchable" />
-85-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
-86
-87
-88 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
-89 android:name="net.micode.notes.data.NotesProvider"
-89-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
-90 android:authorities="micode_notes"
-90-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
-91 android:exported="false"
-91-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
-92 android:multiprocess="true" />
-92-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
-93
-94 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
-95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-95-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
-96 android:exported="true"
-96-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
-97 android:label="@string/app_widget2x2" >
-97-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
-98
-98-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-99
-103
-104 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-105 android:name="android.appwidget.provider"
-105-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-106 android:resource="@xml/widget_2x_info" />
-106-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-107
-108 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
-109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-109-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
-110 android:exported="true"
-110-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
-111 android:label="@string/app_widget4x4" >
-111-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
-112
-112-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-113
-117
-118 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-119 android:name="android.appwidget.provider"
-119-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-120 android:resource="@xml/widget_4x_info" />
-120-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-121
-122 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
-123 android:name="net.micode.notes.ui.AlarmInitReceiver"
-123-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
-124 android:exported="true" >
-124-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
-125
-125-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
-126
-128
-129 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
-130 android:name="net.micode.notes.ui.AlarmReceiver"
-130-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
-131 android:process=":remote" >
-131-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
-132
-133
-134 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
-135 android:name="net.micode.notes.ui.AlarmAlertActivity"
-135-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
-136 android:label="@string/app_name"
-136-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
-137 android:launchMode="singleInstance"
-137-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
-138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-138-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
-139
-140 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
-141 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-141-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
-142 android:label="@string/preferences_title"
-142-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
-143 android:launchMode="singleTop"
-143-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
-144 android:theme="@android:style/Theme.Holo.Light" >
-144-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
-145
-146
-147 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
-148 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-148-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
-149 android:exported="false" >
-149-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
-150
-151
-152 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
-153 android:name="android.app.default_searchable"
-153-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
-154 android:value=".ui.NoteEditActivity" />
-154-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
-155
-156
-157
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
deleted file mode 100644
index 1b78211..0000000
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
- "logs": [
- {
- "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
- "from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- }
- ]
- },
- {
- "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
- "from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "758,1073",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1065,1191"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endColumns": "56",
- "endOffsets": "782"
- },
- "to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
- },
- "to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
- "from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
- },
- "to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "783,836,890,944,730",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "830,884,938,991,777"
- },
- "to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
- }
- }
- ]
- },
- {
- "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
- "from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
deleted file mode 100644
index 9ddb59b..0000000
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "logs": [
- {
- "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
- "map": [
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
- "from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
deleted file mode 100644
index 5b1347a..0000000
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "logs": [
- {
- "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
- "map": [
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
- "from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "758,1073",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1065,1191"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endColumns": "56",
- "endOffsets": "782"
- },
- "to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
- },
- "to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
- "from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
- },
- "to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
- }
- },
- {
- "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "783,836,890,944,730",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "830,884,938,991,777"
- },
- "to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
- }
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
deleted file mode 100644
index 80170f5..0000000
Binary files a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
deleted file mode 100644
index 0d3d400..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
deleted file mode 100644
index 4146280..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
deleted file mode 100644
index 2e6cd58..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
deleted file mode 100644
index 00d6e91..0000000
--- a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-int array format_for_exported_note 0x7f010000
-int array menu_share_ways 0x7f010001
-int color primary_text_dark 0x7f020000
-int color secondary_text_dark 0x7f020001
-int color user_query_highlight 0x7f020002
-int dimen text_font_size_large 0x7f030000
-int dimen text_font_size_medium 0x7f030001
-int dimen text_font_size_normal 0x7f030002
-int dimen text_font_size_small 0x7f030003
-int dimen text_font_size_super 0x7f030004
-int drawable bg_btn_set_color 0x7f040000
-int drawable bg_color_btn_mask 0x7f040001
-int drawable call_record 0x7f040002
-int drawable clock 0x7f040003
-int drawable delete 0x7f040004
-int drawable dropdown_icon 0x7f040005
-int drawable edit_blue 0x7f040006
-int drawable edit_green 0x7f040007
-int drawable edit_red 0x7f040008
-int drawable edit_title_blue 0x7f040009
-int drawable edit_title_green 0x7f04000a
-int drawable edit_title_red 0x7f04000b
-int drawable edit_title_white 0x7f04000c
-int drawable edit_title_yellow 0x7f04000d
-int drawable edit_white 0x7f04000e
-int drawable edit_yellow 0x7f04000f
-int drawable font_large 0x7f040010
-int drawable font_normal 0x7f040011
-int drawable font_size_selector_bg 0x7f040012
-int drawable font_small 0x7f040013
-int drawable font_super 0x7f040014
-int drawable icon_app 0x7f040015
-int drawable list_background 0x7f040016
-int drawable list_blue_down 0x7f040017
-int drawable list_blue_middle 0x7f040018
-int drawable list_blue_single 0x7f040019
-int drawable list_blue_up 0x7f04001a
-int drawable list_folder 0x7f04001b
-int drawable list_footer_bg 0x7f04001c
-int drawable list_green_down 0x7f04001d
-int drawable list_green_middle 0x7f04001e
-int drawable list_green_single 0x7f04001f
-int drawable list_green_up 0x7f040020
-int drawable list_red_down 0x7f040021
-int drawable list_red_middle 0x7f040022
-int drawable list_red_single 0x7f040023
-int drawable list_red_up 0x7f040024
-int drawable list_white_down 0x7f040025
-int drawable list_white_middle 0x7f040026
-int drawable list_white_single 0x7f040027
-int drawable list_white_up 0x7f040028
-int drawable list_yellow_down 0x7f040029
-int drawable list_yellow_middle 0x7f04002a
-int drawable list_yellow_single 0x7f04002b
-int drawable list_yellow_up 0x7f04002c
-int drawable menu_delete 0x7f04002d
-int drawable menu_move 0x7f04002e
-int drawable new_note 0x7f04002f
-int drawable new_note_normal 0x7f040030
-int drawable new_note_pressed 0x7f040031
-int drawable note_edit_color_selector_panel 0x7f040032
-int drawable notification 0x7f040033
-int drawable search_result 0x7f040034
-int drawable selected 0x7f040035
-int drawable title_alert 0x7f040036
-int drawable title_bar_bg 0x7f040037
-int drawable widget_2x_blue 0x7f040038
-int drawable widget_2x_green 0x7f040039
-int drawable widget_2x_red 0x7f04003a
-int drawable widget_2x_white 0x7f04003b
-int drawable widget_2x_yellow 0x7f04003c
-int drawable widget_4x_blue 0x7f04003d
-int drawable widget_4x_green 0x7f04003e
-int drawable widget_4x_red 0x7f04003f
-int drawable widget_4x_white 0x7f040040
-int drawable widget_4x_yellow 0x7f040041
-int id account_dialog_subtitle 0x7f050000
-int id account_dialog_title 0x7f050001
-int id action_select_all 0x7f050002
-int id amPm 0x7f050003
-int id btn_new_note 0x7f050004
-int id btn_set_bg_color 0x7f050005
-int id cb_edit_item 0x7f050006
-int id date 0x7f050007
-int id delete 0x7f050008
-int id et_edit_text 0x7f050009
-int id et_foler_name 0x7f05000a
-int id font_size_selector 0x7f05000b
-int id hour 0x7f05000c
-int id iv_alert_icon 0x7f05000d
-int id iv_bg_blue 0x7f05000e
-int id iv_bg_blue_select 0x7f05000f
-int id iv_bg_green 0x7f050010
-int id iv_bg_green_select 0x7f050011
-int id iv_bg_red 0x7f050012
-int id iv_bg_red_select 0x7f050013
-int id iv_bg_white 0x7f050014
-int id iv_bg_white_select 0x7f050015
-int id iv_bg_yellow 0x7f050016
-int id iv_bg_yellow_select 0x7f050017
-int id iv_large_select 0x7f050018
-int id iv_medium_select 0x7f050019
-int id iv_small_select 0x7f05001a
-int id iv_super_select 0x7f05001b
-int id ll_font_large 0x7f05001c
-int id ll_font_normal 0x7f05001d
-int id ll_font_small 0x7f05001e
-int id ll_font_super 0x7f05001f
-int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_list_mode 0x7f050025
-int id menu_new_folder 0x7f050026
-int id menu_new_note 0x7f050027
-int id menu_search 0x7f050028
-int id menu_send_to_desktop 0x7f050029
-int id menu_setting 0x7f05002a
-int id menu_share 0x7f05002b
-int id menu_sync 0x7f05002c
-int id minute 0x7f05002d
-int id move 0x7f05002e
-int id navigation_bar 0x7f05002f
-int id note_bg_color_selector 0x7f050030
-int id note_edit_list 0x7f050031
-int id note_edit_view 0x7f050032
-int id note_item 0x7f050033
-int id note_title 0x7f050034
-int id notes_list 0x7f050035
-int id prefenerece_sync_status_textview 0x7f050036
-int id preference_sync_button 0x7f050037
-int id selection_menu 0x7f050038
-int id sv_note_edit 0x7f050039
-int id tv_alert_date 0x7f05003a
-int id tv_folder_name 0x7f05003b
-int id tv_modified_date 0x7f05003c
-int id tv_name 0x7f05003d
-int id tv_time 0x7f05003e
-int id tv_title 0x7f05003f
-int id tv_title_bar 0x7f050040
-int id widget_bg_image 0x7f050041
-int id widget_text 0x7f050042
-int layout account_dialog_title 0x7f060000
-int layout add_account_text 0x7f060001
-int layout datetime_picker 0x7f060002
-int layout dialog_edit_text 0x7f060003
-int layout folder_list_item 0x7f060004
-int layout note_edit 0x7f060005
-int layout note_edit_list_item 0x7f060006
-int layout note_item 0x7f060007
-int layout note_list 0x7f060008
-int layout note_list_dropdown_menu 0x7f060009
-int layout note_list_footer 0x7f06000a
-int layout settings_header 0x7f06000b
-int layout widget_2x 0x7f06000c
-int layout widget_4x 0x7f06000d
-int menu call_note_edit 0x7f070000
-int menu call_record_folder 0x7f070001
-int menu note_edit 0x7f070002
-int menu note_list 0x7f070003
-int menu note_list_dropdown 0x7f070004
-int menu note_list_options 0x7f070005
-int menu sub_folder 0x7f070006
-int plurals search_results_title 0x7f080000
-int raw introduction 0x7f090000
-int string alert_message_delete_folder 0x7f0a0000
-int string alert_message_delete_note 0x7f0a0001
-int string alert_message_delete_notes 0x7f0a0002
-int string alert_title_delete 0x7f0a0003
-int string app_name 0x7f0a0004
-int string app_widget2x2 0x7f0a0005
-int string app_widget4x4 0x7f0a0006
-int string button_delete 0x7f0a0007
-int string call_record_folder_name 0x7f0a0008
-int string datetime_dialog_cancel 0x7f0a0009
-int string datetime_dialog_ok 0x7f0a000a
-int string delete_remind_time_message 0x7f0a000b
-int string error_note_empty_for_clock 0x7f0a000c
-int string error_note_empty_for_send_to_desktop 0x7f0a000d
-int string error_note_not_exist 0x7f0a000e
-int string error_sdcard_export 0x7f0a000f
-int string error_sdcard_unmounted 0x7f0a0010
-int string error_sync_cancelled 0x7f0a0011
-int string error_sync_internal 0x7f0a0012
-int string error_sync_network 0x7f0a0013
-int string failed_sdcard_export 0x7f0a0014
-int string file_name_txt_format 0x7f0a0015
-int string file_path 0x7f0a0016
-int string folder_exist 0x7f0a0017
-int string format_date_ymd 0x7f0a0018
-int string format_datetime_mdhm 0x7f0a0019
-int string format_exported_file_location 0x7f0a001a
-int string format_folder_files_count 0x7f0a001b
-int string format_move_notes_to_folder 0x7f0a001c
-int string hint_foler_name 0x7f0a001d
-int string info_note_enter_desktop 0x7f0a001e
-int string menu_alert 0x7f0a001f
-int string menu_create_folder 0x7f0a0020
-int string menu_delete 0x7f0a0021
-int string menu_deselect_all 0x7f0a0022
-int string menu_export_text 0x7f0a0023
-int string menu_folder_change_name 0x7f0a0024
-int string menu_folder_delete 0x7f0a0025
-int string menu_folder_view 0x7f0a0026
-int string menu_font_large 0x7f0a0027
-int string menu_font_normal 0x7f0a0028
-int string menu_font_size 0x7f0a0029
-int string menu_font_small 0x7f0a002a
-int string menu_font_super 0x7f0a002b
-int string menu_list_mode 0x7f0a002c
-int string menu_move 0x7f0a002d
-int string menu_move_parent_folder 0x7f0a002e
-int string menu_normal_mode 0x7f0a002f
-int string menu_remove_remind 0x7f0a0030
-int string menu_search 0x7f0a0031
-int string menu_select_all 0x7f0a0032
-int string menu_select_none 0x7f0a0033
-int string menu_select_title 0x7f0a0034
-int string menu_send_to_desktop 0x7f0a0035
-int string menu_setting 0x7f0a0036
-int string menu_share 0x7f0a0037
-int string menu_sync 0x7f0a0038
-int string menu_sync_cancel 0x7f0a0039
-int string menu_title_select_folder 0x7f0a003a
-int string note_alert_expired 0x7f0a003b
-int string note_link_email 0x7f0a003c
-int string note_link_other 0x7f0a003d
-int string note_link_tel 0x7f0a003e
-int string note_link_web 0x7f0a003f
-int string notealert_enter 0x7f0a0040
-int string notealert_ok 0x7f0a0041
-int string notelist_menu_new 0x7f0a0042
-int string notelist_string_info 0x7f0a0043
-int string preferences_account_summary 0x7f0a0044
-int string preferences_account_title 0x7f0a0045
-int string preferences_add_account 0x7f0a0046
-int string preferences_bg_random_appear_title 0x7f0a0047
-int string preferences_button_sync_cancel 0x7f0a0048
-int string preferences_button_sync_immediately 0x7f0a0049
-int string preferences_dialog_change_account_title 0x7f0a004a
-int string preferences_dialog_change_account_warn_msg 0x7f0a004b
-int string preferences_dialog_select_account_tips 0x7f0a004c
-int string preferences_dialog_select_account_title 0x7f0a004d
-int string preferences_last_sync_time 0x7f0a004e
-int string preferences_last_sync_time_format 0x7f0a004f
-int string preferences_menu_cancel 0x7f0a0050
-int string preferences_menu_change_account 0x7f0a0051
-int string preferences_menu_remove_account 0x7f0a0052
-int string preferences_title 0x7f0a0053
-int string preferences_toast_cannot_change_account 0x7f0a0054
-int string preferences_toast_success_set_accout 0x7f0a0055
-int string search 0x7f0a0056
-int string search_hint 0x7f0a0057
-int string search_label 0x7f0a0058
-int string search_setting_description 0x7f0a0059
-int string set_remind_time_message 0x7f0a005a
-int string success_sdcard_export 0x7f0a005b
-int string success_sync_account 0x7f0a005c
-int string sync_progress_init_list 0x7f0a005d
-int string sync_progress_login 0x7f0a005e
-int string sync_progress_syncing 0x7f0a005f
-int string ticker_cancel 0x7f0a0060
-int string ticker_fail 0x7f0a0061
-int string ticker_success 0x7f0a0062
-int string ticker_syncing 0x7f0a0063
-int string widget_havenot_content 0x7f0a0064
-int string widget_under_visit_mode 0x7f0a0065
-int style HighlightTextAppearancePrimary 0x7f0b0000
-int style HighlightTextAppearanceSecondary 0x7f0b0001
-int style NoteActionBarStyle 0x7f0b0002
-int style NoteTheme 0x7f0b0003
-int style TextAppearanceLarge 0x7f0b0004
-int style TextAppearanceMedium 0x7f0b0005
-int style TextAppearanceNormal 0x7f0b0006
-int style TextAppearancePrimaryItem 0x7f0b0007
-int style TextAppearanceSecondaryItem 0x7f0b0008
-int style TextAppearanceSuper 0x7f0b0009
-int style TextAppearanceUnderMenuIcon 0x7f0b000a
-int xml preferences 0x7f0c0000
-int xml searchable 0x7f0c0001
-int xml widget_2x_info 0x7f0c0002
-int xml widget_4x_info 0x7f0c0003
diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
deleted file mode 100644
index 10df681..0000000
--- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\debug\res
-net.micode.notes.app-main-7 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\res
diff --git a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
deleted file mode 100644
index 4461006..0000000
--- a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:xml/preferences = 0x7f0c0000
-net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
-net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
-net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:string/ticker_success = 0x7f0a0062
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
-net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
-net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:string/search_label = 0x7f0a0058
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
-net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
-net.micode.notes:string/success_sdcard_export = 0x7f0a005b
-net.micode.notes:string/notelist_string_info = 0x7f0a0043
-net.micode.notes:string/notelist_menu_new = 0x7f0a0042
-net.micode.notes:string/notealert_ok = 0x7f0a0041
-net.micode.notes:string/notealert_enter = 0x7f0a0040
-net.micode.notes:string/note_link_web = 0x7f0a003f
-net.micode.notes:string/note_link_tel = 0x7f0a003e
-net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/note_link_email = 0x7f0a003c
-net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_sync = 0x7f0a0038
-net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_select_title = 0x7f0a0034
-net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:string/menu_select_none = 0x7f0a0033
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
-net.micode.notes:string/menu_select_all = 0x7f0a0032
-net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:string/menu_move = 0x7f0a002d
-net.micode.notes:string/menu_list_mode = 0x7f0a002c
-net.micode.notes:string/menu_font_super = 0x7f0a002b
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:string/file_path = 0x7f0a0016
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:drawable/list_green_up = 0x7f040020
-net.micode.notes:string/call_record_folder_name = 0x7f0a0008
-net.micode.notes:drawable/new_note_normal = 0x7f040030
-net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
-net.micode.notes:raw/introduction = 0x7f090000
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
-net.micode.notes:dimen/text_font_size_super = 0x7f030004
-net.micode.notes:drawable/selected = 0x7f040035
-net.micode.notes:plurals/search_results_title = 0x7f080000
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:menu/note_edit = 0x7f070002
-net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:drawable/new_note_pressed = 0x7f040031
-net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:layout/settings_header = 0x7f06000b
-net.micode.notes:layout/note_list = 0x7f060008
-net.micode.notes:drawable/list_white_single = 0x7f040027
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:xml/widget_2x_info = 0x7f0c0002
-net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:layout/datetime_picker = 0x7f060002
-net.micode.notes:id/btn_new_note = 0x7f050004
-net.micode.notes:layout/note_list_footer = 0x7f06000a
-net.micode.notes:id/widget_text = 0x7f050042
-net.micode.notes:id/tv_title_bar = 0x7f050040
-net.micode.notes:drawable/widget_2x_blue = 0x7f040038
-net.micode.notes:id/tv_time = 0x7f05003e
-net.micode.notes:id/tv_name = 0x7f05003d
-net.micode.notes:drawable/new_note = 0x7f04002f
-net.micode.notes:id/sv_note_edit = 0x7f050039
-net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:id/notes_list = 0x7f050035
-net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
-net.micode.notes:drawable/title_alert = 0x7f040036
-net.micode.notes:id/note_title = 0x7f050034
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:string/app_widget4x4 = 0x7f0a0006
-net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:id/minute = 0x7f05002d
-net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:id/menu_sync = 0x7f05002c
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:id/menu_share = 0x7f05002b
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:id/menu_search = 0x7f050028
-net.micode.notes:drawable/list_green_down = 0x7f04001d
-net.micode.notes:id/menu_new_note = 0x7f050027
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
-net.micode.notes:id/menu_new_folder = 0x7f050026
-net.micode.notes:id/menu_list_mode = 0x7f050025
-net.micode.notes:id/iv_medium_select = 0x7f050019
-net.micode.notes:id/menu_export_text = 0x7f050023
-net.micode.notes:string/menu_folder_view = 0x7f0a0026
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/ticker_fail = 0x7f0a0061
-net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:drawable/edit_blue = 0x7f040006
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
-net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_alert = 0x7f0a001f
-net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
-net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
-net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:id/ll_font_normal = 0x7f05001d
-net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:drawable/search_result = 0x7f040034
-net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:id/iv_bg_white_select = 0x7f050015
-net.micode.notes:id/tv_alert_date = 0x7f05003a
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:drawable/notification = 0x7f040033
-net.micode.notes:id/iv_bg_red = 0x7f050012
-net.micode.notes:string/menu_font_large = 0x7f0a0027
-net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
-net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/widget_bg_image = 0x7f050041
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:drawable/menu_move = 0x7f04002e
-net.micode.notes:drawable/widget_4x_white = 0x7f040040
-net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:id/et_foler_name = 0x7f05000a
-net.micode.notes:drawable/edit_green = 0x7f040007
-net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:string/search = 0x7f0a0056
-net.micode.notes:id/cb_edit_item = 0x7f050006
-net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/iv_bg_green = 0x7f050010
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:drawable/widget_4x_green = 0x7f04003e
-net.micode.notes:style/NoteTheme = 0x7f0b0003
-net.micode.notes:id/hour = 0x7f05000c
-net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:id/delete = 0x7f050008
-net.micode.notes:drawable/widget_2x_green = 0x7f040039
-net.micode.notes:drawable/title_bar_bg = 0x7f040037
-net.micode.notes:drawable/menu_delete = 0x7f04002d
-net.micode.notes:string/error_sync_internal = 0x7f0a0012
-net.micode.notes:drawable/list_green_single = 0x7f04001f
-net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
-net.micode.notes:id/tv_modified_date = 0x7f05003c
-net.micode.notes:drawable/list_blue_middle = 0x7f040018
-net.micode.notes:id/iv_small_select = 0x7f05001a
-net.micode.notes:menu/note_list_options = 0x7f070005
-net.micode.notes:xml/searchable = 0x7f0c0001
-net.micode.notes:string/menu_folder_delete = 0x7f0a0025
-net.micode.notes:drawable/dropdown_icon = 0x7f040005
-net.micode.notes:id/date = 0x7f050007
-net.micode.notes:drawable/list_yellow_single = 0x7f04002b
-net.micode.notes:drawable/list_red_up = 0x7f040024
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
-net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
-net.micode.notes:id/tv_folder_name = 0x7f05003b
-net.micode.notes:drawable/list_yellow_down = 0x7f040029
-net.micode.notes:string/format_folder_files_count = 0x7f0a001b
-net.micode.notes:drawable/clock = 0x7f040003
-net.micode.notes:drawable/list_white_up = 0x7f040028
-net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:id/iv_alert_icon = 0x7f05000d
-net.micode.notes:layout/dialog_edit_text = 0x7f060003
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
-net.micode.notes:drawable/edit_white = 0x7f04000e
-net.micode.notes:drawable/list_white_middle = 0x7f040026
-net.micode.notes:color/user_query_highlight = 0x7f020002
-net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
-net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:drawable/list_footer_bg = 0x7f04001c
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
-net.micode.notes:drawable/edit_title_green = 0x7f04000a
-net.micode.notes:drawable/icon_app = 0x7f040015
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
-net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:drawable/widget_4x_red = 0x7f04003f
-net.micode.notes:id/menu_delete_remind = 0x7f050022
-net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:drawable/list_red_middle = 0x7f040022
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
-net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
-net.micode.notes:drawable/list_blue_down = 0x7f040017
-net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
-net.micode.notes:drawable/font_small = 0x7f040013
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
-net.micode.notes:array/menu_share_ways = 0x7f010001
-net.micode.notes:drawable/widget_2x_white = 0x7f04003b
-net.micode.notes:layout/folder_list_item = 0x7f060004
-net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/tv_title = 0x7f05003f
-net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
-net.micode.notes:drawable/list_blue_up = 0x7f04001a
-net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:drawable/list_blue_single = 0x7f040019
-net.micode.notes:drawable/font_large = 0x7f040010
-net.micode.notes:drawable/delete = 0x7f040004
-net.micode.notes:drawable/edit_yellow = 0x7f04000f
-net.micode.notes:id/note_item = 0x7f050033
-net.micode.notes:drawable/edit_title_white = 0x7f04000c
-net.micode.notes:id/note_edit_list = 0x7f050031
-net.micode.notes:drawable/edit_title_red = 0x7f04000b
-net.micode.notes:string/menu_delete = 0x7f0a0021
-net.micode.notes:drawable/list_folder = 0x7f04001b
-net.micode.notes:drawable/call_record = 0x7f040002
-net.micode.notes:string/search_hint = 0x7f0a0057
-net.micode.notes:id/menu_font_size = 0x7f050024
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:dimen/text_font_size_small = 0x7f030003
-net.micode.notes:dimen/text_font_size_normal = 0x7f030002
-net.micode.notes:drawable/list_green_middle = 0x7f04001e
-net.micode.notes:drawable/list_background = 0x7f040016
-net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:string/menu_setting = 0x7f0a0036
-net.micode.notes:dimen/text_font_size_medium = 0x7f030001
-net.micode.notes:layout/note_edit_list_item = 0x7f060006
-net.micode.notes:layout/account_dialog_title = 0x7f060000
-net.micode.notes:array/format_for_exported_note = 0x7f010000
diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
deleted file mode 100644
index 61b2c40..0000000
Binary files a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk and /dev/null differ
diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
deleted file mode 100644
index ec1c77e..0000000
--- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ /dev/null
@@ -1,255 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
- package
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- android:versionName
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- xmlns:tools
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
- xmlns:android
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
- android:versionCode
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
- android:targetSdkVersion
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- tools:ignore
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
- android:minSdkVersion
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
- INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
-uses-permission#android.permission.INTERNET
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
-application
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
- android:label
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
- android:icon
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
- android:launchMode
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
- android:windowSoftInputMode
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
- android:exported
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
- android:uiOptions
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
- android:configChanges
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
- android:theme
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
-action#android.intent.action.MAIN
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
-category#android.intent.category.LAUNCHER
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
- android:launchMode
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
- android:exported
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
- android:configChanges
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
- android:theme
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
- android:scheme
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
- tools:ignore
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47
-action#android.intent.action.VIEW
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
-category#android.intent.category.DEFAULT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-data
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
- android:mimeType
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
-action#android.intent.action.SEARCH
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
-meta-data#android.app.searchable
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
- android:resource
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
- android:authorities
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
- android:multiprocess
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
- android:exported
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
- android:label
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
- android:exported
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
-intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-meta-data#android.appwidget.provider
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
- android:resource
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
- android:label
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
- android:exported
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
- android:exported
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
- android:process
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
- android:label
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
- android:launchMode
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
- tools:ignore
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42
- android:theme
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
- android:label
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
- android:launchMode
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
- android:theme
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
- android:exported
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
-meta-data#android.app.default_searchable
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
- android:value
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
- android:name
- ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
deleted file mode 100644
index abd81ee..0000000
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and /dev/null differ
diff --git a/src/Notes-master3/build.gradle b/src/Notes-master3/build.gradle
index 201f8ad..495c503 100644
--- a/src/Notes-master3/build.gradle
+++ b/src/Notes-master3/build.gradle
@@ -1,17 +1 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- google()
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:7.4.1'
- }
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- }
-}
diff --git a/src/Notes-master3/gradle/wrapper/gradle-wrapper.jar b/src/Notes-master3/gradle/wrapper/gradle-wrapper.jar
index e708b1c..41d9927 100644
Binary files a/src/Notes-master3/gradle/wrapper/gradle-wrapper.jar and b/src/Notes-master3/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/Notes-master3/gradle/wrapper/gradle-wrapper.properties b/src/Notes-master3/gradle/wrapper/gradle-wrapper.properties
index d8f2192..41dfb87 100644
--- a/src/Notes-master3/gradle/wrapper/gradle-wrapper.properties
+++ b/src/Notes-master3/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Mar 27 22:35:50 CST 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/src/Notes-master3/gradlew b/src/Notes-master3/gradlew
index 4f906e0..1b6c787 100644
--- a/src/Notes-master3/gradlew
+++ b/src/Notes-master3/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=`expr $i + 1`
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/src/create.txt b/src/create.txt
index 56a6051..9d60796 100644
--- a/src/create.txt
+++ b/src/create.txt
@@ -1 +1 @@
-1
\ No newline at end of file
+11
\ No newline at end of file