diff --git a/doc/第1组 小米便签开源代码泛读报告.docx b/doc/第1组 小米便签开源代码泛读报告.docx
deleted file mode 100644
index 452824c..0000000
Binary files a/doc/第1组 小米便签开源代码泛读报告.docx and /dev/null differ
diff --git a/doc/第1组 小米便签开源代码质量分析报告.docx b/doc/第1组 小米便签开源代码质量分析报告.docx
deleted file mode 100644
index bfa7c2a..0000000
Binary files a/doc/第1组 小米便签开源代码质量分析报告.docx and /dev/null differ
diff --git a/doc/第1组 小米便签需求维护与设计文档.docx b/doc/第1组 小米便签需求维护与设计文档.docx
deleted file mode 100644
index 4c61d91..0000000
Binary files a/doc/第1组 小米便签需求维护与设计文档.docx and /dev/null differ
diff --git a/other/第1组 小米便签阅读与维护实践总结报告.pptx b/other/第1组 小米便签阅读与维护实践总结报告.pptx
deleted file mode 100644
index da66302..0000000
Binary files a/other/第1组 小米便签阅读与维护实践总结报告.pptx and /dev/null differ
diff --git a/src/开发项目源代码/.gitignore.txt b/src/开发项目源代码/.gitignore.txt
deleted file mode 100644
index f7415cf..0000000
--- a/src/开发项目源代码/.gitignore.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
\ No newline at end of file
diff --git a/src/开发项目源代码/README.md b/src/开发项目源代码/README.md
deleted file mode 100644
index 9688d5d..0000000
--- a/src/开发项目源代码/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# NewNotes(Android App)
-
-Secondary development based on Mi Note
-
-## Two new software functions
-
-### 1. Added the secure folder function
-
-enter in secure folder through inputing the password (password is hard coding: 123456)
-
-### 2. Optimized the time when the note was modified
-
-for example:
-
-Before modification: **3 days ago**
-
-After modification: **Jun 5, 1:09 AM**
-
----
-
-PS: This project is just a try to develop Android App. Thanks for the help of [手把手教你用Android Studio写一个APP](https://www.bilibili.com/video/BV1MK411p7dp/?spm_id_from=333.337.search-card.all.click&vd_source=037f4f8da80b07954c2b7f1dd39cb5fb) and [实战演练-做一个简单的记事本App](https://www.bilibili.com/video/BV1C54y137Dh/?spm_id_from=333.337.search-card.all.click&vd_source=037f4f8da80b07954c2b7f1dd39cb5fb)
diff --git a/src/开发项目源代码/app/build.gradle b/src/开发项目源代码/app/build.gradle
deleted file mode 100644
index 454656c..0000000
--- a/src/开发项目源代码/app/build.gradle
+++ /dev/null
@@ -1,71 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion 30
- buildToolsVersion "30.0.3"
- useLibrary 'org.apache.http.legacy'
- defaultConfig {
- applicationId "net.micode.notes"
- minSdkVersion 21
- targetSdkVersion 30
-
- signingConfigs {
- config {
- keyAlias 'key0'
- keyPassword '123456'
- storeFile file('../test.jks')
- storePassword '123456'
- }
- }
- }
-
- buildTypes {
- release {
- signingConfig signingConfigs.config
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
- }
- debug {
- signingConfig signingConfigs.config
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
- }
- }
- sourceSets {
- main {
- assets {
- srcDirs 'src\\main\\assets'
- }
- resources {
- srcDirs 'src\\main\\resources'
- }
- }
- }
-}
-
-
-repositories {
- flatDir {
- dirs 'libs'
- }
-}
-
-dependencies {
- implementation project(path: ':core')
- compile fileTree(dir: 'libs', include: ['*.jar'])
- implementation(name: 'ocrsdk', ext: 'aar')
- implementation 'com.android.support:appcompat-v7:30.0.0'
- implementation 'com.android.support.constraint:constraint-layout:2.0.4'
- implementation 'androidx.recyclerview:recyclerview:1.2.1'
-
-
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'com.google.android.material:material:1.2.1'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- implementation project(path: ':ocr_ui')
- testImplementation 'junit:junit:4.+'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-
-
-}
diff --git a/src/开发项目源代码/app/libs/ocrsdk.aar b/src/开发项目源代码/app/libs/ocrsdk.aar
deleted file mode 100644
index ccefae9..0000000
Binary files a/src/开发项目源代码/app/libs/ocrsdk.aar and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/AndroidManifest.xml b/src/开发项目源代码/app/src/main/AndroidManifest.xml
deleted file mode 100644
index b8b4766..0000000
--- a/src/开发项目源代码/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/assets/aip-ocr.license b/src/开发项目源代码/app/src/main/assets/aip-ocr.license
deleted file mode 100644
index 5122a65..0000000
Binary files a/src/开发项目源代码/app/src/main/assets/aip-ocr.license and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/data/Contact.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/data/Contact.java
deleted file mode 100644
index d97ac5d..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/data/Contact.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Data;
-import android.telephony.PhoneNumberUtils;
-import android.util.Log;
-
-import java.util.HashMap;
-
-public class Contact {
- private static HashMap sContactCache;
- private static final String TAG = "Contact";
-
- private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
- + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
- + " AND " + Data.RAW_CONTACT_ID + " IN "
- + "(SELECT raw_contact_id "
- + " FROM phone_lookup"
- + " WHERE min_match = '+')";
-
- public static String getContact(Context context, String phoneNumber) {
- if(sContactCache == null) {
- sContactCache = new HashMap();
- }
-
- if(sContactCache.containsKey(phoneNumber)) {
- return sContactCache.get(phoneNumber);
- }
-
- String selection = CALLER_ID_SELECTION.replace("+",
- PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
- Cursor cursor = context.getContentResolver().query(
- Data.CONTENT_URI,
- new String [] { Phone.DISPLAY_NAME },
- selection,
- new String[] { phoneNumber },
- null);
-
- if (cursor != null && cursor.moveToFirst()) {
- try {
- String name = cursor.getString(0);
- sContactCache.put(phoneNumber, name);
- return name;
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, " Cursor get string error " + e.toString());
- return null;
- } finally {
- cursor.close();
- }
- } else {
- Log.d(TAG, "No contact matched with number:" + phoneNumber);
- return null;
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/data/Notes.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/data/Notes.java
deleted file mode 100644
index f240604..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/data/Notes.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * 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;
-
- /**
- * Following IDs are system folders' identifiers
- * {@link Notes#ID_ROOT_FOLDER } is default folder
- * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
- * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
- */
- public static final int ID_ROOT_FOLDER = 0;
- 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 to query all notes and folders
- */
- public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
-
- /**
- * Uri to query data
- */
- public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
-
- public interface NoteColumns {
- /**
- * The unique ID for a row
- *
Type: INTEGER (long)
- */
- public static final String ID = "_id";
-
- /**
- * The parent's id for note or folder
- *
Type: INTEGER (long)
- */
- public static final String PARENT_ID = "parent_id";
-
- /**
- * Created data for note or folder
- *
Type: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * Latest modified date
- *
Type: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
-
- /**
- * Alert date
- *
Type: INTEGER (long)
- */
- public static final String ALERTED_DATE = "alert_date";
-
- /**
- * Folder's name or text content of note
- *
Type: TEXT
- */
- public static final String SNIPPET = "snippet";
-
- /**
- * Note's widget id
- *
Type: INTEGER (long)
- */
- public static final String WIDGET_ID = "widget_id";
-
- /**
- * Note's widget type
- *
Type: INTEGER (long)
- */
- public static final String WIDGET_TYPE = "widget_type";
-
- /**
- * Note's background color's id
- *
Type: INTEGER (long)
- */
- public static final String BG_COLOR_ID = "bg_color_id";
-
- /**
- * For text note, it doesn't has attachment, for multi-media
- * note, it has at least one attachment
- *
Type: INTEGER
- */
- public static final String HAS_ATTACHMENT = "has_attachment";
-
- /**
- * Folder's count of notes
- *
Type: INTEGER (long)
- */
- public static final String NOTES_COUNT = "notes_count";
-
- /**
- * The file type: folder or note
- *
Type: INTEGER
- */
- public static final String TYPE = "type";
-
- /**
- * The last sync id
- *
Type: INTEGER (long)
- */
- public static final String SYNC_ID = "sync_id";
-
- /**
- * Sign to indicate local modified or not
- *
Type: INTEGER
- */
- public static final String LOCAL_MODIFIED = "local_modified";
-
- /**
- * Original parent id before moving into temporary folder
- *
Type : INTEGER
- */
- public static final String ORIGIN_PARENT_ID = "origin_parent_id";
-
- /**
- * The 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 {
- /**
- * The unique ID for a row
- *
Type: INTEGER (long)
- */
- public static final String ID = "_id";
-
- /**
- * The MIME type of the item represented by this row.
- *
Type: Text
- */
- public static final String MIME_TYPE = "mime_type";
-
- /**
- * The reference id to note that this data belongs to
- *
Type: INTEGER (long)
- */
- public static final String NOTE_ID = "note_id";
-
- /**
- * Created data for note or folder
- *
Type: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * Latest modified date
- *
Type: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
- /**
- * Data's content
- *
Type: TEXT
- */
- public static final String CONTENT = "content";
-
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- *
Type: INTEGER
- */
- public static final String DATA1 = "data1";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- *
Type: INTEGER
- */
- public static final String DATA2 = "data2";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- *
Type: TEXT
- */
- public static final String DATA3 = "data3";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- *
Type: TEXT
- */
- public static final String DATA4 = "data4";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- *
Type: TEXT
- */
- public static final String DATA5 = "data5";
- }
-
- public static final class TextNote implements DataColumns {
- /**
- * Mode to indicate the text in check list mode or not
- *
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 {
- /**
- * Call date for this record
- *
Type: INTEGER (long)
- */
- public static final String CALL_DATE = DATA1;
-
- /**
- * Phone number for this record
- *
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/开发项目源代码/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
deleted file mode 100644
index ffe5d57..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.content.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 {
- private static final String DB_NAME = "note.db";
-
- private static final int DB_VERSION = 4;
-
- public interface TABLE {
- public static final String NOTE = "note";
-
- public static final String DATA = "data";
- }
-
- private static final String TAG = "NotesDatabaseHelper";
-
- private static NotesDatabaseHelper mInstance;
-
- private static final String CREATE_NOTE_TABLE_SQL =
- "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 =
- "CREATE TABLE " + TABLE.DATA + "(" +
- DataColumns.ID + " INTEGER PRIMARY KEY," +
- DataColumns.MIME_TYPE + " TEXT NOT NULL," +
- DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA1 + " INTEGER," +
- DataColumns.DATA2 + " INTEGER," +
- DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
- ")";
-
- private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
- "CREATE INDEX IF NOT EXISTS note_id_index ON " +
- TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
-
- /**
- * Increase folder's note count when move note to the folder
- */
- private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
- "CREATE TRIGGER increase_folder_count_on_update "+
- " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
- " BEGIN " +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
- " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
- " END";
-
- /**
- * Decrease folder's note count when move note from folder
- */
- 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";
-
- /**
- * Increase folder's note count when insert new note to the folder
- */
- 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";
-
- /**
- * Decrease folder's note count when delete note from the folder
- */
- 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";
-
- /**
- * Update note's content when insert data with type {@link DataConstants#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";
-
- /**
- * Update note's content when data with {@link DataConstants#NOTE} type has changed
- */
- 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";
-
- /**
- * Update note's content when data with {@link DataConstants#NOTE} type has deleted
- */
- 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";
-
- /**
- * Delete datas belong to note which has been deleted
- */
- 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";
-
- /**
- * Delete notes belong to folder which has been deleted
- */
- 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";
-
- /**
- * Move notes belong to folder which has been moved to trash folder
- */
- 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();
-
- /**
- * call record foler for call notes
- */
- values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
- * root folder which is default folder
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
- * temporary folder which is used for moving note
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
- * create trash folder
- */
- 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) {
- db.execSQL(CREATE_DATA_TABLE_SQL);
- reCreateDataTableTriggers(db);
- db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
- Log.d(TAG, "data table has been created");
- }
-
- private void reCreateDataTableTriggers(SQLiteDatabase db) {
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
- 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;
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- createNoteTable(db);
- createDataTable(db);
- }
-
- @Override
- 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/开发项目源代码/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/data/NotesProvider.java
deleted file mode 100644
index edb0a60..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * 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.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;
-
-
-public class NotesProvider extends ContentProvider {
- 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 {
- mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
- 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.
- */
- private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
- + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
- + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
- + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
- + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
- + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
- + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
-
- private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
- + " FROM " + TABLE.NOTE
- + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
- + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
- + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
-
- @Override
- public boolean onCreate() {
- mHelper = NotesDatabaseHelper.getInstance(getContext());
- return true;
- }
-
- @Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
- String sortOrder) {
- Cursor c = null;
- SQLiteDatabase db = mHelper.getReadableDatabase();
- String id = null;
- switch (mMatcher.match(uri)) {
- 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) {
- 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
- 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;
- 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
- 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);
- }
-
- return ContentUris.withAppendedId(uri, insertedId);
- }
-
- @Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
- 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
- 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 + ')' : "");
- }
-
- 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);
- }
-
- mHelper.getWritableDatabase().execSQL(sql.toString());
- }
-
- @Override
- public String getType(Uri uri) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
deleted file mode 100644
index 3a2050b..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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 {
- private final static String TAG = MetaData.class.getSimpleName();
-
- private String mRelatedGid = null;
-
- public void setMeta(String gid, JSONObject metaInfo) {
- try {
- metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
- } catch (JSONException e) {
- Log.e(TAG, "failed to put related gid");
- }
- setNotes(metaInfo.toString());
- setName(GTaskStringUtils.META_NOTE_NAME);
- }
-
- public String getRelatedGid() {
- return mRelatedGid;
- }
-
- @Override
- public boolean isWorthSaving() {
- return getNotes() != null;
- }
-
- @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;
- }
- }
- }
-
- @Override
- public void setContentByLocalJSON(JSONObject js) {
- // this function should not be called
- throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
- }
-
- @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");
- }
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/Node.java
deleted file mode 100644
index 63950e0..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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 org.json.JSONObject;
-
-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;
- }
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
deleted file mode 100644
index d3ec3be..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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;
-
- public static final String[] PROJECTION_DATA = new String[] {
- DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
- DataColumns.DATA3
- };
-
- 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;
-
- private boolean mIsCreate;
-
- private long mDataId;
-
- private String mDataMimeType;
-
- private String mDataContent;
-
- private long mDataContentData1;
-
- private String mDataContentData3;
-
- private ContentValues mDiffDataValues;
-
- public SqlData(Context context) {
- mContentResolver = context.getContentResolver();
- mIsCreate = true;
- mDataId = INVALID_ID;
- mDataMimeType = DataConstants.NOTE;
- mDataContent = "";
- mDataContentData1 = 0;
- mDataContentData3 = "";
- mDiffDataValues = new ContentValues();
- }
-
- 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 {
- 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 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;
- }
-
- 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;
- }
-
- public long getId() {
- return mDataId;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
deleted file mode 100644
index 79a4095..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * 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;
-
-
-public class SqlNote {
- private static final String TAG = SqlNote.class.getSimpleName();
-
- private static final int INVALID_ID = -99999;
-
- 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
- };
-
- 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;
-
- 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;
-
- 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();
- }
-
- 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();
- }
-
- 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();
-
- }
-
- 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);
- if (c != null) {
- c.moveToNext();
- loadFromCursor(c);
- } else {
- Log.w(TAG, "loadFromCursor: cursor = null");
- }
- } finally {
- if (c != null)
- c.close();
- }
- }
-
- 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);
- }
-
- 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();
- }
- }
-
- 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;
- }
-
- 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.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;
- }
-
- public void setParentId(long id) {
- mParentId = id;
- mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
- }
-
- public void setGtaskId(String gid) {
- mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
- }
-
- public void setSyncId(long syncId) {
- mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
- }
-
- public void resetLocalModified() {
- mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
- }
-
- public long getId() {
- return mId;
- }
-
- public long getParentId() {
- return mParentId;
- }
-
- public String getSnippet() {
- return mSnippet;
- }
-
- public boolean isNoteType() {
- return mType == Notes.TYPE_NOTE;
- }
-
- 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.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/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/Task.java
deleted file mode 100644
index 6a19454..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * 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;
-
- private TaskList mParent;
-
- public Task() {
- super();
- mCompleted = false;
- mNotes = null;
- mPriorSibling = null;
- mParent = null;
- 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
- 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
- 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) {
- 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;
- }
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
deleted file mode 100644
index 4ea21c5..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * 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();
-
- private int mIndex;
-
- private ArrayList mChildren;
-
- public TaskList() {
- super();
- mChildren = new ArrayList();
- mIndex = 1;
- }
-
- 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.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;
- }
-
- 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;
- }
-
- public int getChildTaskCount() {
- return mChildren.size();
- }
-
- 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);
- }
- }
- return ret;
- }
-
- 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;
- }
-
- 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;
- }
-
- 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));
- }
-
- 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;
- }
-
- public int getChildTaskIndex(Task task) {
- return mChildren.indexOf(task);
- }
-
- public Task getChildTaskByIndex(int index) {
- if (index < 0 || index >= mChildren.size()) {
- Log.e(TAG, "getTaskByIndex: invalid index");
- return null;
- }
- return mChildren.get(index);
- }
-
- public Task getChilTaskByGid(String gid) {
- for (Task task : mChildren) {
- 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;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
deleted file mode 100644
index 15504be..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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();
- }
-
- public ActionFailureException(String paramString) {
- super(paramString);
- }
-
- public ActionFailureException(String paramString, Throwable paramThrowable) {
- super(paramString, paramThrowable);
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
deleted file mode 100644
index b08cfb1..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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 NetworkFailureException extends Exception {
- private static final long serialVersionUID = 2107610287180234136L;
-
- public NetworkFailureException() {
- super();
- }
-
- public NetworkFailureException(String paramString) {
- super(paramString);
- }
-
- public NetworkFailureException(String paramString, Throwable paramThrowable) {
- super(paramString, paramThrowable);
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
deleted file mode 100644
index 440a871..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-/*
- * 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;
-
-
-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) {
- publishProgress(new String[] {
- message
- });
- }
-
- private void showNotification(int tickerId, String content) {
- PendingIntent pendingIntent;
- 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.Builder builder = new Notification.Builder(mContext)
- .setAutoCancel(true)
- .setContentTitle(mContext.getString(R.string.app_name))
- .setContentText(content)
- .setContentIntent(pendingIntent)
- .setWhen(System.currentTimeMillis())
- .setOngoing(true);
- Notification notification=builder.getNotification();
- 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) {
- ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
- }
- }
-
- @Override
- protected void onPostExecute(Integer result) {
- 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() {
- mOnCompleteListener.onComplete();
- }
- }).start();
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
deleted file mode 100644
index c67dfdf..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * 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;
-
-
-public class GTaskClient {
- private static final String TAG = GTaskClient.class.getSimpleName();
-
- private static final String GTASK_URL = "https://mail.google.com/tasks/";
-
- 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;
- }
-
- public static synchronized GTaskClient getInstance() {
- if (mInstance == null) {
- mInstance = new GTaskClient();
- }
- return mInstance;
- }
-
- public boolean login(Activity activity) {
- // we suppose that the cookie would expire after 5 minutes
- // then we need to re-login
- 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";
- mPostUrl = url.toString() + "r/ig";
-
- if (tryToLoginGtask(activity, authToken)) {
- mLoggedin = true;
- }
- }
-
- // try to login with google official url
- if (!mLoggedin) {
- mGetUrl = GTASK_GET_URL;
- mPostUrl = GTASK_POST_URL;
- if (!tryToLoginGtask(activity, authToken)) {
- return false;
- }
- }
-
- mLoggedin = true;
- return true;
- }
-
- private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
- String authToken;
- AccountManager accountManager = AccountManager.get(activity);
- Account[] accounts = accountManager.getAccountsByType("com.google");
-
- if (accounts.length == 0) {
- Log.e(TAG, "there is no available google account");
- return null;
- }
-
- String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
- Account account = null;
- 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);
- if (invalidateToken) {
- accountManager.invalidateAuthToken("com.google", authToken);
- loginGoogleAccount(activity, false);
- }
- } catch (Exception e) {
- Log.e(TAG, "get auth token failed");
- authToken = null;
- }
-
- return authToken;
- }
-
- private boolean tryToLoginGtask(Activity activity, String authToken) {
- if (!loginGtask(authToken)) {
- // maybe the auth token is out of date, now let's invalidate the
- // token and try again
- 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;
- }
-
- private boolean loginGtask(String authToken) {
- int timeoutConnection = 10000;
- int timeoutSocket = 15000;
- HttpParams httpParameters = new BasicHttpParams();
- HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
- HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
- mHttpClient = new DefaultHttpClient(httpParameters);
- BasicCookieStore localBasicCookieStore = new BasicCookieStore();
- mHttpClient.setCookieStore(localBasicCookieStore);
- HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
-
- // login gtask
- try {
- String loginUrl = mGetUrl + "?auth=" + authToken;
- HttpGet httpGet = new HttpGet(loginUrl);
- HttpResponse response = null;
- response = mHttpClient.execute(httpGet);
-
- // get the cookie now
- 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
- 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++;
- }
-
- 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;
- }
-
- private String getResponseContent(HttpEntity entity) throws IOException {
- String contentEncoding = null;
- if (entity.getContentEncoding() != null) {
- contentEncoding = entity.getContentEncoding().getValue();
- Log.d(TAG, "encoding: " + contentEncoding);
- }
-
- InputStream input = entity.getContent();
- if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
- input = new GZIPInputStream(entity.getContent());
- } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("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();
- }
- }
-
- private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
- if (!mLoggedin) {
- Log.e(TAG, "please login first");
- throw new ActionFailureException("not logged in");
- }
-
- HttpPost httpPost = createHttpPost();
- try {
- LinkedList list = new LinkedList();
- list.add(new BasicNameValuePair("r", js.toString()));
- UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
- 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");
- }
- }
-
- 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");
- }
- }
-
- 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");
- }
- }
-
- 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");
- }
- }
- }
-
- 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()));
- }
- }
-
- 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
- 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);
- 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");
- }
- }
-
- 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()));
- 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");
- }
- }
-
- 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
- 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);
- 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");
- }
- }
-
- 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);
- 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;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
deleted file mode 100644
index d2b4082..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ /dev/null
@@ -1,800 +0,0 @@
-/*
- * 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;
- mCancelled = false;
- mGTaskListHashMap = new HashMap();
- mGTaskHashMap = new HashMap();
- mMetaHashMap = new HashMap();
- mMetaList = null;
- mLocalDeleteIdMap = new HashSet();
- mGidToNid = new HashMap();
- mNidToGid = new HashMap();
- }
-
- public static synchronized GTaskManager getInstance() {
- if (mInstance == null) {
- mInstance = new GTaskManager();
- }
- return mInstance;
- }
-
- public synchronized void setActivityContext(Activity activity) {
- // used for getting authtoken
- mActivity = activity;
- }
-
- public int sync(Context context, GTaskASyncTask asyncTask) {
- if (mSyncing) {
- Log.d(TAG, "Sync is in progress");
- 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();
- client.resetUpdateArray();
-
- // 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();
-
- // do content sync work
- asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
- syncContent();
- } catch (NetworkFailureException e) {
- Log.e(TAG, e.toString());
- 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;
- }
-
- private void initGTaskList() throws NetworkFailureException {
- if (mCancelled)
- return;
- GTaskClient client = GTaskClient.getInstance();
- try {
- JSONArray jsTaskLists = client.getTaskLists();
-
- // init meta list first
- mMetaList = null;
- for (int i = 0; i < jsTaskLists.length(); i++) {
- JSONObject object = jsTaskLists.getJSONObject(i);
- 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();
- mMetaList.setContentByRemoteJSON(object);
-
- // load meta data
- JSONArray jsMetas = client.getTaskList(gid);
- for (int j = 0; j < jsMetas.length(); j++) {
- object = (JSONObject) jsMetas.getJSONObject(j);
- MetaData metaData = new MetaData();
- metaData.setContentByRemoteJSON(object);
- if (metaData.isWorthSaving()) {
- 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);
- 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();
- 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");
- }
- }
-
- private void syncContent() throws NetworkFailureException {
- int syncType;
- Cursor c = null;
- String gid;
- Node node;
-
- mLocalDeleteIdMap.clear();
-
- 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));
- 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 note in database");
- }
-
- } finally {
- if (c != null) {
- c.close();
- c = null;
- }
- }
-
- // go through remaining items
- Iterator> iter = mGTaskHashMap.entrySet().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
- // 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();
- }
-
- }
-
- 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();
- }
-
- 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");
- }
- }
-
- 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);
- }
-
- 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);
- }
-
- private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
- SqlNote sqlNote = new SqlNote(mContext, c);
- 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);
-
- 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> 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
- mGidToNid.put(n.getGid(), sqlNote.getId());
- mNidToGid.put(sqlNote.getId(), n.getGid());
- }
-
- 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);
-
- // update meta
- updateRemoteMeta(node.getGid(), sqlNote);
-
- // move task if necessary
- if (sqlNote.isNoteType()) {
- Task task = (Task) node;
- TaskList preParentList = task.getParent();
-
- String curParentGid = mNidToGid.get(sqlNote.getParentId());
- if (curParentGid == null) {
- Log.e(TAG, "cannot find task's parent tasklist");
- throw new ActionFailureException("cannot update remote task");
- }
- TaskList curParentList = mGTaskListHashMap.get(curParentGid);
-
- if (preParentList != curParentList) {
- preParentList.removeChildTask(task);
- curParentList.addChildTask(task);
- GTaskClient.getInstance().moveTask(task, preParentList, curParentList);
- }
- }
-
- // clear local modified flag
- sqlNote.resetLocalModified();
- sqlNote.commit(true);
- }
-
- 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);
- }
- }
- }
-
- private void refreshLocalSyncId() throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
- // get the latest 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");
- 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();
- values.put(NoteColumns.SYNC_ID, node.getLastModified());
- mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
- 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;
- }
- }
- }
-
- public String getSyncAccount() {
- return GTaskClient.getInstance().getSyncAccount().name;
- }
-
- public void cancelSync() {
- mCancelled = true;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
deleted file mode 100644
index cca36f7..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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;
-
-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() {
- 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;
- }
- 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.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);
- intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
- sendBroadcast(intent);
- }
-
- public static void startSync(Activity activity) {
- 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) {
- 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;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/model/Note.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/model/Note.java
deleted file mode 100644
index 6706cf6..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/model/Note.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * 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;
- 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);
-
- 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;
- }
- 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);
- }
-
- public long getTextDataId() {
- return mNoteData.mTextDataId;
- }
-
- public void setCallDataId(long id) {
- mNoteData.setCallDataId(id);
- }
-
- public void setCallData(String key, String value) {
- mNoteData.setCallData(key, value);
- }
-
- 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 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();
- }
-
- 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();
- }
-
- 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/开发项目源代码/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/model/WorkingNote.java
deleted file mode 100644
index a1a2455..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * 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
- public 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;
-
- public static final String[] DATA_PROJECTION = new String[] {
- DataColumns.ID,
- DataColumns.CONTENT,
- DataColumns.MIME_TYPE,
- DataColumns.DATA1,
- DataColumns.DATA2,
- DataColumns.DATA3,
- DataColumns.DATA4,
- };
-
- 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
- private 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;
- }
-
- // Existing note construct
- private WorkingNote(Context context, long noteId, long folderId) {
- mContext = context;
- mNoteId = noteId;
- mFolderId = folderId;
- mIsDeleted = false;
- mNote = new Note();
- loadNote();
- }
-
- 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();
- }
-
- 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);
- }
- }
-
- 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);
- }
-
- 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;
- }
- }
-
- public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
- mNoteSettingStatusListener = l;
- }
-
- 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();
- }
- }
-
- public void setBgColorId(int id) {
- if (id != mBgColorId) {
- mBgColorId = id;
- if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onBackgroundColorChanged();
- }
- mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
- }
- }
-
- public void setCheckListMode(int mode) {
- if (mMode != mode) {
- if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
- }
- mMode = mode;
- mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
- }
- }
-
- public void setWidgetType(int type) {
- if (type != mWidgetType) {
- mWidgetType = type;
- mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
- }
- }
-
- public void setWidgetId(int id) {
- if (id != mWidgetId) {
- mWidgetId = id;
- mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
- }
- }
-
- public void setWorkingText(String text) {
- if (!TextUtils.equals(mContent, text)) {
- mContent = text;
- mNote.setTextData(DataColumns.CONTENT, mContent);
- }
- }
-
- 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);
- }
-
- public String getContent() {
- return mContent;
- }
-
- public long getAlertDate() {
- return mAlertDate;
- }
-
- public long getModifiedDate() {
- return mModifiedDate;
- }
-
- public int getBgColorResId() {
- return NoteBgResources.getNoteBgResource(mBgColorId);
- }
-
- public int getBgColorId() {
- return mBgColorId;
- }
-
- public int getTitleBgResId() {
- return NoteBgResources.getNoteTitleBgResource(mBgColorId);
- }
-
- public int getCheckListMode() {
- return mMode;
- }
-
- public long getNoteId() {
- return mNoteId;
- }
-
- public long getFolderId() {
- return mFolderId;
- }
-
- public int getWidgetId() {
- return mWidgetId;
- }
-
- public int getWidgetType() {
- return mWidgetType;
- }
-
- 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/开发项目源代码/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/BackupUtils.java
deleted file mode 100644
index 39f6ec4..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/BackupUtils.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * 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;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.text.format.DateFormat;
-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.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-
-public class BackupUtils {
- private static final String TAG = "BackupUtils";
- // Singleton stuff
- private static BackupUtils sInstance;
-
- public static synchronized BackupUtils getInstance(Context context) {
- if (sInstance == null) {
- sInstance = new BackupUtils(context);
- }
- return sInstance;
- }
-
- /**
- * Following states are signs to represents backup or restore
- * status
- */
- // Currently, the sdcard is not mounted
- public static final int STATE_SD_CARD_UNMOUONTED = 0;
- // The backup file not exist
- public static final int STATE_BACKUP_FILE_NOT_EXIST = 1;
- // The data is not well formated, may be changed by other programs
- public static final int STATE_DATA_DESTROIED = 2;
- // Some run-time exception which causes restore or backup fails
- public static final int STATE_SYSTEM_ERROR = 3;
- // Backup or restore success
- public static final int STATE_SUCCESS = 4;
-
- private TextExport mTextExport;
-
- private BackupUtils(Context context) {
- mTextExport = new TextExport(context);
- }
-
- private static boolean externalStorageAvailable() {
- return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
- }
-
- public int exportToText() {
- return mTextExport.exportToText();
- }
-
- public String getExportedTextFileName() {
- return mTextExport.mFileName;
- }
-
- public String getExportedTextFileDir() {
- return mTextExport.mFileDirectory;
- }
-
- private static class TextExport {
- private static final String[] NOTE_PROJECTION = {
- NoteColumns.ID,
- NoteColumns.MODIFIED_DATE,
- NoteColumns.SNIPPET,
- NoteColumns.TYPE
- };
-
- private static final int NOTE_COLUMN_ID = 0;
-
- private static final int NOTE_COLUMN_MODIFIED_DATE = 1;
-
- private static final int NOTE_COLUMN_SNIPPET = 2;
-
- private static final String[] DATA_PROJECTION = {
- DataColumns.CONTENT,
- DataColumns.MIME_TYPE,
- DataColumns.DATA1,
- DataColumns.DATA2,
- DataColumns.DATA3,
- DataColumns.DATA4,
- };
-
- private static final int DATA_COLUMN_CONTENT = 0;
-
- private static final int DATA_COLUMN_MIME_TYPE = 1;
-
- private static final int DATA_COLUMN_CALL_DATE = 2;
-
- private static final int DATA_COLUMN_PHONE_NUMBER = 4;
-
- private final String [] TEXT_FORMAT;
- private static final int FORMAT_FOLDER_NAME = 0;
- private static final int FORMAT_NOTE_DATE = 1;
- private static final int FORMAT_NOTE_CONTENT = 2;
-
- private Context mContext;
- private String mFileName;
- private String mFileDirectory;
-
- public TextExport(Context context) {
- TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
- mContext = context;
- mFileName = "";
- mFileDirectory = "";
- }
-
- private String getFormat(int id) {
- return TEXT_FORMAT[id];
- }
-
- /**
- * Export the folder identified by folder id to text
- */
- private void exportFolderToText(String folderId, PrintStream ps) {
- // Query notes belong to this folder
- Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] {
- folderId
- }, null);
-
- if (notesCursor != null) {
- if (notesCursor.moveToFirst()) {
- do {
- // Print note's last modified date
- ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
- mContext.getString(R.string.format_datetime_mdhm),
- notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
- // Query data belong to this note
- String noteId = notesCursor.getString(NOTE_COLUMN_ID);
- exportNoteToText(noteId, ps);
- } while (notesCursor.moveToNext());
- }
- notesCursor.close();
- }
- }
-
- /**
- * Export note identified by id to a print stream
- */
- private void exportNoteToText(String noteId, PrintStream ps) {
- Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
- DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
- noteId
- }, null);
-
- if (dataCursor != null) {
- if (dataCursor.moveToFirst()) {
- do {
- String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);
- if (DataConstants.CALL_NOTE.equals(mimeType)) {
- // Print phone number
- String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER);
- long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE);
- String location = dataCursor.getString(DATA_COLUMN_CONTENT);
-
- if (!TextUtils.isEmpty(phoneNumber)) {
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- phoneNumber));
- }
- // Print call date
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat
- .format(mContext.getString(R.string.format_datetime_mdhm),
- callDate)));
- // Print call attachment location
- if (!TextUtils.isEmpty(location)) {
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- location));
- }
- } else if (DataConstants.NOTE.equals(mimeType)) {
- String content = dataCursor.getString(DATA_COLUMN_CONTENT);
- if (!TextUtils.isEmpty(content)) {
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- content));
- }
- }
- } while (dataCursor.moveToNext());
- }
- dataCursor.close();
- }
- // print a line separator between note
- try {
- ps.write(new byte[] {
- Character.LINE_SEPARATOR, Character.LETTER_NUMBER
- });
- } catch (IOException e) {
- Log.e(TAG, e.toString());
- }
- }
-
- /**
- * Note will be exported as text which is user readable
- */
- public int exportToText() {
- if (!externalStorageAvailable()) {
- Log.d(TAG, "Media was not mounted");
- return STATE_SD_CARD_UNMOUONTED;
- }
-
- PrintStream ps = getExportToTextPrintStream();
- if (ps == null) {
- Log.e(TAG, "get print stream error");
- return STATE_SYSTEM_ERROR;
- }
- // First export folder and its notes
- Cursor folderCursor = mContext.getContentResolver().query(
- Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
- "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND "
- + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR "
- + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null);
-
- if (folderCursor != null) {
- if (folderCursor.moveToFirst()) {
- do {
- // Print folder's name
- String folderName = "";
- if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) {
- folderName = mContext.getString(R.string.call_record_folder_name);
- } else {
- folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET);
- }
- if (!TextUtils.isEmpty(folderName)) {
- ps.println(String.format(getFormat(FORMAT_FOLDER_NAME), folderName));
- }
- String folderId = folderCursor.getString(NOTE_COLUMN_ID);
- exportFolderToText(folderId, ps);
- } while (folderCursor.moveToNext());
- }
- folderCursor.close();
- }
-
- // Export notes in root's folder
- Cursor noteCursor = mContext.getContentResolver().query(
- Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
- NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID
- + "=0", null, null);
-
- if (noteCursor != null) {
- if (noteCursor.moveToFirst()) {
- do {
- ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
- mContext.getString(R.string.format_datetime_mdhm),
- noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
- // Query data belong to this note
- String noteId = noteCursor.getString(NOTE_COLUMN_ID);
- exportNoteToText(noteId, ps);
- } while (noteCursor.moveToNext());
- }
- noteCursor.close();
- }
- ps.close();
-
- return STATE_SUCCESS;
- }
-
- /**
- * Get a print stream pointed to the file {@generateExportedTextFile}
- */
- private PrintStream getExportToTextPrintStream() {
- File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
- R.string.file_name_txt_format);
- if (file == null) {
- Log.e(TAG, "create file to exported failed");
- return null;
- }
- mFileName = file.getName();
- mFileDirectory = mContext.getString(R.string.file_path);
- PrintStream ps = null;
- try {
- FileOutputStream fos = new FileOutputStream(file);
- ps = new PrintStream(fos);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
- } catch (NullPointerException e) {
- e.printStackTrace();
- return null;
- }
- return ps;
- }
- }
-
- /**
- * Generate the text file to store imported data
- */
- private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
- StringBuilder sb = new StringBuilder();
- sb.append(Environment.getExternalStorageDirectory());
- sb.append(context.getString(filePathResId));
- File filedir = new File(sb.toString());
- sb.append(context.getString(
- fileNameFormatResId,
- DateFormat.format(context.getString(R.string.format_date_ymd),
- System.currentTimeMillis())));
- File file = new File(sb.toString());
-
- try {
- if (!filedir.exists()) {
- filedir.mkdir();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
- return file;
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
- }
-}
-
-
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/DataUtils.java
deleted file mode 100644
index 2a14982..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * 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;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-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.NoteColumns;
-import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-
-public class DataUtils {
- public static final String TAG = "DataUtils";
- public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) {
- if (ids == null) {
- Log.d(TAG, "the ids is null");
- return true;
- }
- if (ids.size() == 0) {
- Log.d(TAG, "no id is in the hashset");
- return true;
- }
-
- ArrayList operationList = new ArrayList();
- for (long id : ids) {
- if(id == Notes.ID_ROOT_FOLDER) {
- Log.e(TAG, "Don't delete system folder root");
- continue;
- }
- ContentProviderOperation.Builder builder = ContentProviderOperation
- .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
- operationList.add(builder.build());
- }
- 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;
- }
- return true;
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- }
- return false;
- }
-
- public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
- ContentValues values = new ContentValues();
- values.put(NoteColumns.PARENT_ID, desFolderId);
- values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
- values.put(NoteColumns.LOCAL_MODIFIED, 1);
- resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
- }
-
- public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids,
- long folderId) {
- if (ids == null) {
- Log.d(TAG, "the ids is null");
- return true;
- }
-
- ArrayList operationList = new ArrayList();
- for (long id : ids) {
- ContentProviderOperation.Builder builder = ContentProviderOperation
- .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
- builder.withValue(NoteColumns.PARENT_ID, folderId);
- builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
- operationList.add(builder.build());
- }
-
- 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;
- }
- return true;
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- }
- return false;
- }
-
- /**
- * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}}
- */
- public static int getUserFolderCount(ContentResolver resolver) {
- Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI,
- new String[] { "COUNT(*)" },
- NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
- new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
- null);
-
- int count = 0;
- if(cursor != null) {
- if(cursor.moveToFirst()) {
- try {
- count = cursor.getInt(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "get folder count failed:" + e.toString());
- } finally {
- cursor.close();
- }
- }
- }
- return count;
- }
-
- public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
- null,
- NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
- new String [] {String.valueOf(type)},
- null);
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
- null, null, null, null);
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean existInDataDatabase(ContentResolver resolver, long dataId) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId),
- null, null, null, null);
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
- Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
- NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
- " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
- " AND " + NoteColumns.SNIPPET + "=?",
- new String[] { name }, null);
- boolean exist = false;
- if(cursor != null) {
- if(cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) {
- Cursor c = resolver.query(Notes.CONTENT_NOTE_URI,
- new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
- NoteColumns.PARENT_ID + "=?",
- new String[] { String.valueOf(folderId) },
- null);
-
- HashSet set = null;
- if (c != null) {
- if (c.moveToFirst()) {
- set = new HashSet();
- do {
- try {
- AppWidgetAttribute widget = new AppWidgetAttribute();
- widget.widgetId = c.getInt(0);
- widget.widgetType = c.getInt(1);
- set.add(widget);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, e.toString());
- }
- } while (c.moveToNext());
- }
- c.close();
- }
- return set;
- }
-
- public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
- new String [] { CallNote.PHONE_NUMBER },
- CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?",
- new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE },
- null);
-
- if (cursor != null && cursor.moveToFirst()) {
- try {
- return cursor.getString(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Get call number fails " + e.toString());
- } finally {
- cursor.close();
- }
- }
- return "";
- }
-
- public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) {
- Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
- new String [] { CallNote.NOTE_ID },
- CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL("
- + CallNote.PHONE_NUMBER + ",?)",
- new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
- null);
-
- if (cursor != null) {
- if (cursor.moveToFirst()) {
- try {
- return cursor.getLong(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Get call note id fails " + e.toString());
- }
- }
- cursor.close();
- }
- return 0;
- }
-
- public static String getSnippetById(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
- new String [] { NoteColumns.SNIPPET },
- NoteColumns.ID + "=?",
- new String [] { String.valueOf(noteId)},
- null);
-
- if (cursor != null) {
- String snippet = "";
- if (cursor.moveToFirst()) {
- snippet = cursor.getString(0);
- }
- cursor.close();
- return snippet;
- }
- throw new IllegalArgumentException("Note is not found with id: " + noteId);
- }
-
- public static String getFormattedSnippet(String snippet) {
- if (snippet != null) {
- snippet = snippet.trim();
- int index = snippet.indexOf('\n');
- if (index != -1) {
- snippet = snippet.substring(0, index);
- }
- }
- return snippet;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
deleted file mode 100644
index 666b729..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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;
-
-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/开发项目源代码/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/ResourceParser.java
deleted file mode 100644
index 1ad3ad6..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * 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;
-
-import android.content.Context;
-import android.preference.PreferenceManager;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-public class ResourceParser {
-
- public static final int YELLOW = 0;
- public static final int BLUE = 1;
- public static final int WHITE = 2;
- public static final int GREEN = 3;
- public static final int RED = 4;
-
- public static final int BG_DEFAULT_COLOR = YELLOW;
-
- public static final int TEXT_SMALL = 0;
- public static final int TEXT_MEDIUM = 1;
- public static final int TEXT_LARGE = 2;
- public static final int TEXT_SUPER = 3;
-
- public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;
-
- public static class NoteBgResources {
- private final static int [] BG_EDIT_RESOURCES = new int [] {
- R.drawable.edit_yellow,
- R.drawable.edit_blue,
- R.drawable.edit_white,
- R.drawable.edit_green,
- R.drawable.edit_red
- };
-
- private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
- R.drawable.edit_title_yellow,
- R.drawable.edit_title_blue,
- R.drawable.edit_title_white,
- R.drawable.edit_title_green,
- R.drawable.edit_title_red
- };
-
- public static int getNoteBgResource(int id) {
- return BG_EDIT_RESOURCES[id];
- }
-
- public static int getNoteTitleBgResource(int id) {
- return BG_EDIT_TITLE_RESOURCES[id];
- }
- }
-
- public static int getDefaultBgId(Context context) {
- if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
- NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
- return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length);
- } else {
- return BG_DEFAULT_COLOR;
- }
- }
-
- public static class NoteItemBgResources {
- private final static int [] BG_FIRST_RESOURCES = new int [] {
- R.drawable.list_yellow_up,
- R.drawable.list_blue_up,
- R.drawable.list_white_up,
- R.drawable.list_green_up,
- R.drawable.list_red_up
- };
-
- private final static int [] BG_NORMAL_RESOURCES = new int [] {
- R.drawable.list_yellow_middle,
- R.drawable.list_blue_middle,
- R.drawable.list_white_middle,
- R.drawable.list_green_middle,
- R.drawable.list_red_middle
- };
-
- private final static int [] BG_LAST_RESOURCES = new int [] {
- R.drawable.list_yellow_down,
- R.drawable.list_blue_down,
- R.drawable.list_white_down,
- R.drawable.list_green_down,
- R.drawable.list_red_down,
- };
-
- private final static int [] BG_SINGLE_RESOURCES = new int [] {
- R.drawable.list_yellow_single,
- R.drawable.list_blue_single,
- R.drawable.list_white_single,
- R.drawable.list_green_single,
- R.drawable.list_red_single
- };
-
- public static int getNoteBgFirstRes(int id) {
- return BG_FIRST_RESOURCES[id];
- }
-
- public static int getNoteBgLastRes(int id) {
- return BG_LAST_RESOURCES[id];
- }
-
- public static int getNoteBgSingleRes(int id) {
- return BG_SINGLE_RESOURCES[id];
- }
-
- public static int getNoteBgNormalRes(int id) {
- return BG_NORMAL_RESOURCES[id];
- }
-
- public static int getFolderBgRes() {
- return R.drawable.list_folder;
- }
- }
-
- public static class WidgetBgResources {
- private final static int [] BG_2X_RESOURCES = new int [] {
- R.drawable.widget_2x_yellow,
- R.drawable.widget_2x_blue,
- R.drawable.widget_2x_white,
- R.drawable.widget_2x_green,
- R.drawable.widget_2x_red,
- };
-
- public static int getWidget2xBgResource(int id) {
- return BG_2X_RESOURCES[id];
- }
-
- private final static int [] BG_4X_RESOURCES = new int [] {
- R.drawable.widget_4x_yellow,
- R.drawable.widget_4x_blue,
- R.drawable.widget_4x_white,
- R.drawable.widget_4x_green,
- R.drawable.widget_4x_red
- };
-
- public static int getWidget4xBgResource(int id) {
- return BG_4X_RESOURCES[id];
- }
- }
-
- public static class TextAppearanceResources {
- private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
- R.style.TextAppearanceNormal,
- R.style.TextAppearanceMedium,
- R.style.TextAppearanceLarge,
- R.style.TextAppearanceSuper
- };
-
- public static int getTexAppearanceResource(int id) {
- /**
- * HACKME: Fix bug of store the resource id in shared preference.
- * The id may larger than the length of resources, in this case,
- * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
- */
- if (id >= TEXTAPPEARANCE_RESOURCES.length) {
- return BG_DEFAULT_FONT_SIZE;
- }
- return TEXTAPPEARANCE_RESOURCES[id];
- }
-
- public static int getResourcesSize() {
- return TEXTAPPEARANCE_RESOURCES.length;
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/UriHelper.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/UriHelper.java
deleted file mode 100644
index 521716c..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/tool/UriHelper.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package net.micode.notes.tool;
-
-import android.annotation.SuppressLint;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.provider.OpenableColumns;
-import android.text.TextUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class UriHelper {
- /**
- * 根据Uri获取文件绝对路径，解决Android4.4以上版本Uri转换 兼容Android 10
- *
- * @param context
- * @param imageUri
- */
- public static String getFileAbsolutePath(Context context, Uri imageUri) {
- if (context == null || imageUri == null) {
- return null;
- }
-
- //4.4以下的版本
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return getRealFilePath(context, imageUri);
- }
-
- //大于4.4，小于10
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
-// && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
- && DocumentsContract.isDocumentUri(context, imageUri)) {
-
- if (isExternalStorageDocument(imageUri)) {
- String docId = DocumentsContract.getDocumentId(imageUri);
- String[] split = docId.split(":");
- String type = split[0];
- if ("primary".equalsIgnoreCase(type)) {
- return Environment.getExternalStorageDirectory() + "/" + split[1];
- }
- } else if (isDownloadsDocument(imageUri)) {
- String id = DocumentsContract.getDocumentId(imageUri);
- Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
- return getDataColumn(context, contentUri, null, null);
- } else if (isMediaDocument(imageUri)) {
- String docId = DocumentsContract.getDocumentId(imageUri);
- String[] split = docId.split(":");
- String type = split[0];
- Uri contentUri = null;
- if ("image".equals(type)) {
- contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
- } else if ("video".equals(type)) {
- contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
- } else if ("audio".equals(type)) {
- contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
- }
- String selection = MediaStore.Images.Media._ID + "=?";
- String[] selectionArgs = new String[]{split[1]};
- return getDataColumn(context, contentUri, selection, selectionArgs);
- }
- }
-
- // MediaStore (and general) 大于等于10
-// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
-// return uriToFileApiQ(context,imageUri);
-// }
- else if ("content".equalsIgnoreCase(imageUri.getScheme())) {
- // Return the remote address
- if (isGooglePhotosUri(imageUri)) {
- return imageUri.getLastPathSegment();
- }
- if (Build.VERSION.SDK_INT >= 24)
- {
- return getFilePathFromUri(context,imageUri); //content 类型
- }else {
- return getDataColumn(context, imageUri, null, null);
- }
- }
- // File
- else if ("file".equalsIgnoreCase(imageUri.getScheme())) {
- return imageUri.getPath();
- }
- return null;
- }
-
- private static String getRealFilePath(final Context context, final Uri uri) {
- if (null == uri) {
- return null;
- }
- final String scheme = uri.getScheme();
- String data = null;
- if (scheme == null) {
- data = uri.getPath();
- } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
- data = uri.getPath();
- } else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
- String[] projection = {MediaStore.Images.ImageColumns.DATA};
- Cursor cursor = context.getContentResolver().query(uri, projection, null, null, null);
- if (null != cursor) {
- if (cursor.moveToFirst()) {
- int index = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA);
- if (index > -1) {
- data = cursor.getString(index);
- }
- }
- cursor.close();
- }
- }
- return data;
- }
-
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is ExternalStorageProvider.
- */
- private static boolean isExternalStorageDocument(Uri uri) {
- return "com.android.externalstorage.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is DownloadsProvider.
- */
- private static boolean isDownloadsDocument(Uri uri) {
- return "com.android.providers.downloads.documents".equals(uri.getAuthority());
- }
-
- private static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
- Cursor cursor = null;
- String column = MediaStore.Images.Media.DATA;
- String[] projection = {column};
- try {
- cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
- if (cursor != null && cursor.moveToFirst()) {
- int index = cursor.getColumnIndexOrThrow(column);
- return cursor.getString(index);
- }
- } finally {
- if (cursor != null) {
- cursor.close();
- }
- }
- return null;
- }
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is MediaProvider.
- */
- private static boolean isMediaDocument(Uri uri) {
- return "com.android.providers.media.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is Google Photos.
- */
- private static boolean isGooglePhotosUri(Uri uri) {
- return "com.google.android.apps.photos.content".equals(uri.getAuthority());
- }
-
-
- /**
- * Android 10 以上适配 另一种写法
- * @param context
- * @param uri
- * @return
- */
- @SuppressLint("Range")
- private static String getFileFromContentUri(Context context, Uri uri) {
- if (uri == null) {
- return null;
- }
- String filePath;
- String[] filePathColumn = {MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.DISPLAY_NAME};
- ContentResolver contentResolver = context.getContentResolver();
- Cursor cursor = contentResolver.query(uri, filePathColumn, null,
- null, null);
- if (cursor != null) {
- cursor.moveToFirst();
- try {
- filePath = cursor.getString(cursor.getColumnIndex(filePathColumn[0]));
- return filePath;
- } catch (Exception e) {
- } finally {
- cursor.close();
- }
- }
- return "";
- }
-
- /**
- * Android 10 以上适配
- * @param context
- * @param uri
- * @return
- */
- private static String uriToFileApiQ(Context context, Uri uri) {
- File file = null;
- //android10以上转换
- if (uri.getScheme().equals(ContentResolver.SCHEME_FILE)) {
- file = new File(uri.getPath());
- } else if (uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
- //把文件复制到沙盒目录
- ContentResolver contentResolver = context.getContentResolver();
- Cursor cursor = contentResolver.query(uri, null, null, null, null);
- if (cursor.moveToFirst()) {
- @SuppressLint("Range") String displayName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
- try {
- InputStream is = contentResolver.openInputStream(uri);
- File file1 = new File(context.getExternalCacheDir().getAbsolutePath()+"/"+System.currentTimeMillis());
- if (!file1.exists())
- {
- file1.mkdir();
- }
- File cache = new File(file1.getPath(), displayName);
- FileOutputStream fos = new FileOutputStream(cache);
-// FileUtils.copy(is, fos);
- file = cache;
- fos.close();
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return file.getAbsolutePath();
- }
-
- private static String getFilePathFromUri(Context context,Uri uri)
- {
- String realFilePath = getRealFilePath(context,uri); //防止获取不到真实的地址，因此这里需要进行判断
- if (!TextUtils.isEmpty(realFilePath))
- {
- return realFilePath;
- }
- File filesDir = context.getApplicationContext().getFilesDir();
- String fileName = getFileName(uri);
- if (!TextUtils.isEmpty(fileName))
- {
- File copyFile1 = new File(filesDir + File.separator + fileName);
- copyFile(context,uri,copyFile1);
- return copyFile1.getAbsolutePath();
- }
- return null;
- }
- private static String getFileName(Uri uri)
- {
- if (uri == null)
- {
- return null;
- }
- String fileName = null;
- String path = uri.getPath();
- int cut = path.lastIndexOf('/');
- if (cut != -1)
- {
- fileName = path.substring(cut+1);
- }
- return fileName;
- }
- private static void copyFile(Context context, Uri srcUri, File dstFile) {
- try {
- InputStream inputStream = context.getContentResolver().openInputStream(srcUri);
- if (inputStream == null)
- {
- return;
- }
- OutputStream outputStream = new FileOutputStream(dstFile);
- copyStream(inputStream, outputStream);
- inputStream.close();
- outputStream.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- private static int copyStream(InputStream input, OutputStream output){
- final int BUFFER_SIZE = 1024 * 2;
- byte[] buffer = new byte[BUFFER_SIZE];
- BufferedInputStream in = new BufferedInputStream(input, BUFFER_SIZE);
- BufferedOutputStream out = new BufferedOutputStream(output, BUFFER_SIZE);
- int count = 0, n = 0;
- try {
- while ((n = in.read(buffer, 0, BUFFER_SIZE)) != -1) {
- out.write(buffer, 0, n);
- count += n;
- }
- out.flush();
- }
- catch (Exception e)
- {
- }finally {
- try {
- out.close();
- in.close();
- } catch (Exception e) {
- }
- }
- return count;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AddActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AddActivity.java
deleted file mode 100644
index 764e27e..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AddActivity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.EditText;
-
-
-import net.micode.notes.R;
-import net.micode.notes.ui.bean.Note;
-import net.micode.notes.util.ToastUtil;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class AddActivity extends Activity {
-
- private EditText etContent;
-
- private NoteDbOpenHelper mNoteDbOpenHelper;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_add);
-
- etContent = findViewById(R.id.sf_et_1);
-
- mNoteDbOpenHelper = new NoteDbOpenHelper(this);
-
- }
-
- public void add(View view) {
- String content = etContent.getText().toString();
-
- Note note = new Note();
- note.setContent(content);
- note.setCreatedTime(getCurrentTimeFormat());
-
- long row = mNoteDbOpenHelper.insertData(note);
- if(row != -1){
- ToastUtil.toastShort(this,"Add Success");
- this.finish();
- }else{
- ToastUtil.toastShort(this,"Add Fail");
- }
-
-
- }
-
- private String getCurrentTimeFormat() {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM月dd HH:mm:ss");
- Date date = new Date();
- return simpleDateFormat.format(date);
- }
-
-
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
deleted file mode 100644
index 85723be..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.view.Window;
-import android.view.WindowManager;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.DataUtils;
-
-import java.io.IOException;
-
-
-public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
- private long mNoteId;
- private String mSnippet;
- private static final int SNIPPET_PREW_MAX_LEN = 60;
- MediaPlayer mPlayer;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- 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);
- 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;
- }
-
- 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);
-
- int silentModeStreams = Settings.System.getInt(getContentResolver(),
- Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
-
- if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
- mPlayer.setAudioStreamType(silentModeStreams);
- } else {
- mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
- }
- try {
- mPlayer.setDataSource(this, url);
- mPlayer.prepare();
- mPlayer.setLooping(true);
- mPlayer.start();
- } catch (IllegalArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalStateException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- private void showActionDialog() {
- AlertDialog.Builder dialog = new AlertDialog.Builder(this);
- dialog.setTitle(R.string.app_name);
- dialog.setMessage(mSnippet);
- dialog.setPositiveButton(R.string.notealert_ok, this);
- if (isScreenOn()) {
- dialog.setNegativeButton(R.string.notealert_enter, this);
- }
- dialog.show().setOnDismissListener(this);
- }
-
- public void onClick(DialogInterface dialog, int which) {
- switch (which) {
- case DialogInterface.BUTTON_NEGATIVE:
- Intent intent = new Intent(this, NoteEditActivity.class);
- intent.setAction(Intent.ACTION_VIEW);
- intent.putExtra(Intent.EXTRA_UID, mNoteId);
- startActivity(intent);
- break;
- default:
- break;
- }
- }
-
- public void onDismiss(DialogInterface dialog) {
- stopAlarmSound();
- finish();
- }
-
- private void stopAlarmSound() {
- if (mPlayer != null) {
- mPlayer.stop();
- mPlayer.release();
- mPlayer = null;
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
deleted file mode 100644
index f221202..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.ui;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class AlarmInitReceiver extends BroadcastReceiver {
-
- private static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.ALERTED_DATE
- };
-
- 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();
- Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- PROJECTION,
- NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
- new String[] { String.valueOf(currentDate) },
- null);
-
- if (c != null) {
- if (c.moveToFirst()) {
- do {
- long alertDate = c.getLong(COLUMN_ALERTED_DATE);
- Intent sender = new Intent(context, AlarmReceiver.class);
- sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
- PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
- AlarmManager alermManager = (AlarmManager) context
- .getSystemService(Context.ALARM_SERVICE);
- alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
- } while (c.moveToNext());
- }
- c.close();
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
deleted file mode 100644
index 54e503b..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class AlarmReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- intent.setClass(context, AlarmAlertActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(intent);
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
deleted file mode 100644
index 496b0cd..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * 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.text.DateFormatSymbols;
-import java.util.Calendar;
-
-import net.micode.notes.R;
-
-
-import android.content.Context;
-import android.text.format.DateFormat;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.NumberPicker;
-
-public class DateTimePicker extends FrameLayout {
-
- private static final boolean DEFAULT_ENABLE_STATE = true;
-
- private static final int HOURS_IN_HALF_DAY = 12;
- private static final int HOURS_IN_ALL_DAY = 24;
- private static final int DAYS_IN_ALL_WEEK = 7;
- private static final int DATE_SPINNER_MIN_VAL = 0;
- private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1;
- private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0;
- private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23;
- private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1;
- private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12;
- private static final int MINUT_SPINNER_MIN_VAL = 0;
- private static final int MINUT_SPINNER_MAX_VAL = 59;
- private static final int AMPM_SPINNER_MIN_VAL = 0;
- private static final int AMPM_SPINNER_MAX_VAL = 1;
-
- private final NumberPicker mDateSpinner;
- private final NumberPicker mHourSpinner;
- private final NumberPicker mMinuteSpinner;
- private final NumberPicker mAmPmSpinner;
- private Calendar mDate;
-
- private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
-
- private boolean mIsAm;
-
- private boolean mIs24HourView;
-
- private boolean mIsEnabled = DEFAULT_ENABLE_STATE;
-
- private boolean mInitialising;
-
- private OnDateTimeChangedListener mOnDateTimeChangedListener;
-
- private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal);
- updateDateControl();
- onDateTimeChanged();
- }
- };
-
- private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- boolean isDateChanged = false;
- Calendar cal = Calendar.getInstance();
- if (!mIs24HourView) {
- if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, 1);
- isDateChanged = true;
- } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, -1);
- isDateChanged = true;
- }
- if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY ||
- oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
- mIsAm = !mIsAm;
- updateAmPmControl();
- }
- } else {
- if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, 1);
- isDateChanged = true;
- } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, -1);
- isDateChanged = true;
- }
- }
- int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);
- mDate.set(Calendar.HOUR_OF_DAY, newHour);
- onDateTimeChanged();
- if (isDateChanged) {
- setCurrentYear(cal.get(Calendar.YEAR));
- setCurrentMonth(cal.get(Calendar.MONTH));
- setCurrentDay(cal.get(Calendar.DAY_OF_MONTH));
- }
- }
- };
-
- private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- int minValue = mMinuteSpinner.getMinValue();
- int maxValue = mMinuteSpinner.getMaxValue();
- int offset = 0;
- if (oldVal == maxValue && newVal == minValue) {
- offset += 1;
- } else if (oldVal == minValue && newVal == maxValue) {
- offset -= 1;
- }
- if (offset != 0) {
- mDate.add(Calendar.HOUR_OF_DAY, offset);
- mHourSpinner.setValue(getCurrentHour());
- updateDateControl();
- int newHour = getCurrentHourOfDay();
- if (newHour >= HOURS_IN_HALF_DAY) {
- mIsAm = false;
- updateAmPmControl();
- } else {
- mIsAm = true;
- updateAmPmControl();
- }
- }
- mDate.set(Calendar.MINUTE, newVal);
- onDateTimeChanged();
- }
- };
-
- private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- mIsAm = !mIsAm;
- if (mIsAm) {
- mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY);
- } else {
- mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY);
- }
- updateAmPmControl();
- onDateTimeChanged();
- }
- };
-
- public interface OnDateTimeChangedListener {
- void onDateTimeChanged(DateTimePicker view, int year, int month,
- int dayOfMonth, int hourOfDay, int minute);
- }
-
- public DateTimePicker(Context context) {
- this(context, System.currentTimeMillis());
- }
-
- public DateTimePicker(Context context, long date) {
- this(context, date, DateFormat.is24HourFormat(context));
- }
-
- public DateTimePicker(Context context, long date, boolean is24HourView) {
- super(context);
- mDate = Calendar.getInstance();
- mInitialising = true;
- mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
- inflate(context, R.layout.datetime_picker, this);
-
- mDateSpinner = (NumberPicker) findViewById(R.id.date);
- mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
- mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
- mDateSpinner.setOnValueChangedListener(mOnDateChangedListener);
-
- mHourSpinner = (NumberPicker) findViewById(R.id.hour);
- mHourSpinner.setOnValueChangedListener(mOnHourChangedListener);
- mMinuteSpinner = (NumberPicker) findViewById(R.id.minute);
- mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL);
- mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);
- mMinuteSpinner.setOnLongPressUpdateInterval(100);
- mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener);
-
- String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();
- mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);
- mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);
- mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL);
- mAmPmSpinner.setDisplayedValues(stringsForAmPm);
- mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener);
-
- // update controls to initial state
- updateDateControl();
- updateHourControl();
- updateAmPmControl();
-
- set24HourView(is24HourView);
-
- // set to current time
- setCurrentDate(date);
-
- setEnabled(isEnabled());
-
- // set the content descriptions
- mInitialising = false;
- }
-
- @Override
- public void setEnabled(boolean enabled) {
- if (mIsEnabled == enabled) {
- return;
- }
- super.setEnabled(enabled);
- mDateSpinner.setEnabled(enabled);
- mMinuteSpinner.setEnabled(enabled);
- mHourSpinner.setEnabled(enabled);
- mAmPmSpinner.setEnabled(enabled);
- mIsEnabled = enabled;
- }
-
- @Override
- public boolean isEnabled() {
- return mIsEnabled;
- }
-
- /**
- * Get the current date in millis
- *
- * @return the current date in millis
- */
- public long getCurrentDateInTimeMillis() {
- return mDate.getTimeInMillis();
- }
-
- /**
- * Set the current date
- *
- * @param date The current date in millis
- */
- public void setCurrentDate(long date) {
- Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(date);
- setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH),
- cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
- }
-
- /**
- * Set the current date
- *
- * @param year The current year
- * @param month The current month
- * @param dayOfMonth The current dayOfMonth
- * @param hourOfDay The current hourOfDay
- * @param minute The current minute
- */
- public void setCurrentDate(int year, int month,
- int dayOfMonth, int hourOfDay, int minute) {
- setCurrentYear(year);
- setCurrentMonth(month);
- setCurrentDay(dayOfMonth);
- setCurrentHour(hourOfDay);
- setCurrentMinute(minute);
- }
-
- /**
- * Get current year
- *
- * @return The current year
- */
- public int getCurrentYear() {
- return mDate.get(Calendar.YEAR);
- }
-
- /**
- * Set current year
- *
- * @param year The current year
- */
- public void setCurrentYear(int year) {
- if (!mInitialising && year == getCurrentYear()) {
- return;
- }
- mDate.set(Calendar.YEAR, year);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * Get current month in the year
- *
- * @return The current month in the year
- */
- public int getCurrentMonth() {
- return mDate.get(Calendar.MONTH);
- }
-
- /**
- * Set current month in the year
- *
- * @param month The month in the year
- */
- public void setCurrentMonth(int month) {
- if (!mInitialising && month == getCurrentMonth()) {
- return;
- }
- mDate.set(Calendar.MONTH, month);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * Get current day of the month
- *
- * @return The day of the month
- */
- public int getCurrentDay() {
- return mDate.get(Calendar.DAY_OF_MONTH);
- }
-
- /**
- * Set current day of the month
- *
- * @param dayOfMonth The day of the month
- */
- public void setCurrentDay(int dayOfMonth) {
- if (!mInitialising && dayOfMonth == getCurrentDay()) {
- return;
- }
- mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * Get current hour in 24 hour mode, in the range (0~23)
- * @return The current hour in 24 hour mode
- */
- public int getCurrentHourOfDay() {
- return mDate.get(Calendar.HOUR_OF_DAY);
- }
-
- private int getCurrentHour() {
- if (mIs24HourView){
- return getCurrentHourOfDay();
- } else {
- int hour = getCurrentHourOfDay();
- if (hour > HOURS_IN_HALF_DAY) {
- return hour - HOURS_IN_HALF_DAY;
- } else {
- return hour == 0 ? HOURS_IN_HALF_DAY : hour;
- }
- }
- }
-
- /**
- * Set current hour in 24 hour mode, in the range (0~23)
- *
- * @param hourOfDay
- */
- public void setCurrentHour(int hourOfDay) {
- if (!mInitialising && hourOfDay == getCurrentHourOfDay()) {
- return;
- }
- mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
- if (!mIs24HourView) {
- if (hourOfDay >= HOURS_IN_HALF_DAY) {
- mIsAm = false;
- if (hourOfDay > HOURS_IN_HALF_DAY) {
- hourOfDay -= HOURS_IN_HALF_DAY;
- }
- } else {
- mIsAm = true;
- if (hourOfDay == 0) {
- hourOfDay = HOURS_IN_HALF_DAY;
- }
- }
- updateAmPmControl();
- }
- mHourSpinner.setValue(hourOfDay);
- onDateTimeChanged();
- }
-
- /**
- * Get currentMinute
- *
- * @return The Current Minute
- */
- public int getCurrentMinute() {
- return mDate.get(Calendar.MINUTE);
- }
-
- /**
- * Set current minute
- */
- public void setCurrentMinute(int minute) {
- if (!mInitialising && minute == getCurrentMinute()) {
- return;
- }
- mMinuteSpinner.setValue(minute);
- mDate.set(Calendar.MINUTE, minute);
- onDateTimeChanged();
- }
-
- /**
- * @return true if this is in 24 hour view else false.
- */
- public boolean is24HourView () {
- return mIs24HourView;
- }
-
- /**
- * Set whether in 24 hour or AM/PM mode.
- *
- * @param is24HourView True for 24 hour mode. False for AM/PM mode.
- */
- public void set24HourView(boolean is24HourView) {
- if (mIs24HourView == is24HourView) {
- return;
- }
- mIs24HourView = is24HourView;
- mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE);
- int hour = getCurrentHourOfDay();
- updateHourControl();
- setCurrentHour(hour);
- updateAmPmControl();
- }
-
- private void updateDateControl() {
- Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1);
- mDateSpinner.setDisplayedValues(null);
- for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) {
- cal.add(Calendar.DAY_OF_YEAR, 1);
- mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal);
- }
- mDateSpinner.setDisplayedValues(mDateDisplayValues);
- mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2);
- mDateSpinner.invalidate();
- }
-
- private void updateAmPmControl() {
- if (mIs24HourView) {
- mAmPmSpinner.setVisibility(View.GONE);
- } else {
- int index = mIsAm ? Calendar.AM : Calendar.PM;
- mAmPmSpinner.setValue(index);
- mAmPmSpinner.setVisibility(View.VISIBLE);
- }
- }
-
- private void updateHourControl() {
- if (mIs24HourView) {
- mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW);
- mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW);
- } else {
- mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW);
- mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW);
- }
- }
-
- /**
- * Set the callback that indicates the 'Set' button has been pressed.
- * @param callback the callback, if null will do nothing
- */
- public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) {
- mOnDateTimeChangedListener = callback;
- }
-
- private void onDateTimeChanged() {
- if (mOnDateTimeChangedListener != null) {
- mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(),
- getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute());
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
deleted file mode 100644
index 2c47ba4..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.DateTimePicker;
-import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-
-public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
-
- private Calendar mDate = Calendar.getInstance();
- private boolean mIs24HourView;
- private OnDateTimeSetListener mOnDateTimeSetListener;
- private DateTimePicker mDateTimePicker;
-
- 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) {
- 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);
- 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());
- }
-
- public void set24HourView(boolean is24HourView) {
- mIs24HourView = is24HourView;
- }
-
- 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;
- flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
- setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
- }
-
- public void onClick(DialogInterface arg0, int arg1) {
- if (mOnDateTimeSetListener != null) {
- mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
- }
- }
-
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
deleted file mode 100644
index 613dc74..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-
-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);
- mPopupMenu = new PopupMenu(context, mButton);
- mMenu = mPopupMenu.getMenu();
- mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
- mButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- mPopupMenu.show();
- }
- });
- }
-
- 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);
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/EditActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/EditActivity.java
deleted file mode 100644
index 4d4522a..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/EditActivity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package net.micode.notes.ui;
-
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.EditText;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.bean.Note;
-import net.micode.notes.util.ToastUtil;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-public class EditActivity extends Activity {
-
- private Note note;
- private EditText etContent;
-
- private NoteDbOpenHelper mNoteDbOpenHelper;
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_edit);
-
- etContent = findViewById(R.id.sf_et_2);
-
- initData();
-
-
-
- }
-
- private void initData() {
- Intent intent = getIntent();
- note = (Note) intent.getSerializableExtra("note");
- if(note!=null){
- etContent.setText(note.getContent());
- }
-
- mNoteDbOpenHelper = new NoteDbOpenHelper(this);
-
- }
-
- public void save(View view) {
- String content = etContent.getText().toString();
-
- note.setContent(content);
- note.setCreatedTime(getCurrentTimeFormat());
-
- long row = mNoteDbOpenHelper.updateData(note);
-
- if(row != -1 && row != 0){
- ToastUtil.toastShort(this,"Edit Success");
- this.finish();
- }else{
- ToastUtil.toastShort(this,"Edit Fail");
- }
- }
- private String getCurrentTimeFormat() {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM月dd HH:mm:ss");
-
- TimeZone time = TimeZone.getTimeZone("Etc/GMT-8"); //转换为中国时区
- TimeZone.setDefault(time);
- Date date = new Date();
-
- return simpleDateFormat.format(date);
- }
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
deleted file mode 100644
index 96b77da..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class FoldersListAdapter extends CursorAdapter {
- public static final String [] PROJECTION = {
- NoteColumns.ID,
- NoteColumns.SNIPPET
- };
-
- public static final int ID_COLUMN = 0;
- public static final int NAME_COLUMN = 1;
-
- public FoldersListAdapter(Context context, Cursor c) {
- super(context, c);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public View newView(Context context, Cursor cursor, ViewGroup parent) {
- return new FolderListItem(context);
- }
-
- @Override
- public void bindView(View view, Context context, Cursor cursor) {
- if (view instanceof FolderListItem) {
- String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
- .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);
- }
-
- 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);
- }
-
- public void bind(String name) {
- mName.setText(name);
- }
- }
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/ImgInputActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/ImgInputActivity.java
deleted file mode 100644
index 9764830..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/ImgInputActivity.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-
-public class ImgInputActivity extends Activity {
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteDbOpenHelper.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteDbOpenHelper.java
deleted file mode 100644
index b2853f1..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteDbOpenHelper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.text.TextUtils;
-
-import net.micode.notes.ui.bean.Note;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class NoteDbOpenHelper extends SQLiteOpenHelper {
-
- private static final String DB_NAME="noteSQLite.db";
- private static final String TABLE_NAME_NOTE = "note";
- private static final String CREATE_TABLE_SQL = "create table " + TABLE_NAME_NOTE + " (id integer primary key autoincrement, content text, create_time text)";
-
-
- public NoteDbOpenHelper(Context context){
- super(context,DB_NAME,null,1);
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
-
- db.execSQL(CREATE_TABLE_SQL);
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
- }
-
- public long insertData(Note note){
- SQLiteDatabase db = getWritableDatabase();
-
- ContentValues values = new ContentValues();
- values.put("content",note.getContent());
- values.put("create_time",note.getCreatedTime());
-
- return db.insert(TABLE_NAME_NOTE,null,values);
-
- }
-
- public int deleteFromDbById(String id){
- SQLiteDatabase db = getWritableDatabase();
- return db.delete(TABLE_NAME_NOTE,"id like ?", new String[]{id});
- }
-
-
- public int updateData(Note note) {
-
- SQLiteDatabase db = getWritableDatabase();
-
- ContentValues values = new ContentValues();
-
- values.put("content", note.getContent());
- values.put("create_time", note.getCreatedTime());
-
- return db.update(TABLE_NAME_NOTE, values, "id like ?", new String[]{note.getId()});
- }
-
-
-
- public List queryAllFromDb(){
- SQLiteDatabase db = getWritableDatabase();
- List notelist = new ArrayList<>();
-
- Cursor cursor = db.query(TABLE_NAME_NOTE,null,null,null,null,null,null);
- if (cursor != null){
-
- while (cursor.moveToNext()){
- String id = cursor.getString(cursor.getColumnIndex("id"));
- String content = cursor.getString(cursor.getColumnIndex("content"));
- String createTime = cursor.getString(cursor.getColumnIndex("create_time"));
-
- Note note = new Note();
- note.setId(id);
- note.setContent(content);
- note.setCreatedTime(createTime);
-
- notelist.add(note);
-
- }
-
- cursor.close();
- }
- return notelist;
-
-
- }
-
- public List queryFromDbByContent(String content){
- if (TextUtils.isEmpty(content)){
- return queryAllFromDb();
- }
- SQLiteDatabase db = getWritableDatabase();
- List noteList = new ArrayList<>();
-
- Cursor cursor = db.query(TABLE_NAME_NOTE,null,"content like ?",new String[]{"%"+content+"%"},null,null,null);
-
- if (cursor != null){
- while (cursor.moveToNext()){
-
- String id = cursor.getString(cursor.getColumnIndex("id"));
- String content1 = cursor.getString(cursor.getColumnIndex("content"));
- String createTime = cursor.getString(cursor.getColumnIndex("create_time"));
-
- Note note = new Note();
- note.setId(id);
- note.setContent(content1);
- note.setCreatedTime(createTime);
- noteList.add(note);
-
- }
- cursor.close();
-
- }
- return noteList;
-
- }
-
-
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
deleted file mode 100644
index f5e8927..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ /dev/null
@@ -1,1338 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlarmManager;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.app.ProgressDialog;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Paint;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.preference.PreferenceManager;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.text.Editable;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.ImageSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-
-import com.baidu.aip.asrwakeup3.core.mini.AutoCheck;
-import com.baidu.aip.asrwakeup3.core.recog.IStatus;
-import com.baidu.aip.asrwakeup3.core.recog.MyRecognizer;
-import com.baidu.aip.asrwakeup3.core.recog.listener.IRecogListener;
-import com.baidu.aip.asrwakeup3.core.recog.listener.MessageStatusRecogListener;
-import com.baidu.aip.asrwakeup3.core.util.AuthUtil;
-import com.baidu.ocr.sdk.OCR;
-import com.baidu.ocr.sdk.OnResultListener;
-import com.baidu.ocr.sdk.exception.OCRError;
-import com.baidu.ocr.sdk.model.AccessToken;
-import com.baidu.ocr.ui.camera.CameraActivity;
-import com.baidu.speech.asr.SpeechConstant;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.model.WorkingNote;
-import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
-import net.micode.notes.tool.UriHelper;
-import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
-import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
-import net.micode.notes.util.CommonRecogParams;
-import net.micode.notes.util.FileUtil;
-import net.micode.notes.util.OnlineRecogParams;
-import net.micode.notes.util.RecognizeService;
-import net.micode.notes.widget.NoteWidgetProvider_2x;
-import net.micode.notes.widget.NoteWidgetProvider_4x;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-public class NoteEditActivity extends Activity implements OnClickListener,
- NoteSettingChangedListener, OnTextViewChangeListener {
- private class HeadViewHolder {
- public TextView tvModified;
-
- public ImageView ivAlertIcon;
-
- public TextView tvAlertDate;
-
- public ImageView ibSetBgColor;
- }
-
- private static final Map sBgSelectorBtnsMap = new HashMap();
- static {
- sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
- sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
- 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);
- }
-
- private static final Map sBgSelectorSelectionMap = new HashMap();
- static {
- sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
- sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
- 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);
- }
-
- private static final Map sFontSizeBtnsMap = new HashMap();
- static {
- sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
- 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);
- }
-
- private static final Map sFontSelectorSelectionMap = new HashMap();
- static {
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
- 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);
- }
-
- private static final String TAG = "NoteEditActivity";
-
- private HeadViewHolder mNoteHeaderHolder;
-
- private View mHeadViewPanel;
-
- private View mNoteBgColorSelector;
-
- private View mFontSizeSelector;
-
- private EditText mNoteEditor;
-
- private View mNoteEditorPanel;
-
- private WorkingNote mWorkingNote;
-
- private SharedPreferences mSharedPrefs;
- private int mFontSizeId;
-
- private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
-
- private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
-
- public static final String TAG_CHECKED = String.valueOf('\u221A');
- public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
-
- private static final int REQUEST_CODE_GENERAL_BASIC = 106;
-
- private LinearLayout mEditTextList;
-
- private String mUserQuery;
- private Pattern mPattern;
-
- private Button btnVoice,btnImg;
-
- private final int PHOTO_REQUEST = 1;//请求码
- private final int AUDIO_REQUEST = 2;//请求码
-
- /**
- * 识别控制器，使用MyRecognizer控制识别的流程
- */
- protected MyRecognizer myRecognizer;
- protected Handler handler;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- this.setContentView(R.layout.note_edit);
-
- if (savedInstanceState == null && !initActivityState(getIntent())) {
- finish();
- return;
- }
- initResources();
-
-
- //根据id获取添加图片按钮
- final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn);
- //为点击图片按钮设置监听器
- add_img_btn.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View view) {
- Log.d(TAG, "onClick: click add image button");
- //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据，并返回（特殊种类的数据：照一张相片或录一段音）
- Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
- //Category属性用于指定当前动作（Action）被执行的环境.
- //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
- loadImage.addCategory(Intent.CATEGORY_OPENABLE);
- loadImage.setType("image/*");
- startActivityForResult(loadImage, PHOTO_REQUEST);
- }
- });
-
- btnVoice = findViewById(R.id.btn_voice);
- btnImg = findViewById(R.id.btn_img);
-
- btnImg.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View view) {
- ocrImg();
- }
- });
-
- btnVoice.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View view) {
- Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
- //Category属性用于指定当前动作（Action）被执行的环境.
- //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
- loadImage.addCategory(Intent.CATEGORY_OPENABLE);
- loadImage.setType("audio/*");
- startActivityForResult(loadImage, AUDIO_REQUEST);
-
- }
- });
-
- initAccessToken();
- initVoiceRecog();
- }
-
- private void initVoiceRecog() {
- handler = new Handler(){
- @Override
- public void handleMessage(@NonNull Message msg) {
- super.handleMessage(msg);
- handleMsg(msg);
- }
- };
- IRecogListener listener = new MessageStatusRecogListener(handler);
- myRecognizer = new MyRecognizer(this, listener);
- }
-
- private ProgressDialog dialog;
- protected void handleMsg(Message msg) {
- switch (msg.what){
- case IStatus.STATUS_FINISHED:
- Log.e("ares","msg obj="+msg.obj+" what="+msg.what);
- addText(msg.obj.toString());
- break;
- case IStatus.STATUS_RECOGNITION:
- Log.e("ares","正在识别中...");
- if(dialog==null){
- dialog = new ProgressDialog(NoteEditActivity.this);
- dialog.setMessage("正在识别中...");
- }
- if(!dialog.isShowing()){
- dialog.show();
- }
- break;
- case IStatus.STATUS_NONE:
- Log.e("ares","结束识别...");
- if(dialog!=null&&dialog.isShowing()){
- dialog.dismiss();
- }
- break;
- case IStatus.STATUS_ERROR:
- Toast.makeText(this,"文件格式不支持",Toast.LENGTH_SHORT).show();
- break;
- default:
- Log.e("ares","msg obj="+msg.obj+" what="+msg.what);
- break;
-
- }
-
- }
-
-
-
- /**
- * 语音输入
- */
- private void voiceInput(String path) {
- // DEMO集成步骤2.1 拼接识别参数： 此处params可以打印出来，直接写到你的代码里去，最终的json一致即可。
- final Map params = fetchParams(path);
- // params 也可以根据文档此处手动修改，参数会以json的格式在界面和logcat日志中打印
- Log.i(TAG, "设置的start输入参数：" + params);
- // 复制此段可以自动检测常规错误
- (new AutoCheck(getApplicationContext(), new Handler() {
- public void handleMessage(Message msg) {
- if (msg.what == 100) {
- AutoCheck autoCheck = (AutoCheck) msg.obj;
- synchronized (autoCheck) {
- String message = autoCheck.obtainErrorMessage(); // autoCheck.obtainAllMessage();
- Log.e("ares","msg="+message);
- ; // 可以用下面一行替代，在logcat中查看代码
- // Log.w("AutoCheckMessage", message);
- }
- }
- }
- }, false)).checkAsr(params);
-
- // 这里打印出params， 填写至您自己的app中，直接调用下面这行代码即可。
- // DEMO集成步骤2.2 开始识别
- myRecognizer.start(params);
- }
-
- private final CommonRecogParams apiParams = new OnlineRecogParams();;
-
- protected Map fetchParams(String path) {
- // 上面的获取是为了生成下面的Map， 自己集成时可以忽略
- Map params = new HashMap<>();
- params.put(SpeechConstant.IN_FILE, path);
- params.put(SpeechConstant.APP_ID, AuthUtil.getAppId()); // 添加appId
- params.put(SpeechConstant.APP_KEY, AuthUtil.getAk()); // 添加apiKey
- params.put(SpeechConstant.SECRET, AuthUtil.getSk()); // 添加secretKey
- // 集成时不需要上面的代码，只需要params参数。
- return params;
- }
-
- /**
- * 识别文字
- */
- private void ocrImg() {
- if (!checkTokenStatus()) {
- return;
- }
- Intent intent = new Intent(this, CameraActivity.class);
- intent.putExtra(CameraActivity.KEY_OUTPUT_FILE_PATH,
- FileUtil.getSaveFile(getApplicationContext()).getAbsolutePath());
- intent.putExtra(CameraActivity.KEY_CONTENT_TYPE,
- CameraActivity.CONTENT_TYPE_GENERAL);
- startActivityForResult(intent, REQUEST_CODE_GENERAL_BASIC);
- }
-
- private boolean hasGotToken = false;
- private boolean checkTokenStatus() {
- if (!hasGotToken) {
- Toast.makeText(getApplicationContext(), "token还未成功获取", Toast.LENGTH_LONG).show();
- }
- return hasGotToken;
- }
-
- /**
- * 以license文件方式初始化
- */
- private void initAccessToken() {
- OCR.getInstance(getApplicationContext()).initAccessToken(new OnResultListener() {
- @Override
- public void onResult(AccessToken accessToken) {
- String token = accessToken.getAccessToken();
- hasGotToken = true;
- }
-
- @Override
- public void onError(OCRError error) {
- error.printStackTrace();
-
- }
- }, getApplicationContext());
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
- @NonNull int[] grantResults) {
- super.onRequestPermissionsResult(requestCode, permissions, grantResults);
- if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
- initAccessToken();
- } else {
- Toast.makeText(getApplicationContext(), "需要android.permission.READ_PHONE_STATE", Toast.LENGTH_LONG).show();
- }
- }
-
-
- @Override
- protected void onRestoreInstanceState(Bundle savedInstanceState) {
- super.onRestoreInstanceState(savedInstanceState);
- if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
- if (!initActivityState(intent)) {
- finish();
- return;
- }
- Log.d(TAG, "Restoring from killed activity");
- }
- }
-
- private boolean initActivityState(Intent intent) {
- /**
- * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
- * then jump to the NotesListActivity
- */
- mWorkingNote = null;
- if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
- long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
- mUserQuery = "";
-
- /**
- * Starting from the searched result
- */
- if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
- noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
- mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
- }
-
- if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
- Intent jump = new Intent(this, NotesListActivity.class);
- startActivity(jump);
- showToast(R.string.error_note_not_exist);
- finish();
- return false;
- } else {
- mWorkingNote = WorkingNote.load(this, noteId);
- if (mWorkingNote == null) {
- Log.e(TAG, "load note failed with note id" + noteId);
- finish();
- return false;
- }
- }
- 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
- long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
- int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
- AppWidgetManager.INVALID_APPWIDGET_ID);
- int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
- Notes.TYPE_WIDGET_INVALIDE);
- int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
- ResourceParser.getDefaultBgId(this));
-
- // Parse call-record note
- String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
- long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
- if (callDate != 0 && phoneNumber != null) {
- if (TextUtils.isEmpty(phoneNumber)) {
- Log.w(TAG, "The call record number is null");
- }
- long noteId = 0;
- if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
- phoneNumber, callDate)) > 0) {
- mWorkingNote = WorkingNote.load(this, noteId);
- if (mWorkingNote == null) {
- Log.e(TAG, "load call note failed with note id" + noteId);
- 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);
- }
-
- getWindow().setSoftInputMode(
- WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
- | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
- } else {
- Log.e(TAG, "Intent not specified action, should not support");
- finish();
- return false;
- }
- mWorkingNote.setOnSettingStatusChangedListener(this);
- return true;
- }
-
- @Override
- protected void onResume() {//能获得用户焦点：可以操作
- super.onResume();
- initNoteScreen();//初始化便签屏幕
- }
-
- private void initNoteScreen() {
- mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- switchToListMode(mWorkingNote.getContent());
- } else {
- mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
- mNoteEditor.setSelection(mNoteEditor.getText().length());
- }
- for (Integer id : sBgSelectorSelectionMap.keySet()) {
- findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
- }
- mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
- mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
-
- mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
- mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
- | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
- | DateUtils.FORMAT_SHOW_YEAR));
-
- showAlertHeader();
- //将有图片路径的位置转换为图片
- convertToImage();
- }
-
- private void showAlertHeader() {
- if (mWorkingNote.hasClockAlert()) {
- long time = System.currentTimeMillis();
- if (time > mWorkingNote.getAlertDate()) {
- mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
- } 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);
- };
- }
-
- //路径字符串格式 转换为 图片image格式
- private void convertToImage() {
- NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit
- Editable editable = noteEditText.getText();//1.获取text
- String noteText = editable.toString(); //2.将note内容转换为字符串
- int length = editable.length(); //内容的长度
- //3.截取img片段 [local]+uri+[local]，提取uri
- for(int i = 0; i < length; i++) {
- for(int j = i; j < length; j++) {
- String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段
- if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){
- int limit = 7; //[local]为7个字符
- //[local][/local]共15个字符，剩下的为真正的path长度
- int len = img_fragment.length()-15;
- //从[local]之后的len个字符就是path
- String path = img_fragment.substring(limit,limit+len);//获取到了图片路径
- Bitmap bitmap = null;
- Log.d(TAG, "图片的路径是："+path);
- try {
- bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式
- } catch (Exception e) {
- e.printStackTrace();
- }
- if(bitmap!=null){ //若图片存在
- Log.d(TAG, "图片不为null");
- ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
- //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
- String ss = "[local]" + path + "[/local]";
- SpannableString spannableString = new SpannableString(ss);
- //5.将指定的标记对象附加到文本的开始...结束范围
- spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- Log.d(TAG, "Create spannable string success!");
- Editable edit_text = noteEditText.getEditableText();
- edit_text.delete(i,i+len+15); //6.删掉图片路径的文字
- edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片
- }
- }
- }
- }
- }
-
- @Override
- protected void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- initActivityState(intent);
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- /**
- * For new note without note id, we should firstly save it to
- * generate a id. If the editing note is not worth saving, there
- * is no id which is equivalent to create new note
- */
- if (!mWorkingNote.existInDatabase()) {
- saveNote();
- }
- outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
- Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
- }
-
- @Override
- 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);
- int x = location[0];
- int y = location[1];
- if (ev.getX() < x
- || ev.getX() > (x + view.getWidth())
- || ev.getY() < y
- || ev.getY() > (y + view.getHeight())) {
- return false;
- }
- return true;
- }
-
- private void initResources() {
- mHeadViewPanel = findViewById(R.id.note_title);
- mNoteHeaderHolder = new HeadViewHolder();
- mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
- mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
- mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
- mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
- mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
- mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
- mNoteEditorPanel = findViewById(R.id.sv_note_edit);
- mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
- 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);
- /**
- * HACKME: Fix bug of store the resource id in shared preference.
- * The id may larger than the length of resources, in this case,
- * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
- */
- if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
- mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
- }
- mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- if(saveNote()) {
- Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
- }
- clearSettingState();
- }
-
- private void updateWidget() {
- Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
- if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
- intent.setClass(this, NoteWidgetProvider_2x.class);
- } else if (mWorkingNote.getWidgetType() == 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[] {
- mWorkingNote.getWidgetId()
- });
-
- sendBroadcast(intent);
- setResult(RESULT_OK, intent);
- }
-
- public void onClick(View v) {
- int id = v.getId();
- if (id == R.id.btn_set_bg_color) {
- mNoteBgColorSelector.setVisibility(View.VISIBLE);
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
- } else if (sBgSelectorBtnsMap.containsKey(id)) {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.GONE);
- mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
- mNoteBgColorSelector.setVisibility(View.GONE);
- } else if (sFontSizeBtnsMap.containsKey(id)) {
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
- mFontSizeId = sFontSizeBtnsMap.get(id);
- mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- getWorkingText();
- switchToListMode(mWorkingNote.getContent());
- } else {
- mNoteEditor.setTextAppearance(this,
- TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
- }
- mFontSizeSelector.setVisibility(View.GONE);
- }
- }
-
- @Override
- public void onBackPressed() {
- if(clearSettingState()) {
- return;
- }
-
- saveNote();
- super.onBackPressed();
- }
-
- private boolean clearSettingState() {
- if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
- mNoteBgColorSelector.setVisibility(View.GONE);
- return true;
- } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
- mFontSizeSelector.setVisibility(View.GONE);
- return true;
- }
- return false;
- }
-
- public void onBackgroundColorChanged() {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
- mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
- mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- if (isFinishing()) {
- return true;
- }
- clearSettingState();
- menu.clear();
- if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
- getMenuInflater().inflate(R.menu.call_note_edit, menu);
- } else {
- getMenuInflater().inflate(R.menu.note_edit, menu);
- }
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
- } else {
- menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
- }
- if (mWorkingNote.hasClockAlert()) {
- menu.findItem(R.id.menu_alert).setVisible(false);
- } else {
- menu.findItem(R.id.menu_delete_remind).setVisible(false);
- }
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- 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));
- 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();
- }
- });
- builder.setNegativeButton(android.R.string.cancel, null);
- builder.show();
- break;
- case R.id.menu_font_size:
- mFontSizeSelector.setVisibility(View.VISIBLE);
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
- 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());
- 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:
- break;
- }
- 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();
- }
-
- private void sendTo(Context context, String info) {
- Intent intent = new Intent(Intent.ACTION_SEND);
- intent.putExtra(Intent.EXTRA_TEXT, info);
- intent.setType("text/plain");
- context.startActivity(intent);
- }
-
- 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());
- startActivity(intent);
- }
-
- private void deleteCurrentNote() {
- if (mWorkingNote.existInDatabase()) {
- HashSet ids = new HashSet();
- long id = mWorkingNote.getNoteId();
- if (id != Notes.ID_ROOT_FOLDER) {
- ids.add(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);
- }
-
- 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()));
- 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);
- }
- }
-
- public void onWidgetChanged() {
- updateWidget();
- }
-
- 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);
- }
-
- mEditTextList.removeViewAt(index);
- NoteEditText edit = null;
- if(index == 0) {
- edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
- R.id.et_edit_text);
- } else {
- edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
- R.id.et_edit_text);
- }
- int length = edit.length();
- edit.append(text);
- edit.requestFocus();
- edit.setSelection(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);
- 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);
- 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) {
- if (isChecked) {
- edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
- } else {
- edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
- }
- }
- });
-
- 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();
- }
-
- 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);
- convertToImage(); //退出清单模式，应该将有图片的地方显示出来
- }
- }
-
- private boolean getWorkingText() {
- boolean hasChecked = false;
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_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;
- } 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();
- if (saved) {
- /**
- * There are two modes from List view to edit view, open one note,
- * create/edit a node. Opening node requires to the original
- * position in the list when back from edit view, while creating a
- * new node requires to the top of the list. This code
- * {@link #RESULT_OK} is used to identify the create/edit state
- */
- setResult(RESULT_OK);
- }
- return saved;
- }
-
- private void sendToDesktop() {
- /**
- * Before send message to home, we should make sure that current
- * editing note is exists in databases. So, for new note, firstly
- * save it
- */
- 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,
- makeShortcutIconTitle(mWorkingNote.getContent()));
- 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");
- showToast(R.string.info_note_enter_desktop);
- sendBroadcast(sender);
- } 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, "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;
- }
-
- private void showToast(int resId) {
- showToast(resId, Toast.LENGTH_SHORT);
- }
-
- private void showToast(int resId, int duration) {
- Toast.makeText(this, resId, duration).show();
- }
-
- @Override
- //重写onActivityResult()来处理返回的数据
- protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
- super.onActivityResult(requestCode, resultCode, intent);
- ContentResolver resolver = getContentResolver();
- switch (requestCode) {
- case REQUEST_CODE_GENERAL_BASIC:
- RecognizeService.recGeneralBasic(getApplicationContext(), FileUtil.getSaveFile(getApplicationContext()).getAbsolutePath(),
- new RecognizeService.ServiceListener() {
- @Override
- public void onResult(String result) {
- Log.e("ares","result="+result);
- if(TextUtils.isEmpty(result)){
- return;
- }
- try {
- JSONObject object = new JSONObject(result);
- JSONArray arr = object.optJSONArray("words_result");
- if(arr!=null&&arr.length() != 0) {
- for(int i=0;i= Build.VERSION_CODES.KITKAT;
-
- // DocumentProvider
- if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
- // ExternalStorageProvider
-// if (isExternalStorageDocument(uri)) {
-// final String docId = DocumentsContract.getDocumentId(uri);
-// final String[] split = docId.split(":");
-// final String type = split[0];
-//
-// if ("primary".equalsIgnoreCase(type)) {
-// return Environment.getExternalStorageDirectory() + "/" + split[1];
-// }
-// }
-// // DownloadsProvider
-// else if (isDownloadsDocument(uri)) {
-// final String id = DocumentsContract.getDocumentId(uri);
-// final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-// return getDataColumn(context, contentUri, null, null);
-// }
- // MediaProvider
-// else
- if (isMediaDocument(uri)) {
- final String docId = DocumentsContract.getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- Uri contentUri = null;
- if ("image".equals(type)) {
- contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
- }
-
- final String selection = "_id=?";
- final String[] selectionArgs = new String[]{split[1]};
-
- return getDataColumn(context, contentUri, selection, selectionArgs);
- }
- }
- // Media
- else if ("content".equalsIgnoreCase(uri.getScheme())) {
- return getDataColumn(context, uri, null, null);
- }
- // File
- else if ("file".equalsIgnoreCase(uri.getScheme())) {
- return uri.getPath();
- }
- return null;
- }
-
-
- //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。
- public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-
- Cursor cursor = null;
- final String column = "_data";
- final String[] projection = {column};
-
- try {
- cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
- if (cursor != null && cursor.moveToFirst()) {
- final int column_index = cursor.getColumnIndexOrThrow(column);
- return cursor.getString(column_index);
- }
- } finally {
- if (cursor != null)
- cursor.close();
- }
- return null;
- }
-
-
- //是否为外部存储文件
-// public boolean isExternalStorageDocument(Uri uri) {
-// return "com.android.externalstorage.documents".equals(uri.getAuthority());
-// }
-//
-// //是否为下载文件
-// public boolean isDownloadsDocument(Uri uri) {
-// return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-// }
-
- //是否为媒体文件
- public boolean isMediaDocument(Uri uri) {
- return "com.android.providers.media.documents".equals(uri.getAuthority());
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- if(myRecognizer!=null){
- myRecognizer.release();
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteEditText.java
deleted file mode 100644
index 2afe2a8..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * 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.graphics.Rect;
-import android.text.Layout;
-import android.text.Selection;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.widget.EditText;
-
-import net.micode.notes.R;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class NoteEditText extends EditText {
- private static final String TAG = "NoteEditText";
- private int mIndex;
- private int mSelectionStartBeforeDelete;
-
- private static final String SCHEME_TEL = "tel:" ;
- private static final String SCHEME_HTTP = "http:" ;
- private static final String SCHEME_EMAIL = "mailto:" ;
-
- private static final Map sSchemaActionResMap = new HashMap();
- static {
- sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
- sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web);
- sSchemaActionResMap.put(SCHEME_EMAIL, R.string.note_link_email);
- }
-
- /**
- * Call by the {@link NoteEditActivity} to delete or add edit text
- */
- public interface OnTextViewChangeListener {
- /**
- * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
- * and the text is null
- */
- void onEditTextDelete(int index, String text);
-
- /**
- * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER}
- * happen
- */
- void onEditTextEnter(int index, String text);
-
- /**
- * Hide or show item option when text change
- */
- void onTextChange(int index, boolean hasText);
- }
-
- private OnTextViewChangeListener mOnTextViewChangeListener;
-
- public NoteEditText(Context context) {
- super(context, null);
- mIndex = 0;
- }
-
- public void setIndex(int index) {
- mIndex = index;
- }
-
- public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
- mOnTextViewChangeListener = listener;
- }
-
- public NoteEditText(Context context, AttributeSet attrs) {
- super(context, attrs, android.R.attr.editTextStyle);
- }
-
- public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN:
-
- int x = (int) event.getX();
- int y = (int) event.getY();
- x -= getTotalPaddingLeft();
- y -= getTotalPaddingTop();
- x += getScrollX();
- y += getScrollY();
-
- Layout layout = getLayout();
- int line = layout.getLineForVertical(y);
- int off = layout.getOffsetForHorizontal(line, x);
- Selection.setSelection(getText(), off);
- break;
- }
-
- return super.onTouchEvent(event);
- }
-
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_ENTER:
- if (mOnTextViewChangeListener != null) {
- return false;
- }
- break;
- case KeyEvent.KEYCODE_DEL:
- mSelectionStartBeforeDelete = getSelectionStart();
- break;
- default:
- break;
- }
- return super.onKeyDown(keyCode, event);
- }
-
- @Override
- public boolean onKeyUp(int keyCode, KeyEvent event) {
- switch(keyCode) {
- case KeyEvent.KEYCODE_DEL:
- if (mOnTextViewChangeListener != null) {
- if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
- mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
- return true;
- }
- } else {
- Log.d(TAG, "OnTextViewChangeListener was not seted");
- }
- break;
- case KeyEvent.KEYCODE_ENTER:
- if (mOnTextViewChangeListener != null) {
- int selectionStart = getSelectionStart();
- String text = getText().subSequence(selectionStart, length()).toString();
- setText(getText().subSequence(0, selectionStart));
- mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
- } else {
- Log.d(TAG, "OnTextViewChangeListener was not seted");
- }
- break;
- default:
- break;
- }
- return super.onKeyUp(keyCode, event);
- }
-
- @Override
- protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
- if (mOnTextViewChangeListener != null) {
- if (!focused && TextUtils.isEmpty(getText())) {
- mOnTextViewChangeListener.onTextChange(mIndex, false);
- } else {
- mOnTextViewChangeListener.onTextChange(mIndex, true);
- }
- }
- super.onFocusChanged(focused, direction, previouslyFocusedRect);
- }
-
- @Override
- protected void onCreateContextMenu(ContextMenu menu) {
- if (getText() instanceof Spanned) {
- int selStart = getSelectionStart();
- int selEnd = getSelectionEnd();
-
- int min = Math.min(selStart, selEnd);
- int max = Math.max(selStart, selEnd);
-
- final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
- if (urls.length == 1) {
- int defaultResId = 0;
- for(String schema: sSchemaActionResMap.keySet()) {
- if(urls[0].getURL().indexOf(schema) >= 0) {
- defaultResId = sSchemaActionResMap.get(schema);
- break;
- }
- }
-
- if (defaultResId == 0) {
- defaultResId = R.string.note_link_other;
- }
-
- menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
- new OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- // goto a new intent
- urls[0].onClick(NoteEditText.this);
- return true;
- }
- });
- }
- }
- super.onCreateContextMenu(menu);
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteItemData.java
deleted file mode 100644
index 0f5a878..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * 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.text.TextUtils;
-
-import net.micode.notes.data.Contact;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-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,
- };
-
- private static final int ID_COLUMN = 0;
- private static final int ALERTED_DATE_COLUMN = 1;
- private static final int BG_COLOR_ID_COLUMN = 2;
- private static final int CREATED_DATE_COLUMN = 3;
- private static final int HAS_ATTACHMENT_COLUMN = 4;
- private static final int MODIFIED_DATE_COLUMN = 5;
- private static final int NOTES_COUNT_COLUMN = 6;
- private static final int PARENT_ID_COLUMN = 7;
- private static final int SNIPPET_COLUMN = 8;
- private static final int TYPE_COLUMN = 9;
- private static final int WIDGET_ID_COLUMN = 10;
- private static final int WIDGET_TYPE_COLUMN = 11;
-
- private long mId;
- private long mAlertDate;
- private int mBgColorId;
- private long mCreatedDate;
- private boolean mHasAttachment;
- private long mModifiedDate;
- private int mNotesCount;
- private long mParentId;
- private String mSnippet;
- private int mType;
- private int mWidgetId;
- private int mWidgetType;
- private String mName;
- private String mPhoneNumber;
-
- private boolean mIsLastItem;
- private boolean mIsFirstItem;
- private boolean mIsOnlyOneItem;
- private boolean mIsOneNoteFollowingFolder;
- private boolean mIsMultiNotesFollowingFolder;
-
- public NoteItemData(Context context, Cursor cursor) {
- mId = cursor.getLong(ID_COLUMN);
- mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
- mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
- mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN);
- mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false;
- mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
- mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN);
- mParentId = cursor.getLong(PARENT_ID_COLUMN);
- mSnippet = cursor.getString(SNIPPET_COLUMN);
- mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace(
- NoteEditActivity.TAG_UNCHECKED, "");
- mType = cursor.getInt(TYPE_COLUMN);
- 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)) {
- mName = Contact.getContact(context, mPhoneNumber);
- if (mName == null) {
- mName = mPhoneNumber;
- }
- }
- }
-
- if (mName == null) {
- mName = "";
- }
- checkPostion(cursor);
- }
-
- private void checkPostion(Cursor cursor) {
- mIsLastItem = cursor.isLast() ? true : false;
- mIsFirstItem = cursor.isFirst() ? true : false;
- mIsOnlyOneItem = (cursor.getCount() == 1);
- mIsMultiNotesFollowingFolder = false;
- mIsOneNoteFollowingFolder = false;
-
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
- int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {
- if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
- if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;
- } else {
- mIsOneNoteFollowingFolder = true;
- }
- }
- if (!cursor.moveToNext()) {
- throw new IllegalStateException("cursor move to previous but can't move back");
- }
- }
- }
- }
-
- public boolean isOneFollowingFolder() {
- return mIsOneNoteFollowingFolder;
- }
-
- public boolean isMultiFollowingFolder() {
- return mIsMultiNotesFollowingFolder;
- }
-
- public boolean isLast() {
- return mIsLastItem;
- }
-
- public String getCallName() {
- return mName;
- }
-
- public boolean isFirst() {
- return mIsFirstItem;
- }
-
- public boolean isSingle() {
- return mIsOnlyOneItem;
- }
-
- public long getId() {
- return mId;
- }
-
- public long getAlertDate() {
- return mAlertDate;
- }
-
- public long getCreatedDate() {
- return mCreatedDate;
- }
-
- public boolean hasAttachment() {
- return mHasAttachment;
- }
-
- public long getModifiedDate() {
- return mModifiedDate;
- }
-
- public int getBgColorId() {
- return mBgColorId;
- }
-
- public long getParentId() {
- return mParentId;
- }
-
- public int getNotesCount() {
- return mNotesCount;
- }
-
- public long getFolderId () {
- return mParentId;
- }
-
- public int getType() {
- return mType;
- }
-
- public int getWidgetType() {
- return mWidgetType;
- }
-
- public int getWidgetId() {
- return mWidgetId;
- }
-
- public String getSnippet() {
- return mSnippet;
- }
-
- public boolean hasAlert() {
- return (mAlertDate > 0);
- }
-
- public boolean isCallRecord() {
- return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
- }
-
- public static int getNoteType(Cursor cursor) {
- return cursor.getInt(TYPE_COLUMN);
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
deleted file mode 100644
index 549750c..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ /dev/null
@@ -1,968 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.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;
-
-public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
- private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
-
- 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";
-
- 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;
-
- public Button mBtnsf;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.note_list);
- initResources();
-
- mBtnsf = findViewById(R.id.btn_sf);
- mBtnsf.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View view) {
- Intent intent=null;
- intent = new Intent(NotesListActivity.this,pwdActivity.class);
- startActivity(intent);
-
- }
- });
-
-
- /**
- * Insert an introduction when user firstly use this application
- */
- setAppInfoFromRawRes();
- }
-
- @Override
- 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);
- }
- }
-
- private void setAppInfoFromRawRes() {
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
- if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
- StringBuilder sb = new StringBuilder();
- InputStream in = null;
- try {
- 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 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()) {
- 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;
- mNotesListView = (ListView) findViewById(R.id.notes_list);
- 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);
- 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();
- }
-
- 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(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（Unit: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
-
- }
- });
- }
-
- @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;
- }
- }
-
- 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);
- }
-
- @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);
- }
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- 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;
- }
-
- @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();
- }
-
- private boolean isSyncMode() {
- return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
- }
-
- private void startPreferenceActivity() {
- Activity from = getParent() != null ? getParent() : this;
- Intent intent = new Intent(from, NotesPreferenceActivity.class);
- from.startActivityIfNeeded(intent, -1);
- }
-
- 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");
- }
-
- 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;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
deleted file mode 100644
index 51c9cb9..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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;
-
-
-public class NotesListAdapter extends CursorAdapter {
- private static final String TAG = "NotesListAdapter";
- private Context mContext;
- private HashMap mSelectedIndex;
- private int mNotesCount;
- private boolean mChoiceMode;
-
- public static class AppWidgetAttribute {
- public int widgetId;
- public int widgetType;
- };
-
- public NotesListAdapter(Context context) {
- super(context, null);
- mSelectedIndex = new HashMap();
- mContext = context;
- mNotesCount = 0;
- }
-
- @Override
- 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) {
- NoteItemData itemData = new NoteItemData(context, cursor);
- ((NotesListItem) view).bind(context, itemData, mChoiceMode,
- isSelectedItem(cursor.getPosition()));
- }
- }
-
- public void setCheckedItem(final int position, final boolean checked) {
- mSelectedIndex.put(position, checked);
- notifyDataSetChanged();
- }
-
- public boolean isInChoiceMode() {
- return mChoiceMode;
- }
-
- 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();
- 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);
- }
- }
- }
-
- return itemSet;
- }
-
- public HashSet getSelectedWidget() {
- HashSet itemSet = new HashSet();
- for (Integer position : mSelectedIndex.keySet()) {
- if (mSelectedIndex.get(position) == true) {
- Cursor c = (Cursor) getItem(position);
- if (c != null) {
- 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()) {
- 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
- protected void onContentChanged() {
- super.onContentChanged();
- calcNotesCount();
- }
-
- @Override
- 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++;
- }
- } else {
- Log.e(TAG, "Invalid cursor");
- return;
- }
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListItem.java
deleted file mode 100644
index 3292314..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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);
- inflate(context, R.layout.note_item, this);
- 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);
- }
-
- 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;
- if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
- mCallName.setVisibility(View.GONE);
- mAlert.setVisibility(View.VISIBLE);
- mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
- 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);
-
- 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);
- }
- }
- }
- //mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
- mTime.setText(DateUtils.formatDateTime(getContext(),data.getModifiedDate(), DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_ALL));
-
- setBackground(data);
- }
-
- private void setBackground(NoteItemData data) {
- int id = data.getBgColorId();
- 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 {
- setBackgroundResource(NoteItemBgResources.getFolderBgRes());
- }
- }
-
- public NoteItemData getItemData() {
- return mItemData;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
deleted file mode 100644
index 07c5f7e..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * 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.ActionBar;
-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.Menu;
-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;
-
-
-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;
-
- @Override
- protected void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- /* using the app icon for navigation */
- getActionBar().setDisplayHomeAsUpEnabled(true);
-
- addPreferencesFromResource(R.xml.preferences);
- 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);
- getListView().addHeaderView(header, null, true);
- }
-
- @Override
- protected void onResume() {
- super.onResume();
-
- // need to set sync account automatically if user has added a new
- // account
- if (mHasAddedAccount) {
- Account[] accounts = getGoogleAccounts();
- 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
- 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.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);
-
- 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;
- 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() {
- public void onClick(DialogInterface dialog, int 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();
-
- // clean up last sync time
- 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();
- }
- }
-
- 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);
- }
-
- private class GTaskReceiver extends BroadcastReceiver {
-
- @Override
- public void onReceive(Context context, Intent intent) {
- refreshUI();
- if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
- TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
- syncStatus.setText(intent
- .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
- }
-
- }
- }
-
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- Intent intent = new Intent(this, NotesListActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- startActivity(intent);
- return true;
- default:
- return false;
- }
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/SafeFolderActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/SafeFolderActivity.java
deleted file mode 100644
index c572a3f..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/SafeFolderActivity.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-
-
-
-import androidx.annotation.NonNull;
-
-
-import androidx.appcompat.widget.SearchView;
-import androidx.core.view.MenuItemCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.adapter.MyAdapter;
-import net.micode.notes.ui.bean.Note;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-public class SafeFolderActivity extends Activity {
-
- private RecyclerView mRecyclerView;
- private Button mBtnNew;
- private List mNotes;
- private MyAdapter mMyAdapter;
-
- private NoteDbOpenHelper mNoteDbOpenHelper;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_safe_folder);
-
- initView();
- initData();
- initEvent();
-
-
- }
-
- @Override
- protected void onResume() {
- super.onResume();
-
- refreshDataFromDb();
-
- }
-
- private void refreshDataFromDb() {
- mNotes = getDataFromDB();
- mMyAdapter.refreshData(mNotes);
- }
-
- private void initEvent() {
- mMyAdapter = new MyAdapter(this,mNotes);
- mRecyclerView.setAdapter(mMyAdapter);
-
- LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
- mRecyclerView.setLayoutManager(linearLayoutManager);
- }
-
- private void initData() {
- mNotes = new ArrayList<>();
- mNoteDbOpenHelper = new NoteDbOpenHelper(this);
-
- }
-
- private List getDataFromDB() {
- return mNoteDbOpenHelper.queryAllFromDb();
- }
-
- private String getCurrentTimeFormat(){
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM月dd HH:mm:ss");
- Date date = new Date();
- return simpleDateFormat.format(date);
- }
-
-
- private void initView(){
-
- mRecyclerView = findViewById(R.id.sf_list);
- }
-
- public void NewNotes(View view) {
- Intent intent = new Intent(SafeFolderActivity.this,AddActivity.class);
- startActivity(intent);
- }
-
-// @Override
-// public boolean onCreateOptionsMenu(Menu menu) {
-//
-// getMenuInflater().inflate(R.menu.menu_main, menu);
-// SearchView searchView = (SearchView) menu.findItem(R.id.sf_menu_search).getActionView();
-//
-//
-// searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-// @Override
-// public boolean onQueryTextSubmit(String query) {
-// return false;
-// }
-//
-// @Override
-// public boolean onQueryTextChange(String newText) {
-// mNotes = mNoteDbOpenHelper.queryFromDbByContent(newText);
-// mMyAdapter.refreshData(mNotes);
-// return true;
-// }
-// });
-// return super.onCreateOptionsMenu(menu);
-// }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.safe, menu);
- MenuItem x = menu.findItem(R.id.sf_menu_search);
- if (x.getActionView() != null) {
- Log.i("-------------","okk");
- }else{
- Log.i("-------------","false");
- }
- SearchView searchView = (SearchView) menu.findItem(R.id.sf_menu_search).getActionView();
-
-
- if (searchView != null) {
- Log.i("=====================","okk");
-
- searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
- @Override
- public boolean onQueryTextSubmit(String s) {
- return false;
- }
-
- @Override
- public boolean onQueryTextChange(String s) {
- mNotes = mNoteDbOpenHelper.queryFromDbByContent(s);
- mMyAdapter.refreshData(mNotes);
- return true;
- }
- });
- }else{
- Log.i("=====================","false");
- }
- return super.onCreateOptionsMenu(menu);
- }
-
-
-
- @Override
- public boolean onOptionsItemSelected(@NonNull MenuItem item) {
- return super.onOptionsItemSelected(item);
- }
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/VoiceInputActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/VoiceInputActivity.java
deleted file mode 100644
index 3defb98..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/VoiceInputActivity.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-
-public class VoiceInputActivity extends Activity {
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/adapter/MyAdapter.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/adapter/MyAdapter.java
deleted file mode 100644
index ba733bc..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/adapter/MyAdapter.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package net.micode.notes.ui.adapter;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.EditActivity;
-import net.micode.notes.ui.NoteDbOpenHelper;
-import net.micode.notes.ui.NoteEditActivity;
-import net.micode.notes.ui.bean.Note;
-import net.micode.notes.util.ToastUtil;
-
-import java.util.List;
-
-public class MyAdapter extends RecyclerView.Adapter {
-
- private List mBeanList;
- private LayoutInflater mLayoutInflater;
- private Context mContext;
- private NoteDbOpenHelper mNoteDbOpenHelper;
-
- public MyAdapter(Context context,List mBeanList){
- this.mBeanList = mBeanList;
- this.mContext = context;
- mLayoutInflater = LayoutInflater.from(mContext);
- mNoteDbOpenHelper = new NoteDbOpenHelper(mContext);
-
- }
-
- @NonNull
- @Override
- public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- View view = mLayoutInflater.inflate(R.layout.list_item_layout,parent,false);
-
- MyViewHolder myViewHolder= new MyViewHolder(view);
- return myViewHolder;
- }
-
- @Override
- public void onBindViewHolder(@NonNull MyViewHolder holder, @SuppressLint("RecyclerView") final int position) {
-
- final Note note = mBeanList.get(position);
- holder.mTvContent.setText(note.getContent());
- holder.mTvTime.setText(note.getCreatedTime());
- holder.rlContainer.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-
- Intent intent = new Intent(mContext, EditActivity.class);
- intent.putExtra("note",note);
- mContext.startActivity(intent);
-
- }
- });
-
- holder.rlContainer.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- //长按
- final Dialog dialog = new Dialog(mContext,android.R.style.Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth);
- View view = mLayoutInflater.inflate(R.layout.list_item_dialog_layout, null);
-
- TextView tvDelete = view.findViewById(R.id.tv_delete);
-
-
- tvDelete.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- int row = mNoteDbOpenHelper.deleteFromDbById(note.getId());
- if (row > 0){
- removeData(position);
-
- ToastUtil.toastShort(mContext,"Delete Success");
- }else{
- ToastUtil.toastShort(mContext,"Delete Fail");
- }
- dialog.dismiss();
- }
- });
-
- dialog.setContentView(view);
-
- dialog.show();
-
- return false;
- }
- });
-
- }
-
- @Override
- public int getItemCount() {
-
- return mBeanList.size();
- }
-
- public void refreshData(List notes){
- this.mBeanList = notes;
- notifyDataSetChanged();
- }
-
- public void removeData(int pos){
- mBeanList.remove(pos);
- notifyItemRemoved(pos);
- }
-
-
- class MyViewHolder extends RecyclerView.ViewHolder{
-
- TextView mTvContent;
- TextView mTvTime;
- ViewGroup rlContainer;
-
- public MyViewHolder(@NonNull View itemView) {
- super(itemView);
-
- this.mTvContent = itemView.findViewById(R.id.tv_content);
- this.mTvTime = itemView.findViewById(R.id.tv_time);
- this.rlContainer = itemView.findViewById(R.id.rl_item_container);
-
-
- }
- }
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/bean/Note.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/bean/Note.java
deleted file mode 100644
index f5bf39d..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/bean/Note.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package net.micode.notes.ui.bean;
-
-import java.io.Serializable;
-
-public class Note implements Serializable {
-
- private String content;
- private String createdTime;
- private String id;
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getCreatedTime() {
- return createdTime;
- }
-
- public void setCreatedTime(String createdTime) {
- this.createdTime = createdTime;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String toString() {
- return "Note{" +
- "content='" + content + '\'' +
- ", createdTime='" + createdTime + '\'' +
- ", id='" + id + '\'' +
- '}';
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/pwdActivity.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/pwdActivity.java
deleted file mode 100644
index 357e2d4..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/ui/pwdActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-
-import net.micode.notes.R;
-import net.micode.notes.util.ToastUtil;
-
-public class pwdActivity extends NotesListActivity {
-
- public Button mBtnpwd;
- public EditText mEtpwd;
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_pwd);
-
- mBtnpwd = findViewById(R.id.btn_pwd);
- mEtpwd = findViewById(R.id.et_1);
-
-
- mBtnpwd.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- String pwd = mEtpwd.getText().toString();
- Intent intent=null;
-
- if(pwd.equals("123")){
- intent = new Intent(pwdActivity.this,SafeFolderActivity.class);
- startActivity(intent);
- }else{
- ToastUtil.toastShort(pwdActivity.this,"ERROR");
- }
-
- }
- });
-
-
- }
-
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/CommonRecogParams.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/util/CommonRecogParams.java
deleted file mode 100644
index 0b14cca..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/CommonRecogParams.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package net.micode.notes.util;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Environment;
-
-import com.baidu.aip.asrwakeup3.core.util.FileUtil;
-
-import com.baidu.speech.asr.SpeechConstant;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by fujiayi on 2017/6/20.
- */
-
-public class CommonRecogParams {
-
- protected String samplePath;
- /**
- * 字符串格式的参数
- */
- protected ArrayList stringParams = new ArrayList();
-
- /**
- * int格式的参数
- */
- protected ArrayList intParams = new ArrayList();
-
- /**
- * bool格式的参数
- */
- protected ArrayList boolParams = new ArrayList();
-
- private static final String TAG = "CommonRecogParams";
-
- public CommonRecogParams() {
-
- stringParams.addAll(Arrays.asList(
- SpeechConstant.VAD,
- SpeechConstant.IN_FILE
- ));
- intParams.addAll(Arrays.asList(
- SpeechConstant.PID,
- SpeechConstant.LMID,
- SpeechConstant.VAD_ENDPOINT_TIMEOUT
- ));
- boolParams.addAll(Arrays.asList(
- SpeechConstant.BDS_ASR_ENABLE_LONG_SPEECH,
- SpeechConstant.ACCEPT_AUDIO_DATA,
- SpeechConstant.ACCEPT_AUDIO_VOLUME
- ));
- }
-
- /**
- * 创建保存OUTFILE的临时目录. 仅用于OUTFILE参数。不使用demo中的OUTFILE参数可忽略此段
- *
- * @param context
- */
- public void initSamplePath(Context context) {
- String sampleDir = "baiduASR";
- samplePath = Environment.getExternalStorageDirectory().toString() + "/" + sampleDir;
- if (!FileUtil.makeDir(samplePath)) {
- samplePath = context.getExternalFilesDir(sampleDir).getAbsolutePath();
- if (!FileUtil.makeDir(samplePath)) {
- throw new RuntimeException("创建临时目录失败 :" + samplePath);
- }
- }
- }
-
- public Map fetch(SharedPreferences sp) {
- Map map = new HashMap();
-
- parseParamArr(sp, map);
-
-
-
- return map;
- }
-
- /**
- * 根据 stringParams intParams boolParams中定义的参数名称，提取SharedPreferences相关字段
- *
- * @param sp
- * @param map
- */
- private void parseParamArr(SharedPreferences sp, Map map) {
- for (String name : stringParams) {
- if (sp.contains(name)) {
- String tmp = sp.getString(name, "").replaceAll(",.*", "").trim();
- if (null != tmp && !"".equals(tmp)) {
- map.put(name, tmp);
- }
- }
- }
- for (String name : intParams) {
- if (sp.contains(name)) {
- String tmp = sp.getString(name, "").replaceAll(",.*", "").trim();
- if (null != tmp && !"".equals(tmp)) {
- map.put(name, Integer.parseInt(tmp));
- }
- }
- }
- for (String name : boolParams) {
- if (sp.contains(name)) {
- boolean res = sp.getBoolean(name, false);
- if (res || name.equals(SpeechConstant.ACCEPT_AUDIO_VOLUME)) {
- map.put(name, res);
- }
- }
- }
- }
-}
-
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/FileUtil.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/util/FileUtil.java
deleted file mode 100644
index c52b076..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/FileUtil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package net.micode.notes.util;
-
-import android.content.Context;
-
-import java.io.File;
-
-public class FileUtil {
- public static File getSaveFile(Context context) {
- File file = new File(context.getFilesDir(), "pic.jpg");
- return file;
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/OnlineRecogParams.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/util/OnlineRecogParams.java
deleted file mode 100644
index 5eea9ea..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/OnlineRecogParams.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.micode.notes.util;
-
-
-import com.baidu.speech.asr.SpeechConstant;
-
-import java.util.Arrays;
-
-/**
- * Created by fujiayi on 2017/6/13.
- */
-
-public class OnlineRecogParams extends CommonRecogParams {
-
-
- private static final String TAG = "OnlineRecogParams";
-
- public OnlineRecogParams() {
- super();
-
- stringParams.addAll(Arrays.asList(
- "_language", // 用于生成PID参数
- "_model" // 用于生成PID参数
- ));
-
- intParams.addAll(Arrays.asList(SpeechConstant.PROP));
-
- boolParams.addAll(Arrays.asList(SpeechConstant.DISABLE_PUNCTUATION));
-
- }
-
-
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/RecognizeService.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/util/RecognizeService.java
deleted file mode 100644
index 315d632..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/RecognizeService.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package net.micode.notes.util;
-
-import android.content.Context;
-
-import com.baidu.ocr.sdk.OCR;
-import com.baidu.ocr.sdk.OnResultListener;
-import com.baidu.ocr.sdk.exception.OCRError;
-import com.baidu.ocr.sdk.model.BankCardParams;
-import com.baidu.ocr.sdk.model.BankCardResult;
-import com.baidu.ocr.sdk.model.GeneralBasicParams;
-import com.baidu.ocr.sdk.model.GeneralParams;
-import com.baidu.ocr.sdk.model.GeneralResult;
-import com.baidu.ocr.sdk.model.OcrRequestParams;
-import com.baidu.ocr.sdk.model.OcrResponseResult;
-import com.baidu.ocr.sdk.model.Word;
-import com.baidu.ocr.sdk.model.WordSimple;
-
-import java.io.File;
-
-/**
- * Created by ruanshimin on 2017/4/20.
- */
-
-public class RecognizeService {
-
- public interface ServiceListener {
- public void onResult(String result);
- }
-
- public static void recGeneral(Context ctx, String filePath, final ServiceListener listener) {
- GeneralParams param = new GeneralParams();
- param.setDetectDirection(true);
- param.setVertexesLocation(true);
- param.setRecognizeGranularity(GeneralParams.GRANULARITY_SMALL);
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeGeneral(param, new OnResultListener() {
- @Override
- public void onResult(GeneralResult result) {
- StringBuilder sb = new StringBuilder();
- for (WordSimple wordSimple : result.getWordList()) {
- Word word = (Word) wordSimple;
- sb.append(word.getWords());
- sb.append("\n");
- }
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recAccurate(Context ctx, String filePath, final ServiceListener listener) {
- GeneralParams param = new GeneralParams();
- param.setDetectDirection(true);
- param.setVertexesLocation(true);
- param.setRecognizeGranularity(GeneralParams.GRANULARITY_SMALL);
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeAccurate(param, new OnResultListener() {
- @Override
- public void onResult(GeneralResult result) {
- StringBuilder sb = new StringBuilder();
- for (WordSimple wordSimple : result.getWordList()) {
- Word word = (Word) wordSimple;
- sb.append(word.getWords());
- sb.append("\n");
- }
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recAccurateBasic(Context ctx, String filePath, final ServiceListener listener) {
- GeneralParams param = new GeneralParams();
- param.setDetectDirection(true);
- param.setVertexesLocation(true);
- param.setRecognizeGranularity(GeneralParams.GRANULARITY_SMALL);
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeAccurateBasic(param, new OnResultListener() {
- @Override
- public void onResult(GeneralResult result) {
- StringBuilder sb = new StringBuilder();
- for (WordSimple wordSimple : result.getWordList()) {
- WordSimple word = wordSimple;
- sb.append(word.getWords());
- sb.append("\n");
- }
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
-
- public static void recGeneralBasic(Context ctx, String filePath, final ServiceListener listener) {
- GeneralBasicParams param = new GeneralBasicParams();
- param.setDetectDirection(true);
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeGeneralBasic(param, new OnResultListener() {
- @Override
- public void onResult(GeneralResult result) {
- StringBuilder sb = new StringBuilder();
- for (WordSimple wordSimple : result.getWordList()) {
- WordSimple word = wordSimple;
- sb.append(word.getWords());
- sb.append("\n");
- }
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recGeneralEnhanced(Context ctx, String filePath, final ServiceListener listener) {
- GeneralBasicParams param = new GeneralBasicParams();
- param.setDetectDirection(true);
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeGeneralEnhanced(param, new OnResultListener() {
- @Override
- public void onResult(GeneralResult result) {
- StringBuilder sb = new StringBuilder();
- for (WordSimple wordSimple : result.getWordList()) {
- WordSimple word = wordSimple;
- sb.append(word.getWords());
- sb.append("\n");
- }
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recWebimage(Context ctx, String filePath, final ServiceListener listener) {
- GeneralBasicParams param = new GeneralBasicParams();
- param.setDetectDirection(true);
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeWebimage(param, new OnResultListener() {
- @Override
- public void onResult(GeneralResult result) {
- StringBuilder sb = new StringBuilder();
- for (WordSimple wordSimple : result.getWordList()) {
- WordSimple word = wordSimple;
- sb.append(word.getWords());
- sb.append("\n");
- }
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recBankCard(Context ctx, String filePath, final ServiceListener listener) {
- BankCardParams param = new BankCardParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeBankCard(param, new OnResultListener() {
- @Override
- public void onResult(BankCardResult result) {
- /*String res = String.format("卡号：%s\n类型：%s\n发卡行：%s\n有效日期：%s\n持有者姓名：%s",
- result.getBankCardNumber(),
- result.getBankCardType().name(),
- result.getBankName(),
- result.getValid_date(),
- result.getHolder_name());
- listener.onResult(res);*/
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recVehicleLicense(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeVehicleLicense(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recDrivingLicense(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeDrivingLicense(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recLicensePlate(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeLicensePlate(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recBusinessLicense(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeBusinessLicense(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recReceipt(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- param.putParam("detect_direction", "true");
- OCR.getInstance(ctx).recognizeReceipt(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recTaxireceipt(Context ctx, String filePath, final ServiceListener listener){
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeTaxireceipt(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recVincode(Context ctx, String filePath, final ServiceListener listener){
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeVincode(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recTrainticket(Context ctx, String filePath, final ServiceListener listener){
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeTrainticket(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recPassport(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizePassport(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recVatInvoice(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeVatInvoice(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recQrcode(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeQrcode(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recNumbers(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeNumbers(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recLottery(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeLottery(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recBusinessCard(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeBusinessCard(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recHandwriting(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeHandwriting(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recCustom(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.putParam("templateSign", "");
- param.putParam("classifierId", 0);
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recognizeCustom(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recTripTicket(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeTripTicket(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recCarSellInvoice(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeVihickleSellInvoice(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recVihicleCertification(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeVihickleCertificate(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recExampleDoc(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeExampleDoc(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recWrittenText(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeWrittenText(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recHuKouPage(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeHuKouPage(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recNormalMachineInvoice(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeNormalMachineInvoice(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recweightnote(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeweightnote(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void recmedicaldetail(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzemedicaldetail(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-
- public static void reconlinetaxiitinerary(Context ctx, String filePath, final ServiceListener listener) {
- OcrRequestParams param = new OcrRequestParams();
- param.setImageFile(new File(filePath));
- OCR.getInstance(ctx).recoginzeonlinetaxiitinerary(param, new OnResultListener() {
- @Override
- public void onResult(OcrResponseResult result) {
- listener.onResult(result.getJsonRes());
- }
-
- @Override
- public void onError(OCRError error) {
- listener.onResult(error.getMessage());
- }
- });
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/SpfUtil.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/util/SpfUtil.java
deleted file mode 100644
index 153381e..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/SpfUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.micode.notes.util;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-public class SpfUtil {
-
- private static String SPF_NAME = "noteSpf";
-
- public static void saveString(Context context, String key, String value) {
- SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
- SharedPreferences.Editor edit = spf.edit();
- edit.putString(key, value);
- edit.apply();
- }
-
- public static String getString(Context context, String key) {
- SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
- return spf.getString(key, "");
- }
-
- public static void saveInt(Context context, String key, int value) {
- SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
- SharedPreferences.Editor edit = spf.edit();
- edit.putInt(key, value);
- edit.apply();
- }
-
- public static int getInt(Context context, String key) {
- SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
- return spf.getInt(key, -1);
- }
-
- public static int getIntWithDefault(Context context, String key, int defValue) {
- SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
- return spf.getInt(key, defValue);
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/ToastUtil.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/util/ToastUtil.java
deleted file mode 100644
index b1894f7..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/util/ToastUtil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.micode.notes.util;
-
-import android.content.Context;
-import android.widget.Toast;
-
-public class ToastUtil {
-
- public static void toastShort(Context context, String msg) {
- Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
- }
-
- public static void toastLong(Context context, String msg) {
- Toast.makeText(context, msg, Toast.LENGTH_LONG).show();
- }
-}
diff --git a/src/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
deleted file mode 100644
index ec6f819..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
deleted file mode 100644
index adcb2f7..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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;
-
-
-public class NoteWidgetProvider_2x extends NoteWidgetProvider {
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
- super.update(context, appWidgetManager, appWidgetIds);
- }
-
- @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/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
deleted file mode 100644
index c12a02e..0000000
--- a/src/开发项目源代码/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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;
-
-
-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/开发项目源代码/app/src/main/res/color/primary_text_dark.xml b/src/开发项目源代码/app/src/main/res/color/primary_text_dark.xml
deleted file mode 100644
index 8ad98e3..0000000
--- a/src/开发项目源代码/app/src/main/res/color/primary_text_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/color/secondary_text_dark.xml b/src/开发项目源代码/app/src/main/res/color/secondary_text_dark.xml
deleted file mode 100644
index 9cf8a1a..0000000
--- a/src/开发项目源代码/app/src/main/res/color/secondary_text_dark.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
deleted file mode 100644
index 5eb5d44..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/bg_btn_set_color.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
deleted file mode 100644
index 100db77..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/call_record.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/call_record.png
deleted file mode 100644
index fb88ca4..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/call_record.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/clock.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/clock.png
deleted file mode 100644
index 5f2ae9a..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/clock.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/delete.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/delete.png
deleted file mode 100644
index 643de3e..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/delete.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
deleted file mode 100644
index 5525025..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/dropdown_icon.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_blue.9.png
deleted file mode 100644
index 55a1856..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_blue.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_green.9.png
deleted file mode 100644
index 2cb2d60..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_green.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_red.9.png
deleted file mode 100644
index bae944a..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_red.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
deleted file mode 100644
index 96e6092..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_blue.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_green.9.png
deleted file mode 100644
index 08d8644..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_green.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_red.9.png
deleted file mode 100644
index 9c430e5..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_red.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_white.9.png
deleted file mode 100644
index 19e8d95..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_white.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
deleted file mode 100644
index bf8f580..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_white.9.png
deleted file mode 100644
index 918f7a6..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_white.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_yellow.9.png
deleted file mode 100644
index 10cb642..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/edit_yellow.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_large.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_large.png
deleted file mode 100644
index 78cf2e6..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_large.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_normal.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_normal.png
deleted file mode 100644
index 9de7ced..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_normal.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
deleted file mode 100644
index be8e64c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_small.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_small.png
deleted file mode 100644
index d3ff104..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_small.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_super.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_super.png
deleted file mode 100644
index 85b13a1..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/font_super.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/icon_app.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/icon_app.png
deleted file mode 100644
index 418aadc..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/icon_app.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_background.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_background.png
deleted file mode 100644
index 087e1f9..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_background.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_down.9.png
deleted file mode 100644
index b88eebf..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_down.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
deleted file mode 100644
index 96b1c8b..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_middle.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_single.9.png
deleted file mode 100644
index d7e7206..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_single.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_up.9.png
deleted file mode 100644
index 632e88c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_blue_up.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_folder.9.png
deleted file mode 100644
index 829f61b..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_folder.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
deleted file mode 100644
index 5325c25..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_footer_bg.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_down.9.png
deleted file mode 100644
index 64a39d9..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_down.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_middle.9.png
deleted file mode 100644
index 897325a..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_middle.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_single.9.png
deleted file mode 100644
index c83405f..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_single.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_up.9.png
deleted file mode 100644
index 141f9e1..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_green_up.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_down.9.png
deleted file mode 100644
index 4224309..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_down.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_middle.9.png
deleted file mode 100644
index 9988f17..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_middle.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_single.9.png
deleted file mode 100644
index 587c348..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_single.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_up.9.png
deleted file mode 100644
index 46b4757..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_red_up.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_down.9.png
deleted file mode 100644
index 29f9d8c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_down.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_middle.9.png
deleted file mode 100644
index 77a4ab4..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_middle.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_single.9.png
deleted file mode 100644
index 3e79189..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_single.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_up.9.png
deleted file mode 100644
index e23cd5c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_white_up.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
deleted file mode 100644
index 31cfc1e..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_down.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
deleted file mode 100644
index b6549b2..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
deleted file mode 100644
index 3faf507..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_single.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
deleted file mode 100644
index 4ae791c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/list_yellow_up.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/menu_delete.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/menu_delete.png
deleted file mode 100644
index ccdfc4b..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/menu_delete.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/menu_move.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/menu_move.png
deleted file mode 100644
index 1140b71..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/menu_move.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/new_note_normal.png
deleted file mode 100644
index e24e0d1..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/new_note_normal.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/new_note_pressed.png
deleted file mode 100644
index c748936..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/new_note_pressed.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
deleted file mode 100644
index fc49552..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/notification.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/notification.png
deleted file mode 100644
index b13ab4a..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/notification.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/search_result.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/search_result.png
deleted file mode 100644
index ff2befd..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/search_result.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/selected.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/selected.png
deleted file mode 100644
index b889bef..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/selected.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/title_alert.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/title_alert.png
deleted file mode 100644
index 544ee9c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/title_alert.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
deleted file mode 100644
index eb6bff0..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/title_bar_bg.9.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_blue.png
deleted file mode 100644
index a1707f4..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_blue.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_green.png
deleted file mode 100644
index f86886c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_green.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_red.png
deleted file mode 100644
index 0e66c29..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_red.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_white.png
deleted file mode 100644
index 5f0619a..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_white.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
deleted file mode 100644
index 12d1c2b..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_2x_yellow.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_blue.png
deleted file mode 100644
index 9183738..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_blue.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_green.png
deleted file mode 100644
index fa8b452..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_green.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_red.png
deleted file mode 100644
index 62de074..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_red.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_white.png
deleted file mode 100644
index a37d67c..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_white.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
deleted file mode 100644
index d7c5fa4..0000000
Binary files a/src/开发项目源代码/app/src/main/res/drawable-hdpi/widget_4x_yellow.png and /dev/null differ
diff --git a/src/开发项目源代码/app/src/main/res/drawable/ic_baseline_search_24.xml b/src/开发项目源代码/app/src/main/res/drawable/ic_baseline_search_24.xml
deleted file mode 100644
index a5687c6..0000000
--- a/src/开发项目源代码/app/src/main/res/drawable/ic_baseline_search_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/drawable/new_note.xml b/src/开发项目源代码/app/src/main/res/drawable/new_note.xml
deleted file mode 100644
index 2154ebc..0000000
--- a/src/开发项目源代码/app/src/main/res/drawable/new_note.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/layout/account_dialog_title.xml b/src/开发项目源代码/app/src/main/res/layout/account_dialog_title.xml
deleted file mode 100644
index 7717112..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/account_dialog_title.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/activity_add.xml b/src/开发项目源代码/app/src/main/res/layout/activity_add.xml
deleted file mode 100644
index 07bbb1a..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/activity_add.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/activity_edit.xml b/src/开发项目源代码/app/src/main/res/layout/activity_edit.xml
deleted file mode 100644
index 6025b35..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/activity_edit.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/activity_pwd.xml b/src/开发项目源代码/app/src/main/res/layout/activity_pwd.xml
deleted file mode 100644
index 4c34c84..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/activity_pwd.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/activity_safe_folder.xml b/src/开发项目源代码/app/src/main/res/layout/activity_safe_folder.xml
deleted file mode 100644
index a633020..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/activity_safe_folder.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/layout/add_account_text.xml b/src/开发项目源代码/app/src/main/res/layout/add_account_text.xml
deleted file mode 100644
index c799178..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/add_account_text.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/datetime_picker.xml b/src/开发项目源代码/app/src/main/res/layout/datetime_picker.xml
deleted file mode 100644
index f10d592..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/datetime_picker.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/dialog_edit_text.xml b/src/开发项目源代码/app/src/main/res/layout/dialog_edit_text.xml
deleted file mode 100644
index 361b39a..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/dialog_edit_text.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/folder_list_item.xml b/src/开发项目源代码/app/src/main/res/layout/folder_list_item.xml
deleted file mode 100644
index 77e8148..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/folder_list_item.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/list_item_dialog_layout.xml b/src/开发项目源代码/app/src/main/res/layout/list_item_dialog_layout.xml
deleted file mode 100644
index 0649dfd..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/list_item_dialog_layout.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/list_item_layout.xml b/src/开发项目源代码/app/src/main/res/layout/list_item_layout.xml
deleted file mode 100644
index 9f4e656..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/list_item_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/note_edit.xml b/src/开发项目源代码/app/src/main/res/layout/note_edit.xml
deleted file mode 100644
index 138331d..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/note_edit.xml
+++ /dev/null
@@ -1,431 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/layout/note_edit_list_item.xml b/src/开发项目源代码/app/src/main/res/layout/note_edit_list_item.xml
deleted file mode 100644
index a885f9c..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/note_edit_list_item.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/layout/note_item.xml b/src/开发项目源代码/app/src/main/res/layout/note_item.xml
deleted file mode 100644
index d541f6a..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/note_item.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/layout/note_list.xml b/src/开发项目源代码/app/src/main/res/layout/note_list.xml
deleted file mode 100644
index a74d07b..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/note_list.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/开发项目源代码/app/src/main/res/layout/note_list_dropdown_menu.xml
deleted file mode 100644
index 3fa271d..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/note_list_dropdown_menu.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/note_list_footer.xml b/src/开发项目源代码/app/src/main/res/layout/note_list_footer.xml
deleted file mode 100644
index 5ca7b22..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/note_list_footer.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/settings_header.xml b/src/开发项目源代码/app/src/main/res/layout/settings_header.xml
deleted file mode 100644
index 5eb8c50..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/settings_header.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/layout/widget_2x.xml b/src/开发项目源代码/app/src/main/res/layout/widget_2x.xml
deleted file mode 100644
index 55970ce..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/widget_2x.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/layout/widget_4x.xml b/src/开发项目源代码/app/src/main/res/layout/widget_4x.xml
deleted file mode 100644
index dc9bb51..0000000
--- a/src/开发项目源代码/app/src/main/res/layout/widget_4x.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/menu/call_note_edit.xml b/src/开发项目源代码/app/src/main/res/menu/call_note_edit.xml
deleted file mode 100644
index 02c0528..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/call_note_edit.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/menu/call_record_folder.xml b/src/开发项目源代码/app/src/main/res/menu/call_record_folder.xml
deleted file mode 100644
index a54dc4a..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/call_record_folder.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/menu/note_edit.xml b/src/开发项目源代码/app/src/main/res/menu/note_edit.xml
deleted file mode 100644
index 35cacd1..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/note_edit.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/menu/note_list.xml b/src/开发项目源代码/app/src/main/res/menu/note_list.xml
deleted file mode 100644
index 42ea736..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/note_list.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/menu/note_list_dropdown.xml b/src/开发项目源代码/app/src/main/res/menu/note_list_dropdown.xml
deleted file mode 100644
index 7cbaadc..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/note_list_dropdown.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/menu/note_list_options.xml b/src/开发项目源代码/app/src/main/res/menu/note_list_options.xml
deleted file mode 100644
index daac008..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/note_list_options.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/menu/safe.xml b/src/开发项目源代码/app/src/main/res/menu/safe.xml
deleted file mode 100644
index bab0adc..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/safe.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/menu/sub_folder.xml b/src/开发项目源代码/app/src/main/res/menu/sub_folder.xml
deleted file mode 100644
index b00de26..0000000
--- a/src/开发项目源代码/app/src/main/res/menu/sub_folder.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/raw-zh-rCN/introduction b/src/开发项目源代码/app/src/main/res/raw-zh-rCN/introduction
deleted file mode 100644
index 7188359..0000000
--- a/src/开发项目源代码/app/src/main/res/raw-zh-rCN/introduction
+++ /dev/null
@@ -1,7 +0,0 @@
-欢迎使用MIUI便签！
-
- 无论从软件中直接添加，还是从桌面拖出widget，MIUI便签能让你快速建立和保存便签；
-
- 除了调整文字大小、便签背景、文件夹等基础功能外，你会发现MIUI便签也提供了清单模式、便签提醒、软件加密、导出到SD卡、同步google task的高级功能，让你的生活记录更加美好和安全；
-
- 来分享你的使用体验吧：http://www.miui.com/index.php
diff --git a/src/开发项目源代码/app/src/main/res/raw/introduction b/src/开发项目源代码/app/src/main/res/raw/introduction
deleted file mode 100644
index 269cf7b..0000000
--- a/src/开发项目源代码/app/src/main/res/raw/introduction
+++ /dev/null
@@ -1 +0,0 @@
-Welcome to use MIUI notes!
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/values-zh-rCN/arrays.xml b/src/开发项目源代码/app/src/main/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index a092386..0000000
--- a/src/开发项目源代码/app/src/main/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
- 短信
- 邮件
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/values-zh-rCN/strings.xml b/src/开发项目源代码/app/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 09f75ed..0000000
--- a/src/开发项目源代码/app/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
- 便签
- 便签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”的搜索结果
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/values-zh-rTW/arrays.xml b/src/开发项目源代码/app/src/main/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index 5297209..0000000
--- a/src/开发项目源代码/app/src/main/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
- 短信
- 郵件
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/values-zh-rTW/strings.xml b/src/开发项目源代码/app/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index e29b79b..0000000
--- a/src/开发项目源代码/app/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
- 便簽
- 便簽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“的搜尋結果
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/values/arrays.xml b/src/开发项目源代码/app/src/main/res/values/arrays.xml
deleted file mode 100644
index e00210b..0000000
--- a/src/开发项目源代码/app/src/main/res/values/arrays.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
- -%s
- --%s
- --%s
- --%s
-
-
-
- Messaging
- Email
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/values/colors.xml b/src/开发项目源代码/app/src/main/res/values/colors.xml
deleted file mode 100644
index 123ffbf..0000000
--- a/src/开发项目源代码/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- #335b5b5b
-
diff --git a/src/开发项目源代码/app/src/main/res/values/dimens.xml b/src/开发项目源代码/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 194e84f..0000000
--- a/src/开发项目源代码/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- 33sp
- 26sp
- 20sp
- 17sp
- 14sp
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/values/strings.xml b/src/开发项目源代码/app/src/main/res/values/strings.xml
deleted file mode 100644
index a0af4e6..0000000
--- a/src/开发项目源代码/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
- 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\"
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/values/styles.xml b/src/开发项目源代码/app/src/main/res/values/styles.xml
deleted file mode 100644
index d750e65..0000000
--- a/src/开发项目源代码/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/app/src/main/res/xml/preferences.xml b/src/开发项目源代码/app/src/main/res/xml/preferences.xml
deleted file mode 100644
index fe58f8f..0000000
--- a/src/开发项目源代码/app/src/main/res/xml/preferences.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/xml/searchable.xml b/src/开发项目源代码/app/src/main/res/xml/searchable.xml
deleted file mode 100644
index bf74f14..0000000
--- a/src/开发项目源代码/app/src/main/res/xml/searchable.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/xml/widget_2x_info.xml b/src/开发项目源代码/app/src/main/res/xml/widget_2x_info.xml
deleted file mode 100644
index ac8b225..0000000
--- a/src/开发项目源代码/app/src/main/res/xml/widget_2x_info.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/res/xml/widget_4x_info.xml b/src/开发项目源代码/app/src/main/res/xml/widget_4x_info.xml
deleted file mode 100644
index cf79f9c..0000000
--- a/src/开发项目源代码/app/src/main/res/xml/widget_4x_info.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/src/开发项目源代码/app/src/main/resources/com.test/16k_test.pcm b/src/开发项目源代码/app/src/main/resources/com.test/16k_test.pcm
deleted file mode 100644
index e5194ef..0000000
Binary files a/src/开发项目源代码/app/src/main/resources/com.test/16k_test.pcm and /dev/null differ
diff --git a/src/开发项目源代码/build.gradle b/src/开发项目源代码/build.gradle
deleted file mode 100644
index 3134bba..0000000
--- a/src/开发项目源代码/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- //google()
- //jcenter()
- maven { url 'https://maven.aliyun.com/repository/google' } //google
- maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
- maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:4.1.3'
- }
-}
-
-allprojects {
- repositories {
- //google()
- //jcenter()
- maven { url 'https://maven.aliyun.com/repository/google' } //google
- maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
- maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
- }
-}
diff --git a/src/开发项目源代码/core/.gitignore b/src/开发项目源代码/core/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/src/开发项目源代码/core/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/src/开发项目源代码/core/build.gradle b/src/开发项目源代码/core/build.gradle
deleted file mode 100644
index 6c9d9ed..0000000
--- a/src/开发项目源代码/core/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-apply plugin: 'com.android.library'
-
-
-android {
- compileSdkVersion 28
-
- defaultConfig {
- minSdkVersion 16
- targetSdkVersion 28
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
- packagingOptions{
- doNotStrip "*/*/libvad.dnn.so"
- doNotStrip "*/*/libbd_easr_s1_merge_normal_20151216.dat.so"
- }
-}
-
-
-
-dependencies {
- api fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'androidx.appcompat:appcompat:1.0.2'
-}
diff --git a/src/开发项目源代码/core/core.iml b/src/开发项目源代码/core/core.iml
deleted file mode 100644
index 290b3b6..0000000
--- a/src/开发项目源代码/core/core.iml
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/core/libs/bdasr_V3_20210628_cfe8c44.jar b/src/开发项目源代码/core/libs/bdasr_V3_20210628_cfe8c44.jar
deleted file mode 100644
index 927c281..0000000
Binary files a/src/开发项目源代码/core/libs/bdasr_V3_20210628_cfe8c44.jar and /dev/null differ
diff --git a/src/开发项目源代码/core/proguard-rules.pro b/src/开发项目源代码/core/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/src/开发项目源代码/core/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/src/开发项目源代码/core/src/main/AndroidManifest.xml b/src/开发项目源代码/core/src/main/AndroidManifest.xml
deleted file mode 100644
index 95cdd46..0000000
--- a/src/开发项目源代码/core/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/core/src/main/assets/README.txt b/src/开发项目源代码/core/src/main/assets/README.txt
deleted file mode 100644
index 357557e..0000000
--- a/src/开发项目源代码/core/src/main/assets/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-百度语音识别SDK在demo程序中assets目录的文件解释说明:
-WakeUp.bin 唤醒功能的唤醒词配置文件, 需要在百度语音开发平台中定义和导出 http://speech.baidu.com/wake
-baidu_speech_grammar.bsg 自定义语义以及离线命令词识别共用的语法文件, 需要在百度语音开发平台中定义和导出 http://speech.baidu.com/asr
\ No newline at end of file
diff --git a/src/开发项目源代码/core/src/main/assets/WakeUp.bin b/src/开发项目源代码/core/src/main/assets/WakeUp.bin
deleted file mode 100644
index 88fca58..0000000
--- a/src/开发项目源代码/core/src/main/assets/WakeUp.bin
+++ /dev/null
@@ -1 +0,0 @@
-fAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZBfAEYGGtOpEYB_ZB
\ No newline at end of file
diff --git a/src/开发项目源代码/core/src/main/assets/baidu_speech_grammar.bsg b/src/开发项目源代码/core/src/main/assets/baidu_speech_grammar.bsg
deleted file mode 100644
index 7eda192..0000000
--- a/src/开发项目源代码/core/src/main/assets/baidu_speech_grammar.bsg
+++ /dev/null
@@ -1 +0,0 @@
-%7B%0A%20%20%20%20%22version%22%3A%20%220.1%22%2C%0A%20%20%20%20%22slots%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22name%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%22%E5%BC%A0%E4%B8%89%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22%E6%9D%8E%E5%9B%9B%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22%E7%8E%8B%E4%BA%94%22%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22appname%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%22%E5%BE%AE%E4%BF%A1%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22%E7%99%BE%E5%BA%A6%E5%9C%B0%E5%9B%BE%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22%E7%9F%AD%E4%BF%A1%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22%E8%AE%A1%E7%AE%97%E5%99%A8%22%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22msgbody%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%22.%2B%22%0A%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22rules%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22telephone.call%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%89%93%E7%94%B5%E8%AF%9D%E7%BB%99%3Cname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%89%93%E7%94%B5%E8%AF%9D%E7%BB%99(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%89%93%E7%BB%99%3Cname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%89%93%E7%BB%99(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E5%91%BC%E5%8F%AB%3Cname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E5%91%BC%E5%8F%AB(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E7%BB%99%3Cname%3E%E6%89%93%E7%94%B5%E8%AF%9D%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E7%BB%99(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%E6%89%93%E7%94%B5%E8%AF%9D%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22contacts.view%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%9F%A5%E7%9C%8B%3Cname%3E%E7%9A%84%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%9F%A5%E7%9C%8B(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%E7%9A%84%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%9F%A5%E7%9C%8B%3Cname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%9F%A5%E7%9C%8B(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22contacts.create%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%96%B0%E5%BB%BA%E8%81%94%E7%B3%BB%E4%BA%BA%3Cname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%96%B0%E5%BB%BA%E8%81%94%E7%B3%BB%E4%BA%BA(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22contacts.remove%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E5%88%A0%E9%99%A4%3Cname%3E%E7%9A%84%E8%81%94%E7%B3%BB%E6%96%B9%E5%BC%8F%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E5%88%A0%E9%99%A4(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%E7%9A%84%E8%81%94%E7%B3%BB%E6%96%B9%E5%BC%8F%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22message.view%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%9F%A5%E7%9C%8B%E6%9C%AA%E8%AF%BB%E7%9F%AD%E4%BF%A1%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%9F%A5%E7%9C%8B%E6%9C%AA%E8%AF%BB%E7%9F%AD%E4%BF%A1%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22message.send%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%E5%86%85%E5%AE%B9%E6%98%AF%3Cmsgbody%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99(%E5%BC%A0%E4%B8%89%7C%E6%9D%8E%E5%9B%9B%7C%E7%8E%8B%E4%BA%94)%E5%86%85%E5%AE%B9%E6%98%AF(.%2B)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22name%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22msgbody%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22app.open%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%89%93%E5%BC%80%3Cappname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%89%93%E5%BC%80(%E5%BE%AE%E4%BF%A1%7C%E7%99%BE%E5%BA%A6%E5%9C%B0%E5%9B%BE%7C%E7%9F%AD%E4%BF%A1%7C%E8%AE%A1%E7%AE%97%E5%99%A8)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22appname%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E5%90%AF%E5%8A%A8%3Cappname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E5%90%AF%E5%8A%A8(%E5%BE%AE%E4%BF%A1%7C%E7%99%BE%E5%BA%A6%E5%9C%B0%E5%9B%BE%7C%E7%9F%AD%E4%BF%A1%7C%E8%AE%A1%E7%AE%97%E5%99%A8)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22appname%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22app.search%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E6%90%9C%E7%B4%A2%3Cappname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E6%90%9C%E7%B4%A2(%E5%BE%AE%E4%BF%A1%7C%E7%99%BE%E5%BA%A6%E5%9C%B0%E5%9B%BE%7C%E7%9F%AD%E4%BF%A1%7C%E8%AE%A1%E7%AE%97%E5%99%A8)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22appname%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%20%20%22app.download%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22origin%22%3A%20%22%E4%B8%8B%E8%BD%BD%3Cappname%3E%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22pattern%22%3A%20%22%5E%E4%B8%8B%E8%BD%BD(%E5%BE%AE%E4%BF%A1%7C%E7%99%BE%E5%BA%A6%E5%9C%B0%E5%9B%BE%7C%E7%9F%AD%E4%BF%A1%7C%E8%AE%A1%E7%AE%97%E5%99%A8)%24%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22groups%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22appname%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%5D%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22grammar%22%3A%20%22%3Cname%3E%20%3D%20%E5%BC%A0%E4%B8%89%7C%20%5Cn%E6%9D%8E%E5%9B%9B%7C%20%5Cn%E7%8E%8B%E4%BA%94%3B%5Cn%3Cappname%3E%20%3D%20%E5%BE%AE%E4%BF%A1%7C%20%5Cn%E7%99%BE%E5%BA%A6%E5%9C%B0%E5%9B%BE%7C%20%5Cn%E7%9F%AD%E4%BF%A1%7C%20%5Cn%E8%AE%A1%E7%AE%97%E5%99%A8%3B%5Cn%3Cmsgbody%3E%20%3D%20%E8%AF%8D%E6%9D%A1%E9%BB%98%E8%AE%A4%E5%80%BC%3B%5Cn%3Cauto_create_node%3E%20%3D%20%E6%9F%A5%E7%9C%8B%E6%9C%AA%E8%AF%BB%E7%9F%AD%E4%BF%A1%3B%5Cn%3C_wakeup%3E%20%3D%20%E5%94%A4%E9%86%92%E8%AF%8D%E5%8D%A0%E4%BD%8D%E7%AC%A6%3B%5Cn%5Cn%5Cn_SCENE_ID_%200%5Cn%5Cn(%20%3Cauto_create_node%3E%20)%5Cn%5Cn(%20%3C_wakeup%3E%3Cauto_create_node%3E%20)%5Cn%5Cn(%20%E6%89%93%E7%94%B5%E8%AF%9D%E7%BB%99%3Cname%3E%20)%5Cn(%20%3C_wakeup%3E%E6%89%93%E7%94%B5%E8%AF%9D%E7%BB%99%3Cname%3E%20)%5Cn(%20%E6%89%93%E7%BB%99%3Cname%3E%20)%5Cn(%20%3C_wakeup%3E%E6%89%93%E7%BB%99%3Cname%3E%20)%5Cn(%20%E5%91%BC%E5%8F%AB%3Cname%3E%20)%5Cn(%20%3C_wakeup%3E%E5%91%BC%E5%8F%AB%3Cname%3E%20)%5Cn(%20%E7%BB%99%3Cname%3E%E6%89%93%E7%94%B5%E8%AF%9D%20)%5Cn(%20%3C_wakeup%3E%E7%BB%99%3Cname%3E%E6%89%93%E7%94%B5%E8%AF%9D%20)%5Cn(%20%E6%9F%A5%E7%9C%8B%3Cname%3E%E7%9A%84%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81%20)%5Cn(%20%3C_wakeup%3E%E6%9F%A5%E7%9C%8B%3Cname%3E%E7%9A%84%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81%20)%5Cn(%20%E6%9F%A5%E7%9C%8B%3Cname%3E%20)%5Cn(%20%3C_wakeup%3E%E6%9F%A5%E7%9C%8B%3Cname%3E%20)%5Cn(%20%E6%96%B0%E5%BB%BA%E8%81%94%E7%B3%BB%E4%BA%BA%3Cname%3E%20)%5Cn(%20%3C_wakeup%3E%E6%96%B0%E5%BB%BA%E8%81%94%E7%B3%BB%E4%BA%BA%3Cname%3E%20)%5Cn(%20%E5%88%A0%E9%99%A4%3Cname%3E%E7%9A%84%E8%81%94%E7%B3%BB%E6%96%B9%E5%BC%8F%20)%5Cn(%20%3C_wakeup%3E%E5%88%A0%E9%99%A4%3Cname%3E%E7%9A%84%E8%81%94%E7%B3%BB%E6%96%B9%E5%BC%8F%20)%5Cn(%20%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%20)%5Cn(%20%3C_wakeup%3E%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%20)%5Cn(%20%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%E5%86%85%E5%AE%B9%E6%98%AF%3Cmsgbody%3E%20)%5Cn(%20%3C_wakeup%3E%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%E5%86%85%E5%AE%B9%E6%98%AF%3Cmsgbody%3E%20)%5Cn(%20%E6%89%93%E5%BC%80%3Cappname%3E%20)%5Cn(%20%3C_wakeup%3E%E6%89%93%E5%BC%80%3Cappname%3E%20)%5Cn(%20%E5%90%AF%E5%8A%A8%3Cappname%3E%20)%5Cn(%20%3C_wakeup%3E%E5%90%AF%E5%8A%A8%3Cappname%3E%20)%5Cn(%20%E6%90%9C%E7%B4%A2%3Cappname%3E%20)%5Cn(%20%3C_wakeup%3E%E6%90%9C%E7%B4%A2%3Cappname%3E%20)%5Cn(%20%E4%B8%8B%E8%BD%BD%3Cappname%3E%20)%5Cn(%20%3C_wakeup%3E%E4%B8%8B%E8%BD%BD%3Cappname%3E%20)%5Cn%22%2C%0A%20%20%20%20%22origin_slots%22%3A%20%22name%20%3D%20%E5%BC%A0%E4%B8%89%2C%20%E6%9D%8E%E5%9B%9B%2C%20%E7%8E%8B%E4%BA%94%5Cnappname%20%3D%20%E5%BE%AE%E4%BF%A1%2C%20%E7%99%BE%E5%BA%A6%E5%9C%B0%E5%9B%BE%2C%20%E7%9F%AD%E4%BF%A1%2C%20%E8%AE%A1%E7%AE%97%E5%99%A8%5Cnmsgbody%20%3D%20*%22%2C%0A%20%20%20%20%22origin_rules%22%3A%20%22telephone.call%20%20%20%20%20%3D%20%E6%89%93%E7%94%B5%E8%AF%9D%E7%BB%99%3Cname%3E%2C%20%E6%89%93%E7%BB%99%3Cname%3E%2C%20%E5%91%BC%E5%8F%AB%3Cname%3E%2C%E7%BB%99%3Cname%3E%E6%89%93%E7%94%B5%E8%AF%9D%5Cncontacts.view%20%20%20%20%20%3D%20%E6%9F%A5%E7%9C%8B%3Cname%3E%E7%9A%84%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81%2C%20%E6%9F%A5%E7%9C%8B%3Cname%3E%5Cncontacts.create%20%20%3D%20%E6%96%B0%E5%BB%BA%E8%81%94%E7%B3%BB%E4%BA%BA%3Cname%3E%5Cncontacts.remove%3D%20%E5%88%A0%E9%99%A4%3Cname%3E%E7%9A%84%E8%81%94%E7%B3%BB%E6%96%B9%E5%BC%8F%5Cnmessage.view%20%20%20%20%20%3D%20%E6%9F%A5%E7%9C%8B%E6%9C%AA%E8%AF%BB%E7%9F%AD%E4%BF%A1%5Cnmessage.send%20%20%20%20%3D%20%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%2C%20%E5%8F%91%E7%9F%AD%E4%BF%A1%E7%BB%99%3Cname%3E%E5%86%85%E5%AE%B9%E6%98%AF%3Cmsgbody%3E%5Cnapp.open%20%20%20%20%20%20%20%20%20%20%20%20%3D%20%E6%89%93%E5%BC%80%3Cappname%3E%2C%20%E5%90%AF%E5%8A%A8%3Cappname%3E%5Cnapp.search%20%20%20%20%20%20%20%20%20%3D%20%E6%90%9C%E7%B4%A2%3Cappname%3E%5Cnapp.download%20%20%20%20%3D%20%E4%B8%8B%E8%BD%BD%3Cappname%3E%22%0A%7D
\ No newline at end of file
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/FileAudioInputStream.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/FileAudioInputStream.java
deleted file mode 100644
index 74b497e..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/FileAudioInputStream.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.inputstream;
-
-import android.util.Log;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Created by fujiayi on 2017/11/27.
- *
- * 解决大文件的输入问题。
- * 文件大时不能通过Infile参数一下子输入。
- */
-
-public class FileAudioInputStream extends InputStream {
-
- private InputStream in;
-
- private long nextSleepTime = -1;
-
- private long totalSleepMs = 0;
-
- private static final String TAG = "FileAudioInputStream";
-
- public FileAudioInputStream(String file) throws FileNotFoundException {
- in = new FileInputStream(file);
- }
-
- public FileAudioInputStream(InputStream in) {
- this.in = in;
- }
-
- @Override
- public int read() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int read(byte[] buffer, int byteOffset, int byteCount) throws IOException {
- int bytePerMs = 16000 * 2 / 1000;
- int count = bytePerMs * 20; // 20ms 音频数据
- if (byteCount < count) {
- count = byteCount;
- }
- if (nextSleepTime > 0) {
- try {
- long sleepMs = nextSleepTime - System.currentTimeMillis();
- if (sleepMs > 0) {
- Log.i(TAG, "will sleep " + sleepMs);
- Thread.sleep(sleepMs); // 每20ms的音频 ，比如等待20ms传输下一批
- totalSleepMs += sleepMs;
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- int r = in.read(buffer, byteOffset, count);
-
- /*
- if (r >= 0) {
- Log.i("FileAudioInputStream", "Debug:" + System.currentTimeMillis() + ": " + md5(buffer, byteOffset, r));
- } else {
- Log.i("FileAudioInputStream", "Debug:" + System.currentTimeMillis() + ": return " + r);
- }
- */
- nextSleepTime = System.currentTimeMillis() + r / bytePerMs;
-
- // 如果是长语音，在r=-1的情况下，需要手动调用stop
- return r;
- }
-
- @Override
- public void close() throws IOException {
- super.close();
- Log.i(TAG, "time sleeped " + totalSleepMs);
- if (null != in) {
- in.close();
- }
- }
-
- private String md5(byte[] buffer, int byteOffset, int byteCount) {
- try {
- MessageDigest digest = MessageDigest.getInstance("MD5");
- digest.reset();
- digest.update(buffer, byteOffset, byteCount);
- BigInteger bigInt = new BigInteger(1, digest.digest());
- return bigInt.toString(16);
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- }
- return null;
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/InFileStream.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/InFileStream.java
deleted file mode 100644
index eebc3cb..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/InFileStream.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.inputstream;
-
-import android.app.Activity;
-import android.content.Context;
-
-import com.baidu.aip.asrwakeup3.core.util.MyLogger;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Created by fujiayi on 2017/6/20.
- */
-
-public class InFileStream {
-
- private static Context context;
-
- private static final String TAG = "InFileStream";
-
- private static volatile String filename;
-
- private static volatile InputStream is;
-
- // 以下3个setContext
-
- /**
- * 必须要先调用这个方法
- * 如之后调用create16kStream，使用默认的app/src/main/assets/outfile.pcm作为输入
- * 如之后调用createMyPipedInputStream， 见 InPipedStream
- *
- * @param context
- */
- public static void setContext(Context context) {
- InFileStream.context = context;
- }
-
- /**
- * 使用pcm文件作为输入
- *
- * @param context
- * @param filename
- */
- public static void setContext(Context context, String filename) {
- InFileStream.context = context;
- InFileStream.filename = filename;
- }
-
- public static void setContext(Context context, InputStream is) {
- InFileStream.context = context;
- InFileStream.is = is;
- }
-
- public static Context getContext() {
- return context;
- }
-
- public static void reset() {
- filename = null;
- is = null;
- }
-
-
- public static InputStream createMyPipedInputStream() {
- return InPipedStream.createAndStart(context);
- }
-
- /**
- * 默认使用必须要先调用setContext
- * 默认从createFileStream中读取InputStream
- *
- * @return
- */
- public static InputStream create16kStream() {
- if (is == null && filename == null) {
- // 没有任何设置的话，从createFileStream中读取
- return new FileAudioInputStream(createFileStream());
- }
-
- if (is != null) { // 默认为null，setInputStream调用后走这个逻辑
- return new FileAudioInputStream(is);
- } else if (filename != null) { // 默认为null， setFileName调用后走这个逻辑
- try {
- return new FileAudioInputStream(filename);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- }
-
- return null;
- }
-
- private static InputStream createFileStream() {
- try {
- // 这里抛异常表示没有调用 setContext方法
- InputStream is = context.getAssets().open("outfile.pcm");
- MyLogger.info(TAG, "create input stream ok " + is.available());
- return is;
- } catch (IOException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/InPipedStream.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/InPipedStream.java
deleted file mode 100644
index 9b89b36..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/InPipedStream.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.inputstream;
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-
-/**
- * 本示例从app/src/main/assets/outfile.pcm作为byte[]的输入
- * 生成PipedInputStream作为SDK里IN_FILE的参数
- */
-public class InPipedStream {
-
- private PipedInputStream pipedInputStream;
- private PipedOutputStream pipedOutputStream;
- private Context context;
-
- private InPipedStream(Context context) {
- pipedInputStream = new PipedInputStream();
- pipedOutputStream = new PipedOutputStream();
- this.context = context;
- }
-
- private void start() throws IOException {
- /** 准备绑定 **/
- pipedInputStream.connect(pipedOutputStream);
-
- /** 准备文件 **/
-
- /** 新线程中放入 20ms 音频数据，注意从新线程放入**/
- Runnable run = new Runnable() {
- @Override
- public void run() {
-
- try {
- final InputStream is = context.getAssets().open("outfile.pcm");
- /** 读取20ms的音频二进制数据 放入buffer 中**/
- int bytePerMs = 16000 * 2 / 1000;
- int count = bytePerMs * 20; // 20ms 音频数据
- int r = 0;
- byte[] buffer = new byte[count];
- do {
- r = is.read(buffer);
- int sleepTime = 0;
- if (r > 0) {
- pipedOutputStream.write(buffer, 0, count);
- sleepTime = r / bytePerMs;
- } else if (r == 0) {
- sleepTime = 100; // 这里数值按照自己情况而定
- }
- if (sleepTime > 0) {
- try {
- Thread.sleep(sleepTime);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- } while (r >= 0);
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- }
- };
- (new Thread(run)).start();
- }
-
- public static PipedInputStream createAndStart(Context context) {
- InPipedStream obj = new InPipedStream(context);
- try {
- obj.start();
- } catch (IOException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- return obj.pipedInputStream;
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/MyMicrophoneInputStream.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/MyMicrophoneInputStream.java
deleted file mode 100644
index 8be10c5..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/inputstream/MyMicrophoneInputStream.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.inputstream;
-
-import android.content.Context;
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.MediaRecorder;
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Created by fujiayi on 2017/11/27.
- */
-
-public class MyMicrophoneInputStream extends InputStream {
- private static AudioRecord audioRecord;
-
- private static MyMicrophoneInputStream is;
-
- private boolean isStarted = false;
-
- private static final String TAG = "MyMicrophoneInputStream";
-
- public MyMicrophoneInputStream() {
- if (audioRecord == null) {
- int bufferSize = AudioRecord.getMinBufferSize(16000,
- AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT) * 16;
- audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC,
- 16000, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, bufferSize);
-
-
- }
-
-
- }
-
- public static MyMicrophoneInputStream getInstance() {
- if (is == null) {
- synchronized (MyMicrophoneInputStream.class) {
- if (is == null) {
- is = new MyMicrophoneInputStream();
- }
- }
- }
- return is;
- }
-
- public void start() {
- Log.i(TAG, " MyMicrophoneInputStream start recoding!");
- try {
- if (audioRecord == null
- || audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
- throw new IllegalStateException(
- "startRecording() called on an uninitialized AudioRecord." + (audioRecord == null));
- }
-
- Context context = InFileStream.getContext();
-
- audioRecord.startRecording();
-
- } catch (Exception e) {
- Log.e(TAG, e.getClass().getSimpleName(), e);
- }
- Log.i(TAG, " MyMicrophoneInputStream start recoding finished");
- }
-
- @Override
- public int read() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int read(byte[] b, int off, int len) throws IOException {
-
- if (!isStarted) {
- start(); // 建议在CALLBACK_EVENT_ASR_READY事件中调用。
- isStarted = true;
- }
- try {
- int count = audioRecord.read(b, off, len);
- return count;
- } catch (Exception e) {
- Log.e(TAG, e.getClass().getSimpleName(), e);
- throw e;
- }
-
- }
-
- // 建议在建议在CALLBACK_EVENT_ASR_EXIT事件中调用
- @Override
- public void close() throws IOException {
- Log.i(TAG, " MyMicrophoneInputStream close");
- if (audioRecord != null) {
- audioRecord.stop();
- // audioRecord.release(); 程序结束别忘记自行释放
- isStarted = false;
- }
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniRecog.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniRecog.java
deleted file mode 100644
index 532b383..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniRecog.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.mini;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.baidu.aip.asrwakeup3.core.R;
-import com.baidu.aip.asrwakeup3.core.util.AuthUtil;
-import com.baidu.speech.EventListener;
-import com.baidu.speech.EventManager;
-import com.baidu.speech.EventManagerFactory;
-import com.baidu.speech.asr.SpeechConstant;
-
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 集成文档： http://ai.baidu.com/docs#/ASR-Android-SDK/top 集成指南一节
- * demo目录下doc_integration_DOCUMENT
- * ASR-INTEGRATION-helloworld ASR集成指南-集成到helloworld中 对应 ActivityMiniRecog
- * ASR-INTEGRATION-TTS-DEMO ASR集成指南-集成到合成DEMO中 对应 ActivityRecog
- */
-
-public class ActivityMiniRecog extends AppCompatActivity implements EventListener {
- protected TextView txtLog;
- protected TextView txtResult;
- protected Button btn;
- protected Button stopBtn;
- private static String DESC_TEXT = "精简版识别，带有SDK唤醒运行的最少代码，仅仅展示如何调用，\n" +
- "也可以用来反馈测试SDK输入参数及输出回调。\n" +
- "本示例需要自行根据文档填写参数，可以使用之前识别示例中的日志中的参数。\n" +
- "需要完整版请参见之前的识别示例。\n" +
- "需要测试离线命令词识别功能可以将本类中的enableOffline改成true，首次测试离线命令词请联网使用。之后请说出“打电话给李四”";
-
- private EventManager asr;
-
- private boolean logTime = true;
-
- protected boolean enableOffline = false; // 测试离线命令词，需要改成true
-
- /**
- * 基于SDK集成2.2 发送开始事件
- * 点击开始按钮
- * 测试参数填在这里
- */
- private void start() {
- txtLog.setText("");
- Map params = AuthUtil.getParam();
- String event = null;
- event = SpeechConstant.ASR_START; // 替换成测试的event
-
- if (enableOffline) {
- params.put(SpeechConstant.DECODER, 2);
- }
- // 基于SDK集成2.1 设置识别参数
- params.put(SpeechConstant.ACCEPT_AUDIO_VOLUME, false);
- // params.put(SpeechConstant.NLU, "enable");
- // params.put(SpeechConstant.BDS_ASR_ENABLE_LONG_SPEECH, true);//长语音 优先级高于VAD_ENDPOINT_TIMEOUT
- // params.put(SpeechConstant.VAD_ENDPOINT_TIMEOUT, 0); // 长语音
-
- // params.put(SpeechConstant.IN_FILE, "res:///com/baidu/android/voicedemo/16k_test.pcm");
- // params.put(SpeechConstant.VAD, SpeechConstant.VAD_DNN);
- // params.put(SpeechConstant.PID, 1537); // 中文输入法模型，有逗号
-
- /* 语音自训练平台特有参数 */
- // params.put(SpeechConstant.PID, 8002);
- // 语音自训练平台特殊pid，8002：模型类似开放平台 1537 具体是8001还是8002，看自训练平台页面上的显示
- // params.put(SpeechConstant.LMID,1068);
- // 语音自训练平台已上线的模型ID，https://ai.baidu.com/smartasr/model
- // 注意模型ID必须在你的appId所在的百度账号下
- /* 语音自训练平台特有参数 */
-
- /* 测试InputStream*/
- // InFileStream.setContext(this);
- // params.put(SpeechConstant.IN_FILE,
- // "#com.baidu.aip.asrwakeup3.core.inputstream.InFileStream.createMyPipedInputStream()");
-
- // 请先使用如‘在线识别’界面测试和生成识别参数。 params同ActivityRecog类中myRecognizer.start(params);
- // 复制此段可以自动检测错误
- (new AutoCheck(getApplicationContext(), new Handler() {
- public void handleMessage(Message msg) {
- if (msg.what == 100) {
- AutoCheck autoCheck = (AutoCheck) msg.obj;
- synchronized (autoCheck) {
- String message = autoCheck.obtainErrorMessage(); // autoCheck.obtainAllMessage();
- txtLog.append(message + "\n");
- ; // 可以用下面一行替代，在logcat中查看代码
- // Log.w("AutoCheckMessage", message);
- }
- }
- }
- }, enableOffline)).checkAsr(params);
- String json = null; // 可以替换成自己的json
- json = new JSONObject(params).toString(); // 这里可以替换成你需要测试的json
- asr.send(event, json, null, 0, 0);
- printLog("输入参数：" + json);
- }
-
- /**
- * 点击停止按钮
- * 基于SDK集成4.1 发送停止事件
- */
- private void stop() {
- printLog("停止识别：ASR_STOP");
- asr.send(SpeechConstant.ASR_STOP, null, null, 0, 0); //
- }
-
-
- /**
- * enableOffline设为true时，在onCreate中调用
- * 基于SDK离线命令词1.4 加载离线资源(离线时使用)
- */
- private void loadOfflineEngine() {
- Map params = new LinkedHashMap();
- params.put(SpeechConstant.DECODER, 2);
- params.put(SpeechConstant.ASR_OFFLINE_ENGINE_GRAMMER_FILE_PATH, "assets://baidu_speech_grammar.bsg");
- asr.send(SpeechConstant.ASR_KWS_LOAD_ENGINE, new JSONObject(params).toString(), null, 0, 0);
- }
-
- /**
- * enableOffline为true时，在onDestory中调用，与loadOfflineEngine对应
- * 基于SDK集成5.1 卸载离线资源步骤(离线时使用)
- */
- private void unloadOfflineEngine() {
- asr.send(SpeechConstant.ASR_KWS_UNLOAD_ENGINE, null, null, 0, 0); //
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.common_mini);
- initView();
- initPermission();
- // 基于sdk集成1.1 初始化EventManager对象
- asr = EventManagerFactory.create(this, "asr");
- // 基于sdk集成1.3 注册自己的输出事件类
- asr.registerListener(this); // EventListener 中 onEvent方法
- btn.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- start();
- }
- });
- stopBtn.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- stop();
- }
- });
- if (enableOffline) {
- loadOfflineEngine(); // 测试离线命令词请开启, 测试 ASR_OFFLINE_ENGINE_GRAMMER_FILE_PATH 参数时开启
- }
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- asr.send(SpeechConstant.ASR_CANCEL, "{}", null, 0, 0);
- Log.i("ActivityMiniRecog", "On pause");
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- // 基于SDK集成4.2 发送取消事件
- asr.send(SpeechConstant.ASR_CANCEL, "{}", null, 0, 0);
- if (enableOffline) {
- unloadOfflineEngine(); // 测试离线命令词请开启, 测试 ASR_OFFLINE_ENGINE_GRAMMER_FILE_PATH 参数时开启
- }
-
- // 基于SDK集成5.2 退出事件管理器
- // 必须与registerListener成对出现，否则可能造成内存泄露
- asr.unregisterListener(this);
- }
-
- // 基于sdk集成1.2 自定义输出事件类 EventListener 回调方法
- // 基于SDK集成3.1 开始回调事件
- @Override
- public void onEvent(String name, String params, byte[] data, int offset, int length) {
- String logTxt = "name: " + name;
-
- if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL)) {
- // 识别相关的结果都在这里
- if (params == null || params.isEmpty()) {
- return;
- }
- if (params.contains("\"nlu_result\"")) {
- // 一句话的语义解析结果
- if (length > 0 && data.length > 0) {
- logTxt += ", 语义解析结果：" + new String(data, offset, length);
- }
- } else if (params.contains("\"partial_result\"")) {
- // 一句话的临时识别结果
- logTxt += ", 临时识别结果：" + params;
- } else if (params.contains("\"final_result\"")) {
- // 一句话的最终识别结果
- logTxt += ", 最终识别结果：" + params;
- } else {
- // 一般这里不会运行
- logTxt += " ;params :" + params;
- if (data != null) {
- logTxt += " ;data length=" + data.length;
- }
- }
- } else {
- // 识别开始，结束，音量，音频数据回调
- if (params != null && !params.isEmpty()){
- logTxt += " ;params :" + params;
- }
- if (data != null) {
- logTxt += " ;data length=" + data.length;
- }
- }
-
-
- printLog(logTxt);
- }
-
- private void printLog(String text) {
- if (logTime) {
- text += " ;time=" + System.currentTimeMillis();
- }
- text += "\n";
- Log.i(getClass().getName(), text);
- txtLog.append(text + "\n");
- }
-
-
- private void initView() {
- txtResult = (TextView) findViewById(R.id.txtResult);
- txtLog = (TextView) findViewById(R.id.txtLog);
- btn = (Button) findViewById(R.id.btn);
- stopBtn = (Button) findViewById(R.id.btn_stop);
- txtLog.setText(DESC_TEXT + "\n");
- }
-
- /**
- * android 6.0 以上需要动态申请权限
- */
- private void initPermission() {
- String permissions[] = {Manifest.permission.RECORD_AUDIO,
- Manifest.permission.ACCESS_NETWORK_STATE,
- Manifest.permission.INTERNET,
- Manifest.permission.WRITE_EXTERNAL_STORAGE
- };
-
- ArrayList toApplyList = new ArrayList();
-
- for (String perm : permissions) {
- if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(this, perm)) {
- toApplyList.add(perm);
- // 进入到这里代表没有权限.
-
- }
- }
- String tmpList[] = new String[toApplyList.size()];
- if (!toApplyList.isEmpty()) {
- ActivityCompat.requestPermissions(this, toApplyList.toArray(tmpList), 123);
- }
-
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
- // 此处为android 6.0以上动态授权的回调，用户自行实现。
- }
-
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniUnit.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniUnit.java
deleted file mode 100644
index d77b16d..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniUnit.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.mini;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.baidu.aip.asrwakeup3.core.R;
-import com.baidu.aip.asrwakeup3.core.util.AuthUtil;
-import com.baidu.speech.EventListener;
-import com.baidu.speech.EventManager;
-import com.baidu.speech.EventManagerFactory;
-import com.baidu.speech.asr.SpeechConstant;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 集成文档： http://ai.baidu.com/docs#/ASR-Android-SDK/top 集成指南一节
- * demo目录下doc_integration_DOCUMENT
- * ASR-INTEGRATION-helloworld ASR集成指南-集成到helloworld中 对应 ActivityMiniRecog
- * ASR-INTEGRATION-TTS-DEMO ASR集成指南-集成到合成DEMO中 对应 ActivityRecog
- */
-
-public class ActivityMiniUnit extends AppCompatActivity implements EventListener {
- protected TextView txtLog;
- protected TextView txtResult;
- protected Button btn;
- protected Button stopBtn;
- private static String DESC_TEXT =
- "UNIT 2.0为自定义语义解析+多轮会话等功能。语音SDK使用时，仅省去一次http请求。（语音SDK调用Unit实际效果）=（语音识别后的文字+Unit http请求结果）\n\n"+
- "精简版Unit，带有SDKUnit功能的最少代码，仅仅展示如何调用，\n" +
- "结果返回‘我不知道应该怎么答复您。’表示测试成功。 \n" +
- "上述句子测试成功后，Unit 2.0具体功能请通过Unit的QQ群，工单，论坛咨询。语音相关反馈方式不回复Unit相关问题。https://ai.baidu.com/unit/home";
-
- private EventManager asr;
-
- private boolean logTime = true;
-
- protected boolean enableOffline = false; // 测试Unit 2.0 功能，必须一直联网
-
- private String BOT_ID = "26435"; // 修改你自己的AppId AppKey AppSecret后，换成你自己的BOT_ID测试
-
- /**
- * 基于SDK集成2.2 发送开始事件
- * 点击开始按钮
- * 测试参数填在这里
- */
- private void start() {
- txtLog.setText("");
- Map params = AuthUtil.getParam();
- String event = null;
- event = SpeechConstant.ASR_START; // 替换成测试的event
-
- if (enableOffline) {
- params.put(SpeechConstant.DECODER, 2);
- }
- // 基于SDK集成2.1 设置识别参数
- params.put(SpeechConstant.ACCEPT_AUDIO_VOLUME, false);
- params.put(SpeechConstant.PID, 15374); // 或 19364 Unit 2.0 固定pid,仅支持中文普通话
- // params.put(SpeechConstant.NLU, "enable");
- // params.put(SpeechConstant.VAD_ENDPOINT_TIMEOUT, 0); // 长语音
- // params.put(SpeechConstant.IN_FILE, "res:///com/baidu/android/voicedemo/16k_test.pcm");
- // params.put(SpeechConstant.VAD, SpeechConstant.VAD_DNN);
-
- // 请先使用如‘在线识别’界面测试和生成识别参数。 params同ActivityRecog类中myRecognizer.start(params);
- params.put(SpeechConstant.BOT_SESSION_LIST, unitParams());
- // 复制此段可以自动检测错误
- (new AutoCheck(getApplicationContext(), new Handler() {
- public void handleMessage(Message msg) {
- if (msg.what == 100) {
- AutoCheck autoCheck = (AutoCheck) msg.obj;
- synchronized (autoCheck) {
- String message = autoCheck.obtainErrorMessage(); // autoCheck.obtainAllMessage();
- txtLog.append(message + "\n");
- ; // 可以用下面一行替代，在logcat中查看代码
- // Log.w("AutoCheckMessage", message);
- }
- }
- }
- },enableOffline)).checkAsr(params);
- String json = null; // 可以替换成自己的json
- json = new JSONObject(params).toString(); // 这里可以替换成你需要测试的json
- asr.send(event, json, null, 0, 0);
- printLog("输入参数：" + json);
- }
-
- /**
- * 点击停止按钮
- * 基于SDK集成4.1 发送停止事件
- */
- private void stop() {
- printLog("停止识别：ASR_STOP");
- asr.send(SpeechConstant.ASR_STOP, null, null, 0, 0); //
- }
-
-
- /**
- * enableOffline设为true时，在onCreate中调用
- * 基于SDK离线命令词1.4 加载离线资源(离线时使用)
- */
- private void loadOfflineEngine() {
- Map params = new LinkedHashMap();
- params.put(SpeechConstant.DECODER, 2);
- params.put(SpeechConstant.ASR_OFFLINE_ENGINE_GRAMMER_FILE_PATH, "assets://baidu_speech_grammar.bsg");
- asr.send(SpeechConstant.ASR_KWS_LOAD_ENGINE, new JSONObject(params).toString(), null, 0, 0);
- }
-
- /**
- * enableOffline为true时，在onDestory中调用，与loadOfflineEngine对应
- * 基于SDK集成5.1 卸载离线资源步骤(离线时使用)
- */
- private void unloadOfflineEngine() {
- asr.send(SpeechConstant.ASR_KWS_UNLOAD_ENGINE, null, null, 0, 0); //
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.common_mini);
- initView();
- initPermission();
- // 基于sdk集成1.1 初始化EventManager对象
- asr = EventManagerFactory.create(this, "asr");
- // 基于sdk集成1.3 注册自己的输出事件类
- asr.registerListener(this); // EventListener 中 onEvent方法
- btn.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- start();
- }
- });
- stopBtn.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- stop();
- }
- });
- if (enableOffline) {
- loadOfflineEngine(); // 测试离线命令词请开启, 测试 ASR_OFFLINE_ENGINE_GRAMMER_FILE_PATH 参数时开启
- }
- }
-
- @Override
- protected void onPause(){
- super.onPause();
- asr.send(SpeechConstant.ASR_CANCEL, "{}", null, 0, 0);
- Log.i("ActivityMiniRecog","On pause");
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- // 基于SDK集成4.2 发送取消事件
- asr.send(SpeechConstant.ASR_CANCEL, "{}", null, 0, 0);
- if (enableOffline) {
- unloadOfflineEngine(); // 测试离线命令词请开启, 测试 ASR_OFFLINE_ENGINE_GRAMMER_FILE_PATH 参数时开启
- }
-
- // 基于SDK集成5.2 退出事件管理器
- // 必须与registerListener成对出现，否则可能造成内存泄露
- asr.unregisterListener(this);
- }
-
- /**
- * Unit 2.0具体功能请通过Unit的QQ群，工单，论坛咨询。语音相关反馈方式不回复Unit相关问题
- * @return
- */
- private JSONArray unitParams() {
- JSONArray json = new JSONArray();
- try {
- JSONObject bot = new JSONObject();
- bot.put("bot_id",BOT_ID);
- bot.put("bot_session_id","");
- bot.put("bot_session","");
- json.put(bot);
- } catch (JSONException e) {
- e.printStackTrace();
- }
- return json;
- }
-
- // 基于sdk集成1.2 自定义输出事件类 EventListener 回调方法
- // 基于SDK集成3.1 开始回调事件
- @Override
- public void onEvent(String name, String params, byte[] data, int offset, int length) {
- String logTxt = "name: " + name;
-
-
- if (params != null && !params.isEmpty()) {
- logTxt += " ;params :" + params;
- }
- if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL)) {
- if (params != null && params.contains("\"nlu_result\"")) {
- if (length > 0 && data.length > 0) {
- logTxt += ", 语义解析结果：" + new String(data, offset, length);
- }
- }
- } else if (data != null) {
- logTxt += " ;data length=" + data.length;
- }
- printLog(logTxt);
- }
-
- private void printLog(String text) {
- if (logTime) {
- text += " ;time=" + System.currentTimeMillis();
- }
- text += "\n";
- Log.i(getClass().getName(), text);
- txtLog.append(text + "\n");
- }
-
-
- private void initView() {
- txtResult = (TextView) findViewById(R.id.txtResult);
- txtLog = (TextView) findViewById(R.id.txtLog);
- btn = (Button) findViewById(R.id.btn);
- stopBtn = (Button) findViewById(R.id.btn_stop);
- txtLog.setText(DESC_TEXT + "\n");
- }
-
- /**
- * android 6.0 以上需要动态申请权限
- */
- private void initPermission() {
- String permissions[] = {Manifest.permission.RECORD_AUDIO,
- Manifest.permission.ACCESS_NETWORK_STATE,
- Manifest.permission.INTERNET,
- Manifest.permission.WRITE_EXTERNAL_STORAGE
- };
-
- ArrayList toApplyList = new ArrayList();
-
- for (String perm : permissions) {
- if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(this, perm)) {
- toApplyList.add(perm);
- // 进入到这里代表没有权限.
-
- }
- }
- String tmpList[] = new String[toApplyList.size()];
- if (!toApplyList.isEmpty()) {
- ActivityCompat.requestPermissions(this, toApplyList.toArray(tmpList), 123);
- }
-
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
- // 此处为android 6.0以上动态授权的回调，用户自行实现。
- }
-
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniWakeUp.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniWakeUp.java
deleted file mode 100644
index e923a2f..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/ActivityMiniWakeUp.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.mini;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.baidu.aip.asrwakeup3.core.R;
-import com.baidu.aip.asrwakeup3.core.inputstream.InFileStream;
-import com.baidu.aip.asrwakeup3.core.util.AuthUtil;
-import com.baidu.speech.EventListener;
-import com.baidu.speech.EventManager;
-import com.baidu.speech.EventManagerFactory;
-import com.baidu.speech.asr.SpeechConstant;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Created by fujiayi on 2017/8/15.
- */
-
-public class ActivityMiniWakeUp extends AppCompatActivity implements EventListener {
- protected TextView txtLog;
- protected TextView txtResult;
- protected Button btn;
- protected Button stopBtn;
- private static String DESC_TEXT = "精简版唤醒，带有SDK唤醒运行的最少代码，仅仅展示如何调用，\n" +
- "也可以用来反馈测试SDK输入参数及输出回调。\n" +
- "本示例需要自行根据文档填写参数，可以使用之前唤醒示例中的日志中的参数。\n" +
- "需要完整版请参见之前的唤醒示例。\n\n" +
- "唤醒词是纯离线功能，需要获取正式授权文件（与离线命令词的正式授权文件是同一个）。 第一次联网使用唤醒词功能自动获取正式授权文件。之后可以断网测试\n" +
- "请说“小度你好”或者 “百度一下”\n\n";
-
- private EventManager wakeup;
-
- private boolean logTime = true;
-
- /**
- * 测试参数填在这里
- * 基于SDK唤醒词集成第2.1 设置唤醒的输入参数
- */
- private void start() {
- txtLog.setText("");
- // 基于SDK唤醒词集成第2.1 设置唤醒的输入参数
- Map params = AuthUtil.getParam();
- params.put(SpeechConstant.ACCEPT_AUDIO_VOLUME, false);
- params.put(SpeechConstant.WP_WORDS_FILE, "assets:///WakeUp.bin");
- // "assets:///WakeUp.bin" 表示WakeUp.bin文件定义在assets目录下
- InFileStream.setContext(this);
- String json = null; // 这里可以替换成你需要测试的json
- json = new JSONObject(params).toString();
- wakeup.send(SpeechConstant.WAKEUP_START, json, null, 0, 0);
- printLog("输入参数：" + json);
- }
-
- // 基于SDK唤醒词集成第4.1 发送停止事件
- private void stop() {
- wakeup.send(SpeechConstant.WAKEUP_STOP, null, null, 0, 0); //
- }
-
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.common_mini);
- initView();
- initPermission();
- // 基于SDK唤醒词集成1.1 初始化EventManager
- wakeup = EventManagerFactory.create(this, "wp");
- // 基于SDK唤醒词集成1.3 注册输出事件
- wakeup.registerListener(this); // EventListener 中 onEvent方法
- btn.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- start();
- }
- });
- stopBtn.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- stop();
- }
- });
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- wakeup.send(SpeechConstant.WAKEUP_STOP, "{}", null, 0, 0);
- }
-
- // 基于SDK唤醒词集成1.2 自定义输出事件类 EventListener 回调方法
- // 基于SDK唤醒3.1 开始回调事件
- @Override
- public void onEvent(String name, String params, byte[] data, int offset, int length) {
- String logTxt = "name: " + name;
- if (params != null && !params.isEmpty()) {
- logTxt += " ;params :" + params;
- } else if (data != null) {
- logTxt += " ;data length=" + data.length;
- }
- printLog(logTxt);
- }
-
- private void printLog(String text) {
- if (logTime) {
- text += " ;time=" + System.currentTimeMillis();
- }
- text += "\n";
- Log.i(getClass().getName(), text);
- txtLog.append(text + "\n");
- }
-
-
- private void initView() {
- txtResult = (TextView) findViewById(R.id.txtResult);
- txtLog = (TextView) findViewById(R.id.txtLog);
- btn = (Button) findViewById(R.id.btn);
- stopBtn = (Button) findViewById(R.id.btn_stop);
- txtLog.setText(DESC_TEXT + "\n");
- }
-
- /**
- * android 6.0 以上需要动态申请权限
- */
- private void initPermission() {
- String[] permissions = {Manifest.permission.RECORD_AUDIO,
- Manifest.permission.ACCESS_NETWORK_STATE,
- Manifest.permission.INTERNET,
- Manifest.permission.WRITE_EXTERNAL_STORAGE
- };
-
- ArrayList toApplyList = new ArrayList();
-
- for (String perm : permissions) {
- if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(this, perm)) {
- toApplyList.add(perm);
- // 进入到这里代表没有权限.
-
- }
- }
- String[] tmpList = new String[toApplyList.size()];
- if (!toApplyList.isEmpty()) {
- ActivityCompat.requestPermissions(this, toApplyList.toArray(tmpList), 123);
- }
-
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
- // 此处为android 6.0以上动态授权的回调，用户自行实现。
- }
-
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/AutoCheck.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/AutoCheck.java
deleted file mode 100644
index 9de1747..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/mini/AutoCheck.java
+++ /dev/null
@@ -1,472 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.mini;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-import androidx.core.content.ContextCompat;
-
-import com.baidu.speech.asr.SpeechConstant;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.TreeSet;
-
-import javax.net.ssl.HttpsURLConnection;
-
-public class AutoCheck {
- public static final boolean isOnlineLited = false; // 是否只需要是纯在线识别功能
- private LinkedHashMap checks;
-
- private Context context;
- private Handler handler;
-
- private boolean hasError;
- private boolean enableOffline;
- private boolean isFinished = false;
-
- private String name;
-
- private static final String TAG = "AutoCheck";
-
- public AutoCheck(Context context, final Handler handler, boolean enableOffline) {
- this.context = context;
- checks = new LinkedHashMap<>();
- this.handler = handler;
- this.enableOffline = enableOffline;
- }
-
- public void checkAsr(final Map params) {
- Thread t = new Thread(new Runnable() {
- @Override
- public void run() {
- AutoCheck obj = checkAsrInternal(params);
- name = "识别";
- synchronized (obj) { // 偶发，同步线程信息
- isFinished = true;
- Message msg = handler.obtainMessage(100, obj);
- handler.sendMessage(msg);
- }
- }
- });
- t.start();
- }
-
- public String obtainErrorMessage() {
- PrintConfig config = new PrintConfig();
- return formatString(config);
- }
-
- public String obtainDebugMessage() {
- PrintConfig config = new PrintConfig();
- config.withInfo = true;
- return formatString(config);
- }
-
- public String obtainAllMessage() {
- PrintConfig config = new PrintConfig();
- config.withLog = true;
- config.withInfo = true;
- config.withLogOnSuccess = true;
- return formatString(config);
- }
-
- private String formatString(PrintConfig config) {
- StringBuilder sb = new StringBuilder();
- hasError = false;
-
- for (HashMap.Entry entry : checks.entrySet()) {
- Check check = entry.getValue();
- String testName = entry.getKey();
- if (check.hasError()) {
- if (!hasError) {
- hasError = true;
- }
-
- sb.append("【错误】【").append(testName).append(" 】 ").append(check.getErrorMessage()).append("\n");
- Log.e("AutoCheck", sb.toString());
- if (check.hasFix()) {
- sb.append("【修复方法】【").append(testName).append(" 】 ").append(check.getFixMessage()).append("\n");
- }
- } else if (config.withEachCheckInfo) {
- sb.append("【无报错】【").append(testName).append(" 】 ").append("\n");
- }
- if (config.withInfo && check.hasInfo()) {
- sb.append("【请手动检查】【").append(testName).append("】 ").append(check.getInfoMessage()).append("\n");
- }
- if (config.withLog && (config.withLogOnSuccess || hasError) && check.hasLog()) {
- sb.append("【log】:" + check.getLogMessage()).append("\n");
- }
- }
- if (!hasError) {
- sb.append("【" + name + "】集成自动排查工具： 恭喜没有检测到任何问题\n");
- }
- return sb.toString();
- }
-
- private AutoCheck checkAsrInternal(Map params) {
- commonSetting(params);
- checks.put("外部音频文件存在校验", new FileCheck(context, params, SpeechConstant.IN_FILE));
- checks.put("离线命令词及本地语义bsg文件存在校验",
- new FileCheck(context, params, SpeechConstant.ASR_OFFLINE_ENGINE_GRAMMER_FILE_PATH));
- for (Map.Entry e : checks.entrySet()) {
- Check check = e.getValue();
- check.check();
- if (check.hasError()) {
- break;
- }
- }
- return this;
- }
-
- private void commonSetting(Map params) {
- checks.put("检查申请的Android权限", new PermissionCheck(context));
- checks.put("检查so文件是否存在", new JniCheck(context));
- AppInfoCheck infoCheck = null;
- try {
- infoCheck = new AppInfoCheck(context, params);
- checks.put("检查AppId AppKey SecretKey", infoCheck);
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- Log.e(TAG, "检查AppId AppKey SecretKey 错误", e);
- return;
- }
- if (enableOffline) {
- checks.put("检查包名", new ApplicationIdCheck(context, infoCheck.appId));
- }
-
- }
-
- private static class PrintConfig {
- public boolean withEachCheckInfo = false;
- public boolean withInfo = false;
- public boolean withLog = false;
- public boolean withLogOnSuccess = false;
- }
-
-
- private static class PermissionCheck extends Check {
- private Context context;
-
- public PermissionCheck(Context context) {
- this.context = context;
- }
-
- @Override
- public void check() {
- String[] permissions = {
- Manifest.permission.RECORD_AUDIO,
- Manifest.permission.ACCESS_NETWORK_STATE,
- Manifest.permission.INTERNET,
- // Manifest.permission.WRITE_EXTERNAL_STORAGE,
- };
-
- ArrayList toApplyList = new ArrayList();
- for (String perm : permissions) {
- if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(context, perm)) {
- toApplyList.add(perm);
- // 进入到这里代表没有权限.
- }
- }
- if (!toApplyList.isEmpty()) {
- errorMessage = "缺少权限：" + toApplyList;
- fixMessage = "请从AndroidManifest.xml复制相关权限";
- }
- }
- }
-
- private static class JniCheck extends Check {
- private Context context;
-
- private String[] soNames;
-
- public JniCheck(Context context) {
- this.context = context;
- if (isOnlineLited) {
- soNames = new String[]{"libBaiduSpeechSDK.so", "libvad.dnn.so"};
- } else {
- soNames = new String[]{"libBaiduSpeechSDK.so", "libvad.dnn.so",
- "libbd_easr_s1_merge_normal_20151216.dat.so", "libbdEASRAndroid.so",
- "libbdSpilWakeup.so"};
- }
- }
-
- @Override
- public void check() {
- String path = context.getApplicationInfo().nativeLibraryDir;
- appendLogMessage("Jni so文件目录 " + path);
- File[] files = new File(path).listFiles();
- TreeSet set = new TreeSet<>();
- if (files != null) {
- for (File file : files) {
- set.add(file.getName());
- }
- }
- // String debugMessage = "Jni目录内文件: " + set.toString();
- // boolean isSuccess = true;
- for (String name : soNames) {
- if (!set.contains(name)) {
- errorMessage = "Jni目录" + path + " 缺少so文件：" + name + "， 该目录文件列表: " + set.toString();
- fixMessage = "如果您的app内没有其它so文件，请复制demo里的src/main/jniLibs至同名目录。"
- + " 如果app内有so文件，请合并目录放一起(注意目录取交集，多余的目录删除)。";
- break;
- }
- }
- }
- }
-
- private static class AppInfoCheck extends Check {
- private String appId;
- private String appKey;
- private String secretKey;
-
- public AppInfoCheck(Context context, Map params) throws PackageManager.NameNotFoundException {
-
- if (params.get(SpeechConstant.APP_ID) != null) {
- appId = params.get(SpeechConstant.APP_ID).toString();
- }
- if (params.get(SpeechConstant.APP_KEY) != null) {
- appKey = params.get(SpeechConstant.APP_KEY).toString();
- }
-
- if (params.get(SpeechConstant.SECRET) != null) {
- secretKey = params.get(SpeechConstant.SECRET).toString();
- }
- }
-
-
- public void check() {
- do {
- appendLogMessage("try to check appId " + appId + " ,appKey=" + appKey + " ,secretKey" + secretKey);
- if (appId == null || appId.isEmpty()) {
- errorMessage = "appId 为空";
- fixMessage = "填写appID";
- break;
- }
- if (appKey == null || appKey.isEmpty()) {
- errorMessage = "appKey 为空";
- fixMessage = "填写appID";
- break;
- }
- if (secretKey == null || secretKey.isEmpty()) {
- errorMessage = "secretKey 为空";
- fixMessage = "secretKey";
- break;
- }
-
-
- try {
- checkOnline();
- } catch (UnknownHostException e) {
- infoMessage = "无网络或者网络不连通，忽略检测 : " + e.getMessage();
- } catch (Exception e) {
- errorMessage = e.getClass().getCanonicalName() + ":" + e.getMessage();
- fixMessage = " 重新检测appId， appKey， appSecret是否正确";
- }
- } while (false);
- }
-
- public void checkOnline() throws Exception {
- String urlpath = "https://openapi.baidu.com/oauth/2.0/token?client_id="
- + appKey + "&client_secret=" + secretKey + "&grant_type=client_credentials";
- Log.i("AutoCheck", "Url is " + urlpath);
- URL url = new URL(urlpath);
- HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
- conn.setRequestMethod("GET");
- conn.setConnectTimeout(1000);
- InputStream is = conn.getInputStream();
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- StringBuilder result = new StringBuilder();
- String line = "";
- do {
- line = reader.readLine();
- if (line != null) {
- result.append(line);
- }
- } while (line != null);
- String res = result.toString();
- if (!res.contains("audio_voice_assistant_get")) {
- errorMessage = "appid:" + appId + ",没有audio_voice_assistant_get 权限，请在网页上开通\"语音识别\"能力";
- fixMessage = "secretKey";
- return;
- }
- appendLogMessage("openapi return " + res);
- JSONObject jsonObject = new JSONObject(res);
- String error = jsonObject.optString("error");
- if (error != null && !error.isEmpty()) {
- errorMessage = "appkey secretKey 错误" + ", error:" + error + ", json is" + result;
- fixMessage = " 重新检测appId对应的 appKey， appSecret是否正确";
- return;
- }
- String token = jsonObject.getString("access_token");
- if (token == null || !token.endsWith("-" + appId)) {
- errorMessage = "appId 与 appkey及 appSecret 不一致。appId = " + appId + " ,token = " + token;
- fixMessage = " 重新检测appId对应的 appKey， appSecret是否正确";
- }
- }
- }
-
- private static class ApplicationIdCheck extends Check {
-
- private String appId;
- private Context context;
-
- public ApplicationIdCheck(Context context, String appId) {
- this.appId = appId;
- this.context = context;
- }
-
- @Override
- public void check() {
- infoMessage = "如果您集成过程中遇见离线命令词或者唤醒初始化问题，请检查网页上appId：" + appId
- + " 应用填写了Android包名："
- + getApplicationId();
- }
-
- private String getApplicationId() {
- return context.getPackageName();
- }
- }
-
- private static class FileCheck extends Check {
- private Map params;
- private String key;
- private Context context;
- private boolean allowRes = false;
- private boolean allowAssets = true;
-
- public FileCheck(Context context, Map params, String key) {
- this.context = context;
- this.params = params;
- this.key = key;
- if (key.equals(SpeechConstant.IN_FILE)) {
- allowRes = true;
- allowAssets = false;
- }
- }
-
- @Override
- public void check() {
- if (!params.containsKey(key)) {
- return;
- }
- String value = params.get(key).toString();
- if (allowAssets) {
- int len = "assets".length();
- int totalLen = len + ":///".length();
- if (value.startsWith("assets")) {
- String filename = value.substring(totalLen);
- if (!":///".equals(value.substring(len, totalLen)) || filename.isEmpty()) {
- errorMessage = "参数：" + key + "格式错误：" + value;
- fixMessage = "修改成" + "assets:///sdcard/xxxx.yyy";
- }
- try {
- context.getAssets().open(filename);
- } catch (IOException e) {
- errorMessage = "assets 目录下，文件不存在：" + filename;
- fixMessage = "demo的assets目录是：src/main/assets";
- e.printStackTrace();
- }
- appendLogMessage("assets 检验完毕：" + filename);
- }
- }
- if (allowRes) {
- int len = "res".length();
- int totalLen = len + ":///".length();
- if (value.startsWith("res")) {
- String filename = value.substring(totalLen);
- if (!":///".equals(value.substring(len, totalLen)) || filename.isEmpty()) {
- errorMessage = "参数：" + key + "格式错误：" + value;
- fixMessage = "修改成" + "res:///com/baidu/android/voicedemo/16k_test.pcm";
- }
- InputStream is = getClass().getClassLoader().getResourceAsStream(filename);
- if (is == null) {
- errorMessage = "res，文件不存在：" + filename;
- fixMessage = "demo的res目录是：app/src/main/resources";
- } else {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- appendLogMessage("res 检验完毕：" + filename);
- }
- }
- if (value.startsWith("/")) {
- if (!new File(value).canRead()) {
- errorMessage = "文件不存在：" + value;
- fixMessage = "请查看文件是否存在";
- }
- appendLogMessage("文件路径 检验完毕：" + value);
- }
- }
- }
-
- private abstract static class Check {
- protected String errorMessage = null;
-
- protected String fixMessage = null;
-
- protected String infoMessage = null;
-
- protected StringBuilder logMessage;
-
- public Check() {
- logMessage = new StringBuilder();
- }
-
- public abstract void check();
-
- public boolean hasError() {
- return errorMessage != null;
- }
-
- public boolean hasFix() {
- return fixMessage != null;
- }
-
- public boolean hasInfo() {
- return infoMessage != null;
- }
-
- public boolean hasLog() {
- return !logMessage.toString().isEmpty();
- }
-
- public void appendLogMessage(String message) {
- logMessage.append(message + "\n");
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- public String getFixMessage() {
- return fixMessage;
- }
-
- public String getInfoMessage() {
- return infoMessage;
- }
-
- public String getLogMessage() {
- return logMessage.toString();
- }
- }
-}
-
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/IStatus.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/IStatus.java
deleted file mode 100644
index 4ce93ba..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/IStatus.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog;
-
-/**
- * Created by fujiayi on 2017/6/14.
- */
-
-public interface IStatus {
-
- int STATUS_NONE = 2;
-
- int STATUS_READY = 3;
- int STATUS_SPEAKING = 4;
- int STATUS_RECOGNITION = 5;
-
- int STATUS_ERROR = 100001;
-
- int STATUS_FINISHED = 6;
- int STATUS_LONG_SPEECH_FINISHED = 7;
- int STATUS_STOPPED = 10;
-
- int STATUS_WAITING_READY = 8001;
- int WHAT_MESSAGE_STATUS = 9001;
-
- int STATUS_WAKEUP_SUCCESS = 7001;
- int STATUS_WAKEUP_EXIT = 7003;
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/MyRecognizer.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/MyRecognizer.java
deleted file mode 100644
index 1dd4650..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/MyRecognizer.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog;
-
-import android.content.Context;
-import com.baidu.aip.asrwakeup3.core.util.MyLogger;
-import com.baidu.speech.EventListener;
-import com.baidu.speech.EventManager;
-import com.baidu.speech.EventManagerFactory;
-import com.baidu.speech.asr.SpeechConstant;
-import org.json.JSONObject;
-import com.baidu.aip.asrwakeup3.core.recog.listener.IRecogListener;
-import com.baidu.aip.asrwakeup3.core.recog.listener.RecogEventAdapter;
-
-import java.util.Map;
-
-/**
- * Created by fujiayi on 2017/6/13.
- * EventManager内的方法如send 都可以在主线程中进行，SDK中做过处理
- */
-
-public class MyRecognizer {
- /**
- * SDK 内部核心 EventManager 类
- */
- private EventManager asr;
-
- // SDK 内部核心 事件回调类， 用于开发者写自己的识别回调逻辑
- private EventListener eventListener;
-
- // 是否加载离线资源
- private static boolean isOfflineEngineLoaded = false;
-
- // 未release前，只能new一个
- private static volatile boolean isInited = false;
-
- private static final String TAG = "MyRecognizer";
-
- /**
- * 初始化
- *
- * @param context
- * @param recogListener 将EventListener结果做解析的DEMO回调。使用RecogEventAdapter 适配EventListener
- */
- public MyRecognizer(Context context, IRecogListener recogListener) {
- this(context, new RecogEventAdapter(recogListener));
- }
-
- /**
- * 初始化 提供 EventManagerFactory需要的Context和EventListener
- *
- * @param context
- * @param eventListener 识别状态和结果回调
- */
- public MyRecognizer(Context context, EventListener eventListener) {
- if (isInited) {
- MyLogger.error(TAG, "还未调用release()，请勿新建一个新类");
- throw new RuntimeException("还未调用release()，请勿新建一个新类");
- }
- isInited = true;
- this.eventListener = eventListener;
- // SDK集成步骤 初始化asr的EventManager示例，多次得到的类，只能选一个使用
- asr = EventManagerFactory.create(context, "asr");
- // SDK集成步骤 设置回调event， 识别引擎会回调这个类告知重要状态和识别结果
- asr.registerListener(eventListener);
- }
-
-
- /**
- * 离线命令词，在线不需要调用
- *
- * @param params 离线命令词加载参数，见文档“ASR_KWS_LOAD_ENGINE 输入事件参数”
- */
- public void loadOfflineEngine(Map params) {
- String json = new JSONObject(params).toString();
- MyLogger.info(TAG + ".Debug", "离线命令词初始化参数（反馈请带上此行日志）:" + json);
- // SDK集成步骤（可选）加载离线命令词(离线时使用)
- asr.send(SpeechConstant.ASR_KWS_LOAD_ENGINE, json, null, 0, 0);
- isOfflineEngineLoaded = true;
- }
-
- /**
- * @param params
- */
- public void start(Map params) {
- if (!isInited) {
- throw new RuntimeException("release() was called");
- }
- // SDK集成步骤 拼接识别参数
- String json = new JSONObject(params).toString();
- MyLogger.info(TAG + ".Debug", "识别参数（反馈请带上此行日志）" + json);
- asr.send(SpeechConstant.ASR_START, json, null, 0, 0);
- }
-
-
- /**
- * 提前结束录音等待识别结果。
- */
- public void stop() {
- MyLogger.info(TAG, "停止录音");
- // SDK 集成步骤（可选）停止录音
- if (!isInited) {
- throw new RuntimeException("release() was called");
- }
- asr.send(SpeechConstant.ASR_STOP, "{}", null, 0, 0);
- }
-
- /**
- * 取消本次识别，取消后将立即停止不会返回识别结果。
- * cancel 与stop的区别是 cancel在stop的基础上，完全停止整个识别流程，
- */
- public void cancel() {
- MyLogger.info(TAG, "取消识别");
- if (!isInited) {
- throw new RuntimeException("release() was called");
- }
- // SDK集成步骤 (可选） 取消本次识别
- asr.send(SpeechConstant.ASR_CANCEL, "{}", null, 0, 0);
- }
-
- public void release() {
- if (asr == null) {
- return;
- }
- cancel();
- if (isOfflineEngineLoaded) {
- // SDK集成步骤 如果之前有调用过 加载离线命令词，这里要对应释放
- asr.send(SpeechConstant.ASR_KWS_UNLOAD_ENGINE, null, null, 0, 0);
- isOfflineEngineLoaded = false;
- }
- // SDK 集成步骤（可选），卸载listener
- asr.unregisterListener(eventListener);
- asr = null;
- isInited = false;
- }
-
- public void setEventListener(IRecogListener recogListener) {
- if (!isInited) {
- throw new RuntimeException("release() was called");
- }
- this.eventListener = new RecogEventAdapter(recogListener);
- asr.registerListener(eventListener);
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/RecogResult.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/RecogResult.java
deleted file mode 100644
index c36c8a6..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/RecogResult.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Created by fujiayi on 2017/6/24.
- */
-public class RecogResult {
- private static final int ERROR_NONE = 0;
-
- private String origalJson;
- private String[] resultsRecognition;
- private String origalResult;
- private String sn; // 日志id， 请求有问题请提问带上sn
- private String desc;
- private String resultType;
- private int error = -1;
- private int subError = -1;
-
- public static RecogResult parseJson(String jsonStr) {
- RecogResult result = new RecogResult();
- result.setOrigalJson(jsonStr);
- try {
- JSONObject json = new JSONObject(jsonStr);
- int error = json.optInt("error");
- int subError = json.optInt("sub_error");
- result.setError(error);
- result.setDesc(json.optString("desc"));
- result.setResultType(json.optString("result_type"));
- result.setSubError(subError);
- if (error == ERROR_NONE) {
- result.setOrigalResult(json.getString("origin_result"));
- JSONArray arr = json.optJSONArray("results_recognition");
- if (arr != null) {
- int size = arr.length();
- String[] recogs = new String[size];
- for (int i = 0; i < size; i++) {
- recogs[i] = arr.getString(i);
- }
- result.setResultsRecognition(recogs);
- }
-
-
- }
- } catch (JSONException e) {
- e.printStackTrace();
- }
-
- return result;
- }
-
- public boolean hasError() {
- return error != ERROR_NONE;
- }
-
- public boolean isFinalResult() {
- return "final_result".equals(resultType);
- }
-
-
- public boolean isPartialResult() {
- return "partial_result".equals(resultType);
- }
-
- public boolean isNluResult() {
- return "nlu_result".equals(resultType);
- }
-
- public String getOrigalJson() {
- return origalJson;
- }
-
- public void setOrigalJson(String origalJson) {
- this.origalJson = origalJson;
- }
-
- public String[] getResultsRecognition() {
- return resultsRecognition;
- }
-
- public void setResultsRecognition(String[] resultsRecognition) {
- this.resultsRecognition = resultsRecognition;
- }
-
- public String getSn() {
- return sn;
- }
-
- public void setSn(String sn) {
- this.sn = sn;
- }
-
- public int getError() {
- return error;
- }
-
- public void setError(int error) {
- this.error = error;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public String getOrigalResult() {
- return origalResult;
- }
-
- public void setOrigalResult(String origalResult) {
- this.origalResult = origalResult;
- }
-
- public String getResultType() {
- return resultType;
- }
-
- public void setResultType(String resultType) {
- this.resultType = resultType;
- }
-
- public int getSubError() {
- return subError;
- }
-
- public void setSubError(int subError) {
- this.subError = subError;
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/ChainRecogListener.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/ChainRecogListener.java
deleted file mode 100644
index 73156d8..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/ChainRecogListener.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog.listener;
-
-
-import com.baidu.aip.asrwakeup3.core.recog.RecogResult;
-
-import java.util.ArrayList;
-
-/**
- * Created by fujiayi on 2017/10/18.
- */
-
-public class ChainRecogListener implements IRecogListener {
-
- private ArrayList listeners;
-
- public ChainRecogListener() {
- listeners = new ArrayList();
- }
-
- public void addListener(IRecogListener listener) {
- listeners.add(listener);
- }
-
- /**
- * ASR_START 输入事件调用后，引擎准备完毕
- */
- @Override
- public void onAsrReady() {
- for (IRecogListener listener : listeners) {
- listener.onAsrReady();
- }
- }
-
- /**
- * onAsrReady后检查到用户开始说话
- */
- @Override
- public void onAsrBegin() {
- for (IRecogListener listener : listeners) {
- listener.onAsrBegin();
- }
- }
-
- /**
- * 检查到用户开始说话停止，或者ASR_STOP 输入事件调用后，
- */
- @Override
- public void onAsrEnd() {
- for (IRecogListener listener : listeners) {
- listener.onAsrEnd();
- }
- }
-
- /**
- * onAsrBegin 后 随着用户的说话，返回的临时结果
- *
- * @param results 可能返回多个结果，请取第一个结果
- * @param recogResult 完整的结果
- */
- @Override
- public void onAsrPartialResult(String[] results, RecogResult recogResult) {
- for (IRecogListener listener : listeners) {
- listener.onAsrPartialResult(results, recogResult);
- }
- }
-
- /**
- * 最终的识别结果
- *
- * @param results 可能返回多个结果，请取第一个结果
- * @param recogResult 完整的结果
- */
- @Override
- public void onAsrFinalResult(String[] results, RecogResult recogResult) {
- for (IRecogListener listener : listeners) {
- listener.onAsrFinalResult(results, recogResult);
- }
- }
-
- @Override
- public void onAsrFinish(RecogResult recogResult) {
- for (IRecogListener listener : listeners) {
- listener.onAsrFinish(recogResult);
- }
- }
-
- @Override
- public void onAsrFinishError(int errorCode, int subErrorCode, String descMessage,
- RecogResult recogResult) {
- for (IRecogListener listener : listeners) {
- listener.onAsrFinishError(errorCode, subErrorCode, descMessage, recogResult);
- }
- }
-
- /**
- * 长语音识别结束
- */
- @Override
- public void onAsrLongFinish() {
- for (IRecogListener listener : listeners) {
- listener.onAsrLongFinish();
- }
- }
-
- @Override
- public void onAsrVolume(int volumePercent, int volume) {
- for (IRecogListener listener : listeners) {
- listener.onAsrVolume(volumePercent, volume);
- }
- }
-
- @Override
- public void onAsrAudio(byte[] data, int offset, int length) {
- for (IRecogListener listener : listeners) {
- listener.onAsrAudio(data, offset, length);
- }
- }
-
- @Override
- public void onAsrExit() {
- for (IRecogListener listener : listeners) {
- listener.onAsrExit();
- }
- }
-
- @Override
- public void onAsrOnlineNluResult(String nluResult) {
- for (IRecogListener listener : listeners) {
- listener.onAsrOnlineNluResult(nluResult);
- }
- }
-
- @Override
- public void onOfflineLoaded() {
- for (IRecogListener listener : listeners) {
- listener.onOfflineLoaded();
- }
- }
-
- @Override
- public void onOfflineUnLoaded() {
- for (IRecogListener listener : listeners) {
- listener.onOfflineUnLoaded();
- }
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/IRecogListener.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/IRecogListener.java
deleted file mode 100644
index 5f10996..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/IRecogListener.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog.listener;
-
-import com.baidu.aip.asrwakeup3.core.recog.RecogResult;
-
-/**
- * 与SDK中回调参数的对应关系定义在RecogEventAdapter类中
- */
-
-public interface IRecogListener {
-
- /**
- * CALLBACK_EVENT_ASR_READY
- * ASR_START 输入事件调用后，引擎准备完毕
- */
- void onAsrReady();
-
- /**
- * CALLBACK_EVENT_ASR_BEGIN
- * onAsrReady后检查到用户开始说话
- */
- void onAsrBegin();
-
- /**
- * CALLBACK_EVENT_ASR_END
- * 检查到用户开始说话停止，或者ASR_STOP 输入事件调用后，
- */
- void onAsrEnd();
-
- /**
- * CALLBACK_EVENT_ASR_PARTIAL resultType=partial_result
- * onAsrBegin 后 随着用户的说话，返回的临时结果
- *
- * @param results 可能返回多个结果，请取第一个结果
- * @param recogResult 完整的结果
- */
- void onAsrPartialResult(String[] results, RecogResult recogResult);
-
- /**
- * 语音的在线语义结果
- *
- * CALLBACK_EVENT_ASR_PARTIAL resultType=nlu_result
- * @param nluResult
- */
- void onAsrOnlineNluResult(String nluResult);
-
- /**
- * 不开启长语音仅回调一次，长语音的每一句话都会回调一次
- * CALLBACK_EVENT_ASR_PARTIAL resultType=final_result
- * 最终的识别结果
- *
- * @param results 可能返回多个结果，请取第一个结果
- * @param recogResult 完整的结果
- */
- void onAsrFinalResult(String[] results, RecogResult recogResult);
-
- /**
- * CALLBACK_EVENT_ASR_FINISH
- * @param recogResult 结束识别
- */
- void onAsrFinish(RecogResult recogResult);
-
- /**
- * CALLBACK_EVENT_ASR_FINISH error!=0
- *
- * @param errorCode
- * @param subErrorCode
- * @param descMessage
- * @param recogResult
- */
- void onAsrFinishError(int errorCode, int subErrorCode, String descMessage,
- RecogResult recogResult);
-
- /**
- * 长语音识别结束
- */
- void onAsrLongFinish();
-
- /**
- * CALLBACK_EVENT_ASR_VOLUME
- * 音量回调
- *
- * @param volumePercent 音量的相对值，百分比，0-100
- * @param volume 音量绝对值
- */
- void onAsrVolume(int volumePercent, int volume);
-
- /**
- * CALLBACK_EVENT_ASR_AUDIO
- * @param data pcm格式，16bits 16000采样率
- *
- * @param offset
- * @param length
- */
- void onAsrAudio(byte[] data, int offset, int length);
-
- /**
- * CALLBACK_EVENT_ASR_EXIT
- * 引擎完成整个识别，空闲中
- */
- void onAsrExit();
-
- /**
- * CALLBACK_EVENT_ASR_LOADED
- * 离线命令词资源加载成功
- */
- void onOfflineLoaded();
-
- /**
- * CALLBACK_EVENT_ASR_UNLOADED
- * 离线命令词资源释放成功
- */
- void onOfflineUnLoaded();
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/MessageStatusRecogListener.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/MessageStatusRecogListener.java
deleted file mode 100644
index 5d042c6..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/MessageStatusRecogListener.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog.listener;
-
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-import com.baidu.aip.asrwakeup3.core.recog.IStatus;
-import com.baidu.aip.asrwakeup3.core.recog.RecogResult;
-import com.baidu.speech.asr.SpeechConstant;
-
-/**
- * Created by fujiayi on 2017/6/16.
- */
-
-public class MessageStatusRecogListener extends StatusRecogListener {
- private Handler handler;
-
- private long speechEndTime = 0;
-
- private boolean needTime = true;
-
- private static final String TAG = "MesStatusRecogListener";
-
- public MessageStatusRecogListener(Handler handler) {
- this.handler = handler;
- }
-
-
- @Override
- public void onAsrReady() {
- super.onAsrReady();
- speechEndTime = 0;
- sendStatusMessage(SpeechConstant.CALLBACK_EVENT_WAKEUP_READY, "引擎就绪，可以开始说话。");
- }
-
- @Override
- public void onAsrBegin() {
- super.onAsrBegin();
- sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_BEGIN, "检测到用户说话");
- }
-
- @Override
- public void onAsrEnd() {
- super.onAsrEnd();
- speechEndTime = System.currentTimeMillis();
- sendMessage("【asr.end事件】检测到用户说话结束");
- }
-
- @Override
- public void onAsrPartialResult(String[] results, RecogResult recogResult) {
- sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL,
- "临时识别结果，结果是“" + results[0] + "”；原始json：" + recogResult.getOrigalJson());
- super.onAsrPartialResult(results, recogResult);
- }
-
- @Override
- public void onAsrFinalResult(String[] results, RecogResult recogResult) {
- super.onAsrFinalResult(results, recogResult);
-// String message = "识别结束，结果是”" + results[0] + "”";
-// sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL,
-// message + "；原始json：" + recogResult.getOrigalJson());
-// if (speechEndTime > 0) {
-// long currentTime = System.currentTimeMillis();
-// long diffTime = currentTime - speechEndTime;
-// message += "；说话结束到识别结束耗时【" + diffTime + "ms】" + currentTime;
-//
-// }
-// speechEndTime = 0;
-
- sendMessage(results[0]+"", status, true);
- }
-
- @Override
- public void onAsrFinishError(int errorCode, int subErrorCode, String descMessage,
- RecogResult recogResult) {
- super.onAsrFinishError(errorCode, subErrorCode, descMessage, recogResult);
- sendMessage("文件格式不支持", IStatus.STATUS_ERROR);
-// String message = "【asr.finish事件】识别错误, 错误码：" + errorCode + " ," + subErrorCode + " ; " + descMessage;
-// sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL, message);
-// if (speechEndTime > 0) {
-// long diffTime = System.currentTimeMillis() - speechEndTime;
-// message += "。说话结束到识别结束耗时【" + diffTime + "ms】";
-// }
-// speechEndTime = 0;
-// sendMessage(message, STATUS_ERROR, true);
-// speechEndTime = 0;
- }
-
- @Override
- public void onAsrOnlineNluResult(String nluResult) {
- super.onAsrOnlineNluResult(nluResult);
-// if (!nluResult.isEmpty()) {
-// sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL, "原始语义识别结果json：" + nluResult);
-// }
- }
-
- @Override
- public void onAsrFinish(RecogResult recogResult) {
- super.onAsrFinish(recogResult);
-// sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_FINISH, "识别一段话结束。如果是长语音的情况会继续识别下段话。");
-// sendMessage(results[0]+"", status, true);
-
- }
-
- /**
- * 长语音识别结束
- */
- @Override
- public void onAsrLongFinish() {
- super.onAsrLongFinish();
- sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_LONG_SPEECH, "长语音识别结束。");
- }
-
-
- /**
- * 使用离线命令词时，有该回调说明离线语法资源加载成功
- */
- @Override
- public void onOfflineLoaded() {
- sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_LOADED, "离线资源加载成功。没有此回调可能离线语法功能不能使用。");
- }
-
- /**
- * 使用离线命令词时，有该回调说明离线语法资源加载成功
- */
- @Override
- public void onOfflineUnLoaded() {
- sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_UNLOADED, "离线资源卸载成功。");
- }
-
- @Override
- public void onAsrExit() {
- super.onAsrExit();
- sendStatusMessage(SpeechConstant.CALLBACK_EVENT_ASR_EXIT, "识别引擎结束并空闲中");
- }
-
- private void sendStatusMessage(String eventName, String message) {
- message = "[" + eventName + "]" + message;
- sendMessage(message, status);
- }
-
- private void sendMessage(String message) {
- sendMessage(message, WHAT_MESSAGE_STATUS);
- }
-
- private void sendMessage(String message, int what) {
- sendMessage(message, what, false);
- }
-
-
- private void sendMessage(String message, int what, boolean highlight) {
-
-
- if (needTime && what != STATUS_FINISHED) {
- message += " ;time=" + System.currentTimeMillis();
- }
- if (handler == null) {
- Log.i(TAG, message);
- return;
- }
- Message msg = Message.obtain();
- msg.what = what;
- msg.arg1 = status;
- if (highlight) {
- msg.arg2 = 1;
- }
- msg.obj = message + "\n";
- handler.sendMessage(msg);
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/RecogEventAdapter.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/RecogEventAdapter.java
deleted file mode 100644
index 994fa2b..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/RecogEventAdapter.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog.listener;
-
-import android.util.Log;
-import com.baidu.aip.asrwakeup3.core.util.MyLogger;
-import com.baidu.speech.EventListener;
-import com.baidu.speech.asr.SpeechConstant;
-import org.json.JSONException;
-import org.json.JSONObject;
-import com.baidu.aip.asrwakeup3.core.recog.RecogResult;
-
-/**
- * Created by fujiayi on 2017/6/14.
- */
-
-public class RecogEventAdapter implements EventListener {
-
- private IRecogListener listener;
-
- private static final String TAG = "RecogEventAdapter";
-
- public RecogEventAdapter(IRecogListener listener) {
- this.listener = listener;
- }
-
- // 基于DEMO集成3.1 开始回调事件
- @Override
- public void onEvent(String name, String params, byte[] data, int offset, int length) {
- String currentJson = params;
- String logMessage = "name:" + name + "; params:" + params;
-
- // logcat 中 搜索RecogEventAdapter，即可以看见下面一行的日志
- Log.i(TAG, logMessage);
- if (false) { // 可以调试，不需要后续逻辑
- return;
- }
- if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_LOADED)) {
- listener.onOfflineLoaded();
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_UNLOADED)) {
- listener.onOfflineUnLoaded();
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_READY)) {
- // 引擎准备就绪，可以开始说话
- listener.onAsrReady();
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_BEGIN)) {
- // 检测到用户的已经开始说话
- listener.onAsrBegin();
-
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_END)) {
- // 检测到用户的已经停止说话
- listener.onAsrEnd();
-
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL)) {
- RecogResult recogResult = RecogResult.parseJson(params);
- // 识别结果
- String[] results = recogResult.getResultsRecognition();
- if (recogResult.isFinalResult()) {
- // 最终识别结果，长语音每一句话会回调一次
- listener.onAsrFinalResult(results, recogResult);
- } else if (recogResult.isPartialResult()) {
- // 临时识别结果
- listener.onAsrPartialResult(results, recogResult);
- } else if (recogResult.isNluResult()) {
- // 语义理解结果
- listener.onAsrOnlineNluResult(new String(data, offset, length));
- }
-
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_FINISH)) {
- // 识别结束
- RecogResult recogResult = RecogResult.parseJson(params);
- if (recogResult.hasError()) {
- int errorCode = recogResult.getError();
- int subErrorCode = recogResult.getSubError();
- MyLogger.error(TAG, "asr error:" + params);
- listener.onAsrFinishError(errorCode, subErrorCode, recogResult.getDesc(), recogResult);
- } else {
- listener.onAsrFinish(recogResult);
- }
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_LONG_SPEECH)) { // 长语音
- listener.onAsrLongFinish(); // 长语音
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_EXIT)) {
- listener.onAsrExit();
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_VOLUME)) {
- // Logger.info(TAG, "asr volume event:" + params);
- Volume vol = parseVolumeJson(params);
- listener.onAsrVolume(vol.volumePercent, vol.volume);
- } else if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_AUDIO)) {
- if (data.length != length) {
- MyLogger.error(TAG, "internal error: asr.audio callback data length is not equal to length param");
- }
- listener.onAsrAudio(data, offset, length);
- }
- }
-
- private Volume parseVolumeJson(String jsonStr) {
- Volume vol = new Volume();
- vol.origalJson = jsonStr;
- try {
- JSONObject json = new JSONObject(jsonStr);
- vol.volumePercent = json.getInt("volume-percent");
- vol.volume = json.getInt("volume");
- } catch (JSONException e) {
- e.printStackTrace();
- }
- return vol;
- }
-
- private class Volume {
- private int volumePercent = -1;
- private int volume = -1;
- private String origalJson;
- }
-
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/StatusRecogListener.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/StatusRecogListener.java
deleted file mode 100644
index 70fa2f1..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/recog/listener/StatusRecogListener.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.recog.listener;
-
-/**
- * Created by fujiayi on 2017/6/14.
- */
-
-import android.util.Log;
-import com.baidu.aip.asrwakeup3.core.recog.IStatus;
-import com.baidu.aip.asrwakeup3.core.recog.RecogResult;
-
-/**
- * 根据回调，判断asr引擎的状态
- *
- * 通常状态变化如下：
- *
- * STATUS_NONE 初始状态
- * STATUS_READY 引擎准备完毕
- * STATUS_SPEAKING 用户开始说话到用户说话完毕前
- * STATUS_RECOGNITION 用户说话完毕后，识别结束前
- * STATUS_FINISHED 获得最终识别结果
- */
-public class StatusRecogListener implements IRecogListener, IStatus {
-
- private static final String TAG = "StatusRecogListener";
-
- /**
- * 识别的引擎当前的状态
- */
- protected int status = STATUS_NONE;
-
- @Override
- public void onAsrReady() {
- status = STATUS_READY;
- }
-
- @Override
- public void onAsrBegin() {
- status = STATUS_SPEAKING;
- }
-
- @Override
- public void onAsrEnd() {
- status = STATUS_RECOGNITION;
- }
-
- @Override
- public void onAsrPartialResult(String[] results, RecogResult recogResult) {
-
- }
-
- @Override
- public void onAsrFinalResult(String[] results, RecogResult recogResult) {
- status = STATUS_FINISHED;
- }
-
- @Override
- public void onAsrFinish(RecogResult recogResult) {
- status = STATUS_FINISHED;
- }
-
-
- @Override
- public void onAsrFinishError(int errorCode, int subErrorCode, String descMessage,
- RecogResult recogResult) {
- status = STATUS_ERROR;
- }
-
- @Override
- public void onAsrLongFinish() {
- status = STATUS_LONG_SPEECH_FINISHED;
- }
-
- @Override
- public void onAsrVolume(int volumePercent, int volume) {
- Log.i(TAG, "音量百分比" + volumePercent + " ; 音量" + volume);
- }
-
- @Override
- public void onAsrAudio(byte[] data, int offset, int length) {
- if (offset != 0 || data.length != length) {
- byte[] actualData = new byte[length];
- System.arraycopy(data, 0, actualData, 0, length);
- data = actualData;
- }
-
- Log.i(TAG, "音频数据回调, length:" + data.length);
- }
-
- @Override
- public void onAsrExit() {
- status = STATUS_NONE;
- }
-
- @Override
- public void onAsrOnlineNluResult(String nluResult) {
- status = STATUS_FINISHED;
- }
-
- @Override
- public void onOfflineLoaded() {
-
- }
-
- @Override
- public void onOfflineUnLoaded() {
-
- }
-
-
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/AuthUtil.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/AuthUtil.java
deleted file mode 100644
index 39b0f49..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/AuthUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.util;
-
-import com.baidu.speech.asr.SpeechConstant;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 为方便说明 apiKey 简称ak，secretKey简称 sk
- * ak sk为敏感信息，泄露后别人可使用ak sk 消耗你的调用次数，造成财产损失，请妥善保存
- * 建议你将ak sk保存在自己服务端，通过接口请求获得。
- * 如果暂时没有后端服务接口，建议将ak sk加密存储减少暴露风险。
- **/
-public class AuthUtil {
- public static String getAk(){
- //todo 填入apiKey
- return "eQngo9A0REXcqh6U8sHhhWUB";
- }
- public static String getSk(){
- //todo 填入secretKey
- return "sCBILqz6ASa5K0PLbqc1SYfd6YxkOcsN";
- }
- public static String getAppId(){
- //todo 填入appId
- return "34317156";
- }
-
- public static Map getParam(){
- Map params = new LinkedHashMap();
- params.put(SpeechConstant.APP_ID, getAppId()); // 添加appId
- params.put(SpeechConstant.APP_KEY, getAk()); // 添加apiKey
- params.put(SpeechConstant.SECRET, getSk()); // 添加secretKey
- return params;
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/FileUtil.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/FileUtil.java
deleted file mode 100644
index 7daf716..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/FileUtil.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.util;
-
-import android.content.res.AssetManager;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Created by fujiayi on 2017/5/19.
- */
-
-public class FileUtil {
-
- public static boolean makeDir(String dirPath) {
- File file = new File(dirPath);
- if (!file.exists()) {
- return file.mkdirs();
- } else {
- return true;
- }
- }
-
- public static String getContentFromAssetsFile(AssetManager assets, String source) {
- InputStream is = null;
- FileOutputStream fos = null;
- String result = "";
- try {
- is = assets.open(source);
- int lenght = is.available();
- byte[] buffer = new byte[lenght];
- is.read(buffer);
- result = new String(buffer, "utf8");
- } catch (IOException e) {
- e.printStackTrace();
- }
- return result;
- }
-
- public static boolean copyFromAssets(AssetManager assets, String source, String dest,
- boolean isCover) throws IOException {
- File file = new File(dest);
- boolean isCopyed = false;
- if (isCover || (!isCover && !file.exists())) {
- InputStream is = null;
- FileOutputStream fos = null;
- try {
- is = assets.open(source);
- String path = dest;
- fos = new FileOutputStream(path);
- byte[] buffer = new byte[1024];
- int size = 0;
- while ((size = is.read(buffer, 0, 1024)) >= 0) {
- fos.write(buffer, 0, size);
- }
- isCopyed = true;
- } finally {
- if (fos != null) {
- try {
- fos.close();
- } finally {
- if (is != null) {
- is.close();
- }
- }
- }
- }
-
- }
- return isCopyed;
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/MyLogger.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/MyLogger.java
deleted file mode 100644
index 5b9cc7a..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/MyLogger.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.util;
-
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-
-/**
- * 记录日志的时候， 顺带往handler记录一份
- */
-
-public class MyLogger {
- private static final String TAG = "MyLogger";
-
- private static final String INFO = "INFO";
-
- private static final String ERROR = "ERROR";
-
- private static final boolean ENABLE = true;
-
- private static Handler handler;
-
- public static void info(String message) {
- info(TAG, message);
- }
-
- public static void info(String tag, String message) {
- log(INFO, tag, message);
- }
-
- public static void error(String message) {
- error(TAG, message);
- }
-
- public static void error(String tag, String message) {
- log(ERROR, tag, message);
- }
-
- public static void setHandler(Handler handler) {
- MyLogger.handler = handler;
- }
-
- private static void log(String level, String tag, String message) {
- if (!ENABLE) {
- return;
- }
- if (level.equals(INFO)) {
- Log.i(tag, message);
-
- } else if (level.equals(ERROR)) {
- Log.e(tag, message);
- }
- if (handler != null) {
- Message msg = Message.obtain();
- msg.obj = "[" + level + "]" + message + "\n";
- handler.sendMessage(msg);
- }
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/AndroidAudioManager.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/AndroidAudioManager.java
deleted file mode 100644
index bf3f3d5..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/AndroidAudioManager.java
+++ /dev/null
@@ -1,293 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.util.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.media.AudioManager;
-import android.util.Log;
-
-import java.util.List;
-
-import static android.media.AudioManager.STREAM_VOICE_CALL;
-
-public class AndroidAudioManager {
-
- private static volatile AndroidAudioManager instance;
-
- private BluetoothAdapter mBluetoothAdapter;
-
- private AudioManager mAudioManager;
-
- private boolean mIsBluetoothHeadsetConnected;
-
- private boolean mIsBluetoothHeadsetScoConnected;
-
- private BluetoothReceiver mBluetoothReceiver;
-
- private HeadsetReceiver mHeadsetReceiver;
-
- private boolean mAudioFocused;
-
- private Context mContext;
- private BluetoothHeadset mBluetoothHeadset;
-
- private AndroidAudioManager(Context context) {
- mAudioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
- this.mContext = context.getApplicationContext();
- }
-
- public AudioManager getAudioManager() {
- return mAudioManager;
- }
-
- public static AndroidAudioManager getInstance(Context context) {
- if (instance == null) {
- synchronized (AndroidAudioManager.class) {
- if (instance == null) {
- instance = new AndroidAudioManager(context);
- }
- }
- }
- return instance;
- }
-
- public void startBluetooth() {
- mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
- if (mBluetoothAdapter != null) {
- Log.i("AndroidAudioManager", "[Audio Manager] [Bluetooth] Adapter found");
- if (mAudioManager.isBluetoothScoAvailableOffCall()) {
- Log.i("AndroidAudioManager", "[Audio Manager] [Bluetooth] SCO available off call, continue");
- } else {
- Log.w("AndroidAudioManager", "[Audio Manager] [Bluetooth] SCO not available off call !");
- }
- if (mBluetoothAdapter.isEnabled()) {
- Log.i("AndroidAudioManager", "[Audio Manager] [Bluetooth] Adapter enabled");
- mBluetoothReceiver = new BluetoothReceiver();
- mIsBluetoothHeadsetConnected = false;
- mIsBluetoothHeadsetScoConnected = false;
-
- BluetoothProfile.ServiceListener bluetoothServiceListener =
- new BluetoothProfile.ServiceListener() {
- public void onServiceConnected(int profile, BluetoothProfile proxy) {
- if (profile == BluetoothProfile.HEADSET) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] HEADSET profile connected");
- mBluetoothHeadset = (BluetoothHeadset) proxy;
-
- List devices =
- mBluetoothHeadset.getConnectedDevices();
- if (devices.size() > 0) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] A device is already connected");
- bluetoothHeadetConnectionChanged(true);
- }
-
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Registering bluetooth receiver");
-
- IntentFilter filter = new IntentFilter();
- filter.addAction(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED);
- filter.addAction(
- BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
- filter.addAction(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED);
- filter.addAction(
- BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT);
-
- Intent sticky =
- mContext.registerReceiver(mBluetoothReceiver, filter);
- int state =
- sticky.getIntExtra(
- AudioManager.EXTRA_SCO_AUDIO_STATE,
- AudioManager.SCO_AUDIO_STATE_DISCONNECTED);
- if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Bluetooth headset SCO connected");
- bluetoothHeadetScoConnectionChanged(true);
- } else if (state == AudioManager.SCO_AUDIO_STATE_DISCONNECTED) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Bluetooth headset SCO disconnected");
- bluetoothHeadetScoConnectionChanged(false);
- } else if (state == AudioManager.SCO_AUDIO_STATE_CONNECTING) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Bluetooth headset SCO connecting");
- } else if (state == AudioManager.SCO_AUDIO_STATE_ERROR) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Bluetooth headset SCO connection error");
- } else {
- Log.w("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Bluetooth headset " +
- "unknown SCO state changed: "
- + state);
- }
- }
- }
-
- public void onServiceDisconnected(int profile) {
- if (profile == BluetoothProfile.HEADSET) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] HEADSET profile disconnected");
- mBluetoothHeadset = null;
- mIsBluetoothHeadsetConnected = false;
- mIsBluetoothHeadsetScoConnected = false;
- }
- }
- };
- mBluetoothAdapter.getProfileProxy(
- mContext, bluetoothServiceListener, BluetoothProfile.HEADSET);
- }
- }
- }
-
-
- // Bluetooth
-
- public synchronized void bluetoothHeadetConnectionChanged(boolean connected) {
- mIsBluetoothHeadsetConnected = connected;
- mAudioManager.setBluetoothScoOn(connected);
- mAudioManager.startBluetoothSco();
- routeAudioToBluetooth();
- }
-
-
- public synchronized boolean isBluetoothHeadsetConnected() {
- return mIsBluetoothHeadsetConnected;
- }
-
- public synchronized void bluetoothHeadetScoConnectionChanged(boolean connected) {
- mIsBluetoothHeadsetScoConnected = connected;
- }
-
- public synchronized boolean isUsingBluetoothAudioRoute() {
- return mIsBluetoothHeadsetScoConnected;
- }
-
- public synchronized void routeAudioToBluetooth() {
- if (!isBluetoothHeadsetConnected()) {
- Log.w("AndroidAudioManager", "[Audio Manager] [Bluetooth] No headset connected");
- return;
- }
- if (mAudioManager.getMode() != AudioManager.MODE_IN_COMMUNICATION) {
- Log.w("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Changing audio mode to MODE_IN_COMMUNICATION " +
- "and requesting STREAM_VOICE_CALL focus");
- mAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
- requestAudioFocus(STREAM_VOICE_CALL);
- }
- changeBluetoothSco(true);
- }
-
- private void requestAudioFocus(int stream) {
- if (!mAudioFocused) {
- int res =
- mAudioManager.requestAudioFocus(
- null, stream, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE);
- Log.d("AndroidAudioManager",
- "[Audio Manager] Audio focus requested: "
- + (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
- ? "Granted"
- : "Denied"));
- if (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
- mAudioFocused = true;
- }
- }
- }
-
- private synchronized void changeBluetoothSco(final boolean enable) {
- // IT WILL TAKE A CERTAIN NUMBER OF CALLS TO EITHER START/STOP BLUETOOTH SCO FOR IT TO WORK
- if (enable && mIsBluetoothHeadsetScoConnected) {
- Log.i("AndroidAudioManager", "[Audio Manager] [Bluetooth] SCO already enabled, skipping");
- return;
- } else if (!enable && !mIsBluetoothHeadsetScoConnected) {
- Log.i("AndroidAudioManager", "[Audio Manager] [Bluetooth] SCO already disabled, skipping");
- return;
- }
-
- new Thread() {
- @Override
- public void run() {
- boolean resultAcknoledged;
- int retries = 0;
- do {
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- Log.e("AndroidAudioManager", e.getMessage(), e);
- }
-
- synchronized (AndroidAudioManager.this) {
- if (enable) {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Starting SCO: try number "
- + retries);
- mAudioManager.startBluetoothSco();
- } else {
- Log.i("AndroidAudioManager",
- "[Audio Manager] [Bluetooth] Stopping SCO: try number "
- + retries);
- mAudioManager.stopBluetoothSco();
- }
- resultAcknoledged = isUsingBluetoothAudioRoute() == enable;
- retries++;
- }
- } while (!resultAcknoledged && retries < 10);
- }
- }.start();
- }
-
- public void destroy() {
- if (mBluetoothAdapter != null && mBluetoothHeadset != null) {
- Log.i("AndroidAudioManager", "[Audio Manager] [Bluetooth] Closing HEADSET profile proxy");
- mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset);
- }
-
- Log.i("AndroidAudioManager", "[Audio Manager] [Bluetooth] Unegistering bluetooth receiver");
- if (mBluetoothReceiver != null) {
- mContext.unregisterReceiver(mBluetoothReceiver);
- }
- synchronized (AndroidAudioManager.class) {
- mContext = null;
- instance = null;
- }
- }
-
-
- public void startSimpleBluetooth() {
- mAudioManager.setBluetoothScoOn(true);
- mAudioManager.startBluetoothSco();
- }
-
- public void destorySimpleBluetooth() {
- mAudioManager.setBluetoothScoOn(false);
- mAudioManager.stopBluetoothSco();
- }
-
- // HEADSET 插耳机的
-
- public void enableHeadsetReceiver() {
- mHeadsetReceiver = new HeadsetReceiver();
-
- Log.i("AndroidAudioManager", "[Audio Manager] Registering headset receiver");
- mContext.registerReceiver(
- mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
- mContext.registerReceiver(
- mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_HEADSET_PLUG));
- }
-
- public void routeAudioToEarPiece() {
- routeAudioToSpeakerHelper(false);
- }
-
- public void routeAudioToSpeakerHelper(boolean speakerOn) {
- Log.w("AndroidAudioManager", "[Audio Manager] Routing audio to " + (speakerOn ? "speaker" : "earpiece"));
- if (mIsBluetoothHeadsetScoConnected) {
- Log.w("AndroidAudioManager", "[Audio Manager] [Bluetooth] Disabling bluetooth audio route");
- changeBluetoothSco(false);
- }
-
- mAudioManager.setSpeakerphoneOn(speakerOn);
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/BluetoothReceiver.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/BluetoothReceiver.java
deleted file mode 100644
index 7007583..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/BluetoothReceiver.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.util.bluetooth;
-
-import android.bluetooth.BluetoothHeadset;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.util.Log;
-
-public class BluetoothReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- if (action.equals(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)) {
- int state =
- intent.getIntExtra(
- BluetoothHeadset.EXTRA_STATE, BluetoothHeadset.STATE_DISCONNECTED);
- if (state == BluetoothHeadset.STATE_CONNECTED) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset connected");
- AndroidAudioManager.getInstance(context).bluetoothHeadetConnectionChanged(true);
- } else if (state == BluetoothHeadset.STATE_DISCONNECTED) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset disconnected");
- AndroidAudioManager.getInstance(context).bluetoothHeadetConnectionChanged(false);
- } else {
- Log.w("BluetoothReceiver", "[Bluetooth] Bluetooth headset unknown state changed: " + state);
- }
- } else if (action.equals(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED)) {
- int state =
- intent.getIntExtra(
- BluetoothHeadset.EXTRA_STATE,
- BluetoothHeadset.STATE_AUDIO_DISCONNECTED);
- if (state == BluetoothHeadset.STATE_AUDIO_CONNECTED) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset audio connected");
- // AndroidAudioManager.getInstance(context).bluetoothHeadetAudioConnectionChanged(true);
- } else if (state == BluetoothHeadset.STATE_AUDIO_DISCONNECTED) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset audio disconnected");
- // AndroidAudioManager.getInstance(context).bluetoothHeadetAudioConnectionChanged(false);
- } else {
- Log.w("BluetoothReceiver", "[Bluetooth] Bluetooth headset unknown audio state changed: " + state);
- }
- } else if (action.equals(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)) {
- int state =
- intent.getIntExtra(
- AudioManager.EXTRA_SCO_AUDIO_STATE,
- AudioManager.SCO_AUDIO_STATE_DISCONNECTED);
- if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset SCO connected");
- AndroidAudioManager.getInstance(context).bluetoothHeadetScoConnectionChanged(true);
- } else if (state == AudioManager.SCO_AUDIO_STATE_DISCONNECTED) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset SCO disconnected");
- AndroidAudioManager.getInstance(context).bluetoothHeadetScoConnectionChanged(false);
- } else if (state == AudioManager.SCO_AUDIO_STATE_CONNECTING) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset SCO connecting");
- } else if (state == AudioManager.SCO_AUDIO_STATE_ERROR) {
- Log.i("BluetoothReceiver", "[Bluetooth] Bluetooth headset SCO connection error");
- } else {
- Log.w("BluetoothReceiver", "[Bluetooth] Bluetooth headset unknown SCO state changed: " + state);
- }
- } else if (action.equals(BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT)) {
- String command =
- intent.getStringExtra(BluetoothHeadset.EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD);
- int type =
- intent.getIntExtra(
- BluetoothHeadset.EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD_TYPE, -1);
-
- String commandType;
- switch (type) {
- case BluetoothHeadset.AT_CMD_TYPE_ACTION:
- commandType = "AT Action";
- break;
- case BluetoothHeadset.AT_CMD_TYPE_READ:
- commandType = "AT Read";
- break;
- case BluetoothHeadset.AT_CMD_TYPE_TEST:
- commandType = "AT Test";
- break;
- case BluetoothHeadset.AT_CMD_TYPE_SET:
- commandType = "AT Set";
- break;
- case BluetoothHeadset.AT_CMD_TYPE_BASIC:
- commandType = "AT Basic";
- break;
- default:
- commandType = "AT Unknown";
- break;
- }
- Log.i("BluetoothReceiver", "[Bluetooth] Vendor action " + commandType + " : " + command);
- } else {
- Log.w("BluetoothReceiver", "[Bluetooth] Bluetooth unknown action: " + action);
- }
- }
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/HeadsetReceiver.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/HeadsetReceiver.java
deleted file mode 100644
index 35a8062..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/util/bluetooth/HeadsetReceiver.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.util.bluetooth;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.util.Log;
-
-public class HeadsetReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- if (action.equals(AudioManager.ACTION_HEADSET_PLUG)) {
- // This happens when the user plugs a Jack headset to the device for example
- int state = intent.getIntExtra("state", 0);
- String name = intent.getStringExtra("name");
- int hasMicrophone = intent.getIntExtra("microphone", 0);
-
- if (state == 0) {
- Log.i("HeadsetReceiver", "[Headset] Headset disconnected:" + name);
- } else if (state == 1) {
- Log.i("HeadsetReceiver", "[Headset] Headset connected:" + name);
- if (hasMicrophone == 1) {
- Log.i("HeadsetReceiver", "[Headset] Headset " + name + " has a microphone");
- }
- } else {
- Log.w("HeadsetReceiver", "[Headset] Unknown headset plugged state: " + state);
- }
-
- AndroidAudioManager.getInstance(context).routeAudioToEarPiece();
- // LinphoneManager.getCallManager().refreshInCallActions();
- } else if (action.equals(AudioManager.ACTION_AUDIO_BECOMING_NOISY)) {
- // This happens when the user disconnect a headset, so we shouldn't play audio loudly
- Log.i("HeadsetReceiver", "[Headset] Noisy state detected, most probably a headset has been disconnected");
- AndroidAudioManager.getInstance(context).routeAudioToEarPiece();
- // LinphoneManager.getCallManager().refreshInCallActions();
- } else {
- Log.w("HeadsetReceiver", "[Headset] Unknown action: " + action);
- }
- }
-}
\ No newline at end of file
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/MyWakeup.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/MyWakeup.java
deleted file mode 100644
index 1a0b1de..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/MyWakeup.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.wakeup;
-
-import android.content.Context;
-import com.baidu.aip.asrwakeup3.core.util.MyLogger;
-import com.baidu.aip.asrwakeup3.core.wakeup.listener.IWakeupListener;
-import com.baidu.speech.EventListener;
-import com.baidu.speech.EventManager;
-import com.baidu.speech.EventManagerFactory;
-import com.baidu.speech.asr.SpeechConstant;
-import org.json.JSONObject;
-
-import java.util.Map;
-
-/**
- * Created by fujiayi on 2017/6/20.
- */
-
-public class MyWakeup {
-
-
- private static boolean isInited = false;
-
- private EventManager wp;
- private EventListener eventListener;
-
- private static final String TAG = "MyWakeup";
-
- public MyWakeup(Context context, EventListener eventListener) {
- if (isInited) {
- MyLogger.error(TAG, "还未调用release()，请勿新建一个新类");
- throw new RuntimeException("还未调用release()，请勿新建一个新类");
- }
- isInited = true;
- this.eventListener = eventListener;
- wp = EventManagerFactory.create(context, "wp");
- wp.registerListener(eventListener);
- }
-
- public MyWakeup(Context context, IWakeupListener eventListener) {
- this(context, new WakeupEventAdapter(eventListener));
- }
-
- public void start(Map params) {
- String json = new JSONObject(params).toString();
- MyLogger.info(TAG + ".Debug", "wakeup params(反馈请带上此行日志):" + json);
- wp.send(SpeechConstant.WAKEUP_START, json, null, 0, 0);
- }
-
- public void stop() {
- MyLogger.info(TAG, "唤醒结束");
- wp.send(SpeechConstant.WAKEUP_STOP, null, null, 0, 0);
- }
-
- public void setEventListener(EventListener eventListener) {
- this.eventListener = eventListener;
- }
-
- public void setEventListener(IWakeupListener eventListener) {
- this.eventListener = new WakeupEventAdapter(eventListener);
- }
-
- public void release() {
- stop();
- wp.unregisterListener(eventListener);
- wp = null;
- isInited = false;
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/WakeUpResult.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/WakeUpResult.java
deleted file mode 100644
index 1cc6762..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/WakeUpResult.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.wakeup;
-
-import com.baidu.aip.asrwakeup3.core.util.MyLogger;
-import com.baidu.speech.asr.SpeechConstant;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Created by fujiayi on 2017/6/24.
- */
-public class WakeUpResult {
- private String name;
- private String origalJson;
- private String word;
- private String desc;
- private int errorCode;
-
- private static int ERROR_NONE = 0;
-
- private static final String TAG = "WakeUpResult";
-
- public boolean hasError() {
- return errorCode != ERROR_NONE;
- }
-
- public String getOrigalJson() {
- return origalJson;
- }
-
- public void setOrigalJson(String origalJson) {
- this.origalJson = origalJson;
- }
-
- public String getWord() {
- return word;
- }
-
- public void setWord(String word) {
- this.word = word;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public int getErrorCode() {
- return errorCode;
- }
-
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public static WakeUpResult parseJson(String name, String jsonStr) {
- WakeUpResult result = new WakeUpResult();
- result.setOrigalJson(jsonStr);
- try {
- JSONObject json = new JSONObject(jsonStr);
- if (SpeechConstant.CALLBACK_EVENT_WAKEUP_SUCCESS.equals(name)) {
- int error = json.optInt("errorCode");
- result.setErrorCode(error);
- result.setDesc(json.optString("errorDesc"));
- if (!result.hasError()) {
- result.setWord(json.optString("word"));
- }
- } else {
- int error = json.optInt("error");
- result.setErrorCode(error);
- result.setDesc(json.optString("desc"));
- }
-
- } catch (JSONException e) {
- MyLogger.error(TAG, "Json parse error" + jsonStr);
- e.printStackTrace();
- }
-
- return result;
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/WakeupEventAdapter.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/WakeupEventAdapter.java
deleted file mode 100644
index 7a4b795..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/WakeupEventAdapter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.wakeup;
-
-import com.baidu.aip.asrwakeup3.core.util.MyLogger;
-import com.baidu.aip.asrwakeup3.core.wakeup.listener.IWakeupListener;
-import com.baidu.speech.EventListener;
-import com.baidu.speech.asr.SpeechConstant;
-
-/**
- * Created by fujiayi on 2017/6/20.
- */
-
-public class WakeupEventAdapter implements EventListener {
- private IWakeupListener listener;
-
- public WakeupEventAdapter(IWakeupListener listener) {
- this.listener = listener;
- }
-
- private static final String TAG = "WakeupEventAdapter";
- // 基于DEMO唤醒3.1 开始回调事件
- @Override
- public void onEvent(String name, String params, byte[] data, int offset, int length) {
- // android studio日志Monitor 中搜索 WakeupEventAdapter即可看见下面一行的日志
- MyLogger.info(TAG, "wakeup name:" + name + "; params:" + params);
- if (SpeechConstant.CALLBACK_EVENT_WAKEUP_SUCCESS.equals(name)) { // 识别唤醒词成功
- WakeUpResult result = WakeUpResult.parseJson(name, params);
- int errorCode = result.getErrorCode();
- if (result.hasError()) { // error不为0依旧有可能是异常情况
- listener.onError(errorCode, "", result);
- } else {
- String word = result.getWord();
- listener.onSuccess(word, result);
-
- }
- } else if (SpeechConstant.CALLBACK_EVENT_WAKEUP_ERROR.equals(name)) { // 识别唤醒词报错
- WakeUpResult result = WakeUpResult.parseJson(name, params);
- int errorCode = result.getErrorCode();
- if (result.hasError()) {
- listener.onError(errorCode, "", result);
- }
- } else if (SpeechConstant.CALLBACK_EVENT_WAKEUP_STOPED.equals(name)) { // 关闭唤醒词
- listener.onStop();
- } else if (SpeechConstant.CALLBACK_EVENT_WAKEUP_AUDIO.equals(name)) { // 音频回调
- listener.onASrAudio(data, offset, length);
- }
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/IWakeupListener.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/IWakeupListener.java
deleted file mode 100644
index 866c372..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/IWakeupListener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.wakeup.listener;
-
-import com.baidu.aip.asrwakeup3.core.wakeup.WakeUpResult;
-
-/**
- * Created by fujiayi on 2017/6/21.
- */
-
-public interface IWakeupListener {
-
-
- void onSuccess(String word, WakeUpResult result);
-
- void onStop();
-
- void onError(int errorCode, String errorMessge, WakeUpResult result);
-
- void onASrAudio(byte[] data, int offset, int length);
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/RecogWakeupListener.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/RecogWakeupListener.java
deleted file mode 100644
index 31499d8..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/RecogWakeupListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.wakeup.listener;
-
-import android.os.Handler;
-import com.baidu.aip.asrwakeup3.core.recog.IStatus;
-import com.baidu.aip.asrwakeup3.core.wakeup.WakeUpResult;
-
-/**
- * Created by fujiayi on 2017/9/21.
- */
-
-public class RecogWakeupListener extends SimpleWakeupListener implements IStatus {
-
- private static final String TAG = "RecogWakeupListener";
-
- private Handler handler;
-
- public RecogWakeupListener(Handler handler) {
- this.handler = handler;
- }
-
- @Override
- public void onSuccess(String word, WakeUpResult result) {
- super.onSuccess(word, result);
- handler.sendMessage(handler.obtainMessage(STATUS_WAKEUP_SUCCESS));
- }
-}
diff --git a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/SimpleWakeupListener.java b/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/SimpleWakeupListener.java
deleted file mode 100644
index e9390a0..0000000
--- a/src/开发项目源代码/core/src/main/java/com/baidu/aip/asrwakeup3/core/wakeup/listener/SimpleWakeupListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.baidu.aip.asrwakeup3.core.wakeup.listener;
-
-
-import com.baidu.aip.asrwakeup3.core.util.MyLogger;
-import com.baidu.aip.asrwakeup3.core.wakeup.WakeUpResult;
-
-/**
- * Created by fujiayi on 2017/6/21.
- */
-
-public class SimpleWakeupListener implements IWakeupListener {
-
- private static final String TAG = "SimpleWakeupListener";
-
- @Override
- public void onSuccess(String word, WakeUpResult result) {
- MyLogger.info(TAG, "唤醒成功，唤醒词：" + word);
- }
-
- @Override
- public void onStop() {
- MyLogger.info(TAG, "唤醒词识别结束：");
- }
-
- @Override
- public void onError(int errorCode, String errorMessge, WakeUpResult result) {
- MyLogger.info(TAG, "唤醒错误：" + errorCode + ";错误消息：" + errorMessge + "; 原始返回" + result.getOrigalJson());
- }
-
- @Override
- public void onASrAudio(byte[] data, int offset, int length) {
- MyLogger.error(TAG, "audio data： " + data.length);
- }
-
-}
diff --git a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libBaiduSpeechSDK.so b/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libBaiduSpeechSDK.so
deleted file mode 100644
index 2f16021..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libBaiduSpeechSDK.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbdEASRAndroid.so b/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbdEASRAndroid.so
deleted file mode 100644
index c824ce9..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbdEASRAndroid.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbdSpilWakeup.so b/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbdSpilWakeup.so
deleted file mode 100644
index a481633..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbdSpilWakeup.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbd_easr_s1_merge_normal_20151216.dat.so b/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbd_easr_s1_merge_normal_20151216.dat.so
deleted file mode 100644
index 826c81f..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libbd_easr_s1_merge_normal_20151216.dat.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libvad.dnn.so b/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libvad.dnn.so
deleted file mode 100644
index 0550061..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/arm64-v8a/libvad.dnn.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libBaiduSpeechSDK.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libBaiduSpeechSDK.so
deleted file mode 100644
index 5538ab6..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libBaiduSpeechSDK.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbdEASRAndroid.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbdEASRAndroid.so
deleted file mode 100644
index 0fef52a..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbdEASRAndroid.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbdSpilWakeup.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbdSpilWakeup.so
deleted file mode 100644
index f7809e2..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbdSpilWakeup.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbd_easr_s1_merge_normal_20151216.dat.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbd_easr_s1_merge_normal_20151216.dat.so
deleted file mode 100644
index 826c81f..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libbd_easr_s1_merge_normal_20151216.dat.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libvad.dnn.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libvad.dnn.so
deleted file mode 100644
index 0550061..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi-v7a/libvad.dnn.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libBaiduSpeechSDK.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi/libBaiduSpeechSDK.so
deleted file mode 100644
index a31b2ff..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libBaiduSpeechSDK.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbdEASRAndroid.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbdEASRAndroid.so
deleted file mode 100644
index 27509cb..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbdEASRAndroid.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbdSpilWakeup.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbdSpilWakeup.so
deleted file mode 100644
index a93b4e2..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbdSpilWakeup.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbd_easr_s1_merge_normal_20151216.dat.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbd_easr_s1_merge_normal_20151216.dat.so
deleted file mode 100644
index 826c81f..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libbd_easr_s1_merge_normal_20151216.dat.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libvad.dnn.so b/src/开发项目源代码/core/src/main/jniLibs/armeabi/libvad.dnn.so
deleted file mode 100644
index 0550061..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/armeabi/libvad.dnn.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86/libBaiduSpeechSDK.so b/src/开发项目源代码/core/src/main/jniLibs/x86/libBaiduSpeechSDK.so
deleted file mode 100644
index 5de5f75..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86/libBaiduSpeechSDK.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86/libbdEASRAndroid.so b/src/开发项目源代码/core/src/main/jniLibs/x86/libbdEASRAndroid.so
deleted file mode 100644
index f254499..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86/libbdEASRAndroid.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86/libbdSpilWakeup.so b/src/开发项目源代码/core/src/main/jniLibs/x86/libbdSpilWakeup.so
deleted file mode 100644
index 19175de..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86/libbdSpilWakeup.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86/libbd_easr_s1_merge_normal_20151216.dat.so b/src/开发项目源代码/core/src/main/jniLibs/x86/libbd_easr_s1_merge_normal_20151216.dat.so
deleted file mode 100644
index 826c81f..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86/libbd_easr_s1_merge_normal_20151216.dat.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86/libvad.dnn.so b/src/开发项目源代码/core/src/main/jniLibs/x86/libvad.dnn.so
deleted file mode 100644
index 0550061..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86/libvad.dnn.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libBaiduSpeechSDK.so b/src/开发项目源代码/core/src/main/jniLibs/x86_64/libBaiduSpeechSDK.so
deleted file mode 100644
index 82ac641..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libBaiduSpeechSDK.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbdEASRAndroid.so b/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbdEASRAndroid.so
deleted file mode 100644
index c4b6ac2..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbdEASRAndroid.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbdSpilWakeup.so b/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbdSpilWakeup.so
deleted file mode 100644
index 25c10ff..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbdSpilWakeup.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbd_easr_s1_merge_normal_20151216.dat.so b/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbd_easr_s1_merge_normal_20151216.dat.so
deleted file mode 100644
index 826c81f..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libbd_easr_s1_merge_normal_20151216.dat.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libvad.dnn.so b/src/开发项目源代码/core/src/main/jniLibs/x86_64/libvad.dnn.so
deleted file mode 100644
index 0550061..0000000
Binary files a/src/开发项目源代码/core/src/main/jniLibs/x86_64/libvad.dnn.so and /dev/null differ
diff --git a/src/开发项目源代码/core/src/main/res/layout/common_mini.xml b/src/开发项目源代码/core/src/main/res/layout/common_mini.xml
deleted file mode 100644
index e381d13..0000000
--- a/src/开发项目源代码/core/src/main/res/layout/common_mini.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/core/src/main/res/values/strings.xml b/src/开发项目源代码/core/src/main/res/values/strings.xml
deleted file mode 100644
index 4862f83..0000000
--- a/src/开发项目源代码/core/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- BaseAsr
-
diff --git a/src/开发项目源代码/gradle.properties b/src/开发项目源代码/gradle.properties
deleted file mode 100644
index ae4cb58..0000000
--- a/src/开发项目源代码/gradle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
-org.gradle.java.home=D\:\\Program Files\\Android\\Android Studio\\jbr
\ No newline at end of file
diff --git a/src/开发项目源代码/gradle/wrapper/gradle-wrapper.jar b/src/开发项目源代码/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7454180..0000000
Binary files a/src/开发项目源代码/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/src/开发项目源代码/gradle/wrapper/gradle-wrapper.properties b/src/开发项目源代码/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index fa7859c..0000000
--- a/src/开发项目源代码/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-
diff --git a/src/开发项目源代码/gradlew b/src/开发项目源代码/gradlew
deleted file mode 100644
index 744e882..0000000
--- a/src/开发项目源代码/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/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
- ;;
- MSYS* | 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/开发项目源代码/gradlew.bat b/src/开发项目源代码/gradlew.bat
deleted file mode 100644
index 107acd3..0000000
--- a/src/开发项目源代码/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@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/开发项目源代码/import-summary.txt b/src/开发项目源代码/import-summary.txt
deleted file mode 100644
index 649dc1d..0000000
--- a/src/开发项目源代码/import-summary.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ECLIPSE ANDROID PROJECT IMPORT SUMMARY
-======================================
-
- * F:\AndroidStudioProjects\Notes\gradlew:
- Gradle wrapper script is not executable
-
-
-Ignored Files:
---------------
-The following files were *not* copied into the new Gradle project; you
-should evaluate whether these are still needed in your project and if
-so manually move them:
-
-* .gitignore
-* NOTICE
-* README
-
-Moved Files:
-------------
-Android Gradle projects use a different directory structure than ADT
-Eclipse projects. Here's how the projects were restructured:
-
-* AndroidManifest.xml => app\src\main\AndroidManifest.xml
-* res\ => app\src\main\res\
-* src\ => app\src\main\java\
-
-Next Steps:
------------
-You can now build the project. The Gradle project needs network
-connectivity to download dependencies.
-
-Bugs:
------
-If for some reason your project does not build, and you determine that
-it is due to a bug or limitation of the Eclipse to Gradle importer,
-please file a bug at http://b.android.com with category
-Component-Tools.
-
-(This import summary is for your information only, and can be deleted
-after import once you are satisfied with the results.)
diff --git a/src/开发项目源代码/local.properties b/src/开发项目源代码/local.properties
deleted file mode 100644
index 10ba6b8..0000000
--- a/src/开发项目源代码/local.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Sun Jun 04 23:04:06 CST 2023
-sdk.dir=D\:\\Android\\SDK
diff --git a/src/开发项目源代码/ocr_ui/.gitignore b/src/开发项目源代码/ocr_ui/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/src/开发项目源代码/ocr_ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/src/开发项目源代码/ocr_ui/build.gradle b/src/开发项目源代码/ocr_ui/build.gradle
deleted file mode 100644
index b8d47c4..0000000
--- a/src/开发项目源代码/ocr_ui/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 27
- buildToolsVersion "27.0.2"
-
- defaultConfig {
- minSdkVersion 14
- targetSdkVersion 27
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-}
-
-dependencies {
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- implementation 'com.android.support:appcompat-v7:28.0.0'
- testImplementation 'junit:junit:4.12'
- implementation files('libs/license.jar')
-}
diff --git a/src/开发项目源代码/ocr_ui/libs/license.jar b/src/开发项目源代码/ocr_ui/libs/license.jar
deleted file mode 100644
index 57a2fa4..0000000
Binary files a/src/开发项目源代码/ocr_ui/libs/license.jar and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/proguard-rules.pro b/src/开发项目源代码/ocr_ui/proguard-rules.pro
deleted file mode 100644
index ce30132..0000000
--- a/src/开发项目源代码/ocr_ui/proguard-rules.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/baidu/IDE/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
--dontwarn com.baidu.ocr.**
\ No newline at end of file
diff --git a/src/开发项目源代码/ocr_ui/src/main/AndroidManifest.xml b/src/开发项目源代码/ocr_ui/src/main/AndroidManifest.xml
deleted file mode 100644
index 76b1c83..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/assets/models/integrity_model_secret.bin b/src/开发项目源代码/ocr_ui/src/main/assets/models/integrity_model_secret.bin
deleted file mode 100644
index 31dc46c..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/assets/models/integrity_model_secret.bin and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/assets/models/quality_model_secret.bin b/src/开发项目源代码/ocr_ui/src/main/assets/models/quality_model_secret.bin
deleted file mode 100644
index 9e9b7bc..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/assets/models/quality_model_secret.bin and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/idcardquality/IDcardQualityProcess.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/idcardquality/IDcardQualityProcess.java
deleted file mode 100644
index 7e00d46..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/idcardquality/IDcardQualityProcess.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.idcardquality;
-
-import android.content.res.AssetManager;
-import android.graphics.Bitmap;
-
-import com.baidu.idl.authority.AlgorithmOnMainThreadException;
-import com.baidu.idl.authority.IDLAuthorityException;
-import com.baidu.idl.license.License;
-import com.baidu.idl.util.UIThread;
-
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-public class IDcardQualityProcess {
- final ReentrantReadWriteLock nativeModelLock = new ReentrantReadWriteLock();
- private static IDcardQualityProcess mInstance;
- private static String tokenString;
- private static int mAuthorityStatus;
- private static Throwable loadNativeException = null;
- private static volatile boolean hasReleased;
-
- public IDcardQualityProcess() {
- }
-
- public static synchronized IDcardQualityProcess getInstance() {
- if (null == mInstance) {
- mInstance = new IDcardQualityProcess();
- }
-
- return mInstance;
- }
-
- public native byte[] convertRGBImage(int[] colors, int width, int height);
-
- public native int idcardQualityModelInit(AssetManager var1, String var2);
-
- public native int idcardQualityCaptchaRelease();
-
- public native int idcardQualityProcess(byte[] var1, int var2, int var3, boolean var4, int var5);
-
- public static synchronized int init(String token) throws AlgorithmOnMainThreadException, IDLAuthorityException {
- if (UIThread.isUITread()) {
- throw new AlgorithmOnMainThreadException();
- } else {
- tokenString = token;
-
- try {
- mAuthorityStatus = License.getInstance().init(tokenString);
- } catch (Exception var2) {
- var2.printStackTrace();
- }
-
- return mAuthorityStatus;
- }
- }
-
- public int idcardQualityInit(AssetManager assetManager, String modelPath) {
- if (mAuthorityStatus == 0) {
- hasReleased = false;
- nativeModelLock.writeLock().lock();
- int status = this.idcardQualityModelInit(assetManager, modelPath);
- nativeModelLock.writeLock().unlock();
- return status;
- } else {
- return mAuthorityStatus;
- }
- }
-
- public int idcardQualityRelease() {
- if (mAuthorityStatus == 0) {
- hasReleased = true;
- nativeModelLock.writeLock().lock();
- this.idcardQualityCaptchaRelease();
- nativeModelLock.writeLock().unlock();
- return 0;
- } else {
- return mAuthorityStatus;
- }
- }
-
- public int idcardQualityDetectionImg(Bitmap img, boolean isfont) {
- int status;
- if (mAuthorityStatus == 0) {
- if (hasReleased) {
- return -1;
- }
- int imgHeight = img.getHeight();
- int imgWidth = img.getWidth();
- byte[] imageData = this.getRGBImageData(img);
- nativeModelLock.readLock().lock();
- status = this.idcardQualityProcess(imageData, imgHeight, imgWidth, isfont, 3);
- nativeModelLock.readLock().unlock();
- return status;
- } else {
- return mAuthorityStatus;
- }
- }
-
- public static Throwable getLoadSoException() {
- return loadNativeException;
- }
-
- public byte[] getRGBImageData(Bitmap img) {
- int imgWidth = img.getWidth();
- int imgHeight = img.getHeight();
- int[] pixels = new int[imgWidth * imgHeight];
- img.getPixels(pixels, 0, imgWidth, 0, 0, imgWidth, imgHeight);
- byte[] imageData = convertRGBImage(pixels, imgWidth, imgHeight);
- return imageData;
- }
-
- public void releaseModel() {
- this.idcardQualityRelease();
- }
-
- static {
- try {
- System.loadLibrary("idl_license");
- System.loadLibrary("idcard_quality.1.1.1");
- } catch (Throwable e) {
- loadNativeException = e;
- }
- mInstance = null;
- mAuthorityStatus = 256;
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java
deleted file mode 100644
index 9414b02..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.graphics.ImageFormat;
-import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.graphics.YuvImage;
-import android.hardware.Camera;
-import android.view.TextureView;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import androidx.core.app.ActivityCompat;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * 5.0以下相机API的封装。
- */
-@SuppressWarnings("deprecation")
-public class Camera1Control implements ICameraControl {
-
- private int displayOrientation = 0;
- private int cameraId = 0;
- private int flashMode;
- private AtomicBoolean takingPicture = new AtomicBoolean(false);
- private AtomicBoolean abortingScan = new AtomicBoolean(false);
- private Context context;
- private Camera camera;
-
- private Camera.Parameters parameters;
- private PermissionCallback permissionCallback;
- private Rect previewFrame = new Rect();
-
- private PreviewView previewView;
- private View displayView;
- private int rotation = 0;
- private OnDetectPictureCallback detectCallback;
- private int previewFrameCount = 0;
- private Camera.Size optSize;
-
- /*
- * 非扫描模式
- */
- private final int MODEL_NOSCAN = 0;
-
- /*
- * 本地质量控制扫描模式
- */
- private final int MODEL_SCAN = 1;
-
- private int detectType = MODEL_NOSCAN;
-
- public int getCameraRotation() {
- return rotation;
- }
-
- public AtomicBoolean getAbortingScan() {
- return abortingScan;
- }
-
- @Override
- public void setDetectCallback(OnDetectPictureCallback callback) {
- detectType = MODEL_SCAN;
- detectCallback = callback;
- }
-
- private void onRequestDetect(byte[] data) {
- // 相机已经关闭
- if (camera == null || data == null || optSize == null) {
- return;
- }
-
- YuvImage img = new YuvImage(data, ImageFormat.NV21, optSize.width, optSize.height, null);
- ByteArrayOutputStream os = null;
- try {
- os = new ByteArrayOutputStream(data.length);
- img.compressToJpeg(new Rect(0, 0, optSize.width, optSize.height), 80, os);
- byte[] jpeg = os.toByteArray();
- int status = detectCallback.onDetect(jpeg, getCameraRotation());
-
- if (status == 0) {
- clearPreviewCallback();
- }
- } catch (OutOfMemoryError e) {
- // 内存溢出则取消当次操作
- } finally {
- try {
- os.close();
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
-
- }
-
- @Override
- public void setDisplayOrientation(@CameraView.Orientation int displayOrientation) {
- this.displayOrientation = displayOrientation;
- switch (displayOrientation) {
- case CameraView.ORIENTATION_PORTRAIT:
- rotation = 90;
- break;
- case CameraView.ORIENTATION_HORIZONTAL:
- rotation = 0;
- break;
- case CameraView.ORIENTATION_INVERT:
- rotation = 180;
- break;
- default:
- rotation = 0;
- }
- previewView.requestLayout();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void refreshPermission() {
- startPreview(true);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setFlashMode(@FlashMode int flashMode) {
- if (this.flashMode == flashMode) {
- return;
- }
- this.flashMode = flashMode;
- updateFlashMode(flashMode);
- }
-
- @Override
- public int getFlashMode() {
- return flashMode;
- }
-
- @Override
- public void start() {
- startPreview(false);
- }
-
- @Override
- public void stop() {
- if (camera != null) {
- camera.setPreviewCallback(null);
- stopPreview();
- // 避免同步代码，为了先设置null后release
- Camera tempC = camera;
- camera = null;
- tempC.release();
- camera = null;
- buffer = null;
- }
- }
-
- private void stopPreview() {
- if (camera != null) {
- camera.stopPreview();
- }
- }
-
- @Override
- public void pause() {
- if (camera != null) {
- stopPreview();
- }
- setFlashMode(FLASH_MODE_OFF);
- }
-
- @Override
- public void resume() {
- takingPicture.set(false);
- if (camera == null) {
- openCamera();
- } else {
- previewView.textureView.setSurfaceTextureListener(surfaceTextureListener);
- if (previewView.textureView.isAvailable()) {
- startPreview(false);
- }
- }
- }
-
- @Override
- public View getDisplayView() {
- return displayView;
- }
-
- @Override
- public void takePicture(final OnTakePictureCallback onTakePictureCallback) {
- if (takingPicture.get()) {
- return;
- }
- switch (displayOrientation) {
- case CameraView.ORIENTATION_PORTRAIT:
- parameters.setRotation(90);
- break;
- case CameraView.ORIENTATION_HORIZONTAL:
- parameters.setRotation(0);
- break;
- case CameraView.ORIENTATION_INVERT:
- parameters.setRotation(180);
- break;
- }
- try {
- Camera.Size picSize = getOptimalSize(camera.getParameters().getSupportedPictureSizes());
- parameters.setPictureSize(picSize.width, picSize.height);
- camera.setParameters(parameters);
- takingPicture.set(true);
- cancelAutoFocus();
- CameraThreadPool.execute(new Runnable() {
- @Override
- public void run() {
- camera.takePicture(null, null, new Camera.PictureCallback() {
- @Override
- public void onPictureTaken(byte[] data, Camera camera) {
- startPreview(false);
- takingPicture.set(false);
- if (onTakePictureCallback != null) {
- onTakePictureCallback.onPictureTaken(data);
- }
- }
- });
- }
- });
-
- } catch (RuntimeException e) {
- e.printStackTrace();
- startPreview(false);;
- takingPicture.set(false);
- }
- }
-
- @Override
- public void setPermissionCallback(PermissionCallback callback) {
- this.permissionCallback = callback;
- }
-
- public Camera1Control(Context context) {
- this.context = context;
- previewView = new PreviewView(context);
- openCamera();
- }
-
- private void openCamera() {
- setupDisplayView();
- }
-
- private void setupDisplayView() {
- final TextureView textureView = new TextureView(context);
- previewView.textureView = textureView;
- previewView.setTextureView(textureView);
- displayView = previewView;
- textureView.setSurfaceTextureListener(surfaceTextureListener);
- }
-
- private SurfaceTexture surfaceCache;
-
- private byte[] buffer = null;
-
- private void setPreviewCallbackImpl() {
- if (buffer == null) {
- buffer = new byte[displayView.getWidth()
- * displayView.getHeight() * ImageFormat.getBitsPerPixel(ImageFormat.NV21) / 8];
- }
- if (camera != null && detectType == MODEL_SCAN) {
- camera.addCallbackBuffer(buffer);
- camera.setPreviewCallback(previewCallback);
- }
- }
-
- private void clearPreviewCallback() {
- if (camera != null && detectType == MODEL_SCAN) {
- camera.setPreviewCallback(null);
- stopPreview();
- }
- }
-
- Camera.PreviewCallback previewCallback = new Camera.PreviewCallback() {
- @Override
- public void onPreviewFrame(final byte[] data, Camera camera) {
- // 扫描成功阻止打开新线程处理
- if (abortingScan.get()) {
- return;
- }
- // 节流
- if (previewFrameCount++ % 5 != 0) {
- return;
- }
-
- // 在某些机型和某项项目中，某些帧的data的数据不符合nv21的格式，需要过滤，否则后续处理会导致crash
- if (data.length != parameters.getPreviewSize().width * parameters.getPreviewSize().height * 1.5) {
- return;
- }
-
- camera.addCallbackBuffer(buffer);
-
- CameraThreadPool.execute(new Runnable() {
- @Override
- public void run() {
- Camera1Control.this.onRequestDetect(data);
- }
- });
- }
- };
-
-
- private void initCamera() {
- try {
- if (camera == null) {
- Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
- for (int i = 0; i < Camera.getNumberOfCameras(); i++) {
- Camera.getCameraInfo(i, cameraInfo);
- if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
- cameraId = i;
- }
- }
- try {
- camera = Camera.open(cameraId);
- } catch (Throwable e) {
- e.printStackTrace();
- startPreview(true);
- return;
- }
-
- }
- if (parameters == null) {
- parameters = camera.getParameters();
- parameters.setPreviewFormat(ImageFormat.NV21);
- }
- opPreviewSize(previewView.getWidth(), previewView.getHeight());
- camera.setPreviewTexture(surfaceCache);
- setPreviewCallbackImpl();
- startPreview(false);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- private TextureView.SurfaceTextureListener surfaceTextureListener = new TextureView.SurfaceTextureListener() {
- @Override
- public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
- surfaceCache = surface;
- initCamera();
- }
-
- @Override
- public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
- opPreviewSize(previewView.getWidth(), previewView.getHeight());
- startPreview(false);
- setPreviewCallbackImpl();
- }
-
- @Override
- public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
- return false;
- }
-
- @Override
- public void onSurfaceTextureUpdated(SurfaceTexture surface) {
- setPreviewCallbackImpl();
- }
- };
-
- // 开启预览
- private void startPreview(boolean checkPermission) {
- if (ActivityCompat.checkSelfPermission(context, Manifest.permission.CAMERA)
- != PackageManager.PERMISSION_GRANTED) {
- if (checkPermission && permissionCallback != null) {
- permissionCallback.onRequestPermission();
- }
- return;
- }
- if (camera == null) {
- initCamera();
- } else {
- camera.startPreview();
- startAutoFocus();
- }
- }
-
- private void cancelAutoFocus() {
- camera.cancelAutoFocus();
- CameraThreadPool.cancelAutoFocusTimer();
- }
-
- private void startAutoFocus() {
- CameraThreadPool.createAutoFocusTimerTask(new Runnable() {
- @Override
- public void run() {
- synchronized (Camera1Control.this) {
- if (camera != null && !takingPicture.get()) {
- try {
- camera.autoFocus(new Camera.AutoFocusCallback() {
- @Override
- public void onAutoFocus(boolean success, Camera camera) {
- }
- });
- } catch (Throwable e) {
- // startPreview是异步实现，可能在某些机器上前几次调用会autofocus failß
- }
- }
- }
- }
- });
- }
-
- private void opPreviewSize(int width, @SuppressWarnings("unused") int height) {
-
- if (parameters != null && camera != null && width > 0) {
- optSize = getOptimalSize(camera.getParameters().getSupportedPreviewSizes());
- parameters.setPreviewSize(optSize.width, optSize.height);
- previewView.setRatio(1.0f * optSize.width / optSize.height);
-
- camera.setDisplayOrientation(getSurfaceOrientation());
- stopPreview();
- try {
- camera.setParameters(parameters);
- } catch (RuntimeException e) {
- e.printStackTrace();
-
- }
- }
- }
-
- private Camera.Size getOptimalSize(List sizes) {
- int width = previewView.textureView.getWidth();
- int height = previewView.textureView.getHeight();
- Camera.Size pictureSize = sizes.get(0);
-
- List candidates = new ArrayList<>();
-
- for (Camera.Size size : sizes) {
- if (size.width >= width && size.height >= height && size.width * height == size.height * width) {
- // 比例相同
- candidates.add(size);
- } else if (size.height >= width && size.width >= height && size.width * width == size.height * height) {
- // 反比例
- candidates.add(size);
- }
- }
- if (!candidates.isEmpty()) {
- return Collections.min(candidates, sizeComparator);
- }
-
- for (Camera.Size size : sizes) {
- if (size.width > width && size.height > height) {
- return size;
- }
- }
-
- return pictureSize;
- }
-
- private Comparator sizeComparator = new Comparator() {
- @Override
- public int compare(Camera.Size lhs, Camera.Size rhs) {
- return Long.signum((long) lhs.width * lhs.height - (long) rhs.width * rhs.height);
- }
- };
-
- private void updateFlashMode(int flashMode) {
- switch (flashMode) {
- case FLASH_MODE_TORCH:
- parameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
- break;
- case FLASH_MODE_OFF:
- parameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
- break;
- case ICameraControl.FLASH_MODE_AUTO:
- parameters.setFlashMode(Camera.Parameters.FLASH_MODE_AUTO);
- break;
- default:
- parameters.setFlashMode(Camera.Parameters.FLASH_MODE_AUTO);
- break;
- }
- camera.setParameters(parameters);
- }
-
- private int getSurfaceOrientation() {
- @CameraView.Orientation
- int orientation = displayOrientation;
- switch (orientation) {
- case CameraView.ORIENTATION_PORTRAIT:
- return 90;
- case CameraView.ORIENTATION_HORIZONTAL:
- return 0;
- case CameraView.ORIENTATION_INVERT:
- return 180;
- default:
- return 90;
- }
- }
-
- /**
- * 有些相机匹配不到完美的比例。比如。我们的layout是4:3的。预览只有16:9
- * 的，如果直接显示图片会拉伸，变形。缩放的话，又有黑边。所以我们采取的策略
- * 是，等比例放大。这样预览的有一部分会超出屏幕。拍照后再进行裁剪处理。
- */
- private class PreviewView extends FrameLayout {
-
- private TextureView textureView;
-
- private float ratio = 0.75f;
-
- void setTextureView(TextureView textureView) {
- this.textureView = textureView;
- removeAllViews();
- addView(textureView);
- }
-
- void setRatio(float ratio) {
- this.ratio = ratio;
- requestLayout();
- relayout(getWidth(), getHeight());
- }
-
- public PreviewView(Context context) {
- super(context);
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- relayout(w, h);
- }
-
- private void relayout(int w, int h) {
- int width = w;
- int height = h;
- if (w < h) {
- // 垂直模式，高度固定。
- height = (int) (width * ratio);
- } else {
- // 水平模式，宽度固定。
- width = (int) (height * ratio);
- }
-
- int l = (getWidth() - width) / 2;
- int t = (getHeight() - height) / 2;
-
- previewFrame.left = l;
- previewFrame.top = t;
- previewFrame.right = l + width;
- previewFrame.bottom = t + height;
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
- textureView.layout(previewFrame.left, previewFrame.top, previewFrame.right, previewFrame.bottom);
- }
- }
-
- @Override
- public Rect getPreviewFrame() {
- return previewFrame;
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java
deleted file mode 100644
index dbd6209..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-
-package com.baidu.ocr.ui.camera;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import android.Manifest;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.graphics.ImageFormat;
-import android.graphics.Matrix;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.SurfaceTexture;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.CaptureFailure;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.CaptureResult;
-import android.hardware.camera2.TotalCaptureResult;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.Image;
-import android.media.ImageReader;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.Size;
-import android.util.SparseIntArray;
-import android.view.Surface;
-import android.view.TextureView;
-import android.view.View;
-import android.view.WindowManager;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-
-@androidx.annotation.RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-public class Camera2Control implements ICameraControl {
- @Override
- public void setDetectCallback(OnDetectPictureCallback callback) {
- // TODO 暂时只用camera
- }
-
- @Override
- public AtomicBoolean getAbortingScan() {
- // TODO 暂时只用camera
- return null;
- }
-
- /**
- * Conversion from screen rotation to JPEG orientation.
- */
- private static final SparseIntArray ORIENTATIONS = new SparseIntArray();
- private static final int MAX_PREVIEW_SIZE = 2048;
-
- static {
- ORIENTATIONS.append(Surface.ROTATION_0, 90);
- ORIENTATIONS.append(Surface.ROTATION_90, 0);
- ORIENTATIONS.append(Surface.ROTATION_180, 270);
- ORIENTATIONS.append(Surface.ROTATION_270, 180);
- }
-
- private static final int STATE_PREVIEW = 0;
- private static final int STATE_WAITING_FOR_LOCK = 1;
- private static final int STATE_WAITING_FOR_CAPTURE = 2;
- private static final int STATE_CAPTURING = 3;
- private static final int STATE_PICTURE_TAKEN = 4;
-
- private static final int MAX_PREVIEW_WIDTH = 1920;
- private static final int MAX_PREVIEW_HEIGHT = 1080;
-
- private int flashMode;
- private int orientation = 0;
- private int state = STATE_PREVIEW;
-
- private Context context;
- private OnTakePictureCallback onTakePictureCallback;
- private PermissionCallback permissionCallback;
-
- private String cameraId;
- private TextureView textureView;
- private Size previewSize;
- private Rect previewFrame = new Rect();
-
- private HandlerThread backgroundThread;
- private Handler backgroundHandler;
- private ImageReader imageReader;
- private CameraCaptureSession captureSession;
- private CameraDevice cameraDevice;
-
- private CaptureRequest.Builder previewRequestBuilder;
- private CaptureRequest previewRequest;
-
- private Semaphore cameraLock = new Semaphore(1);
- private int sensorOrientation;
-
- @Override
- public void start() {
- startBackgroundThread();
- if (textureView.isAvailable()) {
- openCamera(textureView.getWidth(), textureView.getHeight());
- textureView.setSurfaceTextureListener(surfaceTextureListener);
- } else {
- textureView.setSurfaceTextureListener(surfaceTextureListener);
- }
- }
-
- @Override
- public void stop() {
- textureView.setSurfaceTextureListener(null);
- closeCamera();
- stopBackgroundThread();
- }
-
- @Override
- public void pause() {
- setFlashMode(FLASH_MODE_OFF);
- }
-
- @Override
- public void resume() {
- state = STATE_PREVIEW;
- }
-
- @Override
- public View getDisplayView() {
- return textureView;
- }
-
- @Override
- public Rect getPreviewFrame() {
- return previewFrame;
- }
-
- @Override
- public void takePicture(OnTakePictureCallback callback) {
- this.onTakePictureCallback = callback;
- // 拍照第一步，对焦
- lockFocus();
- }
-
- @Override
- public void setPermissionCallback(PermissionCallback callback) {
- this.permissionCallback = callback;
- }
-
- @Override
- public void setDisplayOrientation(@CameraView.Orientation int displayOrientation) {
- this.orientation = displayOrientation / 90;
- }
-
- @Override
- public void refreshPermission() {
- openCamera(textureView.getWidth(), textureView.getHeight());
- }
-
- @Override
- public void setFlashMode(@FlashMode int flashMode) {
- if (this.flashMode == flashMode) {
- return;
- }
- this.flashMode = flashMode;
- try {
- previewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
- CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
- updateFlashMode(flashMode, previewRequestBuilder);
- previewRequest = previewRequestBuilder.build();
- captureSession.setRepeatingRequest(previewRequest, captureCallback, backgroundHandler);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public int getFlashMode() {
- return flashMode;
- }
-
- public Camera2Control(Context activity) {
- this.context = activity;
- textureView = new TextureView(activity);
- }
-
- private final TextureView.SurfaceTextureListener surfaceTextureListener =
- new TextureView.SurfaceTextureListener() {
- @Override
- public void onSurfaceTextureAvailable(SurfaceTexture texture, int width, int height) {
- openCamera(width, height);
- }
-
- @Override
- public void onSurfaceTextureSizeChanged(SurfaceTexture texture, int width, int height) {
- configureTransform(width, height);
- previewFrame.left = 0;
- previewFrame.top = 0;
- previewFrame.right = width;
- previewFrame.bottom = height;
- }
-
- @Override
- public boolean onSurfaceTextureDestroyed(SurfaceTexture texture) {
- stop();
- return true;
- }
-
- @Override
- public void onSurfaceTextureUpdated(SurfaceTexture texture) {
- }
- };
-
- private void openCamera(int width, int height) {
- // 6.0+的系统需要检查系统权限 。
- if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA)
- != PackageManager.PERMISSION_GRANTED) {
- requestCameraPermission();
- return;
- }
- setUpCameraOutputs(width, height);
- configureTransform(width, height);
- CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
- try {
- if (!cameraLock.tryAcquire(2500, TimeUnit.MILLISECONDS)) {
- throw new RuntimeException("Time out waiting to lock camera opening.");
- }
- manager.openCamera(cameraId, deviceStateCallback, backgroundHandler);
- } catch (CameraAccessException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- throw new RuntimeException("Interrupted while trying to lock camera opening.", e);
- }
- }
-
- private final CameraDevice.StateCallback deviceStateCallback = new CameraDevice.StateCallback() {
- @Override
- public void onOpened(@NonNull CameraDevice cameraDevice) {
- cameraLock.release();
- Camera2Control.this.cameraDevice = cameraDevice;
- createCameraPreviewSession();
- }
-
- @Override
- public void onDisconnected(@NonNull CameraDevice cameraDevice) {
- cameraLock.release();
- cameraDevice.close();
- Camera2Control.this.cameraDevice = null;
- }
-
- @Override
- public void onError(@NonNull CameraDevice cameraDevice, int error) {
- cameraLock.release();
- cameraDevice.close();
- Camera2Control.this.cameraDevice = null;
- }
- };
-
- private void createCameraPreviewSession() {
- try {
- SurfaceTexture texture = textureView.getSurfaceTexture();
- assert texture != null;
- texture.setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
- Surface surface = new Surface(texture);
- previewRequestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
- previewRequestBuilder.addTarget(surface);
- updateFlashMode(this.flashMode, previewRequestBuilder);
- cameraDevice.createCaptureSession(Arrays.asList(surface, imageReader.getSurface()),
- new CameraCaptureSession.StateCallback() {
-
- @Override
- public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
- // The camera is already closed
- if (null == cameraDevice) {
- return;
- }
- captureSession = cameraCaptureSession;
- try {
- previewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
- CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
- previewRequest = previewRequestBuilder.build();
- captureSession.setRepeatingRequest(previewRequest,
- captureCallback, backgroundHandler);
- } catch (CameraAccessException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void onConfigureFailed(
- @NonNull CameraCaptureSession cameraCaptureSession) {
- // TODO
- }
- }, null
- );
- } catch (CameraAccessException e) {
- e.printStackTrace();
- }
- }
-
- private final ImageReader.OnImageAvailableListener onImageAvailableListener =
- new ImageReader.OnImageAvailableListener() {
- @Override
- public void onImageAvailable(ImageReader reader) {
- if (onTakePictureCallback != null) {
- Image image = reader.acquireNextImage();
- ByteBuffer buffer = image.getPlanes()[0].getBuffer();
- byte[] bytes = new byte[buffer.remaining()];
- buffer.get(bytes);
-
- image.close();
- onTakePictureCallback.onPictureTaken(bytes);
- }
- }
- };
-
- private CameraCaptureSession.CaptureCallback captureCallback =
- new CameraCaptureSession.CaptureCallback() {
- private void process(CaptureResult result) {
- switch (state) {
- case STATE_PREVIEW: {
- break;
- }
- case STATE_WAITING_FOR_LOCK: {
- Integer afState = result.get(CaptureResult.CONTROL_AF_STATE);
- if (afState == null) {
- captureStillPicture();
- return;
- }
- switch (afState) {
- case CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED:
- case CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED:
- case CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED: {
- Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
- if (aeState == null
- || aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
- captureStillPicture();
- } else {
- runPreCaptureSequence();
- }
- break;
- }
- default:
- captureStillPicture();
- }
- break;
- }
- case STATE_WAITING_FOR_CAPTURE: {
- Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
- if (aeState == null
- || aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE
- || aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
- state = STATE_CAPTURING;
- } else {
- if (aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
- captureStillPicture();
- }
- }
- break;
- }
- case STATE_CAPTURING: {
- Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
- if (aeState == null || aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
- captureStillPicture();
- }
- break;
- }
- default:
- break;
- }
- }
-
- @Override
- public void onCaptureProgressed(@NonNull CameraCaptureSession session,
- @NonNull CaptureRequest request,
- @NonNull CaptureResult partialResult) {
- process(partialResult);
- }
-
- @Override
- public void onCaptureCompleted(@NonNull CameraCaptureSession session,
- @NonNull CaptureRequest request,
- @NonNull TotalCaptureResult result) {
- process(result);
- }
-
- };
-
- private Size getOptimalSize(Size[] choices, int textureViewWidth,
- int textureViewHeight, int maxWidth, int maxHeight, Size aspectRatio) {
- List bigEnough = new ArrayList<>();
- List notBigEnough = new ArrayList<>();
- int w = aspectRatio.getWidth();
- int h = aspectRatio.getHeight();
- for (Size option : choices) {
- if (option.getWidth() <= maxWidth && option.getHeight() <= maxHeight
- && option.getHeight() == option.getWidth() * h / w) {
- if (option.getWidth() >= textureViewWidth
- && option.getHeight() >= textureViewHeight) {
- bigEnough.add(option);
- } else {
- notBigEnough.add(option);
- }
- }
- }
-
- // Pick the smallest of those big enough. If there is no one big enough, pick the
- // largest of those not big enough.
- if (bigEnough.size() > 0) {
- return Collections.min(bigEnough, sizeComparator);
- }
-
- for (Size option : choices) {
- if (option.getWidth() >= maxWidth && option.getHeight() >= maxHeight) {
- return option;
- }
- }
-
- if (notBigEnough.size() > 0) {
- return Collections.max(notBigEnough, sizeComparator);
- }
-
- return choices[0];
- }
-
- private Comparator sizeComparator = new Comparator() {
- @Override
- public int compare(Size lhs, Size rhs) {
- return Long.signum((long) lhs.getWidth() * lhs.getHeight() - (long) rhs.getWidth() * rhs.getHeight());
- }
- };
-
- private void requestCameraPermission() {
- if (permissionCallback != null) {
- permissionCallback.onRequestPermission();
- }
- }
-
- @SuppressWarnings("SuspiciousNameCombination")
- private void setUpCameraOutputs(int width, int height) {
- CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
- try {
- for (String cameraId : manager.getCameraIdList()) {
- CameraCharacteristics characteristics =
- manager.getCameraCharacteristics(cameraId);
-
- Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING);
- if (facing != null && facing == CameraCharacteristics.LENS_FACING_FRONT) {
- continue;
- }
-
- StreamConfigurationMap map = characteristics.get(
- CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
- if (map == null) {
- continue;
- }
-
- // int preferredPictureSize = (int) (Math.max(textureView.getWidth(), textureView
- // .getHeight()) * 1.5);
- // preferredPictureSize = Math.min(preferredPictureSize, 2560);
-
- WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
- Point screenSize = new Point();
- windowManager.getDefaultDisplay().getSize(screenSize);
- int maxImageSize = Math.max(MAX_PREVIEW_SIZE, screenSize.y * 3 / 2);
-
- Size size = getOptimalSize(map.getOutputSizes(ImageFormat.JPEG), textureView.getWidth(),
- textureView.getHeight(), maxImageSize, maxImageSize, new Size(4, 3));
-
- imageReader = ImageReader.newInstance(size.getWidth(), size.getHeight(),
- ImageFormat.JPEG, 1);
- imageReader.setOnImageAvailableListener(
- onImageAvailableListener, backgroundHandler);
-
- int displayRotation = orientation;
- // noinspection ConstantConditions
- sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
- boolean swappedDimensions = false;
- switch (displayRotation) {
- case Surface.ROTATION_0:
- case Surface.ROTATION_180:
- if (sensorOrientation == 90 || sensorOrientation == 270) {
- swappedDimensions = true;
- }
- break;
- case Surface.ROTATION_90:
- case Surface.ROTATION_270:
- if (sensorOrientation == 0 || sensorOrientation == 180) {
- swappedDimensions = true;
- }
- break;
- default:
- }
-
- int rotatedPreviewWidth = width;
- int rotatedPreviewHeight = height;
- int maxPreviewWidth = screenSize.x;
- int maxPreviewHeight = screenSize.y;
-
- if (swappedDimensions) {
- rotatedPreviewWidth = height;
- rotatedPreviewHeight = width;
- maxPreviewWidth = screenSize.y;
- maxPreviewHeight = screenSize.x;
- }
-
- maxPreviewWidth = Math.min(maxPreviewWidth, MAX_PREVIEW_WIDTH);
- maxPreviewHeight = Math.min(maxPreviewHeight, MAX_PREVIEW_HEIGHT);
-
- previewSize = getOptimalSize(map.getOutputSizes(SurfaceTexture.class),
- rotatedPreviewWidth, rotatedPreviewHeight, maxPreviewWidth,
- maxPreviewHeight, size);
- this.cameraId = cameraId;
- return;
- }
- } catch (CameraAccessException | NullPointerException e) {
- e.printStackTrace();
- }
- }
-
- private void closeCamera() {
- try {
- cameraLock.acquire();
- if (null != captureSession) {
- captureSession.close();
- captureSession = null;
- }
- if (null != cameraDevice) {
- cameraDevice.close();
- cameraDevice = null;
- }
- if (null != imageReader) {
- imageReader.close();
- imageReader = null;
- }
- } catch (InterruptedException e) {
- throw new RuntimeException("Interrupted while trying to lock camera closing.", e);
- } finally {
- cameraLock.release();
- }
- }
-
- private void startBackgroundThread() {
- backgroundThread = new HandlerThread("ocr_camera");
- backgroundThread.start();
- backgroundHandler = new Handler(backgroundThread.getLooper());
- }
-
- private void stopBackgroundThread() {
- if (backgroundThread != null) {
- backgroundThread.quitSafely();
- backgroundThread = null;
- backgroundHandler = null;
- }
- }
-
- private void configureTransform(int viewWidth, int viewHeight) {
- if (null == textureView || null == previewSize || null == context) {
- return;
- }
- int rotation = orientation;
- Matrix matrix = new Matrix();
- RectF viewRect = new RectF(0, 0, viewWidth, viewHeight);
- RectF bufferRect = new RectF(0, 0, previewSize.getHeight(), previewSize.getWidth());
- float centerX = viewRect.centerX();
- float centerY = viewRect.centerY();
- if (Surface.ROTATION_90 == rotation || Surface.ROTATION_270 == rotation) {
- bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY());
- matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL);
- float scale = Math.max(
- (float) viewHeight / previewSize.getHeight(),
- (float) viewWidth / previewSize.getWidth());
- matrix.postScale(scale, scale, centerX, centerY);
- matrix.postRotate(90 * (rotation - 2), centerX, centerY);
- } else if (Surface.ROTATION_180 == rotation) {
- matrix.postRotate(180, centerX, centerY);
- }
- textureView.setTransform(matrix);
- }
-
- // 拍照前，先对焦
- private void lockFocus() {
- if (captureSession != null && state == STATE_PREVIEW) {
- try {
- previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
- CameraMetadata.CONTROL_AF_TRIGGER_START);
- state = STATE_WAITING_FOR_LOCK;
- captureSession.capture(previewRequestBuilder.build(), captureCallback,
- backgroundHandler);
- } catch (CameraAccessException e) {
- e.printStackTrace();
- }
- }
- }
-
- private void runPreCaptureSequence() {
- try {
- previewRequestBuilder.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
- CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START);
- state = STATE_WAITING_FOR_CAPTURE;
- captureSession.capture(previewRequestBuilder.build(), captureCallback,
- backgroundHandler);
- } catch (CameraAccessException e) {
- e.printStackTrace();
- }
- }
-
- // 拍照session
- private void captureStillPicture() {
- try {
- if (null == context || null == cameraDevice) {
- return;
- }
- final CaptureRequest.Builder captureBuilder =
- cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
- captureBuilder.addTarget(imageReader.getSurface());
- captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
- CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-
- captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, getOrientation(orientation));
- updateFlashMode(this.flashMode, captureBuilder);
- CameraCaptureSession.CaptureCallback captureCallback =
- new CameraCaptureSession.CaptureCallback() {
- @Override
- public void onCaptureCompleted(@NonNull CameraCaptureSession session,
- @NonNull CaptureRequest request,
- @NonNull TotalCaptureResult result) {
- unlockFocus();
- }
-
- @Override
- public void onCaptureFailed(@NonNull CameraCaptureSession session,
- @NonNull CaptureRequest request,
- @NonNull CaptureFailure failure) {
- super.onCaptureFailed(session, request, failure);
- }
- };
-
- // 停止预览
- captureSession.stopRepeating();
- captureSession.capture(captureBuilder.build(), captureCallback, backgroundHandler);
- state = STATE_PICTURE_TAKEN;
- // unlockFocus();
- } catch (CameraAccessException e) {
- e.printStackTrace();
- }
- }
-
- private int getOrientation(int rotation) {
- return (ORIENTATIONS.get(rotation) + sensorOrientation + 270) % 360;
- }
-
- // 停止对焦
- private void unlockFocus() {
- try {
- previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
- CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
- captureSession.capture(previewRequestBuilder.build(), captureCallback,
- backgroundHandler);
- state = STATE_PREVIEW;
- // 预览
- captureSession.setRepeatingRequest(previewRequest, captureCallback,
- backgroundHandler);
- textureView.setSurfaceTextureListener(surfaceTextureListener);
- } catch (CameraAccessException e) {
- e.printStackTrace();
- }
- }
-
- private void updateFlashMode(@FlashMode int flashMode, CaptureRequest.Builder builder) {
- switch (flashMode) {
- case FLASH_MODE_TORCH:
- builder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
- break;
- case FLASH_MODE_OFF:
- builder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_OFF);
- break;
- case ICameraControl.FLASH_MODE_AUTO:
- default:
- builder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_SINGLE);
- break;
- }
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java
deleted file mode 100644
index 51b1faf..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import com.baidu.idcardquality.IDcardQualityProcess;
-import com.baidu.ocr.ui.R;
-import com.baidu.ocr.ui.crop.CropView;
-import com.baidu.ocr.ui.crop.FrameOverlayView;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.provider.MediaStore;
-
-import android.view.Surface;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-
-public class CameraActivity extends Activity {
-
- public static final String KEY_OUTPUT_FILE_PATH = "outputFilePath";
- public static final String KEY_CONTENT_TYPE = "contentType";
- public static final String KEY_NATIVE_TOKEN = "nativeToken";
- public static final String KEY_NATIVE_ENABLE = "nativeEnable";
- public static final String KEY_NATIVE_MANUAL = "nativeEnableManual";
-
- public static final String CONTENT_TYPE_GENERAL = "general";
- public static final String CONTENT_TYPE_ID_CARD_FRONT = "IDCardFront";
- public static final String CONTENT_TYPE_ID_CARD_BACK = "IDCardBack";
- public static final String CONTENT_TYPE_BANK_CARD = "bankCard";
- public static final String CONTENT_TYPE_PASSPORT = "passport";
-
- private static final int REQUEST_CODE_PICK_IMAGE = 100;
- private static final int PERMISSIONS_REQUEST_CAMERA = 800;
- private static final int PERMISSIONS_EXTERNAL_STORAGE = 801;
-
- private File outputFile;
- private String contentType;
- private Handler handler = new Handler();
-
- private boolean isNativeEnable;
- private boolean isNativeManual;
-
- private OCRCameraLayout takePictureContainer;
- private OCRCameraLayout cropContainer;
- private OCRCameraLayout confirmResultContainer;
- private ImageView lightButton;
- private CameraView cameraView;
- private ImageView displayImageView;
- private CropView cropView;
- private FrameOverlayView overlayView;
- private MaskView cropMaskView;
- private ImageView takePhotoBtn;
- private PermissionCallback permissionCallback = new PermissionCallback() {
- @Override
- public boolean onRequestPermission() {
- ActivityCompat.requestPermissions(CameraActivity.this,
- new String[] {Manifest.permission.CAMERA},
- PERMISSIONS_REQUEST_CAMERA);
- return false;
- }
- };
-
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
-
- super.onCreate(savedInstanceState);
- setContentView(R.layout.bd_ocr_activity_camera);
-
- takePictureContainer = (OCRCameraLayout) findViewById(R.id.take_picture_container);
- confirmResultContainer = (OCRCameraLayout) findViewById(R.id.confirm_result_container);
-
- cameraView = (CameraView) findViewById(R.id.camera_view);
- cameraView.getCameraControl().setPermissionCallback(permissionCallback);
- lightButton = (ImageView) findViewById(R.id.light_button);
- lightButton.setOnClickListener(lightButtonOnClickListener);
- takePhotoBtn = (ImageView) findViewById(R.id.take_photo_button);
- findViewById(R.id.album_button).setOnClickListener(albumButtonOnClickListener);
- takePhotoBtn.setOnClickListener(takeButtonOnClickListener);
-
- // confirm result;
- displayImageView = (ImageView) findViewById(R.id.display_image_view);
- confirmResultContainer.findViewById(R.id.confirm_button).setOnClickListener(confirmButtonOnClickListener);
- confirmResultContainer.findViewById(R.id.cancel_button).setOnClickListener(confirmCancelButtonOnClickListener);
- findViewById(R.id.rotate_button).setOnClickListener(rotateButtonOnClickListener);
-
- cropView = (CropView) findViewById(R.id.crop_view);
- cropContainer = (OCRCameraLayout) findViewById(R.id.crop_container);
- overlayView = (FrameOverlayView) findViewById(R.id.overlay_view);
- cropContainer.findViewById(R.id.confirm_button).setOnClickListener(cropConfirmButtonListener);
- cropMaskView = (MaskView) cropContainer.findViewById(R.id.crop_mask_view);
- cropContainer.findViewById(R.id.cancel_button).setOnClickListener(cropCancelButtonListener);
-
- setOrientation(getResources().getConfiguration());
- initParams();
-
- cameraView.setAutoPictureCallback(autoTakePictureCallback);
- }
-
- @Override
- protected void onStart() {
- super.onStart();
-
- }
-
- @Override
- protected void onStop() {
- super.onStop();
-
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- cameraView.stop();
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- cameraView.start();
- }
-
- private void initParams() {
- String outputPath = getIntent().getStringExtra(KEY_OUTPUT_FILE_PATH);
- final String token = getIntent().getStringExtra(KEY_NATIVE_TOKEN);
- isNativeEnable = getIntent().getBooleanExtra(KEY_NATIVE_ENABLE, true);
- isNativeManual = getIntent().getBooleanExtra(KEY_NATIVE_MANUAL, false);
-
- if (token == null && !isNativeManual) {
- isNativeEnable = false;
- }
-
- if (outputPath != null) {
- outputFile = new File(outputPath);
- }
-
- contentType = getIntent().getStringExtra(KEY_CONTENT_TYPE);
- if (contentType == null) {
- contentType = CONTENT_TYPE_GENERAL;
- }
- int maskType;
- switch (contentType) {
- case CONTENT_TYPE_ID_CARD_FRONT:
- maskType = MaskView.MASK_TYPE_ID_CARD_FRONT;
- overlayView.setVisibility(View.INVISIBLE);
- if (isNativeEnable) {
- takePhotoBtn.setVisibility(View.INVISIBLE);
- }
- break;
- case CONTENT_TYPE_ID_CARD_BACK:
- maskType = MaskView.MASK_TYPE_ID_CARD_BACK;
- overlayView.setVisibility(View.INVISIBLE);
- if (isNativeEnable) {
- takePhotoBtn.setVisibility(View.INVISIBLE);
- }
- break;
- case CONTENT_TYPE_BANK_CARD:
- maskType = MaskView.MASK_TYPE_BANK_CARD;
- overlayView.setVisibility(View.INVISIBLE);
- break;
- case CONTENT_TYPE_PASSPORT:
- maskType = MaskView.MASK_TYPE_PASSPORT;
- overlayView.setVisibility(View.INVISIBLE);
- break;
- case CONTENT_TYPE_GENERAL:
- default:
- maskType = MaskView.MASK_TYPE_NONE;
- cropMaskView.setVisibility(View.INVISIBLE);
- break;
- }
-
- // 身份证本地能力初始化
- if (maskType == MaskView.MASK_TYPE_ID_CARD_FRONT || maskType == MaskView.MASK_TYPE_ID_CARD_BACK) {
- if (isNativeEnable && !isNativeManual) {
- initNative(token);
- }
- }
- cameraView.setEnableScan(isNativeEnable);
- cameraView.setMaskType(maskType, this);
- cropMaskView.setMaskType(maskType);
- }
-
- private void initNative(final String token) {
- CameraNativeHelper.init(CameraActivity.this, token,
- new CameraNativeHelper.CameraNativeInitCallback() {
- @Override
- public void onError(int errorCode, Throwable e) {
- cameraView.setInitNativeStatus(errorCode);
- }
- });
- }
-
- private void showTakePicture() {
- cameraView.getCameraControl().resume();
- updateFlashMode();
- takePictureContainer.setVisibility(View.VISIBLE);
- confirmResultContainer.setVisibility(View.INVISIBLE);
- cropContainer.setVisibility(View.INVISIBLE);
- }
-
- private void showCrop() {
- cameraView.getCameraControl().pause();
- updateFlashMode();
- takePictureContainer.setVisibility(View.INVISIBLE);
- confirmResultContainer.setVisibility(View.INVISIBLE);
- cropContainer.setVisibility(View.VISIBLE);
- }
-
- private void showResultConfirm() {
- cameraView.getCameraControl().pause();
- updateFlashMode();
- takePictureContainer.setVisibility(View.INVISIBLE);
- confirmResultContainer.setVisibility(View.VISIBLE);
- cropContainer.setVisibility(View.INVISIBLE);
- }
-
- // take photo;
- private void updateFlashMode() {
- int flashMode = cameraView.getCameraControl().getFlashMode();
- if (flashMode == ICameraControl.FLASH_MODE_TORCH) {
- lightButton.setImageResource(R.drawable.bd_ocr_light_on);
- } else {
- lightButton.setImageResource(R.drawable.bd_ocr_light_off);
- }
- }
-
- private View.OnClickListener albumButtonOnClickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-
- if (ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.READ_EXTERNAL_STORAGE)
- != PackageManager.PERMISSION_GRANTED) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- ActivityCompat.requestPermissions(CameraActivity.this,
- new String[] {Manifest.permission.READ_EXTERNAL_STORAGE},
- PERMISSIONS_EXTERNAL_STORAGE);
- return;
- }
- }
- Intent intent = new Intent(Intent.ACTION_PICK);
- intent.setType("image/*");
- startActivityForResult(intent, REQUEST_CODE_PICK_IMAGE);
- }
- };
-
- private View.OnClickListener lightButtonOnClickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (cameraView.getCameraControl().getFlashMode() == ICameraControl.FLASH_MODE_OFF) {
- cameraView.getCameraControl().setFlashMode(ICameraControl.FLASH_MODE_TORCH);
- } else {
- cameraView.getCameraControl().setFlashMode(ICameraControl.FLASH_MODE_OFF);
- }
- updateFlashMode();
- }
- };
-
- private View.OnClickListener takeButtonOnClickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- cameraView.takePicture(outputFile, takePictureCallback);
- }
- };
-
- private CameraView.OnTakePictureCallback autoTakePictureCallback = new CameraView.OnTakePictureCallback() {
- @Override
- public void onPictureTaken(final Bitmap bitmap) {
- CameraThreadPool.execute(new Runnable() {
- @Override
- public void run() {
- try {
- FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fileOutputStream);
- bitmap.recycle();
- fileOutputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- Intent intent = new Intent();
- intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, contentType);
- setResult(Activity.RESULT_OK, intent);
- finish();
- }
- });
- }
- };
-
- private CameraView.OnTakePictureCallback takePictureCallback = new CameraView.OnTakePictureCallback() {
- @Override
- public void onPictureTaken(final Bitmap bitmap) {
- handler.post(new Runnable() {
- @Override
- public void run() {
- takePictureContainer.setVisibility(View.INVISIBLE);
- if (cropMaskView.getMaskType() == MaskView.MASK_TYPE_NONE) {
- cropView.setFilePath(outputFile.getAbsolutePath());
- showCrop();
- } else if (cropMaskView.getMaskType() == MaskView.MASK_TYPE_BANK_CARD) {
- cropView.setFilePath(outputFile.getAbsolutePath());
- cropMaskView.setVisibility(View.INVISIBLE);
- overlayView.setVisibility(View.VISIBLE);
- overlayView.setTypeWide();
- showCrop();
- } else {
- displayImageView.setImageBitmap(bitmap);
- showResultConfirm();
- }
- }
- });
- }
- };
-
- private View.OnClickListener cropCancelButtonListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- // 释放 cropView中的bitmap;
- cropView.setFilePath(null);
- showTakePicture();
- }
- };
-
- private View.OnClickListener cropConfirmButtonListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- int maskType = cropMaskView.getMaskType();
- Rect rect;
- switch (maskType) {
- case MaskView.MASK_TYPE_BANK_CARD:
- case MaskView.MASK_TYPE_ID_CARD_BACK:
- case MaskView.MASK_TYPE_ID_CARD_FRONT:
- rect = cropMaskView.getFrameRect();
- break;
- case MaskView.MASK_TYPE_NONE:
- default:
- rect = overlayView.getFrameRect();
- break;
- }
- Bitmap cropped = cropView.crop(rect);
- displayImageView.setImageBitmap(cropped);
- cropAndConfirm();
- }
- };
-
- private void cropAndConfirm() {
- cameraView.getCameraControl().pause();
- updateFlashMode();
- doConfirmResult();
- }
-
- private void doConfirmResult() {
- CameraThreadPool.execute(new Runnable() {
- @Override
- public void run() {
- try {
- FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
- Bitmap bitmap = ((BitmapDrawable) displayImageView.getDrawable()).getBitmap();
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fileOutputStream);
- fileOutputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- Intent intent = new Intent();
- intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, contentType);
- setResult(Activity.RESULT_OK, intent);
- finish();
- }
- });
- }
-
- private View.OnClickListener confirmButtonOnClickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- doConfirmResult();
- }
- };
-
- private View.OnClickListener confirmCancelButtonOnClickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- displayImageView.setImageBitmap(null);
- showTakePicture();
- }
- };
-
- private View.OnClickListener rotateButtonOnClickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- cropView.rotate(90);
- }
- };
-
- private String getRealPathFromURI(Uri contentURI) {
- String result;
- Cursor cursor = null;
- try {
- cursor = getContentResolver().query(contentURI, null, null, null, null);
- } catch (Throwable e) {
- e.printStackTrace();
- }
- if (cursor == null) {
- result = contentURI.getPath();
- } else {
- cursor.moveToFirst();
- int idx = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA);
- result = cursor.getString(idx);
- cursor.close();
- }
- return result;
- }
-
- @Override
- public void onConfigurationChanged(Configuration newConfig) {
- super.onConfigurationChanged(newConfig);
- setOrientation(newConfig);
- }
-
- private void setOrientation(Configuration newConfig) {
- int rotation = getWindowManager().getDefaultDisplay().getRotation();
- int orientation;
- int cameraViewOrientation = CameraView.ORIENTATION_PORTRAIT;
- switch (newConfig.orientation) {
- case Configuration.ORIENTATION_PORTRAIT:
- cameraViewOrientation = CameraView.ORIENTATION_PORTRAIT;
- orientation = OCRCameraLayout.ORIENTATION_PORTRAIT;
- break;
- case Configuration.ORIENTATION_LANDSCAPE:
- orientation = OCRCameraLayout.ORIENTATION_HORIZONTAL;
- if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90) {
- cameraViewOrientation = CameraView.ORIENTATION_HORIZONTAL;
- } else {
- cameraViewOrientation = CameraView.ORIENTATION_INVERT;
- }
- break;
- default:
- orientation = OCRCameraLayout.ORIENTATION_PORTRAIT;
- cameraView.setOrientation(CameraView.ORIENTATION_PORTRAIT);
- break;
- }
- takePictureContainer.setOrientation(orientation);
- cameraView.setOrientation(cameraViewOrientation);
- cropContainer.setOrientation(orientation);
- confirmResultContainer.setOrientation(orientation);
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == REQUEST_CODE_PICK_IMAGE) {
- if (resultCode == Activity.RESULT_OK) {
- Uri uri = data.getData();
- cropView.setFilePath(getRealPathFromURI(uri));
- showCrop();
- } else {
- cameraView.getCameraControl().resume();
- }
- }
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
- @NonNull int[] grantResults) {
- super.onRequestPermissionsResult(requestCode, permissions, grantResults);
- switch (requestCode) {
- case PERMISSIONS_REQUEST_CAMERA: {
- if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
- cameraView.getCameraControl().refreshPermission();
- } else {
- Toast.makeText(getApplicationContext(), R.string.camera_permission_required, Toast.LENGTH_LONG)
- .show();
- }
- break;
- }
- case PERMISSIONS_EXTERNAL_STORAGE:
- default:
- break;
- }
- }
-
- /**
- * 做一些收尾工作
- *
- */
- private void doClear() {
- CameraThreadPool.cancelAutoFocusTimer();
- if (isNativeEnable && !isNativeManual) {
- IDcardQualityProcess.getInstance().releaseModel();
- }
- }
-
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- this.doClear();
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraNativeHelper.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraNativeHelper.java
deleted file mode 100644
index 29a6d74..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraNativeHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2018 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import android.content.Context;
-
-import com.baidu.idcardquality.IDcardQualityProcess;
-
-/**
- * Created by ruanshimin on 2018/1/23.
- */
-
-public class CameraNativeHelper {
-
- public interface CameraNativeInitCallback {
- /**
- * 加载本地库异常回调
- *
- * @param errorCode 错误代码
- * @param e 如果加载so异常则会有异常对象传入
- */
- void onError(int errorCode, Throwable e);
- }
-
- public static void init(final Context ctx, final String token, final CameraNativeInitCallback cb) {
- CameraThreadPool.execute(new Runnable() {
- @Override
- public void run() {
- int status;
- // 加载本地so失败, 异常返回getloadSoException
- if (IDcardQualityProcess.getLoadSoException() != null) {
- status = CameraView.NATIVE_SOLOAD_FAIL;
- cb.onError(status, IDcardQualityProcess.getLoadSoException());
- return;
- }
- // 授权状态
- int authStatus = IDcardQualityProcess.init(token);
- if (authStatus != 0) {
- cb.onError(CameraView.NATIVE_AUTH_FAIL, null);
- return;
- }
-
- // 加载模型状态
- int initModelStatus = IDcardQualityProcess.getInstance()
- .idcardQualityInit(ctx.getAssets(),
- "models");
-
- if (initModelStatus != 0) {
- cb.onError(CameraView.NATIVE_INIT_FAIL, null);
- }
- }
- });
- }
-
- public static void release() {
- IDcardQualityProcess.getInstance().releaseModel();
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraThreadPool.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraThreadPool.java
deleted file mode 100644
index b1d97ff..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraThreadPool.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraThreadPool {
-
- static Timer timerFocus = null;
-
- /*
- * 对焦频率
- */
- static final long cameraScanInterval = 2000;
-
- /*
- * 线程池大小
- */
- private static int poolCount = Runtime.getRuntime().availableProcessors();
-
- private static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(poolCount);
-
- /**
- * 给线程池添加任务
- * @param runnable 任务
- */
- public static void execute(Runnable runnable) {
- fixedThreadPool.execute(runnable);
- }
-
- /**
- * 创建一个定时对焦的timer任务
- * @param runnable 对焦代码
- * @return Timer Timer对象，用来终止自动对焦
- */
- public static Timer createAutoFocusTimerTask(final Runnable runnable) {
- if (timerFocus != null) {
- return timerFocus;
- }
- timerFocus = new Timer();
- TimerTask task = new TimerTask() {
- @Override
- public void run() {
- runnable.run();
- }
- };
- timerFocus.scheduleAtFixedRate(task, 0, cameraScanInterval);
- return timerFocus;
- }
-
- /**
- * 终止自动对焦任务，实际调用了cancel方法并且清空对象
- * 但是无法终止执行中的任务，需额外处理
- *
- */
- public static void cancelAutoFocusTimer() {
- if (timerFocus != null) {
- timerFocus.cancel();
- timerFocus = null;
- }
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java
deleted file mode 100644
index ac6a6a2..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import com.baidu.idcardquality.IDcardQualityProcess;
-import com.baidu.ocr.ui.R;
-import com.baidu.ocr.ui.util.DimensionUtil;
-import com.baidu.ocr.ui.util.ImageUtil;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.BitmapRegionDecoder;
-import android.graphics.Color;
-import android.graphics.ImageFormat;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.media.ImageReader;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.IntDef;
-
-/**
- * 负责，相机的管理。同时提供，裁剪遮罩功能。
- */
-public class CameraView extends FrameLayout {
-
- private int maskType;
-
- /**
- * 照相回调
- */
- interface OnTakePictureCallback {
- void onPictureTaken(Bitmap bitmap);
- }
-
- /**
- * 垂直方向 {@link #setOrientation(int)}
- */
- public static final int ORIENTATION_PORTRAIT = 0;
- /**
- * 水平方向 {@link #setOrientation(int)}
- */
- public static final int ORIENTATION_HORIZONTAL = 90;
- /**
- * 水平翻转方向 {@link #setOrientation(int)}
- */
- public static final int ORIENTATION_INVERT = 270;
-
- /**
- * 本地模型授权，加载成功
- */
- public static final int NATIVE_AUTH_INIT_SUCCESS = 0;
-
- /**
- * 本地模型授权，缺少SO
- */
- public static final int NATIVE_SOLOAD_FAIL = 10;
-
- /**
- * 本地模型授权，授权失败，token异常
- */
- public static final int NATIVE_AUTH_FAIL = 11;
-
- /**
- * 本地模型授权，模型加载失败
- */
- public static final int NATIVE_INIT_FAIL = 12;
-
-
- /**
- * 是否已经通过本地质量控制扫描
- */
- private final int SCAN_SUCCESS = 0;
-
- public void setInitNativeStatus(int initNativeStatus) {
- this.initNativeStatus = initNativeStatus;
- }
-
- /**
- * 本地检测初始化，模型加载标识
- */
- private int initNativeStatus = NATIVE_AUTH_INIT_SUCCESS;
-
- @IntDef({ORIENTATION_PORTRAIT, ORIENTATION_HORIZONTAL, ORIENTATION_INVERT})
- public @interface Orientation {
-
- }
-
- private CameraViewTakePictureCallback cameraViewTakePictureCallback = new CameraViewTakePictureCallback();
-
- private ICameraControl cameraControl;
-
- /**
- * 相机预览View
- */
- private View displayView;
- /**
- * 身份证，银行卡，等裁剪用的遮罩
- */
- private MaskView maskView;
-
- /**
- * 用于显示提示证 "请对齐身份证正面" 之类的背景
- */
- private ImageView hintView;
-
- /**
- * 用于显示提示证 "请对齐身份证正面" 之类的文字
- */
- private TextView hintViewText;
-
- /**
- * 提示文案容器
- */
- private LinearLayout hintViewTextWrapper;
-
- /**
- * 是否是本地质量控制扫描
- */
- private boolean isEnableScan;
-
- public void setEnableScan(boolean enableScan) {
- isEnableScan = enableScan;
- }
-
- /**
- * UI线程的handler
- */
- Handler uiHandler = new Handler(Looper.getMainLooper());
-
- public ICameraControl getCameraControl() {
- return cameraControl;
- }
-
- public void setOrientation(@Orientation int orientation) {
- cameraControl.setDisplayOrientation(orientation);
- }
- public CameraView(Context context) {
- super(context);
- init();
- }
-
- public CameraView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public CameraView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- public void start() {
- cameraControl.start();
- setKeepScreenOn(true);
- }
-
- public void stop() {
- cameraControl.stop();
- setKeepScreenOn(false);
- }
-
- public void takePicture(final File file, final OnTakePictureCallback callback) {
- cameraViewTakePictureCallback.file = file;
- cameraViewTakePictureCallback.callback = callback;
- cameraControl.takePicture(cameraViewTakePictureCallback);
- }
-
- private OnTakePictureCallback autoPictureCallback;
-
- public void setAutoPictureCallback(OnTakePictureCallback callback) {
- autoPictureCallback = callback;
- }
-
- public void setMaskType(@MaskView.MaskType int maskType, final Context ctx) {
- maskView.setMaskType(maskType);
-
- maskView.setVisibility(VISIBLE);
- hintView.setVisibility(VISIBLE);
-
- int hintResourceId = R.drawable.bd_ocr_hint_align_id_card;
- this.maskType = maskType;
- boolean isNeedSetImage = true;
- switch (maskType) {
- case MaskView.MASK_TYPE_ID_CARD_FRONT:
- hintResourceId = R.drawable.bd_ocr_round_corner;
- isNeedSetImage = false;
- break;
- case MaskView.MASK_TYPE_ID_CARD_BACK:
- isNeedSetImage = false;
- hintResourceId = R.drawable.bd_ocr_round_corner;
- break;
- case MaskView.MASK_TYPE_BANK_CARD:
- hintResourceId = R.drawable.bd_ocr_hint_align_bank_card;
- break;
- case MaskView.MASK_TYPE_PASSPORT:
- hintView.setVisibility(INVISIBLE);
- break;
- case MaskView.MASK_TYPE_NONE:
- default:
- maskView.setVisibility(INVISIBLE);
- hintView.setVisibility(INVISIBLE);
- break;
- }
-
- if (isNeedSetImage) {
- hintView.setImageResource(hintResourceId);
- hintViewTextWrapper.setVisibility(INVISIBLE);
- }
-
- if (maskType == MaskView.MASK_TYPE_ID_CARD_FRONT && isEnableScan) {
- cameraControl.setDetectCallback(new ICameraControl.OnDetectPictureCallback() {
- @Override
- public int onDetect(byte[] data, int rotation) {
- return detect(data, rotation);
- }
- });
- }
-
- if (maskType == MaskView.MASK_TYPE_ID_CARD_BACK && isEnableScan) {
- cameraControl.setDetectCallback(new ICameraControl.OnDetectPictureCallback() {
- @Override
- public int onDetect(byte[] data, int rotation) {
- return detect(data, rotation);
- }
- });
- }
- }
-
- private int detect(byte[] data, final int rotation) {
- if (initNativeStatus != NATIVE_AUTH_INIT_SUCCESS) {
- showTipMessage(initNativeStatus);
- return 1;
- }
- // 扫描成功阻止多余的操作
- if (cameraControl.getAbortingScan().get()) {
- return 0;
- }
-
- Rect previewFrame = cameraControl.getPreviewFrame();
-
- if (maskView.getWidth() == 0 || maskView.getHeight() == 0
- || previewFrame.width() == 0 || previewFrame.height() == 0) {
- return 0;
- }
-
- // BitmapRegionDecoder不会将整个图片加载到内存。
- BitmapRegionDecoder decoder = null;
- try {
- decoder = BitmapRegionDecoder.newInstance(data, 0, data.length, true);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- int width = rotation % 180 == 0 ? decoder.getWidth() : decoder.getHeight();
- int height = rotation % 180 == 0 ? decoder.getHeight() : decoder.getWidth();
-
- Rect frameRect = maskView.getFrameRectExtend();
-
- int left = width * frameRect.left / maskView.getWidth();
- int top = height * frameRect.top / maskView.getHeight();
- int right = width * frameRect.right / maskView.getWidth();
- int bottom = height * frameRect.bottom / maskView.getHeight();
-
- // 高度大于图片
- if (previewFrame.top < 0) {
- // 宽度对齐。
- int adjustedPreviewHeight = previewFrame.height() * getWidth() / previewFrame.width();
- int topInFrame = ((adjustedPreviewHeight - frameRect.height()) / 2)
- * getWidth() / previewFrame.width();
- int bottomInFrame = ((adjustedPreviewHeight + frameRect.height()) / 2) * getWidth()
- / previewFrame.width();
-
- // 等比例投射到照片当中。
- top = topInFrame * height / previewFrame.height();
- bottom = bottomInFrame * height / previewFrame.height();
- } else {
- // 宽度大于图片
- if (previewFrame.left < 0) {
- // 高度对齐
- int adjustedPreviewWidth = previewFrame.width() * getHeight() / previewFrame.height();
- int leftInFrame = ((adjustedPreviewWidth - maskView.getFrameRect().width()) / 2) * getHeight()
- / previewFrame.height();
- int rightInFrame = ((adjustedPreviewWidth + maskView.getFrameRect().width()) / 2) * getHeight()
- / previewFrame.height();
-
- // 等比例投射到照片当中。
- left = leftInFrame * width / previewFrame.width();
- right = rightInFrame * width / previewFrame.width();
- }
- }
-
- Rect region = new Rect();
- region.left = left;
- region.top = top;
- region.right = right;
- region.bottom = bottom;
-
- // 90度或者270度旋转
- if (rotation % 180 == 90) {
- int x = decoder.getWidth() / 2;
- int y = decoder.getHeight() / 2;
-
- int rotatedWidth = region.height();
- int rotated = region.width();
-
- // 计算，裁剪框旋转后的坐标
- region.left = x - rotatedWidth / 2;
- region.top = y - rotated / 2;
- region.right = x + rotatedWidth / 2;
- region.bottom = y + rotated / 2;
- region.sort();
- }
-
- BitmapFactory.Options options = new BitmapFactory.Options();
-
- // 最大图片大小。
- int maxPreviewImageSize = 2560;
- int size = Math.min(decoder.getWidth(), decoder.getHeight());
- size = Math.min(size, maxPreviewImageSize);
-
- options.inSampleSize = ImageUtil.calculateInSampleSize(options, size, size);
- options.inScaled = true;
- options.inDensity = Math.max(options.outWidth, options.outHeight);
- options.inTargetDensity = size;
- options.inPreferredConfig = Bitmap.Config.RGB_565;
- Bitmap bitmap = decoder.decodeRegion(region, options);
- if (rotation != 0) {
- // 只能是裁剪完之后再旋转了。有没有别的更好的方案呢？
- Matrix matrix = new Matrix();
- matrix.postRotate(rotation);
- Bitmap rotatedBitmap = Bitmap.createBitmap(
- bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
- if (bitmap != rotatedBitmap) {
- // 有时候 createBitmap会复用对象
- bitmap.recycle();
- }
- bitmap = rotatedBitmap;
- }
-
- final int status;
-
- // 调用本地质量控制请求
- switch (maskType) {
- case MaskView.MASK_TYPE_ID_CARD_FRONT:
- status = IDcardQualityProcess.getInstance().idcardQualityDetectionImg(bitmap, true);
- break;
- case MaskView.MASK_TYPE_ID_CARD_BACK:
- status = IDcardQualityProcess.getInstance().idcardQualityDetectionImg(bitmap, false);
- break;
- default:
- status = 1;
- }
-
- // 当有某个扫描处理线程调用成功后，阻止其他线程继续调用本地控制代码
- if (status == SCAN_SUCCESS) {
- // 扫描成功阻止多线程同时回调
- if (!cameraControl.getAbortingScan().compareAndSet(false, true)) {
- bitmap.recycle();
- return 0;
- }
- autoPictureCallback.onPictureTaken(bitmap);
- }
-
- showTipMessage(status);
-
- return status;
- }
-
- private void showTipMessage(final int status) {
- // 提示tip文字变化
- uiHandler.post(new Runnable() {
- @Override
- public void run() {
- if (status == 0) {
- hintViewText.setVisibility(View.INVISIBLE);
- } else if (!cameraControl.getAbortingScan().get()) {
- hintViewText.setVisibility(View.VISIBLE);
- hintViewText.setText(getScanMessage(status));
- }
- }
- });
- }
-
- private String getScanMessage(int status) {
- String message;
- switch (status) {
- case 0:
- message = "";
- break;
- case 2:
- message = "身份证模糊，请重新尝试";
- break;
- case 3:
- message = "身份证反光，请重新尝试";
- break;
- case 4:
- message = "请将身份证前后反转再进行识别";
- break;
- case 5:
- message = "请拿稳镜头和身份证";
- break;
- case 6:
- message = "请将镜头靠近身份证";
- break;
- case 7:
- message = "请将身份证完整置于取景框内";
- break;
- case NATIVE_AUTH_FAIL:
- message = "本地质量控制授权失败";
- break;
- case NATIVE_INIT_FAIL:
- message = "本地模型加载失败";
- break;
- case NATIVE_SOLOAD_FAIL:
- message = "本地SO库加载失败";
- break;
- case 1:
- default:
- message = "请将身份证置于取景框内";
- }
-
-
- return message;
- }
-
- private void init() {
-// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-// cameraControl = new Camera2Control(getContext());
-// } else {
-//
-// }
- cameraControl = new Camera1Control(getContext());
-
- displayView = cameraControl.getDisplayView();
- addView(displayView);
-
- maskView = new MaskView(getContext());
- addView(maskView);
-
- hintView = new ImageView(getContext());
- addView(hintView);
-
- hintViewTextWrapper = new LinearLayout(getContext());
- hintViewTextWrapper.setOrientation(LinearLayout.VERTICAL);
- LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
- DimensionUtil.dpToPx(25));
-
- lp.gravity = Gravity.CENTER;
- hintViewText = new TextView(getContext());
- hintViewText.setBackgroundResource(R.drawable.bd_ocr_round_corner);
- hintViewText.setAlpha(0.5f);
- hintViewText.setPadding(DimensionUtil.dpToPx(10), 0, DimensionUtil.dpToPx(10), 0);
- hintViewTextWrapper.addView(hintViewText, lp);
-
-
- hintViewText.setGravity(Gravity.CENTER);
- hintViewText.setTextColor(Color.WHITE);
- hintViewText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
- hintViewText.setText(getScanMessage(-1));
-
-
- addView(hintViewTextWrapper, lp);
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- displayView.layout(left, 0, right, bottom - top);
- maskView.layout(left, 0, right, bottom - top);
-
- int hintViewWidth = DimensionUtil.dpToPx(250);
- int hintViewHeight = DimensionUtil.dpToPx(25);
-
- int hintViewLeft = (getWidth() - hintViewWidth) / 2;
- int hintViewTop = maskView.getFrameRect().bottom + DimensionUtil.dpToPx(16);
-
- hintViewTextWrapper.layout(hintViewLeft, hintViewTop,
- hintViewLeft + hintViewWidth, hintViewTop + hintViewHeight);
-
- hintView.layout(hintViewLeft, hintViewTop,
- hintViewLeft + hintViewWidth, hintViewTop + hintViewHeight);
- }
-
- /**
- * 拍摄后的照片。需要进行裁剪。有些手机（比如三星）不会对照片数据进行旋转，而是将旋转角度写入EXIF信息当中，
- * 所以需要做旋转处理。
- *
- * @param outputFile 写入照片的文件。
- * @param data 原始照片数据。
- * @param rotation 照片exif中的旋转角度。
- *
- * @return 裁剪好的bitmap。
- */
- @SuppressWarnings("ResultOfMethodCallIgnored")
- private Bitmap crop(File outputFile, byte[] data, int rotation) {
- try {
- Rect previewFrame = cameraControl.getPreviewFrame();
-
- if (maskView.getWidth() == 0 || maskView.getHeight() == 0
- || previewFrame.width() == 0 || previewFrame.height() == 0) {
- return null;
- }
-
- // BitmapRegionDecoder不会将整个图片加载到内存。
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(data, 0, data.length, true);
-
-
-
- int width = rotation % 180 == 0 ? decoder.getWidth() : decoder.getHeight();
- int height = rotation % 180 == 0 ? decoder.getHeight() : decoder.getWidth();
-
- Rect frameRect = maskView.getFrameRect();
-
- int left = width * frameRect.left / maskView.getWidth();
- int top = height * frameRect.top / maskView.getHeight();
- int right = width * frameRect.right / maskView.getWidth();
- int bottom = height * frameRect.bottom / maskView.getHeight();
-
- // 高度大于图片
- if (previewFrame.top < 0) {
- // 宽度对齐。
- int adjustedPreviewHeight = previewFrame.height() * getWidth() / previewFrame.width();
- int topInFrame = ((adjustedPreviewHeight - frameRect.height()) / 2)
- * getWidth() / previewFrame.width();
- int bottomInFrame = ((adjustedPreviewHeight + frameRect.height()) / 2) * getWidth()
- / previewFrame.width();
-
- // 等比例投射到照片当中。
- top = topInFrame * height / previewFrame.height();
- bottom = bottomInFrame * height / previewFrame.height();
- } else {
- // 宽度大于图片
- if (previewFrame.left < 0) {
- // 高度对齐
- int adjustedPreviewWidth = previewFrame.width() * getHeight() / previewFrame.height();
- int leftInFrame = ((adjustedPreviewWidth - maskView.getFrameRect().width()) / 2) * getHeight()
- / previewFrame.height();
- int rightInFrame = ((adjustedPreviewWidth + maskView.getFrameRect().width()) / 2) * getHeight()
- / previewFrame.height();
-
- // 等比例投射到照片当中。
- left = leftInFrame * width / previewFrame.width();
- right = rightInFrame * width / previewFrame.width();
- }
- }
-
- Rect region = new Rect();
- region.left = left;
- region.top = top;
- region.right = right;
- region.bottom = bottom;
-
- // 90度或者270度旋转
- if (rotation % 180 == 90) {
- int x = decoder.getWidth() / 2;
- int y = decoder.getHeight() / 2;
-
- int rotatedWidth = region.height();
- int rotated = region.width();
-
- // 计算，裁剪框旋转后的坐标
- region.left = x - rotatedWidth / 2;
- region.top = y - rotated / 2;
- region.right = x + rotatedWidth / 2;
- region.bottom = y + rotated / 2;
- region.sort();
- }
-
- BitmapFactory.Options options = new BitmapFactory.Options();
-
- // 最大图片大小。
- int maxPreviewImageSize = 2560;
- int size = Math.min(decoder.getWidth(), decoder.getHeight());
- size = Math.min(size, maxPreviewImageSize);
-
- options.inSampleSize = ImageUtil.calculateInSampleSize(options, size, size);
- options.inScaled = true;
- options.inDensity = Math.max(options.outWidth, options.outHeight);
- options.inTargetDensity = size;
- options.inPreferredConfig = Bitmap.Config.RGB_565;
- Bitmap bitmap = decoder.decodeRegion(region, options);
-
- if (rotation != 0) {
- // 只能是裁剪完之后再旋转了。有没有别的更好的方案呢？
- Matrix matrix = new Matrix();
- matrix.postRotate(rotation);
- Bitmap rotatedBitmap = Bitmap.createBitmap(
- bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
- if (bitmap != rotatedBitmap) {
- // 有时候 createBitmap会复用对象
- bitmap.recycle();
- }
- bitmap = rotatedBitmap;
- }
-
- try {
- if (!outputFile.exists()) {
- outputFile.createNewFile();
- }
- FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
- bitmap.compress(Bitmap.CompressFormat.JPEG, 90, fileOutputStream);
- fileOutputStream.flush();
- fileOutputStream.close();
- return bitmap;
- } catch (IOException e) {
- e.printStackTrace();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public void release() {
- IDcardQualityProcess.getInstance().releaseModel();
- }
-
- private class CameraViewTakePictureCallback implements ICameraControl.OnTakePictureCallback {
-
- private File file;
- private OnTakePictureCallback callback;
-
- @Override
- public void onPictureTaken(final byte[] data) {
- CameraThreadPool.execute(new Runnable() {
- @Override
- public void run() {
- final int rotation = ImageUtil.getOrientation(data);
- Bitmap bitmap = crop(file, data, rotation);
- callback.onPictureTaken(bitmap);
- }
- });
- }
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java
deleted file mode 100644
index 6575e2f..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import android.graphics.Rect;
-import android.view.View;
-
-import androidx.annotation.IntDef;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Android 5.0 相机的API发生很大的变化。些类屏蔽掉了 api的变化。相机的操作和功能，抽象剥离出来。
- */
-public interface ICameraControl {
-
- /**
- * 闪光灯关 {@link #setFlashMode(int)}
- */
- int FLASH_MODE_OFF = 0;
- /**
- * 闪光灯开 {@link #setFlashMode(int)}
- */
- int FLASH_MODE_TORCH = 1;
- /**
- * 闪光灯自动 {@link #setFlashMode(int)}
- */
- int FLASH_MODE_AUTO = 2;
-
- @IntDef({FLASH_MODE_TORCH, FLASH_MODE_OFF, FLASH_MODE_AUTO})
- @interface FlashMode {
-
- }
-
- /**
- * 照相回调。
- */
- interface OnTakePictureCallback {
- void onPictureTaken(byte[] data);
- }
-
- /**
- * 设置本地质量控制回调，如果不设置则视为不扫描调用本地质量控制代码。
- */
- void setDetectCallback(OnDetectPictureCallback callback);
-
- /**
- * 预览回调
- */
- interface OnDetectPictureCallback {
- int onDetect(byte[] data, int rotation);
- }
-
- /**
- * 打开相机。
- */
- void start();
-
- /**
- * 关闭相机
- */
- void stop();
-
- void pause();
-
- void resume();
-
- /**
- * 相机对应的预览视图。
- * @return 预览视图
- */
- View getDisplayView();
-
- /**
- * 看到的预览可能不是照片的全部。返回预览视图的全貌。
- * @return 预览视图frame;
- */
- Rect getPreviewFrame();
-
- /**
- * 拍照。结果在回调中获取。
- * @param callback 拍照结果回调
- */
- void takePicture(OnTakePictureCallback callback);
-
- /**
- * 设置权限回调，当手机没有拍照权限时，可在回调中获取。
- * @param callback 权限回调
- */
- void setPermissionCallback(PermissionCallback callback);
-
- /**
- * 设置水平方向
- * @param displayOrientation 参数值见 {@link com.baidu.ocr.ui.camera.CameraView.Orientation}
- */
- void setDisplayOrientation(@CameraView.Orientation int displayOrientation);
-
- /**
- * 获取到拍照权限时，调用些函数以继续。
- */
- void refreshPermission();
-
- /**
- * 获取已经扫描成功，处理中
- */
- AtomicBoolean getAbortingScan();
-
- /**
- * 设置闪光灯状态。
- * @param flashMode {@link #FLASH_MODE_TORCH,#FLASH_MODE_OFF,#FLASH_MODE_AUTO}
- */
- void setFlashMode(@FlashMode int flashMode);
-
- /**
- * 获取当前闪光灯状态
- * @return 当前闪光灯状态 参见 {@link #setFlashMode(int)}
- */
- @FlashMode
- int getFlashMode();
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java
deleted file mode 100644
index a0b1425..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import java.io.File;
-
-import com.baidu.ocr.ui.R;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.annotation.IntDef;
-import androidx.annotation.RequiresApi;
-import androidx.core.content.res.ResourcesCompat;
-
-@SuppressWarnings("unused")
-public class MaskView extends View {
-
- public static final int MASK_TYPE_NONE = 0;
- public static final int MASK_TYPE_ID_CARD_FRONT = 1;
- public static final int MASK_TYPE_ID_CARD_BACK = 2;
- public static final int MASK_TYPE_BANK_CARD = 11;
- public static final int MASK_TYPE_PASSPORT = 21;
-
- @IntDef({MASK_TYPE_NONE, MASK_TYPE_ID_CARD_FRONT, MASK_TYPE_ID_CARD_BACK, MASK_TYPE_BANK_CARD,
- MASK_TYPE_PASSPORT})
- @interface MaskType {
-
- }
-
- public void setLineColor(int lineColor) {
- this.lineColor = lineColor;
- }
-
- public void setMaskColor(int maskColor) {
- this.maskColor = maskColor;
- }
-
- private int lineColor = Color.WHITE;
-
- private int maskType = MASK_TYPE_ID_CARD_FRONT;
-
- private int maskColor = Color.argb(100, 0, 0, 0);
-
- private Paint eraser = new Paint(Paint.ANTI_ALIAS_FLAG);
- private Paint pen = new Paint(Paint.ANTI_ALIAS_FLAG);
-
- private Rect frame = new Rect();
-
- private Rect framePassport = new Rect();
-
- private Drawable locatorDrawable;
-
- public Rect getFrameRect() {
- if (maskType == MASK_TYPE_NONE) {
- return new Rect(0, 0, getWidth(), getHeight());
- } else if (maskType == MASK_TYPE_PASSPORT) {
- return new Rect(framePassport);
- } else {
- return new Rect(frame);
- }
-
- }
-
- public Rect getFrameRectExtend() {
- Rect rc = new Rect(frame);
- int widthExtend = (int) ((frame.right - frame.left) * 0.02f);
- int heightExtend = (int) ((frame.bottom - frame.top) * 0.02f);
- rc.left -= widthExtend;
- rc.right += widthExtend;
- rc.top -= heightExtend;
- rc.bottom += heightExtend;
- return rc;
- }
-
- public void setMaskType(@MaskType int maskType) {
- this.maskType = maskType;
- switch (maskType) {
- case MASK_TYPE_ID_CARD_FRONT:
- locatorDrawable = ResourcesCompat.getDrawable(getResources(),
- R.drawable.bd_ocr_id_card_locator_front, null);
- break;
- case MASK_TYPE_ID_CARD_BACK:
- locatorDrawable = ResourcesCompat.getDrawable(getResources(),
- R.drawable.bd_ocr_id_card_locator_back, null);
- break;
- case MASK_TYPE_PASSPORT:
- locatorDrawable = ResourcesCompat.getDrawable(getResources(),
- R.drawable.bd_ocr_passport_locator, null);
- break;
- case MASK_TYPE_BANK_CARD:
- break;
- case MASK_TYPE_NONE:
- default:
- break;
- }
- invalidate();
- }
-
- public int getMaskType() {
- return maskType;
- }
-
- public void setOrientation(@CameraView.Orientation int orientation) {
- }
-
- public MaskView(Context context) {
- super(context);
- init();
- }
-
- public MaskView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public MaskView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- private void init() {
- locatorDrawable = ResourcesCompat.getDrawable(getResources(), R.drawable.bd_ocr_id_card_locator_front, null);
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- if (w > 0 && h > 0) {
- if (maskType != MASK_TYPE_PASSPORT) {
- float ratio = h > w ? 0.9f : 0.72f;
-
- int width = (int) (w * ratio);
- int height = width * 400 / 620;
-
- int left = (w - width) / 2;
- int top = (h - height) / 2;
- int right = width + left;
- int bottom = height + top;
-
- frame.left = left;
- frame.top = top;
- frame.right = right;
- frame.bottom = bottom;
- } else {
- float ratio = 0.9f;
-
- int width = (int) (w * ratio);
- int height = width * 330 / 470;
-
- int left = (w - width) / 2;
- int top = (h - height) / 2;
- int right = width + left;
- int bottom = height + top;
-
- framePassport.left = left;
- framePassport.top = top;
- framePassport.right = right;
- framePassport.bottom = bottom;
- }
- }
- }
-
- @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- Rect frame = this.frame;
- if (maskType == MASK_TYPE_PASSPORT) {
- frame = framePassport;
- }
-
- int width = frame.width();
- int height = frame.height();
-
- int left = frame.left;
- int top = frame.top;
- int right = frame.right;
- int bottom = frame.bottom;
-
- canvas.drawColor(maskColor);
- fillRectRound(left, top, right, bottom, 30, 30, false);
- canvas.drawPath(path, pen);
- canvas.drawPath(path, eraser);
-
- if (maskType == MASK_TYPE_ID_CARD_FRONT) {
- locatorDrawable.setBounds(
- (int) (left + 601f / 1006 * width),
- (int) (top + (110f / 632) * height),
- (int) (left + (963f / 1006) * width),
- (int) (top + (476f / 632) * height));
- } else if (maskType == MASK_TYPE_ID_CARD_BACK) {
- locatorDrawable.setBounds(
- (int) (left + 51f / 1006 * width),
- (int) (top + (48f / 632) * height),
- (int) (left + (250f / 1006) * width),
- (int) (top + (262f / 632) * height));
- } else if (maskType == MASK_TYPE_PASSPORT) {
- locatorDrawable.setBounds(
- (int) (left + 30f / 1006 * width),
- (int) (top + (20f / 632) * height),
- (int) (left + (303f / 1006) * width),
- (int) (top + (416f / 632) * height));
- }
- if (locatorDrawable != null) {
- locatorDrawable.draw(canvas);
- }
- }
-
- private Path path = new Path();
-
- private Path fillRectRound(float left, float top, float right, float bottom, float rx, float ry, boolean
- conformToOriginalPost) {
-
- path.reset();
- if (rx < 0) {
- rx = 0;
- }
- if (ry < 0) {
- ry = 0;
- }
- float width = right - left;
- float height = bottom - top;
- if (rx > width / 2) {
- rx = width / 2;
- }
- if (ry > height / 2) {
- ry = height / 2;
- }
- float widthMinusCorners = (width - (2 * rx));
- float heightMinusCorners = (height - (2 * ry));
-
- path.moveTo(right, top + ry);
- path.rQuadTo(0, -ry, -rx, -ry);
- path.rLineTo(-widthMinusCorners, 0);
- path.rQuadTo(-rx, 0, -rx, ry);
- path.rLineTo(0, heightMinusCorners);
-
- if (conformToOriginalPost) {
- path.rLineTo(0, ry);
- path.rLineTo(width, 0);
- path.rLineTo(0, -ry);
- } else {
- path.rQuadTo(0, ry, rx, ry);
- path.rLineTo(widthMinusCorners, 0);
- path.rQuadTo(rx, 0, rx, -ry);
- }
-
- path.rLineTo(0, -heightMinusCorners);
- path.close();
- return path;
- }
-
- {
- // 硬件加速不支持，图层混合。
- setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-
- pen.setColor(Color.WHITE);
- pen.setStyle(Paint.Style.STROKE);
- pen.setStrokeWidth(6);
-
- eraser.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
- }
-
- private void capture(File file) {
-
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRCameraLayout.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRCameraLayout.java
deleted file mode 100644
index b9aa9e0..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRCameraLayout.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-import com.baidu.ocr.ui.R;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-public class OCRCameraLayout extends FrameLayout {
-
- public static int ORIENTATION_PORTRAIT = 0;
- public static int ORIENTATION_HORIZONTAL = 1;
-
- private int orientation = ORIENTATION_PORTRAIT;
- private View contentView;
- private View centerView;
- private View leftDownView;
- private View rightUpView;
-
- private int contentViewId;
- private int centerViewId;
- private int leftDownViewId;
- private int rightUpViewId;
-
- public void setOrientation(int orientation) {
- if (this.orientation == orientation) {
- return;
- }
- this.orientation = orientation;
- requestLayout();
- }
-
- public OCRCameraLayout(Context context) {
- super(context);
- }
-
- public OCRCameraLayout(Context context, AttributeSet attrs) {
- super(context, attrs);
- parseAttrs(attrs);
- }
-
- public OCRCameraLayout(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- parseAttrs(attrs);
- }
-
- {
- setWillNotDraw(false);
- }
-
- private void parseAttrs(AttributeSet attrs) {
- TypedArray a = getContext().getTheme().obtainStyledAttributes(
- attrs,
- R.styleable.OCRCameraLayout,
- 0, 0);
- try {
- contentViewId = a.getResourceId(R.styleable.OCRCameraLayout_contentView, -1);
- centerViewId = a.getResourceId(R.styleable.OCRCameraLayout_centerView, -1);
- leftDownViewId = a.getResourceId(R.styleable.OCRCameraLayout_leftDownView, -1);
- rightUpViewId = a.getResourceId(R.styleable.OCRCameraLayout_rightUpView, -1);
- } finally {
- a.recycle();
- }
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
- contentView = findViewById(contentViewId);
- if (centerViewId != -1) {
- centerView = findViewById(centerViewId);
- }
- leftDownView = findViewById(leftDownViewId);
- rightUpView = findViewById(rightUpViewId);
- }
-
- private Rect backgroundRect = new Rect();
- private Paint paint = new Paint();
-
- {
- paint.setStyle(Paint.Style.FILL);
- paint.setColor(Color.argb(83, 0, 0, 0));
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- int width = getWidth();
- int height = getHeight();
- int left;
- int top;
-
- ViewGroup.MarginLayoutParams leftDownViewLayoutParams = (MarginLayoutParams) leftDownView.getLayoutParams();
- ViewGroup.MarginLayoutParams rightUpViewLayoutParams = (MarginLayoutParams) rightUpView.getLayoutParams();
- if (r < b) {
- int contentHeight = width * 4 / 3;
- int heightLeft = height - contentHeight;
- contentView.layout(l, t, r, contentHeight);
-
- backgroundRect.left = 0;
- backgroundRect.top = contentHeight;
- backgroundRect.right = width;
- backgroundRect.bottom = height;
-
- // layout centerView;
- if (centerView != null) {
- left = (width - centerView.getMeasuredWidth()) / 2;
- top = contentHeight + (heightLeft - centerView.getMeasuredHeight()) / 2;
- centerView
- .layout(left, top, left + centerView.getMeasuredWidth(), top + centerView.getMeasuredHeight());
- }
- // layout leftDownView
-
- left = leftDownViewLayoutParams.leftMargin;
- top = contentHeight + (heightLeft - leftDownView.getMeasuredHeight()) / 2;
- leftDownView
- .layout(left, top, left + leftDownView.getMeasuredWidth(), top + leftDownView.getMeasuredHeight());
- // layout rightUpView
- left = width - rightUpView.getMeasuredWidth() - rightUpViewLayoutParams.rightMargin;
- top = contentHeight + (heightLeft - rightUpView.getMeasuredHeight()) / 2;
- rightUpView.layout(left, top, left + rightUpView.getMeasuredWidth(), top + rightUpView.getMeasuredHeight());
- } else {
- int contentWidth = height * 4 / 3;
- int widthLeft = width - contentWidth;
- contentView.layout(l, t, contentWidth, height);
-
- backgroundRect.left = contentWidth;
- backgroundRect.top = 0;
- backgroundRect.right = width;
- backgroundRect.bottom = height;
-
- // layout centerView
- if (centerView != null) {
- left = contentWidth + (widthLeft - centerView.getMeasuredWidth()) / 2;
- top = (height - centerView.getMeasuredHeight()) / 2;
- centerView
- .layout(left, top, left + centerView.getMeasuredWidth(), top + centerView.getMeasuredHeight());
- }
- // layout leftDownView
- left = contentWidth + (widthLeft - leftDownView.getMeasuredWidth()) / 2;
- top = height - leftDownView.getMeasuredHeight() - leftDownViewLayoutParams.bottomMargin;
- leftDownView
- .layout(left, top, left + leftDownView.getMeasuredWidth(), top + leftDownView.getMeasuredHeight());
- // layout rightUpView
- left = contentWidth + (widthLeft - rightUpView.getMeasuredWidth()) / 2;
-
- top = rightUpViewLayoutParams.topMargin;
- rightUpView.layout(left, top, left + rightUpView.getMeasuredWidth(), top + rightUpView.getMeasuredHeight());
- }
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- canvas.drawRect(backgroundRect, paint);
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRFrameLayout.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRFrameLayout.java
deleted file mode 100644
index b17d7d9..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRFrameLayout.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class OCRFrameLayout extends ViewGroup {
-
- public OCRFrameLayout(Context context) {
- super(context);
- }
-
- public OCRFrameLayout(Context context, AttributeSet attrs) {
- super(context, attrs);
- parseAttrs(attrs);
- }
-
- public OCRFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- parseAttrs(attrs);
- }
-
- private void parseAttrs(AttributeSet attrs) {
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- View view = getChildAt(i);
- view.layout(l, t, r, b);
- }
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- int width;
- int height;
- int childCount = getChildCount();
-
- width = MeasureSpec.getSize(widthMeasureSpec);
- height = MeasureSpec.getSize(heightMeasureSpec);
- for (int i = 0; i < childCount; i++) {
- View view = getChildAt(i);
- measureChild(view, MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec
- (height, MeasureSpec.EXACTLY));
- }
- setMeasuredDimension(resolveSize(width, widthMeasureSpec), resolveSize(height, heightMeasureSpec));
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/PermissionCallback.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/PermissionCallback.java
deleted file mode 100644
index c45a837..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/camera/PermissionCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.camera;
-
-public interface PermissionCallback {
- boolean onRequestPermission();
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/crop/CropView.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/crop/CropView.java
deleted file mode 100644
index 53dc75f..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/crop/CropView.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.crop;
-
-import java.io.IOException;
-
-import com.baidu.ocr.ui.util.ImageUtil;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.media.ExifInterface;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
-import android.view.View;
-import android.view.WindowManager;
-
-public class CropView extends View {
-
- public CropView(Context context) {
- super(context);
- init();
- }
-
- public CropView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public CropView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- public void setFilePath(String path) {
-
- if (this.bitmap != null && !this.bitmap.isRecycled()) {
- this.bitmap.recycle();
- }
-
- if (path == null) {
- return;
- }
-
- BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
- Bitmap original = BitmapFactory.decodeFile(path, options);
-
- try {
- ExifInterface exif = new ExifInterface(path);
- int rotation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
- Matrix matrix = new Matrix();
- int rotationInDegrees = ImageUtil.exifToDegrees(rotation);
- if (rotation != 0f) {
- matrix.preRotate(rotationInDegrees);
- }
-
- // 图片太大会导致内存泄露，所以在显示前对图片进行裁剪。
- int maxPreviewImageSize = 2560;
-
- int min = Math.min(options.outWidth, options.outHeight);
- min = Math.min(min, maxPreviewImageSize);
-
- WindowManager windowManager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
- Point screenSize = new Point();
- windowManager.getDefaultDisplay().getSize(screenSize);
- min = Math.min(min, screenSize.x * 2 / 3);
-
- options.inSampleSize = ImageUtil.calculateInSampleSize(options, min, min);
- options.inScaled = true;
- options.inDensity = options.outWidth;
- options.inTargetDensity = min * options.inSampleSize;
- options.inPreferredConfig = Bitmap.Config.RGB_565;
-
- options.inJustDecodeBounds = false;
- this.bitmap = BitmapFactory.decodeFile(path, options);
- } catch (IOException e) {
- e.printStackTrace();
- this.bitmap = original;
- } catch (NullPointerException e) {
- e.printStackTrace();
- }
- setBitmap(this.bitmap);
- }
-
- private void setBitmap(Bitmap bitmap) {
- this.bitmap = bitmap;
- matrix.reset();
- centerImage(getWidth(), getHeight());
- rotation = 0;
- invalidate();
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- centerImage(w, h);
- invalidate();
- }
-
- public Bitmap crop(Rect frame) {
- float scale = getScale();
-
- float[] src = new float[] {frame.left, frame.top};
- float[] desc = new float[] {0, 0};
-
- Matrix invertedMatrix = new Matrix();
- this.matrix.invert(invertedMatrix);
- invertedMatrix.mapPoints(desc, src);
-
- Matrix matrix = new Matrix();
-
- int width = (int) (frame.width() / scale);
- int height = (int) (frame.height() / scale);
- Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
- Canvas canvas = new Canvas(bitmap);
-
- Bitmap originalBitmap = this.bitmap;
- matrix.postTranslate(-desc[0], -desc[1]);
- canvas.drawBitmap(originalBitmap, matrix, null);
- return bitmap;
- }
-
- public void setMinimumScale(float setMinimumScale) {
- this.setMinimumScale = setMinimumScale;
- }
-
- public void setMaximumScale(float maximumScale) {
- this.maximumScale = maximumScale;
- }
-
- private float setMinimumScale = 0.2f;
- private float maximumScale = 4.0f;
-
- private float[] matrixArray = new float[9];
- private Matrix matrix = new Matrix();
- private Bitmap bitmap;
-
- private GestureDetector gestureDetector;
-
- private ScaleGestureDetector scaleGestureDetector;
- private ScaleGestureDetector.OnScaleGestureListener onScaleGestureListener =
- new ScaleGestureDetector.OnScaleGestureListener() {
- @Override
- public boolean onScale(ScaleGestureDetector detector) {
- scale(detector);
- return true;
- }
-
- @Override
- public boolean onScaleBegin(ScaleGestureDetector detector) {
- return true;
- }
-
- @Override
- public void onScaleEnd(ScaleGestureDetector detector) {
- float scale = detector.getScaleFactor();
- matrix.postScale(scale, scale);
- invalidate();
- }
- };
-
- private void init() {
- scaleGestureDetector = new ScaleGestureDetector(getContext(), onScaleGestureListener);
- gestureDetector = new GestureDetector(getContext(), new GestureDetector.OnGestureListener() {
- @Override
- public boolean onDown(MotionEvent e) {
- return true;
- }
-
- @Override
- public void onShowPress(MotionEvent e) {
- }
-
- @Override
- public boolean onSingleTapUp(MotionEvent e) {
- return false;
- }
-
- @Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
- translate(distanceX, distanceY);
- return true;
- }
-
- @Override
- public void onLongPress(MotionEvent e) {
- }
-
- @Override
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
- return false;
- }
- });
- }
-
- int rotation = 0;
-
- public void rotate(int degrees) {
- if (this.bitmap == null) {
- return;
- }
- Matrix matrix = new Matrix();
-
- int dx = this.bitmap.getWidth() / 2;
- int dy = this.bitmap.getHeight() / 2;
-
- matrix.postTranslate(-dx, -dy);
- matrix.postRotate(degrees);
- matrix.postTranslate(dy, dx);
- Bitmap scaledBitmap = this.bitmap;
- Bitmap rotatedBitmap = Bitmap.createBitmap(scaledBitmap.getHeight(), scaledBitmap.getWidth(),
- Bitmap.Config.RGB_565);
- Canvas canvas = new Canvas(rotatedBitmap);
- canvas.drawBitmap(this.bitmap, matrix, null);
- this.bitmap.recycle();
- this.bitmap = rotatedBitmap;
- centerImage(getWidth(), getHeight());
- invalidate();
- }
-
- private void translate(float distanceX, float distanceY) {
- matrix.getValues(matrixArray);
- float left = matrixArray[Matrix.MTRANS_X];
- float top = matrixArray[Matrix.MTRANS_Y];
-
- Rect bound = getRestrictedBound();
- if (bound != null) {
- float scale = getScale();
- float right = left + (int) (bitmap.getWidth() / scale);
- float bottom = top + (int) (bitmap.getHeight() / scale);
-
- if (left - distanceX > bound.left) {
- distanceX = left - bound.left;
- }
- if (top - distanceY > bound.top) {
- distanceY = top - bound.top;
- }
-
- if (distanceX > 0) {
- if (right - distanceX < bound.right) {
- distanceX = right - bound.right;
- }
- }
- if (distanceY > 0) {
- if (bottom - distanceY < bound.bottom) {
- distanceY = bottom - bound.bottom;
- }
- }
- }
- matrix.postTranslate(-distanceX, -distanceY);
- invalidate();
- }
-
- private void scale(ScaleGestureDetector detector) {
- float scale = detector.getScaleFactor();
- float currentScale = getScale();
- if (currentScale * scale < setMinimumScale) {
- scale = setMinimumScale / currentScale;
- }
- if (currentScale * scale > maximumScale) {
- scale = maximumScale / currentScale;
- }
- matrix.postScale(scale, scale, detector.getFocusX(), detector.getFocusY());
- invalidate();
- }
-
- private void centerImage(int width, int height) {
- if (width <= 0 || height <= 0 || bitmap == null) {
- return;
- }
- float widthRatio = 1.0f * height / this.bitmap.getHeight();
- float heightRatio = 1.0f * width / this.bitmap.getWidth();
-
- float ratio = Math.min(widthRatio, heightRatio);
-
- float dx = (width - this.bitmap.getWidth()) / 2;
- float dy = (height - this.bitmap.getHeight()) / 2;
- matrix.setTranslate(0, 0);
- matrix.setScale(ratio, ratio, bitmap.getWidth() / 2, bitmap.getHeight() / 2);
- matrix.postTranslate(dx, dy);
- invalidate();
- }
-
- private float getScale() {
- matrix.getValues(matrixArray);
- float scale = matrixArray[Matrix.MSCALE_X];
- if (Math.abs(scale) <= 0.1) {
- scale = matrixArray[Matrix.MSKEW_X];
- }
- return Math.abs(scale);
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- if (bitmap != null) {
- canvas.drawBitmap(bitmap, matrix, null);
- }
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- boolean result = scaleGestureDetector.onTouchEvent(event);
- result = gestureDetector.onTouchEvent(event) || result;
- return result || super.onTouchEvent(event);
- }
-
- private Rect restrictBound;
-
- private Rect getRestrictedBound() {
- return restrictBound;
- }
-
- public void setRestrictBound(Rect rect) {
- this.restrictBound = rect;
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/crop/FrameOverlayView.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/crop/FrameOverlayView.java
deleted file mode 100644
index 8d000a8..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/crop/FrameOverlayView.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.crop;
-
-
-import com.baidu.ocr.ui.util.DimensionUtil;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-
-public class FrameOverlayView extends View {
-
- interface OnFrameChangeListener {
- void onFrameChange(RectF newFrame);
- }
-
- public Rect getFrameRect() {
- Rect rect = new Rect();
- rect.left = (int) frameRect.left;
- rect.top = (int) frameRect.top;
- rect.right = (int) frameRect.right;
- rect.bottom = (int) frameRect.bottom;
- return rect;
- }
-
- public FrameOverlayView(Context context) {
- super(context);
- init();
- }
-
- public FrameOverlayView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public FrameOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- private GestureDetector.SimpleOnGestureListener onGestureListener = new GestureDetector.SimpleOnGestureListener() {
- @Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
- translate(distanceX, distanceY);
- return true;
- }
-
- };
-
- private static final int CORNER_LEFT_TOP = 1;
- private static final int CORNER_RIGHT_TOP = 2;
- private static final int CORNER_RIGHT_BOTTOM = 3;
- private static final int CORNER_LEFT_BOTTOM = 4;
-
- private int currentCorner = -1;
- int margin = 20;
- int cornerLength = 100;
- int cornerLineWidth = 6;
-
- private int maskColor = Color.argb(180, 0, 0, 0);
-
- private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
- private Paint eraser = new Paint(Paint.ANTI_ALIAS_FLAG);
- private GestureDetector gestureDetector;
- private RectF touchRect = new RectF();
- private RectF frameRect = new RectF();
-
- private OnFrameChangeListener onFrameChangeListener;
-
- {
- setLayerType(View.LAYER_TYPE_SOFTWARE, null);
- paint.setColor(Color.WHITE);
- paint.setStyle(Paint.Style.STROKE);
- paint.setStrokeWidth(6);
-
- eraser.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
- }
-
- public void setOnFrameChangeListener(OnFrameChangeListener onFrameChangeListener) {
- this.onFrameChangeListener = onFrameChangeListener;
- }
-
- private void init() {
- gestureDetector = new GestureDetector(getContext(), onGestureListener);
- cornerLength = DimensionUtil.dpToPx(18);
- cornerLineWidth = DimensionUtil.dpToPx(3);
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- resetFrameRect(w, h);
- }
-
- private void resetFrameRect(int w, int h) {
- if (shapeType == 1) {
- frameRect.left = (int) (w * 0.05);
- frameRect.top = (int) (h * 0.25);
- } else {
- frameRect.left = (int) (w * 0.2);
- frameRect.top = (int) (h * 0.2);
- }
- frameRect.right = w - frameRect.left;
- frameRect.bottom = h - frameRect.top;
- }
-
- private int shapeType = 0;
-
- public void setTypeWide() {
- shapeType = 1;
- }
-
-
-
- private void translate(float x, float y) {
- if (x > 0) {
- // moving left;
- if (frameRect.left - x < margin) {
- x = frameRect.left - margin;
- }
- } else {
- if (frameRect.right - x > getWidth() - margin) {
- x = frameRect.right - getWidth() + margin;
- }
- }
-
- if (y > 0) {
- if (frameRect.top - y < margin) {
- y = frameRect.top - margin;
- }
- } else {
- if (frameRect.bottom - y > getHeight() - margin) {
- y = frameRect.bottom - getHeight() + margin;
- }
- }
- frameRect.offset(-x, -y);
- invalidate();
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
-
- canvas.drawColor(maskColor);
-
- paint.setStrokeWidth(DimensionUtil.dpToPx(1));
- canvas.drawRect(frameRect, paint);
- canvas.drawRect(frameRect, eraser);
- drawCorners(canvas);
- }
-
- private void drawCorners(Canvas canvas) {
- paint.setStrokeWidth(cornerLineWidth);
- // left top
- drawLine(canvas, frameRect.left - cornerLineWidth / 2, frameRect.top, cornerLength, 0);
- drawLine(canvas, frameRect.left, frameRect.top, 0, cornerLength);
-
- // right top
- drawLine(canvas, frameRect.right + cornerLineWidth / 2, frameRect.top, -cornerLength, 0);
- drawLine(canvas, frameRect.right, frameRect.top, 0, cornerLength);
-
- // right bottom
- drawLine(canvas, frameRect.right, frameRect.bottom, 0, -cornerLength);
- drawLine(canvas, frameRect.right + cornerLineWidth / 2, frameRect.bottom, -cornerLength, 0);
-
- // left bottom
- drawLine(canvas, frameRect.left - cornerLineWidth / 2, frameRect.bottom, cornerLength, 0);
- drawLine(canvas, frameRect.left, frameRect.bottom, 0, -cornerLength);
- }
-
- private void drawLine(Canvas canvas, float x, float y, int dx, int dy) {
- canvas.drawLine(x, y, x + dx, y + dy, paint);
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- boolean result = handleDown(event);
- float ex = 60;
- RectF rectExtend = new RectF(frameRect.left - ex, frameRect.top - ex,
- frameRect.right + ex, frameRect.bottom + ex);
- if (!result) {
- if (rectExtend.contains(event.getX(), event.getY())) {
- gestureDetector.onTouchEvent(event);
- return true;
- }
- }
- return result;
- }
-
- private boolean handleDown(MotionEvent event) {
- switch (event.getAction()) {
- case MotionEvent.ACTION_CANCEL:
- case MotionEvent.ACTION_UP:
- currentCorner = -1;
- break;
- case MotionEvent.ACTION_DOWN: {
- float radius = cornerLength;
- touchRect.set(event.getX() - radius, event.getY() - radius, event.getX() + radius,
- event.getY() + radius);
- if (touchRect.contains(frameRect.left, frameRect.top)) {
- currentCorner = CORNER_LEFT_TOP;
- return true;
- }
-
- if (touchRect.contains(frameRect.right, frameRect.top)) {
- currentCorner = CORNER_RIGHT_TOP;
- return true;
- }
-
- if (touchRect.contains(frameRect.right, frameRect.bottom)) {
- currentCorner = CORNER_RIGHT_BOTTOM;
- return true;
- }
-
- if (touchRect.contains(frameRect.left, frameRect.bottom)) {
- currentCorner = CORNER_LEFT_BOTTOM;
- return true;
- }
- return false;
- }
- case MotionEvent.ACTION_MOVE:
- return handleScale(event);
- default:
-
- }
- return false;
- }
-
- private boolean handleScale(MotionEvent event) {
- switch (currentCorner) {
- case CORNER_LEFT_TOP:
- scaleTo(event.getX(), event.getY(), frameRect.right, frameRect.bottom);
- return true;
- case CORNER_RIGHT_TOP:
- scaleTo(frameRect.left, event.getY(), event.getX(), frameRect.bottom);
- return true;
- case CORNER_RIGHT_BOTTOM:
- scaleTo(frameRect.left, frameRect.top, event.getX(), event.getY());
- return true;
- case CORNER_LEFT_BOTTOM:
- scaleTo(event.getX(), frameRect.top, frameRect.right, event.getY());
- return true;
- default:
- return false;
- }
- }
-
- private void scaleTo(float left, float top, float right, float bottom) {
- if (bottom - top < getMinimumFrameHeight()) {
- top = frameRect.top;
- bottom = frameRect.bottom;
- }
- if (right - left < getMinimumFrameWidth()) {
- left = frameRect.left;
- right = frameRect.right;
- }
- left = Math.max(margin, left);
- top = Math.max(margin, top);
- right = Math.min(getWidth() - margin, right);
- bottom = Math.min(getHeight() - margin, bottom);
-
- frameRect.set(left, top, right, bottom);
- invalidate();
- }
-
- private void notifyFrameChange() {
- if (onFrameChangeListener != null) {
- onFrameChangeListener.onFrameChange(frameRect);
- }
- }
-
- private float getMinimumFrameWidth() {
- return 2.4f * cornerLength;
- }
-
- private float getMinimumFrameHeight() {
- return 2.4f * cornerLength;
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/util/DimensionUtil.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/util/DimensionUtil.java
deleted file mode 100644
index 42fd59c..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/util/DimensionUtil.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.util;
-
-import android.content.res.Resources;
-
-public class DimensionUtil {
-
- public static int dpToPx(int dp) {
- return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
- }
-
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/util/ImageUtil.java b/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/util/ImageUtil.java
deleted file mode 100644
index 98d69d6..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/java/com/baidu/ocr/ui/util/ImageUtil.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
- */
-package com.baidu.ocr.ui.util;
-
-import android.graphics.BitmapFactory;
-import android.media.ExifInterface;
-import android.util.Log;
-
-public class ImageUtil {
- private static final String TAG = "CameraExif";
-
- public static int exifToDegrees(int exifOrientation) {
- if (exifOrientation == ExifInterface.ORIENTATION_ROTATE_90) {
- return 90;
- } else if (exifOrientation == ExifInterface.ORIENTATION_ROTATE_180) {
- return 180;
- } else if (exifOrientation == ExifInterface.ORIENTATION_ROTATE_270) {
- return 270;
- }
- return 0;
- }
-
- // Returns the degrees in clockwise. Values are 0, 90, 180, or 270.
- public static int getOrientation(byte[] jpeg) {
- if (jpeg == null) {
- return 0;
- }
-
- int offset = 0;
- int length = 0;
-
- // ISO/IEC 10918-1:1993(E)
- while (offset + 3 < jpeg.length && (jpeg[offset++] & 0xFF) == 0xFF) {
- int marker = jpeg[offset] & 0xFF;
-
- // Check if the marker is a padding.
- if (marker == 0xFF) {
- continue;
- }
- offset++;
-
- // Check if the marker is SOI or TEM.
- if (marker == 0xD8 || marker == 0x01) {
- continue;
- }
- // Check if the marker is EOI or SOS.
- if (marker == 0xD9 || marker == 0xDA) {
- break;
- }
-
- // Get the length and check if it is reasonable.
- length = pack(jpeg, offset, 2, false);
- if (length < 2 || offset + length > jpeg.length) {
- Log.e(TAG, "Invalid length");
- return 0;
- }
-
- // Break if the marker is EXIF in APP1.
- if (marker == 0xE1 && length >= 8
- && pack(jpeg, offset + 2, 4, false) == 0x45786966
- && pack(jpeg, offset + 6, 2, false) == 0) {
- offset += 8;
- length -= 8;
- break;
- }
-
- // Skip other markers.
- offset += length;
- length = 0;
- }
-
- // JEITA CP-3451 Exif Version 2.2
- if (length > 8) {
- // Identify the byte order.
- int tag = pack(jpeg, offset, 4, false);
- if (tag != 0x49492A00 && tag != 0x4D4D002A) {
- Log.e(TAG, "Invalid byte order");
- return 0;
- }
- boolean littleEndian = (tag == 0x49492A00);
-
- // Get the offset and check if it is reasonable.
- int count = pack(jpeg, offset + 4, 4, littleEndian) + 2;
- if (count < 10 || count > length) {
- Log.e(TAG, "Invalid offset");
- return 0;
- }
- offset += count;
- length -= count;
-
- // Get the count and go through all the elements.
- count = pack(jpeg, offset - 2, 2, littleEndian);
- while (count-- > 0 && length >= 12) {
- // Get the tag and check if it is orientation.
- tag = pack(jpeg, offset, 2, littleEndian);
- if (tag == 0x0112) {
- // We do not really care about type and count, do we?
- int orientation = pack(jpeg, offset + 8, 2, littleEndian);
- switch (orientation) {
- case 1:
- return 0;
- case 3:
- return 180;
- case 6:
- return 90;
- case 8:
- return 270;
- default:
- return 0;
- }
- }
- offset += 12;
- length -= 12;
- }
- }
-
- Log.i(TAG, "Orientation not found");
- return 0;
- }
-
- private static int pack(byte[] bytes, int offset, int length,
- boolean littleEndian) {
- int step = 1;
- if (littleEndian) {
- offset += length - 1;
- step = -1;
- }
-
- int value = 0;
- while (length-- > 0) {
- value = (value << 8) | (bytes[offset] & 0xFF);
- offset += step;
- }
- return value;
- }
-
- public static int calculateInSampleSize(
- BitmapFactory.Options options, int reqWidth, int reqHeight) {
- // Raw height and width of image
- final int height = options.outHeight;
- final int width = options.outWidth;
- int inSampleSize = 1;
-
- if (height > reqHeight || width > reqWidth) {
-
- final int halfHeight = height / 2;
- final int halfWidth = width / 2;
- // Calculate the largest inSampleSize value that is a power of 2 and keeps both
- // height and width larger than the requested height and width.
- while ((halfHeight / inSampleSize) >= reqHeight
- && (halfWidth / inSampleSize) >= reqWidth) {
- inSampleSize *= 2;
- }
- }
-
- return inSampleSize;
- }
-}
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/arm64-v8a/libidcard_quality.1.1.1.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/arm64-v8a/libidcard_quality.1.1.1.so
deleted file mode 100644
index 9d96062..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/arm64-v8a/libidcard_quality.1.1.1.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/arm64-v8a/libidl_license.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/arm64-v8a/libidl_license.so
deleted file mode 100644
index 23739c7..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/arm64-v8a/libidl_license.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi-v7a/libidcard_quality.1.1.1.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi-v7a/libidcard_quality.1.1.1.so
deleted file mode 100644
index 8a2ad1d..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi-v7a/libidcard_quality.1.1.1.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi-v7a/libidl_license.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi-v7a/libidl_license.so
deleted file mode 100644
index 52d48e8..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi-v7a/libidl_license.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi/libidcard_quality.1.1.1.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi/libidcard_quality.1.1.1.so
deleted file mode 100644
index a3147ca..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi/libidcard_quality.1.1.1.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi/libidl_license.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi/libidl_license.so
deleted file mode 100644
index 0305834..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/armeabi/libidl_license.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/x86/libidcard_quality.1.1.1.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/x86/libidcard_quality.1.1.1.so
deleted file mode 100644
index 6644d9a..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/x86/libidcard_quality.1.1.1.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/jniLibs/x86/libidl_license.so b/src/开发项目源代码/ocr_ui/src/main/jniLibs/x86/libidl_license.so
deleted file mode 100644
index ac680a4..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/jniLibs/x86/libidl_license.so and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_cancel.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_cancel.png
deleted file mode 100644
index 9a4c575..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_cancel.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_close.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_close.png
deleted file mode 100644
index 080f00f..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_close.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_confirm.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_confirm.png
deleted file mode 100644
index e01cc7c..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_confirm.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_gallery.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_gallery.png
deleted file mode 100644
index 3749366..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_gallery.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_bank_card.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_bank_card.png
deleted file mode 100644
index 9a73728..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_bank_card.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_id_card.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_id_card.png
deleted file mode 100644
index b90d6b4..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_id_card.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_id_card_back.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_id_card_back.png
deleted file mode 100644
index 9f4a642..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_hint_align_id_card_back.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_id_card_locator_back.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_id_card_locator_back.png
deleted file mode 100644
index a38c86e..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_id_card_locator_back.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_id_card_locator_front.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_id_card_locator_front.png
deleted file mode 100644
index 255b665..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_id_card_locator_front.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_light_off.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_light_off.png
deleted file mode 100644
index c74408d..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_light_off.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_light_on.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_light_on.png
deleted file mode 100644
index 9cbf8ba..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_light_on.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_passport_locator.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_passport_locator.png
deleted file mode 100644
index 3f31101..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_passport_locator.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_reset.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_reset.png
deleted file mode 100644
index 1be3678..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_reset.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_rotate.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_rotate.png
deleted file mode 100644
index 9cb08a6..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_rotate.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_round_corner.xml b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_round_corner.xml
deleted file mode 100644
index 74d6ca4..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_round_corner.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_highlight.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_highlight.png
deleted file mode 100644
index d30c4ab..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_highlight.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_normal.png b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_normal.png
deleted file mode 100644
index eb83dd0..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_normal.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_selector.xml b/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_selector.xml
deleted file mode 100644
index 1230626..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/drawable-xhdpi/bd_ocr_take_photo_selector.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_activity_camera.xml b/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_activity_camera.xml
deleted file mode 100644
index 9445247..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_activity_camera.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_confirm_result.xml b/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_confirm_result.xml
deleted file mode 100644
index 0f18a36..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_confirm_result.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_crop.xml b/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_crop.xml
deleted file mode 100644
index d9c1542..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_crop.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_take_picture.xml b/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_take_picture.xml
deleted file mode 100644
index 8fc77f1..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/layout/bd_ocr_take_picture.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-hdpi/ic_launcher.png b/src/开发项目源代码/ocr_ui/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-mdpi/ic_launcher.png b/src/开发项目源代码/ocr_ui/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xhdpi/ic_launcher.png b/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
Binary files a/src/开发项目源代码/ocr_ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/values/bd_ocr_dimensions.xml b/src/开发项目源代码/ocr_ui/src/main/res/values/bd_ocr_dimensions.xml
deleted file mode 100644
index 6d2ecdf..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/values/bd_ocr_dimensions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- 18dp
- 18dp
- 16dp
- 16dp
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/values/bd_ocr_widgets.xml b/src/开发项目源代码/ocr_ui/src/main/res/values/bd_ocr_widgets.xml
deleted file mode 100644
index 6df54d2..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/values/bd_ocr_widgets.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/values/colors.xml b/src/开发项目源代码/ocr_ui/src/main/res/values/colors.xml
deleted file mode 100644
index 13a7544..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- #3F51B5
- #303F9F
- #FF4081
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/values/strings.xml b/src/开发项目源代码/ocr_ui/src/main/res/values/strings.xml
deleted file mode 100644
index 5f2896d..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- OCR_UI
- 本功能需要相机权限！
-
diff --git a/src/开发项目源代码/ocr_ui/src/main/res/values/styles.xml b/src/开发项目源代码/ocr_ui/src/main/res/values/styles.xml
deleted file mode 100644
index 55a8ffb..0000000
--- a/src/开发项目源代码/ocr_ui/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/开发项目源代码/settings.gradle b/src/开发项目源代码/settings.gradle
deleted file mode 100644
index 0a58127..0000000
--- a/src/开发项目源代码/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-include ':app'
-include ':ocr_ui'
-include ':core'
diff --git a/src/开发项目源代码/test.jks b/src/开发项目源代码/test.jks
deleted file mode 100644
index 13c9e91..0000000
Binary files a/src/开发项目源代码/test.jks and /dev/null differ
diff --git a/src/杨可达精读代码/gtask/exception/ActionFailureException.java b/src/杨可达精读代码/gtask/exception/ActionFailureException.java
deleted file mode 100644
index 68bd690..0000000
--- a/src/杨可达精读代码/gtask/exception/ActionFailureException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/*
- * 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() {
- // serialVersionUID相当于java类的身份证。主要用于版本控制。
- super();
- }
- public ActionFailureException(String paramString) {
- super(paramString);
- }
- //ActionFailureException类构造函数，调用父类构造函数，此处相当于Exception ( )
- public ActionFailureException(String paramString, Throwable paramThrowable) {
- //调用父类具有相同形参paramString和paramThrowable的构造方法
- super(paramString, paramThrowable);
- }
-}
diff --git a/src/杨可达精读代码/gtask/exception/NetworkFailureException.java b/src/杨可达精读代码/gtask/exception/NetworkFailureException.java
deleted file mode 100644
index b6b0f5d..0000000
--- a/src/杨可达精读代码/gtask/exception/NetworkFailureException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/*
- * 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 NetworkFailureException extends Exception {
- private static final long serialVersionUID = 2107610287180234136L;
- //网络异常处理，是从Exception类派生出NetworkFailureException类
-
- public NetworkFailureException() {
- super();
- }
- //以下均为构造函数，通过不同参数调用父函数
- public NetworkFailureException(String paramString) {
- super(paramString);
- }
-
- public NetworkFailureException(String paramString, Throwable paramThrowable) {
- super(paramString, paramThrowable);
- }
-}
diff --git a/src/杨可达精读代码/gtask/remote/GTaskASyncTask.java b/src/杨可达精读代码/gtask/remote/GTaskASyncTask.java
deleted file mode 100644
index 80fe18e..0000000
--- a/src/杨可达精读代码/gtask/remote/GTaskASyncTask.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-/*
- * 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;
-
-
-
-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);
- //如果同步不成功，那么从系统取得一个用于启动一个NotesPreferenceActivity的PendingIntent对象
-
- } else {
- pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesListActivity.class), 0);
- //如果同步成功，那么从系统取得一个用于启动一个NotesListActivity的PendingIntent对象
- }
- notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
- pendingIntent);
- mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
- //通过NotificationManager对象的notify（）方法来执行一个notification的消息
- }
-
- @Override
- protected Integer doInBackground(Void... unused) {
- publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
- .getSyncAccountName(mContext)));
- //利用getString,将把 NotesPreferenceActivity.getSyncAccountName(mContext))的字符串内容传进sync_progress_login中
- 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/杨可达精读代码/gtask/remote/GTaskClient.java b/src/杨可达精读代码/gtask/remote/GTaskClient.java
deleted file mode 100644
index c961c2a..0000000
--- a/src/杨可达精读代码/gtask/remote/GTaskClient.java
+++ /dev/null
@@ -1,614 +0,0 @@
-package net.micode.notes.gtask.remote;
-
-/*
- * 主要功能：实现GTASK的登录操作，进行GTASK任务的创建，创建任务列表，从网络上获取任务和任务列表的内容
- * 主要使用类或技术：accountManager JSONObject HttpParams authToken Gid
- */
-
-import android.app.*;
-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/杨可达精读代码/gtask/remote/GTaskManager.java b/src/杨可达精读代码/gtask/remote/GTaskManager.java
deleted file mode 100644
index 4542acf..0000000
--- a/src/杨可达精读代码/gtask/remote/GTaskManager.java
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
- * 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;
- }
-}
\ No newline at end of file
diff --git a/src/杨可达精读代码/gtask/remote/GTaskSyncService.java b/src/杨可达精读代码/gtask/remote/GTaskSyncService.java
deleted file mode 100644
index bf7fb43..0000000
--- a/src/杨可达精读代码/gtask/remote/GTaskSyncService.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package net.micode.notes.gtask.remote;
-
-/*
- * 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/杨可达精读代码/model/Note.java b/src/杨可达精读代码/model/Note.java
deleted file mode 100644
index 9a40ae6..0000000
--- a/src/杨可达精读代码/model/Note.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * 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;
- 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) {
- //生成一个新的笔记ID并添加到数据库中。
- 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);
-
- 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;
- }
- 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) {
- //设置笔记的文本数据ID。
- mNoteData.setTextDataId(id);
- }
-
- public long getTextDataId() {
- //获取笔记的文本数据ID。
- return mNoteData.mTextDataId;
- }
-
- public void setCallDataId(long id) {
- //设置笔记的通话数据ID。
- mNoteData.setCallDataId(id);
- }
-
- public void setCallData(String key, String value) {
- //设置笔记的通话数据，例如通话记录。
- mNoteData.setCallData(key, value);
- }
-
- 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 pushIntoContentResolver(Context context, long noteId) {
- //下面函数的作用是将新的数据通过Uri的操作存储到数据库
- /**
- * 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/杨可达精读代码/model/WorkingNote.java b/src/杨可达精读代码/model/WorkingNote.java
deleted file mode 100644
index 7df1f3f..0000000
--- a/src/杨可达精读代码/model/WorkingNote.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package net.micode.notes.model;
-
-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);
- }
-}
\ No newline at end of file
diff --git a/src/殷嘉辰精读代码/data/Contact.java b/src/殷嘉辰精读代码/data/Contact.java
deleted file mode 100644
index 53ae2c0..0000000
--- a/src/殷嘉辰精读代码/data/Contact.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Data;
-import android.telephony.PhoneNumberUtils;
-import android.util.Log;
-
-import java.util.HashMap;
-
-public class Contact {//联系人
- private static HashMap sContactCache;
- private static final String TAG = "Contact";
-
- private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
- + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
- + " AND " + Data.RAW_CONTACT_ID + " IN "
- + "(SELECT raw_contact_id "
- + " FROM phone_lookup"
- + " WHERE min_match = '+')";
-
- public static String getContact(Context context, String phoneNumber) {// 获取联系人
- if(sContactCache == null) {
- sContactCache = new HashMap();
- }
-
- if(sContactCache.containsKey(phoneNumber)) {// 查找HashMap中是否已有phoneNumber信息
- return sContactCache.get(phoneNumber);
- }
-
- String selection = CALLER_ID_SELECTION.replace("+",
- PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
- // 查找数据库中phoneNumber的信息
- Cursor cursor = context.getContentResolver().query(
- Data.CONTENT_URI,
- new String [] { Phone.DISPLAY_NAME },
- selection,
- new String[] { phoneNumber },
- null);
- // 判定查询结果
- // moveToFirst()返回第一条
- if (cursor != null && cursor.moveToFirst()) {
- try {// 找到相关信息
- String name = cursor.getString(0);
- sContactCache.put(phoneNumber, name);
- return name;
- // 异常
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, " Cursor get string error " + e.toString());
- return null;
- } finally {
- cursor.close();
- }
- // 未找到相关信息
- } else {
- Log.d(TAG, "No contact matched with number:" + phoneNumber);
- return null;
- }
- }
-}
diff --git a/src/殷嘉辰精读代码/data/Notes.java b/src/殷嘉辰精读代码/data/Notes.java
deleted file mode 100644
index af4f51b..0000000
--- a/src/殷嘉辰精读代码/data/Notes.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * 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;
-// Notes 类中定义了很多常量，这些常量大多是int型和string型
-public class Notes {
- public static final String AUTHORITY = "micode_notes";
- public static final String TAG = "Notes";
- //以下三个常量对NoteColumns.TYPE的值进行设置时会用到
- public static final int TYPE_NOTE = 0;
- public static final int TYPE_FOLDER = 1;
- public static final int TYPE_SYSTEM = 2;
-
- /**
- * Following IDs are system folders' identifiers
- * {@link Notes#ID_ROOT_FOLDER } is default folder
- * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
- * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
- */
- public static final int ID_ROOT_FOLDER = 0;
- 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 to query all notes and folders
- */
- public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
-//定义查询便签和文件夹的指针。
- /**
- * Uri to query data
- */
- public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
- //定义查找数据的指针。
- public interface NoteColumns {// 定义NoteColumns的常量,用于后面创建数据库的表头
- /**
- * The unique ID for a row
- *
Type: INTEGER (long)
- */
- public static final String ID = "_id";
-
- /**
- * The parent's id for note or folder
- *
Type: INTEGER (long)
- */
- public static final String PARENT_ID = "parent_id";
-
- /**
- * Created data for note or folder
- *
Type: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * Latest modified date
- *
Type: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
-
- /**
- * Alert date
- *
Type: INTEGER (long)
- */
- public static final String ALERTED_DATE = "alert_date";
-
- /**
- * Folder's name or text content of note
- *
Type: TEXT
- */
- public static final String SNIPPET = "snippet";
-
- /**
- * Note's widget id
- *
Type: INTEGER (long)
- */
- public static final String WIDGET_ID = "widget_id";
-
- /**
- * Note's widget type
- *
Type: INTEGER (long)
- */
- public static final String WIDGET_TYPE = "widget_type";
-
- /**
- * Note's background color's id
- *
Type: INTEGER (long)
- */
- public static final String BG_COLOR_ID = "bg_color_id";
-
- /**
- * For text note, it doesn't has attachment, for multi-media
- * note, it has at least one attachment
- *
Type: INTEGER
- */
- public static final String HAS_ATTACHMENT = "has_attachment";
-
- /**
- * Folder's count of notes
- *
Type: INTEGER (long)
- */
- public static final String NOTES_COUNT = "notes_count";
-
- /**
- * The file type: folder or note
- *
Type: INTEGER
- */
- public static final String TYPE = "type";
-
- /**
- * The last sync id
- *
Type: INTEGER (long)
- */
- public static final String SYNC_ID = "sync_id";
-
- /**
- * Sign to indicate local modified or not
- *
Type: INTEGER
- */
- public static final String LOCAL_MODIFIED = "local_modified";
-
- /**
- * Original parent id before moving into temporary folder
- *
Type : INTEGER
- */
- public static final String ORIGIN_PARENT_ID = "origin_parent_id";
-
- /**
- * The 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 {
- // 定义DataColumns的常量,用于后面创建数据库的表头
- /**
- * The unique ID for a row
- *
Type: INTEGER (long)
- */
- public static final String ID = "_id";
-
- /**
- * The MIME type of the item represented by this row.
- *
Type: Text
- */
- public static final String MIME_TYPE = "mime_type";
-
- /**
- * The reference id to note that this data belongs to
- *
Type: INTEGER (long)
- */
- public static final String NOTE_ID = "note_id";
-
- /**
- * Created data for note or folder
- *
Type: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * Latest modified date
- *
Type: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
- /**
- * Data's content
- *
Type: TEXT
- */
- public static final String CONTENT = "content";
-
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- *
Type: INTEGER
- */
- public static final String DATA1 = "data1";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- *
Type: INTEGER
- */
- public static final String DATA2 = "data2";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- *
Type: TEXT
- */
- public static final String DATA3 = "data3";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- *
Type: TEXT
- */
- public static final String DATA4 = "data4";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- *
Type: TEXT
- */
- public static final String DATA5 = "data5";
- }//定义存储便签内容数据的
-
- public static final class TextNote implements DataColumns {
- /**
- * Mode to indicate the text in check list mode or not
- *
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 {
- /**
- * Call date for this record
- *
Type: INTEGER (long)
- */
- public static final String CALL_DATE = DATA1;
-
- /**
- * Phone number for this record
- *
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/殷嘉辰精读代码/data/NotesDatabaseHelper.java b/src/殷嘉辰精读代码/data/NotesDatabaseHelper.java
deleted file mode 100644
index 7caf467..0000000
--- a/src/殷嘉辰精读代码/data/NotesDatabaseHelper.java
+++ /dev/null
@@ -1,351 +0,0 @@
-package net.micode.notes.data;
-
-import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。
-import android.content.Context;//加载和访问资源。（android中主要是这两个功能，但是这里具体不清楚）
-import android.database.sqlite.SQLiteDatabase;//主要提供了对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values
-import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新
-import android.util.Log;
-
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-//数据库操作，用SQLOpenhelper,对一些note和文件进行数据库的操作，比如删除文件后，将文件里的note也相应删除
-
-public class NotesDatabaseHelper extends SQLiteOpenHelper {
- private static final String DB_NAME = "note.db";
-
- private static final int DB_VERSION = 4;
-
- public interface TABLE {//接口，分成note和data，在后面的程序里分别使用过
- public static final String NOTE = "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 =
- "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 =
- "CREATE TABLE " + TABLE.DATA + "(" +
- DataColumns.ID + " INTEGER PRIMARY KEY," +
- DataColumns.MIME_TYPE + " TEXT NOT NULL," +
- DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA1 + " INTEGER," +
- DataColumns.DATA2 + " INTEGER," +
- DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
- ")";//和上面的功能一样，主要是存储的项目不同
-
- private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
- "CREATE INDEX IF NOT EXISTS note_id_index ON " +
- TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";//存储便签编号的一个数据表格
-
- /**
- * Increase folder's note count when move note to the folder
- */
- private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
- "CREATE TRIGGER increase_folder_count_on_update "+
- " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
- " BEGIN " +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
- " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
- " END";//在文件夹中移入一个Note之后需要更改的数据的表格。
-
- /**
- * Decrease folder's note count when move note from folder
- */
- 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";//在文件夹中移出一个Note之后需要更改的数据的表格。
-
- /**
- * Increase folder's note count when insert new note to the folder
- */
- 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";//在文件夹中插入一个Note之后需要更改的数据的表格。
-
- /**
- * Decrease folder's note count when delete note from the folder
- */
- 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";//在文件夹中删除一个Note之后需要更改的数据的表格。
-
- /**
- * Update note's content when insert data with type {@link DataConstants#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";//在文件夹中对一个Note导入新的数据之后需要更改的数据的表格。
-
- /**
- * Update note's content when data with {@link DataConstants#NOTE} type has changed
- */
- 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";//Note数据被修改后需要更改的数据的表格。
-
- /**
- * Update note's content when data with {@link DataConstants#NOTE} type has deleted
- */
- 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";//Note数据被删除后需要更改的数据的表格。
-
- /**
- * Delete datas belong to note which has been deleted
- */
- 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";//删除已删除的便签的数据后需要更改的数据的表格。
-
- /**
- * Delete notes belong to folder which has been deleted
- */
- 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";//删除已删除的文件夹的便签后需要更改的数据的表格。
-
- /**
- * Move notes belong to folder which has been moved to trash folder
- */
- 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);
- }//execSQL是数据库操作的API，主要是更改行为的SQL语句。
- //在这里主要是用来重新创建上述定义的表格用的，先删除原来有的数据库的触发器再重新创建新的数据库
-
-
- private void createSystemFolder(SQLiteDatabase db) {
- ContentValues values = new ContentValues();
-
- /**
- * call record foler for call notes
- */
- values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
- * root folder which is default folder
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
- * temporary folder which is used for moving note
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
- * create trash folder
- */
- 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) {
- db.execSQL(CREATE_DATA_TABLE_SQL);
- reCreateDataTableTriggers(db);
- db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
- Log.d(TAG, "data table has been created");
- }//创建表格（用来存储标签内容）
-
- private void reCreateDataTableTriggers(SQLiteDatabase db) {
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
- 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);
- }//同上面的execSQL
-
- static synchronized NotesDatabaseHelper getInstance(Context context) {
- if (mInstance == null) {
- mInstance = new NotesDatabaseHelper(context);
- }
- return mInstance;
- }//上网查是为解决同一时刻只能有一个线程执行.
- //在写程序库代码时，有时有一个类需要被所有的其它类使用，
- //但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例
-
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- createNoteTable(db);
- createDataTable(db);
- }//实现两个表格（上面创建的两个表格）
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- 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);
- }//更新到V2版本
-
- 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);
- }//更新到V3版本
-
- private void upgradeToV4(SQLiteDatabase db) {
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
- + " INTEGER NOT NULL DEFAULT 0");
- }//更新到V4版本
-}
diff --git a/src/殷嘉辰精读代码/data/NotesProvider.java b/src/殷嘉辰精读代码/data/NotesProvider.java
deleted file mode 100644
index f3a2e58..0000000
--- a/src/殷嘉辰精读代码/data/NotesProvider.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * 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.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_QUER
- 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对象并且更新里面的内容
- // Notify the note uri
- 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 + ')' : "");
- }
-
- private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { //增加一个noteVersion
- 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;
- }
-
-}
diff --git a/src/殷嘉辰精读代码/gtask/data/MetaData.java b/src/殷嘉辰精读代码/gtask/data/MetaData.java
deleted file mode 100644
index 3483eb4..0000000
--- a/src/殷嘉辰精读代码/gtask/data/MetaData.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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 {
- private final static String TAG = MetaData.class.getSimpleName();
- // 关联的gid
- private String mRelatedGid = null;
- /**
- * 设置元数据的gid和相关信息
- *
- * @param gid 元数据的gid
- * @param metaInfo 元数据的相关信息
- */
- public void setMeta(String gid, JSONObject metaInfo) {
- try {
- // 将关联的gid放入JSONObject中
- metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
- } catch (JSONException e) {
- Log.e(TAG, "failed to put related gid");
- }
- // 将元数据的相关信息转换为字符串，设置为Task的notes
- setNotes(metaInfo.toString());
- // 设置Task的名称为元数据的名称
- setName(GTaskStringUtils.META_NOTE_NAME);
- }
-
- public String getRelatedGid() {
- return mRelatedGid;
- }
- /**
- * 判断元数据是否有值。
- * @return 如果有备注信息则返回true，否则返回false。
- */
- @Override
- public boolean isWorthSaving() {
- return getNotes() != null;
- }
- /**
- * 通过远程JSON对象设置元数据内容。
- * @param js 远程JSON对象。
- */
- @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对象不应该调用该方法。
- * @param js 本地JSON对象。
- */
- @Override
- public void setContentByLocalJSON(JSONObject js) {
- // this function should not be called
- // 不应该被调用的方法
- throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
- }
- /**
- * 不应该被调用的方法。
- * @return 不应该被调用的方法。
- */
-
- @Override
- public JSONObject getLocalJSONFromContent() {
- throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
- }
-/*该方法接受一个 Cursor 参数，返回一个整型值。
-
-方法体中抛出了一个 IllegalAccessError 异常，并指定了异常消息为 "MetaData:getSyncAction should not be called"，即 "MetaData:getSyncAction 不应该被调用"。*/
-
- @Override
- public int getSyncAction(Cursor c) {
- throw new IllegalAccessError("MetaData:getSyncAction should not be called");
- }
-
-}
diff --git a/src/殷嘉辰精读代码/gtask/data/Node.java b/src/殷嘉辰精读代码/gtask/data/Node.java
deleted file mode 100644
index 0e4da8c..0000000
--- a/src/殷嘉辰精读代码/gtask/data/Node.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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 org.json.JSONObject;
-
-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;
- //表示节点的全局唯一标识符（global identifier）
- private String mName;
- //表示节点的名称
- private long mLastModified;
- //表示节点最后一次修改时间
- private boolean mDeleted;
- //表示节点是否已被删除
- // 抽象方法，获取创建操作的 JSON 对象
-
- public Node() {
- mGid = null;
- mName = "";
- mLastModified = 0;
- mDeleted = false;
- }//Node类
-
- public abstract JSONObject getCreateAction(int actionId);
-
- // 抽象方法，获取更新操作的 JSON 对象
- public abstract JSONObject getUpdateAction(int actionId);
-
- // 抽象方法，根据远程 JSON 对象设置内容
- public abstract void setContentByRemoteJSON(JSONObject js);
-
- // 抽象方法，根据本地 JSON 对象设置内容
- public abstract void setContentByLocalJSON(JSONObject js);
-
- // 抽象方法，将内容转换为本地 JSON 对象
- 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;
- }
- // 获取节点 ID
- public String getGid() {
- return this.mGid;
- }
- // 获取节点名称
- public String getName() {
- return this.mName;
- }
- // 获取最后修改时间
- public long getLastModified() {
- return this.mLastModified;
- }
- // 获取是否已删除
- public boolean getDeleted() {
- return this.mDeleted;
- }
-
-}
diff --git a/src/殷嘉辰精读代码/gtask/data/SqlData.java b/src/殷嘉辰精读代码/gtask/data/SqlData.java
deleted file mode 100644
index 3632a25..0000000
--- a/src/殷嘉辰精读代码/gtask/data/SqlData.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 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;// 无效ID常量
-
- // PROJECTION_DATA常量数组，用于查询数据表中的字段
-
- public static final String[] PROJECTION_DATA = new String[] {
- DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
- DataColumns.DATA3
- };
- // 数据表字段的索引常量，用于读取查询结果集
-
- 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; // ContentResolver对象，用于操作数据表
- private boolean mIsCreate; // 是否创建了数据
- private long mDataId; // 数据ID
- private String mDataMimeType; // 数据类型
- private String mDataContent; // 数据内容
- private long mDataContentData1; // 数据字段1
- private String mDataContentData3; // 数据字段3
- private ContentValues mDiffDataValues; // ContentValues对象，用于更新数据表的内容
-
- // 构造函数，初始化ContentResolver对象
- public SqlData(Context context) {
- mContentResolver = context.getContentResolver();
- mIsCreate = true;
- mDataId = INVALID_ID;
- mDataMimeType = DataConstants.NOTE;
- mDataContent = "";
- mDataContentData1 = 0;
- mDataContentData3 = "";
- mDiffDataValues = new ContentValues();
- }
-
- public SqlData(Context context, Cursor c) {
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(c);
- mDiffDataValues = new ContentValues();
- }
- // 从Cursor对象中读取数据
- private void loadFromCursor(Cursor c) {
- mDataId = c.getLong(DATA_ID_COLUMN); // 读取数据ID
- mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); // 读取数据类型
- mDataContent = c.getString(DATA_CONTENT_COLUMN); // 读取数据内容
- mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); // 读取数据字段1
- mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); // 读取数据字段3
- }
-
- // 设置数据内容
- public void setContent(JSONObject js) throws JSONException {
- // 从JSONObject对象中读取数据，若不存在则使用默认值
- long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
- // 比较新数据和旧数据，如果不同则添加到ContentValues对象中
- 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 {
- // 如果数据还没有在数据库中创建，则返回null，并打印错误日志
- 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;
- }
-
- public void commit(long noteId, boolean validateVersion, long version) {
- // 如果数据还没有在数据库中创建，则将其插入到数据库中
- if (mIsCreate) {
- // 如果数据id无效且存在于差异数据值中，则从差异数据值中删除该id
- if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
- mDiffDataValues.remove(DataColumns.ID);
- }
- // 将数据与所属笔记的id关联起来，并将其插入到数据库中
- mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
- Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
- try {
- // 从uri中获取新插入数据的id
- 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)
- });
- }
- // 如果更新的数据数量为0，则打印警告日志
- if (result == 0) {
- Log.w(TAG, "there is no update. maybe user updates note when syncing");
- }
- }
- }
-// 清空差异数据值，并将是否创建标志设为false
- mDiffDataValues.clear();
- mIsCreate = false;
- }
- //返回数据索引
- public long getId() {
- return mDataId;
- }
-}
diff --git a/src/殷嘉辰精读代码/gtask/data/SqlNote.java b/src/殷嘉辰精读代码/gtask/data/SqlNote.java
deleted file mode 100644
index 9d24a2b..0000000
--- a/src/殷嘉辰精读代码/gtask/data/SqlNote.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * 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;
-
-
-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;
- //构造函数只有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();
- }
- //构造函数有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();
- }
-
- 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();
-
- }
-
- 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);//然后加载数据进行初始化，这样函数
- } else {
- Log.w(TAG, "loadFromCursor: cursor = null");
- }
- } finally {
- if (c != null)
- c.close();
- }
- }
-
- 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);
- }
-
- 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();
- }
- }
-
- 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;
- }
-
- 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;
- }
-
- public void setParentId(long id) {
- mParentId = id;
- mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
- }
-
- public void setGtaskId(String gid) {
- mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
- }
-
- public void setSyncId(long syncId) {
- mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
- }
-
- public void resetLocalModified() {
- mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
- }
-
- public long getId() {
- return mId;
- }
-
- public long getParentId() {
- return mParentId;
- }
-
- public String getSnippet() {
- return mSnippet;
- }
-
- public boolean isNoteType() {
- return mType == Notes.TYPE_NOTE;
- }
-
- 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/殷嘉辰精读代码/gtask/data/Task.java b/src/殷嘉辰精读代码/gtask/data/Task.java
deleted file mode 100644
index a990f29..0000000
--- a/src/殷嘉辰精读代码/gtask/data/Task.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * 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
- 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
- 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) {
- 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;
- }
-
-}
diff --git a/src/殷嘉辰精读代码/gtask/data/TaskList.java b/src/殷嘉辰精读代码/gtask/data/TaskList.java
deleted file mode 100644
index 559d6d3..0000000
--- a/src/殷嘉辰精读代码/gtask/data/TaskList.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * 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();
-
- 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.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);
-
- }
- }
- 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);
- }
-
- 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) {
- if (task.getGid().equals(gid))
- return task;
- }
- return null;
- }
-
-
- public ArrayList getChildTaskList() {
- return this.mChildren;
- }//一种常见的ArrayList的遍历方法
-
- public void setIndex(int index) {
- this.mIndex = index;
- }
-
- public int getIndex() {
- return this.mIndex;
- }
-}
diff --git a/src/王天宝精读代码/ui/AlarmAlertActivity.java b/src/王天宝精读代码/ui/AlarmAlertActivity.java
deleted file mode 100644
index 2cee886..0000000
--- a/src/王天宝精读代码/ui/AlarmAlertActivity.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package net.micode.notes.ui;
-
- import android.app.Activity;
- import android.app.AlertDialog;
- import android.content.Context;
- import android.content.DialogInterface;
- import android.content.DialogInterface.OnClickListener;
- import android.content.DialogInterface.OnDismissListener;
- import android.content.Intent;
- import android.media.AudioManager;
- import android.media.MediaPlayer;
- import android.media.RingtoneManager;
- import android.net.Uri;
- import android.os.Bundle;
- import android.os.PowerManager;
- import android.provider.Settings;
- import android.view.Window;
- import android.view.WindowManager;
-
- import net.micode.notes.R;
- import net.micode.notes.data.Notes;
- import net.micode.notes.tool.DataUtils;
-
- import java.io.IOException;
-
-public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
- private long mNoteId; //文本在数据库存储中的ID号
- private String mSnippet; //闹钟提示时出现的文本片段
- private 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);
-
- if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
- mPlayer.setAudioStreamType(silentModeStreams);
- } else {
- mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
- }
- try {
- mPlayer.setDataSource(this, url);
- //方法：setDataSource(Context context, Uri uri)
- //解释：无返回值，设置多媒体数据来源【根据 Uri】
- mPlayer.prepare();
- //准备同步
- mPlayer.setLooping(true);
- //设置是否循环播放
- mPlayer.start();
- //开始播放
- } catch (IllegalArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息
- //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalStateException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- private void showActionDialog() {
- AlertDialog.Builder dialog = new AlertDialog.Builder(this);
- //要创建一个AlertDialog，就要用到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;
- }
- }
-}
diff --git a/src/王天宝精读代码/ui/AlarmInitReceiver.java b/src/王天宝精读代码/ui/AlarmInitReceiver.java
deleted file mode 100644
index 9848745..0000000
--- a/src/王天宝精读代码/ui/AlarmInitReceiver.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class AlarmInitReceiver extends BroadcastReceiver {
-
- private static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.ALERTED_DATE
- };
- //对数据库的操作，调用标签ID和闹钟时间
- private static final int COLUMN_ID = 0;
- private static final int COLUMN_ALERTED_DATE = 1;
-
- @Override
- public void onReceive(Context context, Intent intent) {
- long currentDate = System.currentTimeMillis();
- //System.currentTimeMillis()产生一个当前的毫秒
- Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- PROJECTION,
- NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
- new String[] { String.valueOf(currentDate) },
- //将long变量currentDate转化为字符串
- null);
- //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
-
- if (c != null) {
- if (c.moveToFirst()) {
- do {
- long alertDate = c.getLong(COLUMN_ALERTED_DATE);
- Intent sender = new Intent(context, AlarmReceiver.class);
- sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
- PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
- AlarmManager alermManager = (AlarmManager) context
- .getSystemService(Context.ALARM_SERVICE);
- alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
- } while (c.moveToNext());
- }
- c.close();
- }
- //通过网上查找资料发现，对于闹钟机制的启动，通常需要新建Intent、PendingIntent以及AlarmManager等
- //这里就是根据数据库里的闹钟时间创建一个闹钟机制
- }
-}
diff --git a/src/王天宝精读代码/ui/AlarmReceiver.java b/src/王天宝精读代码/ui/AlarmReceiver.java
deleted file mode 100644
index 04f40cf..0000000
--- a/src/王天宝精读代码/ui/AlarmReceiver.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class AlarmReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- intent.setClass(context, AlarmAlertActivity.class);
- //启动AlarmAlertActivity
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈
- //所以要新起一个栈装入启动的activity
- context.startActivity(intent);
- }
-}
-//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
-//作用还需要深究但是对于setClass和addFlags的
diff --git a/src/王天宝精读代码/ui/DateTimePicker.java b/src/王天宝精读代码/ui/DateTimePicker.java
deleted file mode 100644
index f30a124..0000000
--- a/src/王天宝精读代码/ui/DateTimePicker.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.micode.notes.ui;
-
-import java.util.Calendar;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.DateTimePicker;
-import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-
-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) {
- 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());
- }
-
- public void set24HourView(boolean is24HourView) {
- mIs24HourView = is24HourView;
- }
-
- 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;
- 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是该对话框上的按钮
-
-}
diff --git a/src/王天宝精读代码/ui/DateTimePickerDialog.java b/src/王天宝精读代码/ui/DateTimePickerDialog.java
deleted file mode 100644
index d891cba..0000000
--- a/src/王天宝精读代码/ui/DateTimePickerDialog.java
+++ /dev/null
@@ -1,489 +0,0 @@
-package net.micode.notes.ui;
-
-import java.text.DateFormatSymbols;
-import java.util.Calendar;
-
-import net.micode.notes.R;
-
-
-import android.content.Context;
-import android.text.format.DateFormat;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.NumberPicker;
-
-class DateTimePicker extends FrameLayout {
- //FrameLayout是布局模板之一
- //所有的子元素全部在屏幕的右上方
- private static final boolean DEFAULT_ENABLE_STATE = true;
-
- private static final int HOURS_IN_HALF_DAY = 12;
- private static final int HOURS_IN_ALL_DAY = 24;
- private static final int DAYS_IN_ALL_WEEK = 7;
- private static final int DATE_SPINNER_MIN_VAL = 0;
- private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1;
- private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0;
- private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23;
- private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1;
- private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12;
- private static final int MINUT_SPINNER_MIN_VAL = 0;
- private static final int MINUT_SPINNER_MAX_VAL = 59;
- private static final int AMPM_SPINNER_MIN_VAL = 0;
- private static final int AMPM_SPINNER_MAX_VAL = 1;
- //初始化控件
- private final NumberPicker mDateSpinner;
- private final NumberPicker mHourSpinner;
- private final NumberPicker mMinuteSpinner;
- private final NumberPicker mAmPmSpinner;
- //NumberPicker是数字选择器
- //这里定义的四个变量全部是在设置闹钟时需要选择的变量（如日期、时、分、上午或者下午）
- private Calendar mDate;
- //定义了Calendar类型的变量mDate，用于操作时间
- private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
-
- private boolean mIsAm;
-
- private boolean mIs24HourView;
-
- private boolean mIsEnabled = DEFAULT_ENABLE_STATE;
-
- private boolean mInitialising;
-
- private OnDateTimeChangedListener mOnDateTimeChangedListener;
-
- private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal);
- updateDateControl();
- onDateTimeChanged();
- }
- };//OnValueChangeListener，这是时间改变监听器，这里主要是对日期的监听
- //将现在日期的值传递给mDate；updateDateControl是同步操作
-
- private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
- //这里是对 小时（Hour） 的监听
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- boolean isDateChanged = false;
- Calendar cal = Calendar.getInstance();
- //声明一个Calendar的变量cal，便于后续的操作
- if (!mIs24HourView) {
- if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, 1);
- isDateChanged = true;
- //这里是对于12小时制时，晚上11点和12点交替时对日期的更改
- } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, -1);
- isDateChanged = true;
- }
- //这里是对于12小时制时，凌晨11点和12点交替时对日期的更改
- if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY ||
- oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
- mIsAm = !mIsAm;
- updateAmPmControl();
- }//这里是对于12小时制时，中午11点和12点交替时对AM和PM的更改
- } else {
- if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, 1);
- isDateChanged = true;
- //这里是对于24小时制时，晚上11点和12点交替时对日期的更改
- } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, -1);
- isDateChanged = true;
- }
- } //这里是对于12小时制时，凌晨11点和12点交替时对日期的更改
- int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);
- //通过数字选择器对newHour的赋值
- mDate.set(Calendar.HOUR_OF_DAY, newHour);
- //通过set函数将新的Hour值传给mDate
- onDateTimeChanged();
- if (isDateChanged) {
- setCurrentYear(cal.get(Calendar.YEAR));
- setCurrentMonth(cal.get(Calendar.MONTH));
- setCurrentDay(cal.get(Calendar.DAY_OF_MONTH));
- }
- }
- };
-
- private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
- //这里是对 分钟（Minute）改变的监听
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- int minValue = mMinuteSpinner.getMinValue();
- int maxValue = mMinuteSpinner.getMaxValue();
- int offset = 0;
- //设置offset，作为小时改变的一个记录数据
- if (oldVal == maxValue && newVal == minValue) {
- offset += 1;
- } else if (oldVal == minValue && newVal == maxValue) {
- offset -= 1;
- }
- //如果原值为59，新值为0，则offset加1
- //如果原值为0，新值为59，则offset减1
- if (offset != 0) {
- mDate.add(Calendar.HOUR_OF_DAY, offset);
- mHourSpinner.setValue(getCurrentHour());
- updateDateControl();
- int newHour = getCurrentHourOfDay();
- if (newHour >= HOURS_IN_HALF_DAY) {
- mIsAm = false;
- updateAmPmControl();
- } else {
- mIsAm = true;
- updateAmPmControl();
- }
- }
- mDate.set(Calendar.MINUTE, newVal);
- onDateTimeChanged();
- }
- };
-
- private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
- //对AM和PM的监听
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- mIsAm = !mIsAm;
- if (mIsAm) {
- mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY);
- } else {
- mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY);
- }
- updateAmPmControl();
- onDateTimeChanged();
- }
- };
-
- public interface OnDateTimeChangedListener {
- void onDateTimeChanged(DateTimePicker view, int year, int month,
- int dayOfMonth, int hourOfDay, int minute);
- }
-
- public DateTimePicker(Context context) {
- this(context, System.currentTimeMillis());
- }//通过对数据库的访问，获取当前的系统时间
-
- public DateTimePicker(Context context, long date) {
- this(context, date, DateFormat.is24HourFormat(context));
- }//上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义
-
- public DateTimePicker(Context context, long date, boolean is24HourView) {
- super(context);
- //获取系统时间
- mDate = Calendar.getInstance();
- mInitialising = true;
- mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
- inflate(context, R.layout.datetime_picker, this);
- //如果当前Activity里用到别的layout，比如对话框layout
- //还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来
- //然后再用findViewById()找到它上面的其它组件
- mDateSpinner = (NumberPicker) findViewById(R.id.date);
- mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
- mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
- mDateSpinner.setOnValueChangedListener(mOnDateChangedListener);
-
- mHourSpinner = (NumberPicker) findViewById(R.id.hour);
- mHourSpinner.setOnValueChangedListener(mOnHourChangedListener);
- mMinuteSpinner = (NumberPicker) findViewById(R.id.minute);
- mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL);
- mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);
- mMinuteSpinner.setOnLongPressUpdateInterval(100);
- mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener);
-
- String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();
- mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);
- mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);
- mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL);
- mAmPmSpinner.setDisplayedValues(stringsForAmPm);
- mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener);
-
- // update controls to initial state
- updateDateControl();
- updateHourControl();
- updateAmPmControl();
-
- set24HourView(is24HourView);
-
- // set to current time
- setCurrentDate(date);
-
- setEnabled(isEnabled());
-
- // set the content descriptions
- mInitialising = false;
- }
-
- @Override
- public void setEnabled(boolean enabled) {
- if (mIsEnabled == enabled) {
- return;
- }
- super.setEnabled(enabled);
- mDateSpinner.setEnabled(enabled);
- mMinuteSpinner.setEnabled(enabled);
- mHourSpinner.setEnabled(enabled);
- mAmPmSpinner.setEnabled(enabled);
- mIsEnabled = enabled;
- }
- //下面的各函数主要是对上面代码引用到的各函数功能的实现
- @Override
- public boolean isEnabled() {
- return mIsEnabled;
- }
-
- /**
- * Get the current date in millis
- *
- * @return the current date in millis
- */
- public long getCurrentDateInTimeMillis() {
- return mDate.getTimeInMillis();
- }//实现函数——得到当前的秒数
-
- /**
- * Set the current date
- *
- * @param date The current date in millis
- */
- public void setCurrentDate(long date) {
- Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(date);
- setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH),
- cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
- }//实现函数功能——设置当前的时间，参数是date
-
- /**
- * Set the current date
- *
- * @param year The current year
- * @param month The current month
- * @param dayOfMonth The current dayOfMonth
- * @param hourOfDay The current hourOfDay
- * @param minute The current minute
- */
- public void setCurrentDate(int year, int month,
- int dayOfMonth, int hourOfDay, int minute) {
- setCurrentYear(year);
- setCurrentMonth(month);
- setCurrentDay(dayOfMonth);
- setCurrentHour(hourOfDay);
- setCurrentMinute(minute);
- }//实现函数功能——设置当前的时间，参数是各详细的变量
-
- /**
- * Get current year
- *
- * @return The current year
- */
- //下面是得到year、month、day等值
- public int getCurrentYear() {
- return mDate.get(Calendar.YEAR);
- }
-
- /**
- * Set current year
- *
- * @param year The current year
- */
- public void setCurrentYear(int year) {
- if (!mInitialising && year == getCurrentYear()) {
- return;
- }
- mDate.set(Calendar.YEAR, year);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * Get current month in the year
- *
- * @return The current month in the year
- */
- public int getCurrentMonth() {
- return mDate.get(Calendar.MONTH);
- }
-
- /**
- * Set current month in the year
- *
- * @param month The month in the year
- */
- public void setCurrentMonth(int month) {
- if (!mInitialising && month == getCurrentMonth()) {
- return;
- }
- mDate.set(Calendar.MONTH, month);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * Get current day of the month
- *
- * @return The day of the month
- */
- public int getCurrentDay() {
- return mDate.get(Calendar.DAY_OF_MONTH);
- }
-
- /**
- * Set current day of the month
- *
- * @param dayOfMonth The day of the month
- */
- public void setCurrentDay(int dayOfMonth) {
- if (!mInitialising && dayOfMonth == getCurrentDay()) {
- return;
- }
- mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * Get current hour in 24 hour mode, in the range (0~23)
- * @return The current hour in 24 hour mode
- */
- public int getCurrentHourOfDay() {
- return mDate.get(Calendar.HOUR_OF_DAY);
- }
-
- private int getCurrentHour() {
- if (mIs24HourView){
- return getCurrentHourOfDay();
- } else {
- int hour = getCurrentHourOfDay();
- if (hour > HOURS_IN_HALF_DAY) {
- return hour - HOURS_IN_HALF_DAY;
- } else {
- return hour == 0 ? HOURS_IN_HALF_DAY : hour;
- }
- }
- }
-
- /**
- * Set current hour in 24 hour mode, in the range (0~23)
- *
- * @param hourOfDay
- */
- public void setCurrentHour(int hourOfDay) {
- if (!mInitialising && hourOfDay == getCurrentHourOfDay()) {
- return;
- }
- mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
- if (!mIs24HourView) {
- if (hourOfDay >= HOURS_IN_HALF_DAY) {
- mIsAm = false;
- if (hourOfDay > HOURS_IN_HALF_DAY) {
- hourOfDay -= HOURS_IN_HALF_DAY;
- }
- } else {
- mIsAm = true;
- if (hourOfDay == 0) {
- hourOfDay = HOURS_IN_HALF_DAY;
- }
- }
- updateAmPmControl();
- }
- mHourSpinner.setValue(hourOfDay);
- onDateTimeChanged();
- }
-
- /**
- * Get currentMinute
- *
- * @return The Current Minute
- */
- public int getCurrentMinute() {
- return mDate.get(Calendar.MINUTE);
- }
-
- /**
- * Set current minute
- */
- public void setCurrentMinute(int minute) {
- if (!mInitialising && minute == getCurrentMinute()) {
- return;
- }
- mMinuteSpinner.setValue(minute);
- mDate.set(Calendar.MINUTE, minute);
- onDateTimeChanged();
- }
-
- /**
- * @return true if this is in 24 hour view else false.
- */
- public boolean is24HourView () {
- return mIs24HourView;
- }
-
- /**
- * Set whether in 24 hour or AM/PM mode.
- *
- * @param is24HourView True for 24 hour mode. False for AM/PM mode.
- */
- public void set24HourView(boolean is24HourView) {
- if (mIs24HourView == is24HourView) {
- return;
- }
- mIs24HourView = is24HourView;
- mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE);
- int hour = getCurrentHourOfDay();
- updateHourControl();
- setCurrentHour(hour);
- updateAmPmControl();
- }
-
- private void updateDateControl() {
- Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1);
- mDateSpinner.setDisplayedValues(null);
- for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) {
- cal.add(Calendar.DAY_OF_YEAR, 1);
- mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal);
- }
- mDateSpinner.setDisplayedValues(mDateDisplayValues);
- mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2);
- mDateSpinner.invalidate();
- }// 对于星期几的算法
-
- private void updateAmPmControl() {
- if (mIs24HourView) {
- mAmPmSpinner.setVisibility(View.GONE);
- } else {
- int index = mIsAm ? Calendar.AM : Calendar.PM;
- mAmPmSpinner.setValue(index);
- mAmPmSpinner.setVisibility(View.VISIBLE);
- }// 对于上下午操作的算法
- }
-
- private void updateHourControl() {
- if (mIs24HourView) {
- mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW);
- mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW);
- } else {
- mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW);
- mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW);
- }// 对与小时的算法
- }
-
- /**
- * Set the callback that indicates the 'Set' button has been pressed.
- * @param callback the callback, if null will do nothing
- */
- public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) {
- mOnDateTimeChangedListener = callback;
- }
-
- private void onDateTimeChanged() {
- if (mOnDateTimeChangedListener != null) {
- mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(),
- getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute());
- }
- }
-}
diff --git a/src/王天宝精读代码/ui/DropdownMenu.java b/src/王天宝精读代码/ui/DropdownMenu.java
deleted file mode 100644
index 01915a4..0000000
--- a/src/王天宝精读代码/ui/DropdownMenu.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-
-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();
- }
- });
- }
-
- 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);
- }//布局文件，设置标题
-}
diff --git a/src/王天宝精读代码/ui/FoldersListAdapter.java b/src/王天宝精读代码/ui/FoldersListAdapter.java
deleted file mode 100644
index 719c8d3..0000000
--- a/src/王天宝精读代码/ui/FoldersListAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-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
- };//调用数据库中便签的ID和片段
-
- public static final int ID_COLUMN = 0;
- public static final int NAME_COLUMN = 1;
-
- 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) {
- if (view instanceof FolderListItem) {
- String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
- .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);
- }
-
- public void bind(String name) {
- mName.setText(name);
- }
- }
-
-}
diff --git a/src/王天宝精读代码/ui/NoteEditActivity.java b/src/王天宝精读代码/ui/NoteEditActivity.java
deleted file mode 100644
index 71d6590..0000000
--- a/src/王天宝精读代码/ui/NoteEditActivity.java
+++ /dev/null
@@ -1,1067 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlarmManager;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.text.style.BackgroundColorSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-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.TextNote;
-import net.micode.notes.model.WorkingNote;
-import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
-import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
-import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
-import net.micode.notes.widget.NoteWidgetProvider_2x;
-import net.micode.notes.widget.NoteWidgetProvider_4x;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-public class NoteEditActivity extends Activity implements OnClickListener,
- NoteSettingChangedListener, OnTextViewChangeListener {
- //该类主要是针对标签的编辑
- //继承了系统内部许多和监听有关的类
- private class HeadViewHolder {
- public TextView tvModified;
-
- public ImageView ivAlertIcon;
-
- public TextView tvAlertDate;
-
- public ImageView ibSetBgColor;
- }
- //使用Map实现数据存储
- private static final Map sBgSelectorBtnsMap = new HashMap();
- static {
- sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
- sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
- 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();
- static {
- sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
- sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
- 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();
- static {
- sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
- 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();
- static {
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
- 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";
-
- private HeadViewHolder mNoteHeaderHolder;
-
- private View mHeadViewPanel;
- //私有化一个界面操作mHeadViewPanel，对表头的操作
- private View mNoteBgColorSelector;
- //私有化一个界面操作mNoteBgColorSelector，对背景颜色的操作
- private View mFontSizeSelector;
- //私有化一个界面操作mFontSizeSelector，对标签字体的操作
- private EditText mNoteEditor;
- //声明编辑控件，对文本操作
- private View mNoteEditorPanel;
- //私有化一个界面操作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;
-
- public static final String TAG_CHECKED = String.valueOf('\u221A');
- public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
-
- private LinearLayout mEditTextList;
- //线性布局
- private String mUserQuery;
- private Pattern mPattern;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- this.setContentView(R.layout.note_edit);
- //对数据库的访问操作
- if (savedInstanceState == null && !initActivityState(getIntent())) {
- finish();
- return;
- }
- initResources();
- }
-
- /**
- * Current activity may be killed when the memory is low. Once it is killed, for another time
- * user load this activity, we should restore the former state
- */
- @Override
- protected void onRestoreInstanceState(Bundle savedInstanceState) {
- super.onRestoreInstanceState(savedInstanceState);
- if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
- if (!initActivityState(intent)) {
- finish();
- return;
- }
- Log.d(TAG, "Restoring from killed activity");
- }//为防止内存不足时程序的终止，在这里有一个保存现场的函数
- }
-
- private boolean initActivityState(Intent intent) {
- /**
- * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
- * then jump to the NotesListActivity
- */
- mWorkingNote = null;
- 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;
- }
- //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())) {
- // 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);
- int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
- 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);
- if (callDate != 0 && phoneNumber != null) {
- if (TextUtils.isEmpty(phoneNumber)) {
- Log.w(TAG, "The call record number is null");
- }
- long noteId = 0;
- if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
- phoneNumber, callDate)) > 0) {
- mWorkingNote = WorkingNote.load(this, noteId);
- if (mWorkingNote == null) {
- Log.e(TAG, "load call note failed with note id" + noteId);
- 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
- | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
- } else {
- Log.e(TAG, "Intent not specified action, should not support");
- finish();
- return false;
- }
- mWorkingNote.setOnSettingStatusChangedListener(this);
- return true;
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- initNoteScreen();
- }
-
- private void initNoteScreen() {
- //对界面的初始化操作
- mNoteEditor.setTextAppearance(this, TextAppearanceResources
- .getTexAppearanceResource(mFontSizeId));
- //设置外观
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- switchToListMode(mWorkingNote.getContent());
- } else {
- mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
- mNoteEditor.setSelection(mNoteEditor.getText().length());
- }
- for (Integer id : sBgSelectorSelectionMap.keySet()) {
- findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
- }
- mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
- mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
-
- mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
- mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
- | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
- | DateUtils.FORMAT_SHOW_YEAR));
-
- /**
- * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
- * is not ready
- */
- showAlertHeader();
- }
- //设置闹钟的显示
- private void showAlertHeader() {
- if (mWorkingNote.hasClockAlert()) {
- long time = System.currentTimeMillis();
- if (time > mWorkingNote.getAlertDate()) {
- mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
- }
- //如果系统时间大于了闹钟设置的时间，那么闹钟失效
- 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);
- };
- }
-
- @Override
- protected void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- initActivityState(intent);
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- /**
- * For new note without note id, we should firstly save it to
- * generate a id. If the editing note is not worth saving, there
- * is no id which is equivalent to create new note
- */
- 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);
- int x = location[0];
- int y = location[1];
- if (ev.getX() < x
- || ev.getX() > (x + view.getWidth())
- || ev.getY() < y
- || ev.getY() > (y + view.getHeight()))
- //如果触控的位置超出了给定的范围，返回false
- {
- return false;
- }
- return true;
- }
-
- private void initResources() {
- mHeadViewPanel = findViewById(R.id.note_title);
- mNoteHeaderHolder = new HeadViewHolder();
- mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
- mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
- mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
- mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
- mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
- mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
- mNoteEditorPanel = findViewById(R.id.sv_note_edit);
- mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
- 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);
- /**
- * HACKME: Fix bug of store the resource id in shared preference.
- * The id may larger than the length of resources, in this case,
- * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
- */
- if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
- mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
- }
- mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- if(saveNote()) {
- Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
- }
- clearSettingState();
- }
- //和桌面小工具的同步
- private void updateWidget() {
- Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
- if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
- intent.setClass(this, NoteWidgetProvider_2x.class);
- } else if (mWorkingNote.getWidgetType() == 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[] {
- mWorkingNote.getWidgetId()
- });
-
- sendBroadcast(intent);
- setResult(RESULT_OK, intent);
- }
-
- public void onClick(View v) {
- int id = v.getId();
- if (id == R.id.btn_set_bg_color) {
- mNoteBgColorSelector.setVisibility(View.VISIBLE);
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- - View.VISIBLE);
- } else if (sBgSelectorBtnsMap.containsKey(id)) {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.GONE);
- mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
- mNoteBgColorSelector.setVisibility(View.GONE);
- } else if (sFontSizeBtnsMap.containsKey(id)) {
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
- mFontSizeId = sFontSizeBtnsMap.get(id);
- mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- getWorkingText();
- switchToListMode(mWorkingNote.getContent());
- } else {
- mNoteEditor.setTextAppearance(this,
- TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
- }
- mFontSizeSelector.setVisibility(View.GONE);
- }
- }//************************存在问题
-
- @Override
- public void onBackPressed() {
- if(clearSettingState()) {
- return;
- }
-
- saveNote();
- super.onBackPressed();
- }
-
- private boolean clearSettingState() {
- if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
- mNoteBgColorSelector.setVisibility(View.GONE);
- return true;
- } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
- mFontSizeSelector.setVisibility(View.GONE);
- return true;
- }
- return false;
- }
-
- public void onBackgroundColorChanged() {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
- mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
- mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
- }
-
- @Override
- //对选择菜单的准备
- public boolean onPrepareOptionsMenu(Menu menu) {
- if (isFinishing()) {
- return true;
- }
- clearSettingState();
- 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);
- }
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
- } else {
- menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
- }
- if (mWorkingNote.hasClockAlert()) {
- menu.findItem(R.id.menu_alert).setVisible(false);
- } else {
- menu.findItem(R.id.menu_delete_remind).setVisible(false);
- }
- return true;
- }
-
- @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:
- break;
- }
- 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();//更新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(
- R.id.et_edit_text);
- } else {
- 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);//定位到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);//定位到起始位置
- 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) {
- if (isChecked) {
- edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
- } else {
- edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
- }
- }
- });
- //建立一个打钩框并设置监听器
-
- 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();
- }
-
- 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,
- * create/edit a node. Opening node requires to the original
- * position in the list when back from edit view, while creating a
- * 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
- * editing note is exists in databases. So, for new note, firstly
- * save it
- */
- 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,
- makeShortcutIconTitle(mWorkingNote.getContent()));
- 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
- * not worthy saving), we have no note id, remind the user that he
- * should input something
- */
- 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();
- }
-}
diff --git a/src/王天宝精读代码/ui/NoteEditText.java b/src/王天宝精读代码/ui/NoteEditText.java
deleted file mode 100644
index c235628..0000000
--- a/src/王天宝精读代码/ui/NoteEditText.java
+++ /dev/null
@@ -1,514 +0,0 @@
-package net.micode.notes.ui;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.ActionBar;
-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.Menu;
-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
- */
-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/王天宝精读代码/ui/NoteItemData.java b/src/王天宝精读代码/ui/NoteItemData.java
deleted file mode 100644
index 647d252..0000000
--- a/src/王天宝精读代码/ui/NoteItemData.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-
-import net.micode.notes.data.Contact;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-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,
- };
- private static final int ID_COLUMN = 0;
- private static final int ALERTED_DATE_COLUMN = 1;
- private static final int BG_COLOR_ID_COLUMN = 2;
- private static final int CREATED_DATE_COLUMN = 3;
- private static final int HAS_ATTACHMENT_COLUMN = 4;
- private static final int MODIFIED_DATE_COLUMN = 5;
- private static final int NOTES_COUNT_COLUMN = 6;
- private static final int PARENT_ID_COLUMN = 7;
- private static final int SNIPPET_COLUMN = 8;
- private static final int TYPE_COLUMN = 9;
- private static final int WIDGET_ID_COLUMN = 10;
- private static final int WIDGET_TYPE_COLUMN = 11;
-
- private long mId;
- private long mAlertDate;
- private int mBgColorId;
- private long mCreatedDate;
- private boolean mHasAttachment;
- private long mModifiedDate;
- private int mNotesCount;
- private long mParentId;
- private String mSnippet;
- private int mType;
- private int mWidgetId;
- private int mWidgetType;
- private String mName;
- private String mPhoneNumber;
-
- private boolean mIsLastItem;
- private boolean mIsFirstItem;
- private boolean mIsOnlyOneItem;
- private boolean mIsOneNoteFollowingFolder;
- private boolean mIsMultiNotesFollowingFolder;
- //初始化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);
- mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN);
- mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false;
- mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
- mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN);
- mParentId = cursor.getLong(PARENT_ID_COLUMN);
- mSnippet = cursor.getString(SNIPPET_COLUMN);
- mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace(
- NoteEditActivity.TAG_UNCHECKED, "");
- mType = cursor.getInt(TYPE_COLUMN);
- 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)) {//mphonenumber里有符合字符串，则用contart功能连接
- mName = Contact.getContact(context, mPhoneNumber);
- if (mName == null) {
- mName = mPhoneNumber;
- }
- }
- }
-
- if (mName == null) {
- mName = "";
- }
- 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;
-
- //主要是设置上诉2标记
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
- int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {//获取光标位置后看上一行
- if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
- if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
- } else {
- mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
- }
- }
- if (!cursor.moveToNext()) {//若不能再往下走则报错
- throw new IllegalStateException("cursor move to previous but can't move back");
- }
- }
- }
- }
- ///以下都是获取标记没什么好说的，不过倒数第二个需要说明下，很具体看下面
- public boolean isOneFollowingFolder() {
- return mIsOneNoteFollowingFolder;
- }
-
- public boolean isMultiFollowingFolder() {
- return mIsMultiNotesFollowingFolder;
- }
-
- public boolean isLast() {
- return mIsLastItem;
- }
-
- public String getCallName() {
- return mName;
- }
-
- public boolean isFirst() {
- return mIsFirstItem;
- }
-
- public boolean isSingle() {
- return mIsOnlyOneItem;
- }
-
- public long getId() {
- return mId;
- }
-
- public long getAlertDate() {
- return mAlertDate;
- }
-
- public long getCreatedDate() {
- return mCreatedDate;
- }
-
- public boolean hasAttachment() {
- return mHasAttachment;
- }
-
- public long getModifiedDate() {
- return mModifiedDate;
- }
-
- public int getBgColorId() {
- return mBgColorId;
- }
-
- public long getParentId() {
- return mParentId;
- }
-
- public int getNotesCount() {
- return mNotesCount;
- }
-
- public long getFolderId () {
- return mParentId;
- }
-
- public int getType() {
- return mType;
- }
-
- public int getWidgetType() {
- return mWidgetType;
- }
-
- public int getWidgetId() {
- return mWidgetId;
- }
-
- public String getSnippet() {
- return mSnippet;
- }
-
- public boolean hasAlert() {
- return (mAlertDate > 0);
- }
-
- //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空，则isCallRecord为true
- public boolean isCallRecord() {
- return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
- }
-
- public static int getNoteType(Cursor cursor) {
- return cursor.getInt(TYPE_COLUMN);
- }
-}
diff --git a/src/王天宝精读代码/ui/NotesListActivity.java b/src/王天宝精读代码/ui/NotesListActivity.java
deleted file mode 100644
index 0813597..0000000
--- a/src/王天宝精读代码/ui/NotesListActivity.java
+++ /dev/null
@@ -1,1002 +0,0 @@
-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 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);
- 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);
- }
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- 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/王天宝精读代码/ui/NotesListAdapter.java b/src/王天宝精读代码/ui/NotesListAdapter.java
deleted file mode 100644
index f9725ea..0000000
--- a/src/王天宝精读代码/ui/NotesListAdapter.java
+++ /dev/null
@@ -1,257 +0,0 @@
-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;
- }
- //否则报错
- }
- }
-}
diff --git a/src/王天宝精读代码/ui/NotesListItem.java b/src/王天宝精读代码/ui/NotesListItem.java
deleted file mode 100644
index fa8b3d2..0000000
--- a/src/王天宝精读代码/ui/NotesListItem.java
+++ /dev/null
@@ -1,116 +0,0 @@
-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/王天宝精读代码/ui/NotesPreferenceActivity.java b/src/王天宝精读代码/ui/NotesPreferenceActivity.java
deleted file mode 100644
index 7d286c8..0000000
--- a/src/王天宝精读代码/ui/NotesPreferenceActivity.java
+++ /dev/null
@@ -1,270 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.text.Layout;
-import android.text.Selection;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.widget.EditText;
-
-import net.micode.notes.R;
-
-import java.util.HashMap;
-import java.util.Map;
-
-//继承edittext，设置便签设置文本框
-class NoteEditText extends EditText {
- private static final String TAG = "NoteEditText";
- private int mIndex;
- private int mSelectionStartBeforeDelete;
-
- private static final String SCHEME_TEL = "tel:" ;
- private static final String SCHEME_HTTP = "http:" ;
- private static final String SCHEME_EMAIL = "mailto:" ;
-
- ///建立一个字符和整数的hash表，用于链接电话，网站，还有邮箱
- private static final Map sSchemaActionResMap = new HashMap();
- static {
- sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
- sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web);
- sSchemaActionResMap.put(SCHEME_EMAIL, R.string.note_link_email);
- }
-
- /**
- * Call by the {@link NoteEditActivity} to delete or add edit text
- */
- //在NoteEditActivity中删除或添加文本的操作，可以看做是一个文本是否被变的标记，英文注释已说明的很清楚
- public interface OnTextViewChangeListener {
- /**
- * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
- * and the text is null
- */
- //处理删除按键时的操作
- void onEditTextDelete(int index, String text);
-
- /**
- * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER}
- * happen
- */
- //处理进入按键时的操作
- void onEditTextEnter(int index, String text);
-
- /**
- * Hide or show item option when text change
- */
- void onTextChange(int index, boolean hasText);
- }
-
- private OnTextViewChangeListener mOnTextViewChangeListener;
-
- //根据context设置文本
- public NoteEditText(Context context) {
- super(context, null);//用super引用父类变量
- mIndex = 0;
- }
-
- //设置当前光标
- public void setIndex(int index) {
- mIndex = index;
- }
-
- //初始化文本修改标记
- public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
- mOnTextViewChangeListener = listener;
- }
-
- //AttributeSet 百度了一下是自定义空控件属性，用于维护便签动态变化的属性
- //初始化便签
- public NoteEditText(Context context, AttributeSet attrs) {
- super(context, attrs, android.R.attr.editTextStyle);
- }
-
- // 根据defstyle自动初始化
- public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- // TODO Auto-generated construct or stub
- }
-
- @Override
- //view里的函数，处理手机屏幕的所有事件
- /*参数event为手机屏幕触摸事件封装类的对象，其中封装了该事件的所有信息，
- 例如触摸的位置、触摸的类型以及触摸的时间等。该对象会在用户触摸手机屏幕时被创建。*/
- public boolean onTouchEvent(MotionEvent event) {
- switch (event.getAction()) {
- //重写了需要处理屏幕被按下的事件
- case MotionEvent.ACTION_DOWN:
- //跟新当前坐标值
- int x = (int) event.getX();
- int y = (int) event.getY();
- x -= getTotalPaddingLeft();
- y -= getTotalPaddingTop();
- x += getScrollX();
- y += getScrollY();
-
- //用布局控件layout根据x,y的新值设置新的位置
- Layout layout = getLayout();
- int line = layout.getLineForVertical(y);
- int off = layout.getOffsetForHorizontal(line, x);
-
- //更新光标新的位置
- Selection.setSelection(getText(), off);
- break;
- }
-
- return super.onTouchEvent(event);
- }
-
- @Override
- /*
- * 函数功能：处理用户按下一个键盘按键时会触发 的事件
- * 实现过程：如下注释
- */
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- switch (keyCode) {
- //根据按键的 Unicode 编码值来处理
- case KeyEvent.KEYCODE_ENTER:
- //“进入”按键
- if (mOnTextViewChangeListener != null) {
- return false;
- }
- break;
- case KeyEvent.KEYCODE_DEL:
- //“删除”按键
- mSelectionStartBeforeDelete = getSelectionStart();
- break;
- default:
- break;
- }
- //继续执行父类的其他点击事件
- return super.onKeyDown(keyCode, event);
- }
-
- @Override
- /*
- * 函数功能：处理用户松开一个键盘按键时会触发 的事件
- * 实现方式：如下注释
- */
- public boolean onKeyUp(int keyCode, KeyEvent event) {
- switch(keyCode) {
- //根据按键的 Unicode 编码值来处理，有删除和进入2种操作
- case KeyEvent.KEYCODE_DEL:
- if (mOnTextViewChangeListener != null) {
- //若是被修改过
- if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
- //若之前有被修改并且文档不为空
- mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
- //利用上文OnTextViewChangeListener对KEYCODE_DEL按键情况的删除函数进行删除
- return true;
- }
- } else {
- Log.d(TAG, "OnTextViewChangeListener was not seted");
- //其他情况报错，文档的改动监听器并没有建立
- }
- break;
- case KeyEvent.KEYCODE_ENTER:
- //同上也是分为监听器是否建立2种情况
- if (mOnTextViewChangeListener != null) {
- int selectionStart = getSelectionStart();
- //获取当前位置
- String text = getText().subSequence(selectionStart, length()).toString();
- //获取当前文本
- setText(getText().subSequence(0, selectionStart));
- //根据获取的文本设置当前文本
- mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
- //当{@link KeyEvent#KEYCODE_ENTER}添加新文本
- } else {
- Log.d(TAG, "OnTextViewChangeListener was not seted");
- //其他情况报错，文档的改动监听器并没有建立
- }
- break;
- default:
- break;
- }
- //继续执行父类的其他按键弹起的事件
- return super.onKeyUp(keyCode, event);
- }
-
- @Override
- /*
- * 函数功能：当焦点发生变化时，会自动调用该方法来处理焦点改变的事件
- * 实现方式：如下注释
- * 参数：focused表示触发该事件的View是否获得了焦点，当该控件获得焦点时，Focused等于true，否则等于false。
- direction表示焦点移动的方向，用数值表示
- Rect：表示在触发事件的View的坐标系中，前一个获得焦点的矩形区域，即表示焦点是从哪里来的。如果不可用则为null
- */
- protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
- if (mOnTextViewChangeListener != null) {
- //若监听器已经建立
- if (!focused && TextUtils.isEmpty(getText())) {
- //获取到焦点并且文本不为空
- mOnTextViewChangeListener.onTextChange(mIndex, false);
- //mOnTextViewChangeListener子函数，置false隐藏事件选项
- } else {
- mOnTextViewChangeListener.onTextChange(mIndex, true);
- //mOnTextViewChangeListener子函数，置true显示事件选项
- }
- }
- //继续执行父类的其他焦点变化的事件
- super.onFocusChanged(focused, direction, previouslyFocusedRect);
- }
-
- @Override
- /*
- * 函数功能：生成上下文菜单
- * 函数实现：如下注释
- */
- protected void onCreateContextMenu(ContextMenu menu) {
- if (getText() instanceof Spanned) {
- //有文本存在
- int selStart = getSelectionStart();
- int selEnd = getSelectionEnd();
- //获取文本开始和结尾位置
-
- int min = Math.min(selStart, selEnd);
- int max = Math.max(selStart, selEnd);
- //获取开始到结尾的最大值和最小值
-
- final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
- //设置url的信息的范围值
- if (urls.length == 1) {
- int defaultResId = 0;
- for(String schema: sSchemaActionResMap.keySet()) {
- //获取计划表中所有的key值
- if(urls[0].getURL().indexOf(schema) >= 0) {
- //若url可以添加则在添加后将defaultResId置为key所映射的值
- defaultResId = sSchemaActionResMap.get(schema);
- break;
- }
- }
-
- if (defaultResId == 0) {
- //defaultResId == 0则说明url并没有添加任何东西，所以置为连接其他SchemaActionResMap的值
- defaultResId = R.string.note_link_other;
- }
-
- //建立菜单
- menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
- new OnMenuItemClickListener() {
- //新建按键监听器
- public boolean onMenuItemClick(MenuItem item) {
- // goto a new intent
- urls[0].onClick(NoteEditText.this);
- //根据相应的文本设置菜单的按键
- return true;
- }
- });
- }
- }
- //继续执行父类的其他菜单创建的事件
- super.onCreateContextMenu(menu);
- }
-}
\ No newline at end of file
diff --git a/src/王天宝精读代码/widget/NoteWidgetProvider.java b/src/王天宝精读代码/widget/NoteWidgetProvider.java
deleted file mode 100644
index f50c5ce..0000000
--- a/src/王天宝精读代码/widget/NoteWidgetProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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 //@Override标识重写，供编译器验证
- public void onDeleted(Context context, int[] appWidgetIds) {
- //重载删除操作，调用INVALID_APPWIDGET_ID将小部件ID设置为无效，然后同步修改每个WIDGET_ID对应的URI
- ContentValues values = new ContentValues();
- values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);//将新的widget信息存入数据库
- 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,//定义context寻找并返回获取的widget窗口信息
- 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) {//上传widget的信息
- update(context, appWidgetManager, appWidgetIds, false);
- }
-
- private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,//更新widget信息
- boolean privacyMode) {
- for (int i = 0; i < appWidgetIds.length; i++) {// 每添加一个widget就会进行一次循环更新widget操作
- 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()) {//处理若多个窗口同时出现在同一位置，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());// 获取AppWidget对应的视图
- 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);//从背景资源中获取当前应用ID
-
- protected abstract int getLayoutId();//获取当前在桌面布置位置的ID
-
- protected abstract int getWidgetType();//获取窗口部件的类型
-}
diff --git a/src/王天宝精读代码/widget/NoteWidgetProvider_2x.java b/src/王天宝精读代码/widget/NoteWidgetProvider_2x.java
deleted file mode 100644
index 0e85457..0000000
--- a/src/王天宝精读代码/widget/NoteWidgetProvider_2x.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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;
-
-public class NoteWidgetProvider_2x extends NoteWidgetProvider {//继承NoteWidgetProvider这个类
-
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {//声明更新窗口
- super.update(context, appWidgetManager, appWidgetIds);
- }
-
- @Override
- protected int getLayoutId() {
- return R.layout.widget_2x;
- }//获取窗口的布局信息
-
- @Override
- protected int getBgResourceId(int bgId) {//获取背景颜色id
- return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
- }
-
- @Override
- protected int getWidgetType() {
- return Notes.TYPE_WIDGET_2X;
- }//确定窗口大小
-}
diff --git a/src/王天宝精读代码/widget/NoteWidgetProvider_4x.java b/src/王天宝精读代码/widget/NoteWidgetProvider_4x.java
deleted file mode 100644
index 37b24d5..0000000
--- a/src/王天宝精读代码/widget/NoteWidgetProvider_4x.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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; //19到24行导入各种类
-
-public class NoteWidgetProvider_4x extends NoteWidgetProvider {//设置大小为4*4的小窗口
- @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) {// 获取背景id
- return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
- }
-
- @Override
- protected int getWidgetType() {
- return Notes.TYPE_WIDGET_4X;
- }//返回窗口类型
-}
diff --git a/src/谢思远精读代码/BackupUtils.java b/src/谢思远精读代码/BackupUtils.java
deleted file mode 100644
index 3366178..0000000
--- a/src/谢思远精读代码/BackupUtils.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package net.micode.notes.tool;
-
-public class BackupUtils {
- private static final String TAG = "BackupUtils";
- // Singleton stuff
- private static BackupUtils sInstance;
-
- public static synchronized BackupUtils getInstance(Context context) {
- //运行到这个方法时，锁定方法
- if (sInstance == null) {
- //判断备份
- sInstance = new BackupUtils(context);
- }
- return sInstance;
- }
-
- /**
- * Following states are signs to represents backup or restore
- * status
- */
- // Currently, the sdcard is not mounted SD卡没有被装入手机
- public static final int STATE_SD_CARD_UNMOUONTED = 0;
- // The backup file not exist 备份文件夹不存在
- public static final int STATE_BACKUP_FILE_NOT_EXIST = 1;
- // The data is not well formated, may be changed by other programs 数据已被破坏，可能被修改
- public static final int STATE_DATA_DESTROIED = 2;
- // Some run-time exception which causes restore or backup fails 超时异常
- public static final int STATE_SYSTEM_ERROR = 3;
- // Backup or restore success 成功存储
- public static final int STATE_SUCCESS = 4;
-
- private TextExport mTextExport;
-
- private BackupUtils(Context context) { //初始化函数
- mTextExport = new TextExport(context);
- }
-
- private static boolean externalStorageAvailable() { //外部存储功能是否可用
- return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
- }
-
- public int exportToText() {
- return mTextExport.exportToText();
- }
-
- public String getExportedTextFileName() {
- return mTextExport.mFileName;
- }
-
- public String getExportedTextFileDir() {
- return mTextExport.mFileDirectory;
- }
-
- private static class TextExport {
- private static final String[] NOTE_PROJECTION = {
- NoteColumns.ID,
- NoteColumns.MODIFIED_DATE,
- NoteColumns.SNIPPET,
- NoteColumns.TYPE
- };
-
- private static final int NOTE_COLUMN_ID = 0;
-
- private static final int NOTE_COLUMN_MODIFIED_DATE = 1;
-
- private static final int NOTE_COLUMN_SNIPPET = 2;
-
- private static final String[] DATA_PROJECTION = {
- DataColumns.CONTENT,
- DataColumns.MIME_TYPE,
- DataColumns.DATA1,
- DataColumns.DATA2,
- DataColumns.DATA3,
- DataColumns.DATA4,
- };
-
- private static final int DATA_COLUMN_CONTENT = 0;
-
- private static final int DATA_COLUMN_MIME_TYPE = 1;
-
- private static final int DATA_COLUMN_CALL_DATE = 2;
-
- private static final int DATA_COLUMN_PHONE_NUMBER = 4;
-
- private final String [] TEXT_FORMAT;
- private static final int FORMAT_FOLDER_NAME = 0;
- private static final int FORMAT_NOTE_DATE = 1;
- private static final int FORMAT_NOTE_CONTENT = 2;
-
- private Context mContext;
- private String mFileName;
- private String mFileDirectory;
-
- public TextExport(Context context) {
- TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
- mContext = context;
- mFileName = "";
- mFileDirectory = "";
- }
-
- private String getFormat(int id) {
- //获取文本的组成部分
- return TEXT_FORMAT[id];
- }
-
- /**
- * Export the folder identified by folder id to text
- */
- private void exportFolderToText(String folderId, PrintStream ps) {
- // 通过查询parent id是文件夹id的note来选出制定ID文件夹下的Note
- Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] {
- folderId
- }, null);
-
- if (notesCursor != null) {
- if (notesCursor.moveToFirst()) {
- do {
- // Print note's last modified date ps里面保存有这份note的日期
- ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
- mContext.getString(R.string.format_datetime_mdhm),
- notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
- // Query data belong to this note
- String noteId = notesCursor.getString(NOTE_COLUMN_ID);
- exportNoteToText(noteId, ps); //将文件导出到text
- } while (notesCursor.moveToNext());
- }
- notesCursor.close();
- }
- }
-
- /**
- * Export note identified by id to a print stream
- */
- private void exportNoteToText(String noteId, PrintStream ps) {
- Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
- DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
- noteId
- }, null);
-
- if (dataCursor != null) { //利用光标来扫描内容，区别为callnote和note两种，靠ps.printline输出
- if (dataCursor.moveToFirst()) {
- do {
- String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);
- if (DataConstants.CALL_NOTE.equals(mimeType)) {
- // Print phone number
- String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER);
- long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE);
- String location = dataCursor.getString(DATA_COLUMN_CONTENT);
-
- if (!TextUtils.isEmpty(phoneNumber)) { //判断是否为空字符
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- phoneNumber));
- }
- // Print call date
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat
- .format(mContext.getString(R.string.format_datetime_mdhm),
- callDate)));
- // Print call attachment location
- if (!TextUtils.isEmpty(location)) {
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- location));
- }
- } else if (DataConstants.NOTE.equals(mimeType)) {
- String content = dataCursor.getString(DATA_COLUMN_CONTENT);
- if (!TextUtils.isEmpty(content)) {
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- content));
- }
- }
- } while (dataCursor.moveToNext());
- }
- dataCursor.close();
- }
- // print a line separator between note
- try {
- ps.write(new byte[] {
- Character.LINE_SEPARATOR, Character.LETTER_NUMBER
- });
- } catch (IOException e) {
- Log.e(TAG, e.toString());
- }
- }
-
- /**
- * Note will be exported as text which is user readable
- */
- public int exportToText() { //总函数，调用上面的exportFolder和exportNote
- if (!externalStorageAvailable()) {
- Log.d(TAG, "Media was not mounted");
- return STATE_SD_CARD_UNMOUONTED;
- }
-
- PrintStream ps = getExportToTextPrintStream();
- if (ps == null) {
- Log.e(TAG, "get print stream error");
- return STATE_SYSTEM_ERROR;
- }
- // First export folder and its notes 导出文件夹，就是导出里面包含的便签
- Cursor folderCursor = mContext.getContentResolver().query(
- Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
- "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND "
- + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR "
- + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null);
-
- if (folderCursor != null) {
- if (folderCursor.moveToFirst()) {
- do {
- // Print folder's name
- String folderName = "";
- if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) {
- folderName = mContext.getString(R.string.call_record_folder_name);
- } else {
- folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET);
- }
- if (!TextUtils.isEmpty(folderName)) {
- ps.println(String.format(getFormat(FORMAT_FOLDER_NAME), folderName));
- }
- String folderId = folderCursor.getString(NOTE_COLUMN_ID);
- exportFolderToText(folderId, ps);
- } while (folderCursor.moveToNext());
- }
- folderCursor.close();
- }
-
- // Export notes in root's folder 将根目录里的便签导出（由于不属于任何文件夹，因此无法通过文件夹导出来实现这一部分便签的导出）
- Cursor noteCursor = mContext.getContentResolver().query(
- Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
- NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID
- + "=0", null, null);
-
- if (noteCursor != null) {
- if (noteCursor.moveToFirst()) {
- do {
- ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
- mContext.getString(R.string.format_datetime_mdhm),
- noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
- // Query data belong to this note
- String noteId = noteCursor.getString(NOTE_COLUMN_ID);
- exportNoteToText(noteId, ps);
- } while (noteCursor.moveToNext());
- }
- noteCursor.close();
- }
- ps.close();
-
- return STATE_SUCCESS;
- }
-
- /**
- * Get a print stream pointed to the file {@generateExportedTextFile}
- */
- private PrintStream getExportToTextPrintStream() {
- File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
- R.string.file_name_txt_format);
- if (file == null) {
- Log.e(TAG, "create file to exported failed");
- return null;
- }
- mFileName = file.getName();
- mFileDirectory = mContext.getString(R.string.file_path);
- PrintStream ps = null;
- try {
- FileOutputStream fos = new FileOutputStream(file);
- ps = new PrintStream(fos); //将ps输出流输出到特定的文件，目的就是导出到文件，而不是直接输出
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
- } catch (NullPointerException e) {
- e.printStackTrace();
- return null;
- }
- return ps;
- }
- }
-
- /**
- * Generate the text file to store imported data
- */
- private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
- StringBuilder sb = new StringBuilder();
- sb.append(Environment.getExternalStorageDirectory()); //外部（SD卡）的存储路径
- sb.append(context.getString(filePathResId)); //文件的存储路径
- File filedir = new File(sb.toString()); //filedir应该就是用来存储路径信息
- sb.append(context.getString(
- fileNameFormatResId,
- DateFormat.format(context.getString(R.string.format_date_ymd),
- System.currentTimeMillis())));
- File file = new File(sb.toString());
-
- try { //如果这些文件不存在，则新建
- if (!filedir.exists()) {
- filedir.mkdir();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
- return file;
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-// try catch 异常处理
- return null;
- }
-}
diff --git a/src/谢思远精读代码/DataUtils.java b/src/谢思远精读代码/DataUtils.java
deleted file mode 100644
index 3c35b91..0000000
--- a/src/谢思远精读代码/DataUtils.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package net.micode.notes.tool;
-
-public class DataUtils {
- public static final String TAG = "DataUtils";
- public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) {
-//直接删除多个笔记
- if (ids == null) {
- Log.d(TAG, "the ids is null");
- return true;
- }
- if (ids.size() == 0) {
- Log.d(TAG, "no id is in the hashset");
- return true;
- }
-
- ArrayList operationList = new ArrayList();
-//提供一个任务列表
- for (long id : ids) {
- if(id == Notes.ID_ROOT_FOLDER) { //判断是否是根文件录
- Log.e(TAG, "Don't delete system folder root");
- continue;
- }
- ContentProviderOperation.Builder builder = ContentProviderOperation
- .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); //用newDelete实现删除功能
- operationList.add(builder.build()); //
- }
- try {
- ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);//主机名（或叫Authority）用于唯一标识这个ContentProvider，外部调用者可以根据这个标识来找到它。
- //数据库事务，数据库事务是由一组数据库操作序列组成，事务作为一个整体被执行
- if (results == null || results.length == 0 || results[0] == null) {
- Log.d(TAG, "delete notes failed, ids:" + ids.toString());
- return false;
- }
- return true;
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- }
- return false;
- }
-
- public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
- ContentValues values = new ContentValues();
- values.put(NoteColumns.PARENT_ID, desFolderId);
- values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
- values.put(NoteColumns.LOCAL_MODIFIED, 1);
- resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); //对需要移动的便签进行数据更新，然后用update实现
- }
-
- public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids,
- long folderId) {
- if (ids == null) {
- Log.d(TAG, "the ids is null");
- return true;
- }
-
- ArrayList operationList = new ArrayList();
- for (long id : ids) {
- ContentProviderOperation.Builder builder = ContentProviderOperation
- .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); //通过withAppendedId方法，为该Uri加上ID
- builder.withValue(NoteColumns.PARENT_ID, folderId);
- builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
- operationList.add(builder.build());
- }//将ids里包含的每一列的数据逐次加入到operationList中，等待最后的批量处理
-
- try {
- ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); //applyBatch一次性处理一个操作列表
- if (results == null || results.length == 0 || results[0] == null) {
- Log.d(TAG, "delete notes failed, ids:" + ids.toString());
- return false;
- }
- return true;
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- }
- return false;
- }
-
- /**
- * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}}
- */
- public static int getUserFolderCount(ContentResolver resolver) {
- Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI,
- new String[] { "COUNT(*)" },
- NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
- new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
- null); //筛选条件：源文件不为trash folder
-
- int count = 0;
- if(cursor != null) {
- if(cursor.moveToFirst()) {
- try {
- count = cursor.getInt(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "get folder count failed:" + e.toString());
- } finally {
- cursor.close();
- }
- }
- }
- return count;
- }
-
- public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), //通过withAppendedId方法，为该Uri加上ID
- null,
- NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
- new String [] {String.valueOf(type)},
- null);
-//查询条件：type符合，且不属于垃圾文件夹
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {//用getcount函数判断cursor是否为空
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
- null, null, null, null);
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean existInDataDatabase(ContentResolver resolver, long dataId) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId),
- null, null, null, null);
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
- Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
- NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
- " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
- " AND " + NoteColumns.SNIPPET + "=?",
- new String[] { name }, null);
- //通过名字查询文件是否存在
- boolean exist = false;
- if(cursor != null) {
- if(cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) {
- Cursor c = resolver.query(Notes.CONTENT_NOTE_URI,
- new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
- NoteColumns.PARENT_ID + "=?",
- new String[] { String.valueOf(folderId) },
- null); //查询条件：父ID是传入的folderId;
-
- HashSet set = null;
- if (c != null) {
- if (c.moveToFirst()) {
- set = new HashSet();
- do {
- try {
- AppWidgetAttribute widget = new AppWidgetAttribute();
- widget.widgetId = c.getInt(0); //0对应的NoteColumns.WIDGET_ID
- widget.widgetType = c.getInt(1); //1对应的NoteColumns.WIDGET_TYPE
- set.add(widget);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, e.toString());
- }
- } while (c.moveToNext());
-
- } //利用while进行查询
- c.close();
- }
- return set;
- }
-
- public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
- new String [] { CallNote.PHONE_NUMBER },
- CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?",
- new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE },
- null);
-
- if (cursor != null && cursor.moveToFirst()) {
- try {
- return cursor.getString(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Get call number fails " + e.toString());
- } finally {
- cursor.close();
- }
- }
- return "";
- }
-
- public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) {
- Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
- new String [] { CallNote.NOTE_ID },
- CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL("
- + CallNote.PHONE_NUMBER + ",?)",
- new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
- null);
- //通过数据库操作，查询条件是（callDate和phoneNumber匹配传入参数的值）
-
- if (cursor != null) {
- if (cursor.moveToFirst()) {
- try {
- return cursor.getLong(0); //0对应的CallNote.NOTE_ID
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Get call note id fails " + e.toString());
- }
- }
- cursor.close();
- }
- return 0;
- }
-
- public static String getSnippetById(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
- new String [] { NoteColumns.SNIPPET },
- NoteColumns.ID + "=?",
- new String [] { String.valueOf(noteId)},
- null);//查询条件：noteId
-
- if (cursor != null) {
- String snippet = "";
- if (cursor.moveToFirst()) {
- snippet = cursor.getString(0);
- }
- cursor.close();
- return snippet;
- }
- throw new IllegalArgumentException("Note is not found with id: " + noteId);
- }
- public static String getFormattedSnippet(String snippet) { //对字符串进行格式处理，将字符串两头的空格去掉，同时将换行符去掉
- if (snippet != null) { //判断是否有用
- snippet = snippet.trim();
- int index = snippet.indexOf('\n');
- if (index != -1) {
- snippet = snippet.substring(0, index);
- }
- }
- return snippet;
- }
-
-}
\ No newline at end of file
diff --git a/src/谢思远精读代码/GTaskStringUtils.java b/src/谢思远精读代码/GTaskStringUtils.java
deleted file mode 100644
index 75c0739..0000000
--- a/src/谢思远精读代码/GTaskStringUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//简介：定义了很多的静态字符串，目的就是为了提供jsonObject中相应字符串的"key"。把这些静态的定义单独写到了一个类里面，这是非常好的编程规范
-package net.micode.notes.tool;
-
-//这个类就是定义了一堆static string，实际就是为jsonObject提供Key，把这些定义全部写到一个类里，方便查看管理，是一个非常好的编程习惯
-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";
-
-}
\ No newline at end of file
diff --git a/src/谢思远精读代码/ResourceParser.java b/src/谢思远精读代码/ResourceParser.java
deleted file mode 100644
index 3528455..0000000
--- a/src/谢思远精读代码/ResourceParser.java
+++ /dev/null
@@ -1,175 +0,0 @@
-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 默认文本大小（中）
- */
-
-public class ResourceParser {
-
- public static final int YELLOW = 0;
- public static final int BLUE = 1;
- public static final int WHITE = 2;
- public static final int GREEN = 3;
- public static final int RED = 4;
-
- public static final int BG_DEFAULT_COLOR = YELLOW;
-
- public static final int TEXT_SMALL = 0;
- public static final int TEXT_MEDIUM = 1;
- public static final int TEXT_LARGE = 2;
- public static final int TEXT_SUPER = 3;
-
- public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;
-
- public static class NoteBgResources {
- private final static int [] BG_EDIT_RESOURCES = new int [] {
- R.drawable.edit_yellow,
- R.drawable.edit_blue,
- R.drawable.edit_white,
- R.drawable.edit_green,
- R.drawable.edit_red
- };
-
- private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
- R.drawable.edit_title_yellow,
- R.drawable.edit_title_blue,
- R.drawable.edit_title_white,
- R.drawable.edit_title_green,
- R.drawable.edit_title_red
- };
-
- public static int getNoteBgResource(int id) {
- return BG_EDIT_RESOURCES[id];
- }
-
- public static int getNoteTitleBgResource(int id) {
- return BG_EDIT_TITLE_RESOURCES[id];
- }
- }
- //直接获取默认的背景颜色。看不太懂，这个PREFERENCE_SET_BG_COLOR_KEY是个final string,也就是说getBoolean肯定执行else，为什么要这么写
- public static int getDefaultBgId(Context context) {
- if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
- NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
- return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length);
- } else {
- return BG_DEFAULT_COLOR;
- }
- }
-
- public static class NoteItemBgResources {
- private final static int [] BG_FIRST_RESOURCES = new int [] {
- R.drawable.list_yellow_up,
- R.drawable.list_blue_up,
- R.drawable.list_white_up,
- R.drawable.list_green_up,
- R.drawable.list_red_up
- };
-
- private final static int [] BG_NORMAL_RESOURCES = new int [] {
- R.drawable.list_yellow_middle,
- R.drawable.list_blue_middle,
- R.drawable.list_white_middle,
- R.drawable.list_green_middle,
- R.drawable.list_red_middle
- };
-
- private final static int [] BG_LAST_RESOURCES = new int [] {
- R.drawable.list_yellow_down,
- R.drawable.list_blue_down,
- R.drawable.list_white_down,
- R.drawable.list_green_down,
- R.drawable.list_red_down,
- };
-
- private final static int [] BG_SINGLE_RESOURCES = new int [] {
- R.drawable.list_yellow_single,
- R.drawable.list_blue_single,
- R.drawable.list_white_single,
- R.drawable.list_green_single,
- R.drawable.list_red_single
- };
-
- public static int getNoteBgFirstRes(int id) {
- return BG_FIRST_RESOURCES[id];
- }
-
- public static int getNoteBgLastRes(int id) {
- return BG_LAST_RESOURCES[id];
- }
-
- public static int getNoteBgSingleRes(int id) {
- return BG_SINGLE_RESOURCES[id];
- }
-
- public static int getNoteBgNormalRes(int id) {
- return BG_NORMAL_RESOURCES[id];
- }
-
- public static int getFolderBgRes() {
- return R.drawable.list_folder;
- }
- }
-
- public static class WidgetBgResources {
- private final static int [] BG_2X_RESOURCES = new int [] {
- R.drawable.widget_2x_yellow,
- R.drawable.widget_2x_blue,
- R.drawable.widget_2x_white,
- R.drawable.widget_2x_green,
- R.drawable.widget_2x_red,
- };
-
- public static int getWidget2xBgResource(int id) {
- return BG_2X_RESOURCES[id];
- }
-
- private final static int [] BG_4X_RESOURCES = new int [] {
- R.drawable.widget_4x_yellow,
- R.drawable.widget_4x_blue,
- R.drawable.widget_4x_white,
- R.drawable.widget_4x_green,
- R.drawable.widget_4x_red
- };
-
- public static int getWidget4xBgResource(int id) {
- return BG_4X_RESOURCES[id];
- }
- }
-
- public static class TextAppearanceResources {
- private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
- R.style.TextAppearanceNormal,
- R.style.TextAppearanceMedium,
- R.style.TextAppearanceLarge,
- R.style.TextAppearanceSuper
- };
-
- //这里有一个容错的函数，防止输入的id大于资源总量，若如此，则自动返回默认的设置结果
- public static int getTexAppearanceResource(int id) {
- /**
- * HACKME: Fix bug of store the resource id in shared preference.
- * The id may larger than the length of resources, in this case,
- * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
- */
- if (id >= TEXTAPPEARANCE_RESOURCES.length) {
- return BG_DEFAULT_FONT_SIZE;
- }
- return TEXTAPPEARANCE_RESOURCES[id];
- }
-
- public static int getResourcesSize() {
- return TEXTAPPEARANCE_RESOURCES.length;
- }
- }
-}
\ No newline at end of file