diff --git a/doc/小米便签开源代码的泛读报告.docx b/doc/小米便签开源代码的泛读报告.docx
new file mode 100644
index 0000000..4f1049e
Binary files /dev/null and b/doc/小米便签开源代码的泛读报告.docx differ
diff --git a/src/MiNotes-master/.gitignore b/src/MiNotes-master/.gitignore
deleted file mode 100644
index ba4cbe0..0000000
--- a/src/MiNotes-master/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-*.iml
-
-.DS_Store
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Intellij
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/dictionaries
-.idea/libraries
-.idea/
-
-# Keystore files
-*.jks
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
diff --git a/src/MiNotes-master/LICENSE b/src/MiNotes-master/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/src/MiNotes-master/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/src/MiNotes-master/README.md b/src/MiNotes-master/README.md
deleted file mode 100644
index 9c1f955..0000000
--- a/src/MiNotes-master/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# MiNotes
-[中文]
-
-1. MiCode便签是小米便签的社区开源版,由MIUI团队(www.miui.com) 发起并贡献第一批代码,遵循NOTICE文件所描述的开源协议,
- 今后为MiCode社区(www.micode.net) 拥有,并由社区发布和维护。
-
-2. Bug反馈和跟踪,请访问Github,
- https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
-
-3. 功能建议和综合讨论,请访问MiCode,
- http://micode.net/forum.php?mod=forumdisplay&fid=38
-
-
-[English]
-
-1. MiCode Notes is open source edition of XM notepad, it's first initiated and sponsored by MIUI team (www.miui.com).
- It's opened under license described by NOTICE file. It's owned by the MiCode community (www.micode.net). In future,
- the MiCode community will release and maintain this project.
-
-2. Regarding issue tracking, please visit Github,
- https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
-
-3. Regarding feature request and general discussion, please visit Micode forum,
- http://micode.net/forum.php?mod=forumdisplay&fid=38
diff --git a/src/MiNotes-master/app/build.gradle b/src/MiNotes-master/app/build.gradle
deleted file mode 100644
index 042200a..0000000
--- a/src/MiNotes-master/app/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion 23
- buildToolsVersion "25.0.1"
-
- defaultConfig {
- applicationId "net.micode.notes"
- minSdkVersion 14
- targetSdkVersion 14
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
- }
- }
- android{ useLibrary 'org.apache.http.legacy' }
-}
diff --git a/src/MiNotes-master/app/src/main/AndroidManifest.xml b/src/MiNotes-master/app/src/main/AndroidManifest.xml
deleted file mode 100644
index e5c7d47..0000000
--- a/src/MiNotes-master/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
deleted file mode 100644
index 3a2050b..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
deleted file mode 100644
index 54e503b..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/color/primary_text_dark.xml b/src/MiNotes-master/app/src/main/res/color/primary_text_dark.xml
deleted file mode 100644
index 8ad98e3..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/color/secondary_text_dark.xml b/src/MiNotes-master/app/src/main/res/color/secondary_text_dark.xml
deleted file mode 100644
index 9cf8a1a..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
deleted file mode 100644
index 5eb5d44..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
deleted file mode 100644
index 100db77..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/call_record.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/call_record.png
deleted file mode 100644
index fb88ca4..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/call_record.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/clock.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/clock.png
deleted file mode 100644
index 5f2ae9a..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/clock.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/delete.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/delete.png
deleted file mode 100644
index 643de3e..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/delete.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
deleted file mode 100644
index 5525025..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
deleted file mode 100644
index 55a1856..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
deleted file mode 100644
index 2cb2d60..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_green.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
deleted file mode 100644
index bae944a..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_red.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
deleted file mode 100644
index 96e6092..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
deleted file mode 100644
index 08d8644..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
deleted file mode 100644
index 9c430e5..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
deleted file mode 100644
index 19e8d95..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
deleted file mode 100644
index bf8f580..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
deleted file mode 100644
index 918f7a6..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_white.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
deleted file mode 100644
index 10cb642..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_large.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_large.png
deleted file mode 100644
index 78cf2e6..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_large.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_normal.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_normal.png
deleted file mode 100644
index 9de7ced..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_normal.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
deleted file mode 100644
index be8e64c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_small.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_small.png
deleted file mode 100644
index d3ff104..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_small.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_super.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_super.png
deleted file mode 100644
index 85b13a1..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/font_super.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/ic_menu_more.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/ic_menu_more.png
deleted file mode 100644
index 2abc458..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/ic_menu_more.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/ic_menu_more_dark.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/ic_menu_more_dark.png
deleted file mode 100644
index bb6aef1..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/ic_menu_more_dark.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/icon_app.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/icon_app.png
deleted file mode 100644
index 418aadc..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/icon_app.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_background.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_background.png
deleted file mode 100644
index 087e1f9..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_background.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
deleted file mode 100644
index b88eebf..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
deleted file mode 100644
index 96b1c8b..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
deleted file mode 100644
index d7e7206..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
deleted file mode 100644
index 632e88c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
deleted file mode 100644
index 829f61b..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_folder.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
deleted file mode 100644
index 5325c25..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
deleted file mode 100644
index 64a39d9..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
deleted file mode 100644
index 897325a..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
deleted file mode 100644
index c83405f..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
deleted file mode 100644
index 141f9e1..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
deleted file mode 100644
index 4224309..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
deleted file mode 100644
index 9988f17..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
deleted file mode 100644
index 587c348..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
deleted file mode 100644
index 46b4757..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
deleted file mode 100644
index 29f9d8c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
deleted file mode 100644
index 77a4ab4..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
deleted file mode 100644
index 3e79189..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
deleted file mode 100644
index e23cd5c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
deleted file mode 100644
index 31cfc1e..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
deleted file mode 100644
index b6549b2..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
deleted file mode 100644
index 3faf507..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
deleted file mode 100644
index 4ae791c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/menu_delete.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/menu_delete.png
deleted file mode 100644
index ccdfc4b..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/menu_delete.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/menu_move.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/menu_move.png
deleted file mode 100644
index 1140b71..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/menu_move.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
deleted file mode 100644
index e24e0d1..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/new_note_normal.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
deleted file mode 100644
index c748936..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
deleted file mode 100644
index fc49552..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/notification.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/notification.png
deleted file mode 100644
index b13ab4a..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/notification.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/search_result.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/search_result.png
deleted file mode 100644
index ff2befd..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/search_result.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/selected.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/selected.png
deleted file mode 100644
index b889bef..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/selected.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/title_alert.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/title_alert.png
deleted file mode 100644
index 544ee9c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/title_alert.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
deleted file mode 100644
index eb6bff0..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
deleted file mode 100644
index a1707f4..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
deleted file mode 100644
index f86886c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
deleted file mode 100644
index 0e66c29..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
deleted file mode 100644
index 5f0619a..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
deleted file mode 100644
index 12d1c2b..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
deleted file mode 100644
index 9183738..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
deleted file mode 100644
index fa8b452..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
deleted file mode 100644
index 62de074..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
deleted file mode 100644
index a37d67c..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
deleted file mode 100644
index d7c5fa4..0000000
Binary files a/src/MiNotes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png and /dev/null differ
diff --git a/src/MiNotes-master/app/src/main/res/drawable/new_note.xml b/src/MiNotes-master/app/src/main/res/drawable/new_note.xml
deleted file mode 100644
index 2154ebc..0000000
--- a/src/MiNotes-master/app/src/main/res/drawable/new_note.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/layout/account_dialog_title.xml b/src/MiNotes-master/app/src/main/res/layout/account_dialog_title.xml
deleted file mode 100644
index 7717112..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/layout/add_account_text.xml b/src/MiNotes-master/app/src/main/res/layout/add_account_text.xml
deleted file mode 100644
index c799178..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/layout/datetime_picker.xml b/src/MiNotes-master/app/src/main/res/layout/datetime_picker.xml
deleted file mode 100644
index f10d592..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/datetime_picker.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/res/layout/dialog_edit_text.xml b/src/MiNotes-master/app/src/main/res/layout/dialog_edit_text.xml
deleted file mode 100644
index 361b39a..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/layout/folder_list_item.xml b/src/MiNotes-master/app/src/main/res/layout/folder_list_item.xml
deleted file mode 100644
index 77e8148..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/layout/note_edit.xml b/src/MiNotes-master/app/src/main/res/layout/note_edit.xml
deleted file mode 100644
index 3f0c279..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/note_edit.xml
+++ /dev/null
@@ -1,410 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/layout/note_edit_list_item.xml b/src/MiNotes-master/app/src/main/res/layout/note_edit_list_item.xml
deleted file mode 100644
index a885f9c..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/note_edit_list_item.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/layout/note_item.xml b/src/MiNotes-master/app/src/main/res/layout/note_item.xml
deleted file mode 100644
index d541f6a..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/note_item.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/layout/note_list.xml b/src/MiNotes-master/app/src/main/res/layout/note_list.xml
deleted file mode 100644
index b62a661..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/note_list.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/MiNotes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
deleted file mode 100644
index 3fa271d..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/layout/note_list_footer.xml b/src/MiNotes-master/app/src/main/res/layout/note_list_footer.xml
deleted file mode 100644
index 5ca7b22..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/layout/settings_header.xml b/src/MiNotes-master/app/src/main/res/layout/settings_header.xml
deleted file mode 100644
index 5eb8c50..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/settings_header.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/res/layout/widget_2x.xml b/src/MiNotes-master/app/src/main/res/layout/widget_2x.xml
deleted file mode 100644
index 9bd6cd0..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/widget_2x.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/layout/widget_4x.xml b/src/MiNotes-master/app/src/main/res/layout/widget_4x.xml
deleted file mode 100644
index 774cc3a..0000000
--- a/src/MiNotes-master/app/src/main/res/layout/widget_4x.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/menu/call_note_edit.xml b/src/MiNotes-master/app/src/main/res/menu/call_note_edit.xml
deleted file mode 100644
index 02c0528..0000000
--- a/src/MiNotes-master/app/src/main/res/menu/call_note_edit.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/menu/call_record_folder.xml b/src/MiNotes-master/app/src/main/res/menu/call_record_folder.xml
deleted file mode 100644
index c664346..0000000
--- a/src/MiNotes-master/app/src/main/res/menu/call_record_folder.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/menu/note_edit.xml b/src/MiNotes-master/app/src/main/res/menu/note_edit.xml
deleted file mode 100644
index 35cacd1..0000000
--- a/src/MiNotes-master/app/src/main/res/menu/note_edit.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/res/menu/note_list.xml b/src/MiNotes-master/app/src/main/res/menu/note_list.xml
deleted file mode 100644
index 42ea736..0000000
--- a/src/MiNotes-master/app/src/main/res/menu/note_list.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/menu/note_list_dropdown.xml b/src/MiNotes-master/app/src/main/res/menu/note_list_dropdown.xml
deleted file mode 100644
index 7cbaadc..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/menu/note_list_options.xml b/src/MiNotes-master/app/src/main/res/menu/note_list_options.xml
deleted file mode 100644
index daac008..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/menu/sub_folder.xml b/src/MiNotes-master/app/src/main/res/menu/sub_folder.xml
deleted file mode 100644
index b00de26..0000000
--- a/src/MiNotes-master/app/src/main/res/menu/sub_folder.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/res/raw-zh-rCN/introduction b/src/MiNotes-master/app/src/main/res/raw-zh-rCN/introduction
deleted file mode 100644
index 8432550..0000000
--- a/src/MiNotes-master/app/src/main/res/raw-zh-rCN/introduction
+++ /dev/null
@@ -1,6 +0,0 @@
-欢迎使用MIUI便签!
-
- 无论从软件中直接添加,还是从桌面拖出widget,MIUI便签能让你快速建立和保存便签;
-
- 除了调整文字大小、便签背景、文件夹等基础功能外,你会发现MIUI便签也提供了清单模式、便签提醒、软件加密、导出到SD卡、同步google task的高级功能,让你的生活记录更加美好和安全;
-
diff --git a/src/MiNotes-master/app/src/main/res/raw/introduction b/src/MiNotes-master/app/src/main/res/raw/introduction
deleted file mode 100644
index 269cf7b..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/values-zh-rCN/arrays.xml b/src/MiNotes-master/app/src/main/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index a092386..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/values-zh-rCN/strings.xml b/src/MiNotes-master/app/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 09f75ed..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/values-zh-rTW/arrays.xml b/src/MiNotes-master/app/src/main/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index 5297209..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/values-zh-rTW/strings.xml b/src/MiNotes-master/app/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index e29b79b..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/values/arrays.xml b/src/MiNotes-master/app/src/main/res/values/arrays.xml
deleted file mode 100644
index e00210b..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/values/colors.xml b/src/MiNotes-master/app/src/main/res/values/colors.xml
deleted file mode 100644
index 123ffbf..0000000
--- a/src/MiNotes-master/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- #335b5b5b
-
diff --git a/src/MiNotes-master/app/src/main/res/values/dimens.xml b/src/MiNotes-master/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 194e84f..0000000
--- a/src/MiNotes-master/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/MiNotes-master/app/src/main/res/values/strings.xml b/src/MiNotes-master/app/src/main/res/values/strings.xml
deleted file mode 100644
index 55df868..0000000
--- a/src/MiNotes-master/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,135 +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/MiNotes-master/app/src/main/res/values/styles.xml b/src/MiNotes-master/app/src/main/res/values/styles.xml
deleted file mode 100644
index d750e65..0000000
--- a/src/MiNotes-master/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/res/xml/preferences.xml b/src/MiNotes-master/app/src/main/res/xml/preferences.xml
deleted file mode 100644
index fe58f8f..0000000
--- a/src/MiNotes-master/app/src/main/res/xml/preferences.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/xml/searchable.xml b/src/MiNotes-master/app/src/main/res/xml/searchable.xml
deleted file mode 100644
index bf74f14..0000000
--- a/src/MiNotes-master/app/src/main/res/xml/searchable.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/xml/widget_2x_info.xml b/src/MiNotes-master/app/src/main/res/xml/widget_2x_info.xml
deleted file mode 100644
index ac8b225..0000000
--- a/src/MiNotes-master/app/src/main/res/xml/widget_2x_info.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/src/MiNotes-master/app/src/main/res/xml/widget_4x_info.xml b/src/MiNotes-master/app/src/main/res/xml/widget_4x_info.xml
deleted file mode 100644
index cf79f9c..0000000
--- a/src/MiNotes-master/app/src/main/res/xml/widget_4x_info.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/src/MiNotes-master/build.gradle b/src/MiNotes-master/build.gradle
deleted file mode 100644
index f6627fc..0000000
--- a/src/MiNotes-master/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:2.3.2'
- }
-}
-
-allprojects {
- repositories {
- jcenter()
- }
-}
diff --git a/src/MiNotes-master/gradle.properties b/src/MiNotes-master/gradle.properties
deleted file mode 100644
index 39018db..0000000
--- a/src/MiNotes-master/gradle.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-## Project-wide Gradle settings.
-#
-# 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.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -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
-#Thu May 04 14:08:34 GMT+08:00 2017
-
diff --git a/src/MiNotes-master/gradle/wrapper/gradle-wrapper.jar b/src/MiNotes-master/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 13372ae..0000000
Binary files a/src/MiNotes-master/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/src/MiNotes-master/gradle/wrapper/gradle-wrapper.properties b/src/MiNotes-master/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 6a932ea..0000000
--- a/src/MiNotes-master/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sat May 05 06:31:36 CST 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/src/MiNotes-master/gradlew b/src/MiNotes-master/gradlew
deleted file mode 100644
index 9d82f78..0000000
--- a/src/MiNotes-master/gradlew
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# 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
-
-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" ] ; 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, switch paths to Windows format before running java
-if $cygwin ; 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=$((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
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/src/MiNotes-master/gradlew.bat b/src/MiNotes-master/gradlew.bat
deleted file mode 100644
index 8a0b282..0000000
--- a/src/MiNotes-master/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@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
-
-@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=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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 init
-
-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 init
-
-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
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-: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 %CMD_LINE_ARGS%
-
-: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/MiNotes-master/import-summary.txt b/src/MiNotes-master/import-summary.txt
deleted file mode 100644
index cd1d3d6..0000000
--- a/src/MiNotes-master/import-summary.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ECLIPSE ANDROID PROJECT IMPORT SUMMARY
-======================================
-
-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.md
-
-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/MiNotes-master/settings.gradle b/src/MiNotes-master/settings.gradle
deleted file mode 100644
index e7b4def..0000000
--- a/src/MiNotes-master/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java b/src/data/Contact.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java
rename to src/data/Contact.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Notes.java b/src/data/Notes.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/data/Notes.java
rename to src/data/Notes.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/data/NotesDatabaseHelper.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
rename to src/data/NotesDatabaseHelper.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/data/NotesProvider.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
rename to src/data/NotesProvider.java
diff --git a/src/data/data部分用例图-杨耀淞.jpg b/src/data/data部分用例图-杨耀淞.jpg
new file mode 100644
index 0000000..2dd910f
Binary files /dev/null and b/src/data/data部分用例图-杨耀淞.jpg differ
diff --git a/src/gtask/data/MetaData.java b/src/gtask/data/MetaData.java
new file mode 100644
index 0000000..fe7a778
--- /dev/null
+++ b/src/gtask/data/MetaData.java
@@ -0,0 +1,104 @@
+package net.micode.notes.gtask.data;
+
+public class MetaData extends Task {
+ /*
+ * 功能描述:得到类的简写名称存入字符串TAG中
+ * 实现过程:调用getSimpleName ()函数
+ */
+ private final static String TAG = MetaData.class.getSimpleName();
+ private String mRelatedGid = null;
+ /*
+ * 功能描述:设置数据,即生成元数据库
+ * 实现过程:调用JSONObject库函数put (),Task类中的setNotes ()和setName ()函数
+ * 参数注解:
+ */
+ public void setMeta(String gid, JSONObject metaInfo)
+ {
+ //对函数块进行注释
+ try {
+ metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
+ /*
+ * 将这对键值放入metaInfo这个jsonobject对象中
+ */
+ } catch (JSONException e) {
+ Log.e(TAG, "failed to put related gid");
+ /*
+ * 输出错误信息
+ */
+ }
+ setNotes(metaInfo.toString());
+ setName(GTaskStringUtils.META_NOTE_NAME);
+ }
+ /*
+ * 功能描述:获取相关联的Gid
+ */
+ public String getRelatedGid() {
+ return mRelatedGid;
+ }
+ /*
+ * 功能描述:判断当前数据是否为空,若为空则返回真即值得保存
+ * Made By CuiCan
+ */
+ @Override
+ public boolean isWorthSaving() {
+ return getNotes() != null;
+ }
+ /*
+ * 功能描述:使用远程json数据对象设置元数据内容
+ * 实现过程:调用父类Task中的setContentByRemoteJSON ()函数,并
+ * 参数注解:
+ */
+ @Override
+ public void setContentByRemoteJSON(JSONObject js) {
+ super.setContentByRemoteJSON(js);
+ if (getNotes() != null) {
+ try {
+ JSONObject metaInfo = new JSONObject(getNotes().trim());
+ mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
+ } catch (JSONException e) {
+ Log.w(TAG, "failed to get related gid");
+ /*
+ * 输出警告信息
+ */
+ mRelatedGid = null;
+ }
+ }
+ }
+ /*
+ * 功能描述:使用本地json数据对象设置元数据内容,一般不会用到,若用到,则抛出异常
+ * Made By CuiCan
+ */
+ @Override
+ public void setContentByLocalJSON(JSONObject js) {
+ // this function should not be called
+ throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
+ /*
+ * 传递非法参数异常
+ */
+ }
+ /*
+ * 功能描述:从元数据内容中获取本地json对象,一般不会用到,若用到,则抛出异常
+ * Made By CuiCan
+ */
+ @Override
+ public JSONObject getLocalJSONFromContent() {
+ throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
+ /*
+ * 传递非法参数异常
+ * Made By Cui Can
+ */
+ }
+ /*
+ * 功能描述:获取同步动作状态,一般不会用到,若用到,则抛出异常
+ * Made By CuiCan
+ */
+ @Override
+ public int getSyncAction(Cursor c) {
+ throw new IllegalAccessError("MetaData:getSyncAction should not be called");
+ /*
+ * 传递非法参数异常
+ * Made By Cui Can
+ */
+ }
+
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/gtask/data/Node.java
similarity index 50%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
rename to src/gtask/data/Node.java
index 63950e0..db7db78 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ b/src/gtask/data/Node.java
@@ -1,101 +1,90 @@
-/*
- * 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;
-
+
+/**
+ * 应该是同步操作的基础数据类型,定义了相关指示同步操作的常量
+ * 关键字:abstract
+ */
public abstract class Node {
- public static final int SYNC_ACTION_NONE = 0;
-
- public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
- public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
- public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
- public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
- public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
- public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
- public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
- public static final int SYNC_ACTION_ERROR = 8;
-
+ //定义了各种用于表征同步状态的常量
+ 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;
-
+
+ private long mLastModified;//记录最后一次修改时间
+
+ private boolean mDeleted;//表征是否被删除
+
public Node() {
mGid = null;
mName = "";
mLastModified = 0;
mDeleted = false;
}
-
+
public abstract JSONObject getCreateAction(int actionId);
-
+
public abstract JSONObject getUpdateAction(int actionId);
-
+
public abstract void setContentByRemoteJSON(JSONObject js);
-
+
public abstract void setContentByLocalJSON(JSONObject js);
-
+
public abstract JSONObject getLocalJSONFromContent();
-
+
public abstract int getSyncAction(Cursor c);
-
+
public void setGid(String gid) {
this.mGid = gid;
}
-
+
public void setName(String name) {
this.mName = name;
}
-
+
public void setLastModified(long lastModified) {
this.mLastModified = lastModified;
}
-
+
public void setDeleted(boolean deleted) {
this.mDeleted = deleted;
}
-
+
public String getGid() {
return this.mGid;
}
-
+
public String getName() {
return this.mName;
}
-
+
public long getLastModified() {
return this.mLastModified;
}
-
+
public boolean getDeleted() {
return this.mDeleted;
}
-
-}
+
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/gtask/data/SqlData.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
rename to src/gtask/data/SqlData.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/gtask/data/SqlNote.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
rename to src/gtask/data/SqlNote.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/gtask/data/Task.java
similarity index 87%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
rename to src/gtask/data/Task.java
index 6a19454..79610b7 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/src/gtask/data/Task.java
@@ -1,73 +1,41 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.gtask.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 boolean mCompleted;//是否完成
+
private String mNotes;
-
- private JSONObject mMetaInfo;
-
- private Task mPriorSibling;
-
- private TaskList mParent;
-
+
+ private JSONObject mMetaInfo;//将在实例中存储数据的类型
+
+ private Task mPriorSibling;//对应的优先兄弟Task的指针(待完善)
+
+ private TaskList mParent;//所在的任务列表的指针
+
public Task() {
super();
mCompleted = false;
mNotes = null;
- mPriorSibling = null;
- mParent = 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());
@@ -78,45 +46,49 @@ public class Task extends Node {
entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
}
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
+
// parent_id
+ if (mParent!= null) {
js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
-
+ }
+
// dest_parent_type
js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE,
GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
-
+
// list_id
+ if (mParent!= null) {
js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
-
+ }
+
// prior_sibling_id
if (mPriorSibling != null) {
js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
}
-
+
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
throw new ActionFailureException("fail to generate task-create jsonobject");
}
-
+
return js;
}
-
+
public JSONObject getUpdateAction(int actionId) {
JSONObject js = new JSONObject();
-
+
try {
// action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
+
// action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
+
// id
js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
+
// entity_delta
JSONObject entity = new JSONObject();
entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
@@ -125,16 +97,16 @@ public class Task extends Node {
}
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 {
@@ -142,27 +114,27 @@ public class Task extends Node {
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));
@@ -174,22 +146,22 @@ public class Task extends Node {
}
}
}
-
- public void setContentByLocalJSON(JSONObject js) {
+
+ public void setContentByLocalJSON(JSONObject js) { //��metadata����ʵʩ
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
}
-
+
try {
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
+
if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
- Log.e(TAG, "invalid type");
+ 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)) {
@@ -197,13 +169,13 @@ public class Task extends Node {
break;
}
}
-
+
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
}
}
-
+
public JSONObject getLocalJSONFromContent() {
String name = getName();
try {
@@ -213,7 +185,7 @@ public class Task extends Node {
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();
@@ -228,7 +200,7 @@ public class Task extends Node {
// 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)) {
@@ -236,7 +208,7 @@ public class Task extends Node {
break;
}
}
-
+
note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
return mMetaInfo;
}
@@ -246,7 +218,7 @@ public class Task extends Node {
return null;
}
}
-
+
public void setMetaInfo(MetaData metaData) {
if (metaData != null && metaData.getNotes() != null) {
try {
@@ -257,30 +229,30 @@ public class Task extends Node {
}
}
}
-
+
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()) {
@@ -307,45 +279,45 @@ public class Task extends Node {
Log.e(TAG, e.toString());
e.printStackTrace();
}
-
+
return SYNC_ACTION_ERROR;
}
-
+
public boolean isWorthSaving() {
return mMetaInfo != null || (getName() != null && getName().trim().length() > 0)
|| (getNotes() != null && getNotes().trim().length() > 0);
}
-
+
public void setCompleted(boolean completed) {
this.mCompleted = completed;
}
-
+
public void setNotes(String notes) {
this.mNotes = notes;
}
-
+
public void setPriorSibling(Task priorSibling) {
this.mPriorSibling = priorSibling;
}
-
+
public void setParent(TaskList parent) {
this.mParent = parent;
}
-
+
public boolean getCompleted() {
return this.mCompleted;
}
-
+
public String getNotes() {
return this.mNotes;
}
-
+
public Task getPriorSibling() {
return this.mPriorSibling;
}
-
+
public TaskList getParent() {
return this.mParent;
}
-
-}
+
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/gtask/data/TaskList.java
similarity index 83%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
rename to src/gtask/data/TaskList.java
index 4ea21c5..15a6bbc 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/src/gtask/data/TaskList.java
@@ -1,108 +1,86 @@
-/*
- * 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;
-
+ private static final String TAG = TaskList.class.getSimpleName();//tag标记
+
+ private int mIndex;//当前TaskList的指针
+
+ private ArrayList mChildren;//类中主要的保存数据的单元,用来实现一个以Task为元素的ArrayList
+
public TaskList() {
super();
mChildren = new ArrayList();
mIndex = 1;
}
-
+
+ /* (non-Javadoc)
+ * @see net.micode.notes.gtask.data.Node#getCreateAction(int)
+ * 生成并返回一个包含了一定数据的JSONObject实体
+ */
public JSONObject getCreateAction(int actionId) {
JSONObject js = new JSONObject();
-
+
try {
// action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
-
+
// action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
+
// index
js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
-
+
// entity_delta
- JSONObject entity = new JSONObject();
+ JSONObject entity = new JSONObject();//entity实体
entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
+
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
throw new ActionFailureException("fail to generate tasklist-create jsonobject");
}
-
+
return js;
}
-
+
+ /* (non-Javadoc)
+ * @see net.micode.notes.gtask.data.Node#getUpdateAction(int)
+ * 生成并返回一个包含了一定数据的JSONObject实体
+ */
public JSONObject getUpdateAction(int actionId) {
JSONObject js = new JSONObject();
-
+
try {
// action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
+
// action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
+
// id
js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
+
// entity_delta
JSONObject entity = new JSONObject();
entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
+
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
throw new ActionFailureException("fail to generate tasklist-update jsonobject");
}
-
+
return js;
}
-
+
public void setContentByRemoteJSON(JSONObject js) {
if (js != null) {
try {
@@ -110,17 +88,17 @@ public class TaskList extends Node {
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();
@@ -128,15 +106,15 @@ public class TaskList extends Node {
}
}
}
-
+
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);
@@ -156,12 +134,12 @@ public class TaskList extends Node {
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(),
@@ -172,9 +150,9 @@ public class TaskList extends Node {
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());
@@ -182,7 +160,7 @@ public class TaskList extends Node {
return null;
}
}
-
+
public int getSyncAction(Cursor c) {
try {
if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
@@ -212,14 +190,23 @@ public class TaskList extends Node {
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)) {
@@ -229,21 +216,29 @@ public class TaskList extends Node {
task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
.get(mChildren.size() - 1));
task.setParent(this);
+ //注意:每一次ArrayList的变化都要紧跟相关Task中PriorSibling的更改
+ //,接下来几个函数都有相关操作
}
}
return ret;
}
-
+
+ /**
+ * @param task
+ * @param index
+ * @return
+ * 功能:在当前任务表的指定位置添加新的任务。
+ */
public boolean addChildTask(Task task, int index) {
if (index < 0 || index > mChildren.size()) {
Log.e(TAG, "add child task: invalid index");
return false;
}
-
+
int pos = mChildren.indexOf(task);
if (task != null && pos == -1) {
mChildren.add(index, task);
-
+
// update the task list
Task preTask = null;
Task afterTask = null;
@@ -251,26 +246,31 @@ public class TaskList extends Node {
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(
@@ -280,25 +280,37 @@ public class TaskList extends Node {
}
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);
@@ -308,11 +320,21 @@ public class TaskList extends Node {
}
return null;
}
-
+
+ /**
+ * @param task
+ * @return
+ * 功能:返回指定Task的index
+ */
public int getChildTaskIndex(Task task) {
return mChildren.indexOf(task);
}
-
+
+ /**
+ * @param index
+ * @return
+ * 功能:返回指定index的Task
+ */
public Task getChildTaskByIndex(int index) {
if (index < 0 || index >= mChildren.size()) {
Log.e(TAG, "getTaskByIndex: invalid index");
@@ -320,24 +342,29 @@ public class TaskList extends Node {
}
return mChildren.get(index);
}
-
+
+ /**
+ * @param gid
+ * @return
+ * 功能:返回指定gid的Task
+ */
public Task getChilTaskByGid(String gid) {
- for (Task task : mChildren) {
+ for (Task task : mChildren) {//一种常见的ArrayList的遍历方法(四种,见精读笔记)
if (task.getGid().equals(gid))
return task;
}
return null;
}
-
+
public ArrayList getChildTaskList() {
return this.mChildren;
}
-
+
public void setIndex(int index) {
this.mIndex = index;
}
-
+
public int getIndex() {
return this.mIndex;
}
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/gtask/exception/ActionFailureException.java
similarity index 61%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
rename to src/gtask/exception/ActionFailureException.java
index 15504be..db44b16 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/src/gtask/exception/ActionFailureException.java
@@ -18,11 +18,22 @@ package net.micode.notes.gtask.exception;
public class ActionFailureException extends RuntimeException {
private static final long serialVersionUID = 4425249765923293627L;
+ /*
+ * serialVersionUID相当于java类的身份证。主要用于版本控制。
+ * serialVersionUID作用是序列化时保持版本的兼容性,即在版本升级时反序列化仍保持对象的唯一性。
+ * Made By Cuican
+ */
public ActionFailureException() {
super();
}
-
+ /*
+ * 在JAVA类中使用super来引用父类的成分,用this来引用当前对象.
+ * 如果一个类从另外一个类继承,我们new这个子类的实例对象的时候,这个子类对象里面会有一个父类对象。
+ * 怎么去引用里面的父类对象呢?使用super来引用
+ * 也就是说,此处super()以及super (paramString)可认为是Exception ()和Exception (paramString)
+ * Made By Cuican
+ */
public ActionFailureException(String paramString) {
super(paramString);
}
@@ -31,3 +42,4 @@ public class ActionFailureException extends RuntimeException {
super(paramString, paramThrowable);
}
}
+
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/gtask/exception/NetworkFailureException.java
similarity index 61%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to src/gtask/exception/NetworkFailureException.java
index b08cfb1..d65a7f7 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/src/gtask/exception/NetworkFailureException.java
@@ -18,11 +18,23 @@ package net.micode.notes.gtask.exception;
public class NetworkFailureException extends Exception {
private static final long serialVersionUID = 2107610287180234136L;
+ /*
+ * serialVersionUID相当于java类的身份证。主要用于版本控制。
+ * serialVersionUID作用是序列化时保持版本的兼容性,即在版本升级时反序列化仍保持对象的唯一性。
+ * Made By Cuican
+ */
public NetworkFailureException() {
super();
}
+ /*
+ * 在JAVA类中使用super来引用父类的成分,用this来引用当前对象.
+ * 如果一个类从另外一个类继承,我们new这个子类的实例对象的时候,这个子类对象里面会有一个父类对象。
+ * 怎么去引用里面的父类对象呢?使用super来引用
+ * 也就是说,此处super()以及super (paramString)可认为是Exception ()和Exception (paramString)
+ * Made By Cuican
+ */
public NetworkFailureException(String paramString) {
super(paramString);
}
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/gtask/remote/GTaskASyncTask.java
similarity index 57%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to src/gtask/remote/GTaskASyncTask.java
index 56c8e5e..6547e64 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/src/gtask/remote/GTaskASyncTask.java
@@ -17,20 +17,16 @@
package net.micode.notes.gtask.remote;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesListActivity;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-
+/*异步操作类,实现GTask的异步操作过程
+ * 主要方法:
+ * private void showNotification(int tickerId, String content) 向用户提示当前同步的状态,是一个用于交互的方法
+ * protected Integer doInBackground(Void... unused) 此方法在后台线程执行,完成任务的主要工作,通常需要较长的时间
+ * protected void onProgressUpdate(String... progress) 可以使用进度条增加用户体验度。 此方法在主线程执行,用于显示任务执行的进度。
+ * protected void onPostExecute(Integer result) 相当于Handler 处理UI的方式,在这里面可以使用在doInBackground 得到的结果处理操作UI
+ */
public class GTaskASyncTask extends AsyncTask {
+
private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
public interface OnCompleteListener {
@@ -57,53 +53,52 @@ public class GTaskASyncTask extends AsyncTask {
mTaskManager.cancelSync();
}
- public void publishProgess(String message) {
+ public void publishProgess(String message) { // 发布进度单位,系统将会调用onProgressUpdate()方法更新这些值
publishProgress(new String[] {
- message
+ 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;
+ 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.class), 0); //如果同步不成功,那么从系统取得一个用于启动一个NotesPreferenceActivity的PendingIntent对象
} else {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesListActivity.class), 0);
+ NotesListActivity.class), 0); //如果同步成功,那么从系统取得一个用于启动一个NotesListActivity的PendingIntent对象
}
-// notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-// pendingIntent);
- notification.contentIntent = pendingIntent;
- mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+ 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)));
- return mTaskManager.sync(mContext, this);
+ .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) {
+ if (mContext instanceof GTaskSyncService) { //instanceof 判断mContext是否是GTaskSyncService的实例
((GTaskSyncService) mContext).sendBroadcast(progress[0]);
}
}
@Override
- protected void onPostExecute(Integer result) {
+ 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());
+ 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) {
@@ -111,14 +106,14 @@ public class GTaskASyncTask extends AsyncTask {
} 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() {
+ new Thread(new Runnable() { //这里好像是方法内的一个线程,但是并不太懂什么意思
- public void run() {
+ public void run() { //完成后的操作,使用onComplete()将所有值都重新初始化,相当于完成一次操作
mOnCompleteListener.onComplete();
}
}).start();
}
}
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/gtask/remote/GTaskClient.java
similarity index 73%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
rename to src/gtask/remote/GTaskClient.java
index c67dfdf..48d3212 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/gtask/remote/GTaskClient.java
@@ -16,55 +16,14 @@
package net.micode.notes.gtask.remote;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerFuture;
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.gtask.data.Node;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.gtask.exception.NetworkFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
-
-
+/*
+ * 主要功能:实现GTASK的登录操作,进行GTASK任务的创建,创建任务列表,从网络上获取任务和任务列表的内容
+ * 主要使用类或技术:accountManager JSONObject HttpParams authToken Gid
+ */
public class GTaskClient {
private static final String TAG = GTaskClient.class.getSimpleName();
- private static final String GTASK_URL = "https://mail.google.com/tasks/";
+ 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";
@@ -102,6 +61,10 @@ public class GTaskClient {
mUpdateArray = null;
}
+ /*用来获取的实例化对象
+ * 使用 getInstance()
+ * 返回mInstance这个实例化对象
+ */
public static synchronized GTaskClient getInstance() {
if (mInstance == null) {
mInstance = new GTaskClient();
@@ -109,42 +72,50 @@ public class 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
+ // need to re-login after account switch 重新登录操作
if (mLoggedin
&& !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
- .getSyncAccountName(activity))) {
+ .getSyncAccountName(activity))) {
mLoggedin = false;
}
+ //如果没超过时间,则不需要重新登录
if (mLoggedin) {
Log.d(TAG, "already logged in");
return true;
}
- mLastLoginTime = System.currentTimeMillis();
- String authToken = loginGoogleAccount(activity, false);
+ 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()
+ //尝试使用用户自己的域名登录
+ 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";
+ mGetUrl = url.toString() + "ig"; //设置用户对应的getUrl
+ mPostUrl = url.toString() + "r/ig"; //设置用户对应的postUrl
if (tryToLoginGtask(activity, authToken)) {
mLoggedin = true;
@@ -152,6 +123,7 @@ public class GTaskClient {
}
// try to login with google official url
+ //如果用户账户无法登录,则使用谷歌官方的URI进行登录
if (!mLoggedin) {
mGetUrl = GTASK_GET_URL;
mPostUrl = GTASK_POST_URL;
@@ -164,10 +136,15 @@ public class GTaskClient {
return true;
}
+ /*具体实现登录谷歌账户的方法
+ * 使用令牌机制
+ * 使用AccountManager来管理注册账号
+ * 返回值是账号的令牌
+ */
private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
- String authToken;
- AccountManager accountManager = AccountManager.get(activity);
- Account[] accounts = accountManager.getAccountsByType("com.google");
+ 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");
@@ -176,6 +153,7 @@ public class GTaskClient {
String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
Account account = null;
+ //遍历获得的accounts信息,寻找已经记录过的账户信息
for (Account a : accounts) {
if (a.name.equals(accountName)) {
account = a;
@@ -190,11 +168,13 @@ public class GTaskClient {
}
// 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);
@@ -207,10 +187,12 @@ public class GTaskClient {
return authToken;
}
+ //尝试登陆Gtask,这只是一个预先判断令牌是否是有效以及是否能登上GTask的方法,而不是具体实现登陆的方法
private boolean tryToLoginGtask(Activity activity, String authToken) {
if (!loginGtask(authToken)) {
- // maybe the auth token is out of date, now let's invalidate the
+ // 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");
@@ -225,25 +207,27 @@ public class GTaskClient {
return true;
}
+ //实现登录GTask的具体操作
private boolean loginGtask(String authToken) {
int timeoutConnection = 10000;
- int timeoutSocket = 15000;
- HttpParams httpParameters = new BasicHttpParams();
- HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
- HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
+ 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();
+ BasicCookieStore localBasicCookieStore = new BasicCookieStore(); //设置本地cookie
mHttpClient.setCookieStore(localBasicCookieStore);
HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
// login gtask
try {
- String loginUrl = mGetUrl + "?auth=" + authToken;
- HttpGet httpGet = new HttpGet(loginUrl);
+ 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) {
@@ -256,6 +240,7 @@ public class GTaskClient {
}
// get the client version
+ //获取client的内容,具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容,也就是gtask_url的内容
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -284,6 +269,10 @@ public class GTaskClient {
return mActionId++;
}
+ /*实例化创建一个用于向网络传输数据的对象
+ * 使用HttpPost类
+ * 返回一个httpPost实例化对象,但里面还没有内容
+ */
private HttpPost createHttpPost() {
HttpPost httpPost = new HttpPost(mPostUrl);
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
@@ -291,24 +280,28 @@ public class GTaskClient {
return httpPost;
}
+ /*通过URL获取响应后返回的数据,也就是网络上的数据和资源
+ * 使用getContentEncoding()获取网络上的资源和数据
+ * 返回值就是获取到的资源
+ */
private String getResponseContent(HttpEntity entity) throws IOException {
String contentEncoding = null;
- if (entity.getContentEncoding() != 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")) {
+ if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {//GZIP是使用DEFLATE进行压缩数据的另一个压缩库
input = new GZIPInputStream(entity.getContent());
- } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
+ } 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);
+ BufferedReader br = new BufferedReader(isr);//是一个包装类,它可以包装字符流,将字符流放入缓存里,先把字符读到缓存里,到缓存满了时候,再读入内存,是为了提供读的效率而设计的
StringBuilder sb = new StringBuilder();
while (true) {
@@ -323,20 +316,28 @@ public class GTaskClient {
}
}
+ /*通过JSON发送请求
+ * 请求的具体内容在json的实例化对象js中然后传入
+ * 利用UrlEncodedFormEntity entity和httpPost.setEntity(entity)方法把js中的内容放置到httpPost中
+ * 执行请求后使用getResponseContent方法得到返回的数据和资源
+ * 将资源再次放入json后返回
+ */
private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
- if (!mLoggedin) {
+ 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 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);
@@ -360,6 +361,12 @@ public class GTaskClient {
}
}
+ /*创建单个任务
+ * 传入参数是一个.gtask.data.Task包里Task类的对象
+ * 利用json获取Task里的内容,并且创建相应的jsPost
+ * 利用postRequest得到任务的返回信息
+ * 使用task.setGid设置task的new_ID
+ */
public void createTask(Task task) throws NetworkFailureException {
commitUpdate();
try {
@@ -386,6 +393,9 @@ public class GTaskClient {
}
}
+ /*
+ * 创建一个任务列表,与createTask几乎一样,区别就是最后设置的是tasklist的gid
+ */
public void createTaskList(TaskList tasklist) throws NetworkFailureException {
commitUpdate();
try {
@@ -412,6 +422,11 @@ public class GTaskClient {
}
}
+ /*
+ * 同步更新操作
+ * 使用JSONObject进行数据存储,使用jsPost.put,Put的信息包括UpdateArray和ClientVersion
+ * 使用postRequest发送这个jspost,进行处理
+ */
public void commitUpdate() throws NetworkFailureException {
if (mUpdateArray != null) {
try {
@@ -433,6 +448,10 @@ public class GTaskClient {
}
}
+ /*
+ * 添加更新的事项
+ * 调用commitUpdate()实现
+ */
public void addUpdateNode(Node node) throws NetworkFailureException {
if (node != null) {
// too many update items may result in an error
@@ -447,6 +466,12 @@ public class GTaskClient {
}
}
+ /*
+ * 移动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();
@@ -463,15 +488,17 @@ public class GTaskClient {
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());
+ 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
@@ -486,6 +513,11 @@ public class GTaskClient {
}
}
+ /*
+ * 删除操作节点
+ * 还是利用JSON
+ * 删除过后使用postRequest发送删除后的结果
+ */
public void deleteNode(Node node) throws NetworkFailureException {
commitUpdate();
try {
@@ -494,7 +526,7 @@ public class GTaskClient {
// action_list
node.setDeleted(true);
- actionList.put(node.getUpdateAction(getActionId()));
+ actionList.put(node.getUpdateAction(getActionId())); //这里会获取到删除操作的ID,加入到actionLiast中
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
@@ -509,6 +541,11 @@ public class GTaskClient {
}
}
+ /*
+ * 获取任务列表
+ * 首先通过GetURI使用getResponseContent从网上获取数据
+ * 然后筛选出"_setup("到)}的部分,并且从中获取GTASK_JSON_LISTS的内容返回
+ */
public JSONArray getTaskLists() throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
@@ -521,6 +558,7 @@ public class GTaskClient {
response = mHttpClient.execute(httpGet);
// get the task list
+ //筛选工作,把筛选出的字符串放入jsString
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -531,6 +569,7 @@ public class GTaskClient {
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());
@@ -547,6 +586,9 @@ public class GTaskClient {
}
}
+ /*
+ * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务
+ */
public JSONArray getTaskList(String listGid) throws NetworkFailureException {
commitUpdate();
try {
@@ -558,7 +600,7 @@ public class GTaskClient {
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_LIST_ID, listGid); //这里设置为传入的listGid
action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
actionList.put(action);
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
@@ -579,6 +621,7 @@ public class GTaskClient {
return mAccount;
}
+ //重置更新的内容
public void resetUpdateArray() {
mUpdateArray = null;
}
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/gtask/remote/GTaskManager.java
similarity index 75%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
rename to src/gtask/remote/GTaskManager.java
index d2b4082..b10e77c 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/gtask/remote/GTaskManager.java
@@ -16,104 +16,74 @@
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();
+ 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();
- mNidToGid = new HashMap();
+ mGidToNid = new HashMap(); //GoogleID to NodeID??
+ mNidToGid = new HashMap(); //NodeID to GoogleID???通过hashmap散列表建立映射
}
- public static synchronized GTaskManager getInstance() {
+ /**
+ * 包含关键字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 authtoken
+ // used for getting auth token
mActivity = activity;
}
- public int sync(Context context, GTaskASyncTask asyncTask) {
+ /**
+ * 核心函数
+ * 功能:实现了本地同步操作和远端同步操作
+ * @author TTS
+ * @param context-----获取上下文
+ * @param asyncTask-------用于同步的异步操作类
+ * @return int
+ */
+ public int sync(Context context, GTaskASyncTask asyncTask) { //核心函数
if (mSyncing) {
- Log.d(TAG, "Sync is in progress");
+ Log.d(TAG, "Sync is in progress"); //创建日志文件(调试信息),debug
return STATE_SYNC_IN_PROGRESS;
}
mContext = context;
@@ -128,8 +98,8 @@ public class GTaskManager {
mNidToGid.clear();
try {
- GTaskClient client = GTaskClient.getInstance();
- client.resetUpdateArray();
+ GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client--客户机
+ client.resetUpdateArray(); //JSONArray类型,reset即置为NULL
// login google task
if (!mCancelled) {
@@ -140,15 +110,15 @@ public class GTaskManager {
// get the task list from google
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
- initGTaskList();
+ 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());
+ } catch (NetworkFailureException e) { //分为两种异常,此类异常为网络异常
+ Log.e(TAG, e.toString()); //创建日志文件(调试信息),error
return STATE_NETWORK_ERROR;
- } catch (ActionFailureException e) {
+ } catch (ActionFailureException e) { //此类异常为操作异常
Log.e(TAG, e.toString());
return STATE_INTERNAL_ERROR;
} catch (Exception e) {
@@ -168,32 +138,41 @@ public class GTaskManager {
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();
+ GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client应指远端客户机
try {
- JSONArray jsTaskLists = client.getTaskLists();
+ //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;
+ mMetaList = null; //TaskList类型
for (int i = 0; i < jsTaskLists.length(); i++) {
- JSONObject object = jsTaskLists.getJSONObject(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();
- mMetaList.setContentByRemoteJSON(object);
+ 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);
+ 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();
+ MetaData metaData = new MetaData(); //继承自Node
metaData.setContentByRemoteJSON(object);
- if (metaData.isWorthSaving()) {
+ if (metaData.isWorthSaving()) { //if not worth to save,metadata将不加入mMetaList
mMetaList.addChildTask(metaData);
if (metaData.getGid() != null) {
mMetaHashMap.put(metaData.getRelatedGid(), metaData);
@@ -214,16 +193,16 @@ public class GTaskManager {
// 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 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();
+ + GTaskStringUtils.FOLDER_META)) {
+ TaskList tasklist = new TaskList(); //继承自Node
tasklist.setContentByRemoteJSON(object);
mGTaskListHashMap.put(gid, tasklist);
- mGTaskHashMap.put(gid, tasklist);
+ mGTaskHashMap.put(gid, tasklist); //为什么加两遍???
// load tasks
JSONArray jsTasks = client.getTaskList(gid);
@@ -247,13 +226,18 @@ public class GTaskManager {
}
}
- private void syncContent() throws NetworkFailureException {
+ /**
+ * 功能:本地内容同步操作
+ * @throws NetworkFailureException
+ * @return 无返回值
+ */
+ private void syncContent() throws NetworkFailureException { //本地内容同步操作
int syncType;
- Cursor c = null;
- String gid;
- Node node;
+ Cursor c = null; //数据库指针
+ String gid; //GoogleID??
+ Node node; //Node包含Sync_Action的不同类型
- mLocalDeleteIdMap.clear();
+ mLocalDeleteIdMap.clear(); //HashSet类型
if (mCancelled) {
return;
@@ -301,8 +285,8 @@ public class GTaskManager {
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);
+ 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) {
@@ -327,14 +311,14 @@ public class GTaskManager {
}
// go through remaining items
- Iterator> iter = mGTaskHashMap.entrySet().iterator();
+ 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
+ // mCancelled can be set by another thread, so we neet to check one by //thread----线程
// one
// clear local delete table
if (!mCancelled) {
@@ -351,6 +335,11 @@ public class GTaskManager {
}
+ /**
+ * 功能:
+ * @author TTS
+ * @throws NetworkFailureException
+ */
private void syncFolder() throws NetworkFailureException {
Cursor c = null;
String gid;
@@ -394,7 +383,7 @@ public class GTaskManager {
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
new String[] {
- String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
+ String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
}, null);
if (c != null) {
if (c.moveToNext()) {
@@ -476,6 +465,14 @@ public class GTaskManager {
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;
@@ -522,6 +519,12 @@ public class GTaskManager {
}
}
+ /**
+ * 功能:本地增加Node
+ * @author TTS
+ * @param node
+ * @throws NetworkFailureException
+ */
private void addLocalNode(Node node) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -596,6 +599,15 @@ public class GTaskManager {
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;
@@ -619,12 +631,22 @@ public class GTaskManager {
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);
+ SqlNote sqlNote = new SqlNote(mContext, c); //从本地mContext中获取内容
Node n;
// update remotely
@@ -634,11 +656,12 @@ public class GTaskManager {
String parentGid = mNidToGid.get(sqlNote.getParentId());
if (parentGid == null) {
- Log.e(TAG, "cannot find task's parent tasklist");
+ Log.e(TAG, "cannot find task's parent tasklist"); //调试信息
throw new ActionFailureException("cannot add remote task");
}
- mGTaskListHashMap.get(parentGid).addChildTask(task);
+ mGTaskListHashMap.get(parentGid).addChildTask(task); //在本地生成的GTaskList中增加子结点
+ //登录远程服务器,创建Task
GTaskClient.getInstance().createTask(task);
n = (Node) task;
@@ -656,6 +679,7 @@ public class GTaskManager {
else
folderName += sqlNote.getSnippet();
+ //iterator迭代器,通过统一的接口迭代所有的map元素
Iterator> iter = mGTaskListHashMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry entry = iter.next();
@@ -687,11 +711,20 @@ public class GTaskManager {
sqlNote.resetLocalModified();
sqlNote.commit(true);
- // gid-id mapping
+ // 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;
@@ -701,7 +734,7 @@ public class GTaskManager {
// update remotely
node.setContentByLocalJSON(sqlNote.getContent());
- GTaskClient.getInstance().addUpdateNode(node);
+ GTaskClient.getInstance().addUpdateNode(node); //GTaskClient用途为从本地登陆远端服务器
// update meta
updateRemoteMeta(node.getGid(), sqlNote);
@@ -710,15 +743,19 @@ public class GTaskManager {
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) {
+ if (preParentList != curParentList) { //?????????????
preParentList.removeChildTask(task);
curParentList.addChildTask(task);
GTaskClient.getInstance().moveTask(task, preParentList, curParentList);
@@ -727,9 +764,19 @@ public class GTaskManager {
// 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);
@@ -746,12 +793,18 @@ public class GTaskManager {
}
}
+ /**
+ * 功能:刷新本地,给sync的ID对应上最后更改过的对象
+ * @author TTS
+ * @return void
+ * @throws NetworkFailureException
+ */
private void refreshLocalSyncId() throws NetworkFailureException {
if (mCancelled) {
return;
}
- // get the latest gtask list
+ // get the latest gtask list //获取最近的(最晚的)gtask list
mGTaskHashMap.clear();
mGTaskListHashMap.clear();
mMetaHashMap.clear();
@@ -762,16 +815,16 @@ public class GTaskManager {
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");
+ }, 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 values = new ContentValues(); //在ContentValues中创建键值对。准备通过contentResolver写入数据
values.put(NoteColumns.SYNC_ID, node.getLastModified());
- mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
+ 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");
@@ -790,11 +843,20 @@ public class GTaskManager {
}
}
+ /**
+ * 功能:获取同步账号,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/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/gtask/remote/GTaskSyncService.java
similarity index 68%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to src/gtask/remote/GTaskSyncService.java
index cca36f7..b64ec28 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/src/gtask/remote/GTaskSyncService.java
@@ -16,12 +16,21 @@
package net.micode.notes.gtask.remote;
-import android.app.Activity;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
+/*
+ * Service是在一段不定的时间运行在后台,不和用户交互的应用组件
+ * 主要方法:
+ * private void startSync() 启动一个同步工作
+ * private void cancelSync() 取消同步
+ * public void onCreate()
+ * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分,相当于重启service(比如在被暂停之后),而不是创建一个新的service
+ * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service
+ * public IBinder onBind()
+ * public void sendBroadcast(String msg) 发送同步的相关通知
+ * public static void startSync(Activity activity)
+ * public static void cancelSync(Context context)
+ * public static boolean isSyncing() 判读是否在进行同步
+ * public static String getProgressString() 获取当前进度的信息
+ */
public class GTaskSyncService extends Service {
public final static String ACTION_STRING_NAME = "sync_action_type";
@@ -42,6 +51,7 @@ public class GTaskSyncService extends Service {
private static String mSyncProgress = "";
+ //开始一个同步的工作
private void startSync() {
if (mSyncTask == null) {
mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
@@ -52,10 +62,11 @@ public class GTaskSyncService extends Service {
}
});
sendBroadcast("");
- mSyncTask.execute();
+ mSyncTask.execute(); //这个函数让任务是以单线程队列方式或线程池队列方式运行
}
}
+
private void cancelSync() {
if (mSyncTask != null) {
mSyncTask.cancelSync();
@@ -63,7 +74,7 @@ public class GTaskSyncService extends Service {
}
@Override
- public void onCreate() {
+ public void onCreate() { //初始化一个service
mSyncTask = null;
}
@@ -72,6 +83,7 @@ public class GTaskSyncService extends Service {
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;
@@ -81,7 +93,7 @@ public class GTaskSyncService extends Service {
default:
break;
}
- return START_STICKY;
+ return START_STICKY; //等待新的intent来是这个service继续运行
}
return super.onStartCommand(intent, flags, startId);
}
@@ -93,26 +105,26 @@ public class GTaskSyncService extends Service {
}
}
- public IBinder onBind(Intent intent) {
+ 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 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);
+ sendBroadcast(intent); //发送这个通知
}
- public static void startSync(Activity activity) {
+ 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) {
+ 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);
@@ -125,4 +137,4 @@ public class GTaskSyncService extends Service {
public static String getProgressString() {
return mSyncProgress;
}
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/model/Note.java b/src/model/Note.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/model/Note.java
rename to src/model/Note.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/model/WorkingNote.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
rename to src/model/WorkingNote.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/tool/BackupUtils.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to src/tool/BackupUtils.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/tool/DataUtils.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to src/tool/DataUtils.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/tool/GTaskStringUtils.java
similarity index 94%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
rename to src/tool/GTaskStringUtils.java
index 666b729..c28c295 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ b/src/tool/GTaskStringUtils.java
@@ -14,100 +14,102 @@
* limitations under the License.
*/
+//˺ܶľַ̬ṩjsonObjectӦַ"key"
package net.micode.notes.tool;
-
-public class GTaskStringUtils {
-
+
+//ඨ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/MiNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/tool/ResourceParser.java
similarity index 70%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to src/tool/ResourceParser.java
index 1ad3ad6..8a3a0a0 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/src/tool/ResourceParser.java
@@ -22,24 +22,45 @@ import android.preference.PreferenceManager;
import net.micode.notes.R;
import net.micode.notes.ui.NotesPreferenceActivity;
+/**
+ * ResourceParserһ࣬ڽӦóʹõԴ
+ */
public class ResourceParser {
+ /**
+ * 屳ɫij
+ */
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;
+ /**
+ * ıСij
+ */
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;
+ /**
+ * NoteBgResourcesʼDZ༭صԴ
+ */
public static class NoteBgResources {
+ /**
+ * ʼDZ༭Դ
+ */
private final static int [] BG_EDIT_RESOURCES = new int [] {
R.drawable.edit_yellow,
R.drawable.edit_blue,
@@ -48,6 +69,9 @@ public class ResourceParser {
R.drawable.edit_red
};
+ /**
+ * ʼDZ༭ⱳԴ
+ */
private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
R.drawable.edit_title_yellow,
R.drawable.edit_title_blue,
@@ -56,15 +80,30 @@ public class ResourceParser {
R.drawable.edit_title_red
};
+ /**
+ * ȡʼDZ༭Դ
+ * @param id Դid
+ * @return ʼDZ༭Դ
+ */
public static int getNoteBgResource(int id) {
return BG_EDIT_RESOURCES[id];
}
+ /**
+ * ȡʼDZ༭ⱳԴ
+ * @param id Դid
+ * @return ʼDZ༭ⱳԴ
+ */
public static int getNoteTitleBgResource(int id) {
return BG_EDIT_TITLE_RESOURCES[id];
}
}
+ /**
+ * ȡĬϱid
+ * @param context Ķ
+ * @return Ĭϱid
+ */
public static int getDefaultBgId(Context context) {
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
@@ -74,7 +113,13 @@ public class ResourceParser {
}
}
+ /**
+ * NoteItemBgResourcesʼбصԴ
+ */
public static class NoteItemBgResources {
+ /**
+ * һԴ
+ */
private final static int [] BG_FIRST_RESOURCES = new int [] {
R.drawable.list_yellow_up,
R.drawable.list_blue_up,
@@ -83,6 +128,9 @@ public class ResourceParser {
R.drawable.list_red_up
};
+ /**
+ * ͨԴ
+ */
private final static int [] BG_NORMAL_RESOURCES = new int [] {
R.drawable.list_yellow_middle,
R.drawable.list_blue_middle,
@@ -91,6 +139,9 @@ public class ResourceParser {
R.drawable.list_red_middle
};
+ /**
+ * һԴ
+ */
private final static int [] BG_LAST_RESOURCES = new int [] {
R.drawable.list_yellow_down,
R.drawable.list_blue_down,
@@ -99,6 +150,9 @@ public class ResourceParser {
R.drawable.list_red_down,
};
+ /**
+ * Դ
+ */
private final static int [] BG_SINGLE_RESOURCES = new int [] {
R.drawable.list_yellow_single,
R.drawable.list_blue_single,
@@ -107,28 +161,58 @@ public class ResourceParser {
R.drawable.list_red_single
};
+ /**
+ * ȡһԴ
+ * @param id Դid
+ * @return һԴ
+ */
public static int getNoteBgFirstRes(int id) {
return BG_FIRST_RESOURCES[id];
}
+ /**
+ * ȡһԴ
+ * @param id Դid
+ * @return һԴ
+ */
public static int getNoteBgLastRes(int id) {
return BG_LAST_RESOURCES[id];
}
+ /**
+ * ȡԴ
+ * @param id Դid
+ * @return Դ
+ */
public static int getNoteBgSingleRes(int id) {
return BG_SINGLE_RESOURCES[id];
}
+ /**
+ * ȡͨԴ
+ * @param id Դid
+ * @return ͨԴ
+ */
public static int getNoteBgNormalRes(int id) {
return BG_NORMAL_RESOURCES[id];
}
+ /**
+ * ȡļбԴ
+ * @return ļбԴ
+ */
public static int getFolderBgRes() {
return R.drawable.list_folder;
}
}
+ /**
+ * WidgetBgResourcesСصԴ
+ */
public static class WidgetBgResources {
+ /**
+ * 2xСԴ
+ */
private final static int [] BG_2X_RESOURCES = new int [] {
R.drawable.widget_2x_yellow,
R.drawable.widget_2x_blue,
@@ -137,10 +221,18 @@ public class ResourceParser {
R.drawable.widget_2x_red,
};
+ /**
+ * ȡ2xСԴ
+ * @param id Դid
+ * @return 2xСԴ
+ */
public static int getWidget2xBgResource(int id) {
return BG_2X_RESOURCES[id];
}
+ /**
+ * 4xСԴ
+ */
private final static int [] BG_4X_RESOURCES = new int [] {
R.drawable.widget_4x_yellow,
R.drawable.widget_4x_blue,
@@ -149,12 +241,23 @@ public class ResourceParser {
R.drawable.widget_4x_red
};
+ /**
+ * ȡ4xСԴ
+ * @param id Դid
+ * @return 4xСԴ
+ */
public static int getWidget4xBgResource(int id) {
return BG_4X_RESOURCES[id];
}
}
+ /**
+ * TextAppearanceResourcesıصԴ
+ */
public static class TextAppearanceResources {
+ /**
+ * ıԴ
+ */
private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
R.style.TextAppearanceNormal,
R.style.TextAppearanceMedium,
@@ -162,11 +265,15 @@ public class ResourceParser {
R.style.TextAppearanceSuper
};
+ /**
+ * ȡıԴ
+ * @param id Դid
+ * @return ıԴ
+ */
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}
+ * HACKME: 洢ڹѡеԴidĴ
+ * idܴԴijȣ£BG_DEFAULT_FONT_SIZE
*/
if (id >= TEXTAPPEARANCE_RESOURCES.length) {
return BG_DEFAULT_FONT_SIZE;
@@ -174,6 +281,10 @@ public class ResourceParser {
return TEXTAPPEARANCE_RESOURCES[id];
}
+ /**
+ * ȡԴĴС
+ * @return ԴĴС
+ */
public static int getResourcesSize() {
return TEXTAPPEARANCE_RESOURCES.length;
}
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/ui/AlarmAlertActivity.java
similarity index 63%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to src/ui/AlarmAlertActivity.java
index 85723be..e3327bd 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/ui/AlarmAlertActivity.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -32,68 +16,91 @@ 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 long mNoteId; //文本在数据库存储中的ID号
+ private String mSnippet; //闹钟提示时出现的文本片段
private static final int SNIPPET_PREW_MAX_LEN = 60;
MediaPlayer mPlayer;
-
+
@Override
- protected void onCreate(Bundle savedInstanceState) {
+ 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 {
@@ -101,12 +108,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
try {
mPlayer.setDataSource(this, url);
+ //方法:setDataSource(Context context, Uri uri)
+ //解释:无返回值,设置多媒体数据来源【根据 Uri】
mPlayer.prepare();
+ //准备同步
mPlayer.setLooping(true);
+ //设置是否循环播放
mPlayer.start();
+ //开始播放
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ //e.printStackTrace()函数功能是抛出异常, 还将显示出更深的调用信息
+ //System.out.println(e),这个方法打印出异常,并且输出在哪里出现的异常
} catch (SecurityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -118,41 +132,61 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
e.printStackTrace();
}
}
-
+
private void showActionDialog() {
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+ //AlertDialog的构造方法全部是Protected的
+ //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
+ //要创建一个AlertDialog,就要用到AlertDialog.Builder中的create()方法
+ //如这里的dialog就是新建了一个AlertDialog
dialog.setTitle(R.string.app_name);
+ //为对话框设置标题
dialog.setMessage(mSnippet);
+ //为对话框设置内容
dialog.setPositiveButton(R.string.notealert_ok, this);
+ //给对话框添加"Yes"按钮
if (isScreenOn()) {
dialog.setNegativeButton(R.string.notealert_enter, this);
- }
+ }//对话框添加"No"按钮
dialog.show().setOnDismissListener(this);
}
-
+
public void onClick(DialogInterface dialog, int which) {
switch (which) {
+ //用which来选择click后下一步的操作
case DialogInterface.BUTTON_NEGATIVE:
+ //这是取消操作
Intent intent = new Intent(this, NoteEditActivity.class);
+ //实现两个类间的数据传输
intent.setAction(Intent.ACTION_VIEW);
+ //设置动作属性
intent.putExtra(Intent.EXTRA_UID, mNoteId);
+ //实现key-value对
+ //EXTRA_UID为key;mNoteId为键
startActivity(intent);
+ //开始动作
break;
default:
+ //这是确定操作
break;
}
}
-
+
public void onDismiss(DialogInterface dialog) {
+ //忽略
stopAlarmSound();
+ //停止闹钟声音
finish();
+ //完成该动作
}
-
+
private void stopAlarmSound() {
if (mPlayer != null) {
mPlayer.stop();
+ //停止播放
mPlayer.release();
+ //释放MediaPlayer对象
mPlayer = null;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/ui/AlarmInitReceiver.java
similarity index 73%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to src/ui/AlarmInitReceiver.java
index f221202..353f4ae 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/ui/AlarmInitReceiver.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -23,30 +7,34 @@ 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()产生一个当前的毫秒
+ //这个毫秒其实就是自1970年1月1日0时起的毫秒数
Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
new String[] { String.valueOf(currentDate) },
+ //将long变量currentDate转化为字符串
null);
-
+ //Cursor在这里的作用是通过查找数据库中的标签内容,找到和当前系统时间相等的标签
+
if (c != null) {
if (c.moveToFirst()) {
do {
@@ -61,5 +49,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
}
c.close();
}
+ //然而通过网上查找资料发现,对于闹钟机制的启动,通常需要上面的几个步骤
+ //如新建Intent、PendingIntent以及AlarmManager等
+ //这里就是根据数据库里的闹钟时间创建一个闹钟机制
}
-}
+}
\ No newline at end of file
diff --git a/src/ui/AlarmReceiver.java b/src/ui/AlarmReceiver.java
new file mode 100644
index 0000000..f35ed7b
--- /dev/null
+++ b/src/ui/AlarmReceiver.java
@@ -0,0 +1,20 @@
+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的
+
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/ui/DateTimePicker.java
similarity index 84%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to src/ui/DateTimePicker.java
index 496b0cd..c7fbbcd 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/src/ui/DateTimePicker.java
@@ -1,37 +1,22 @@
-/*
- * 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 {
-
+ //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;
@@ -45,25 +30,27 @@ public class DateTimePicker extends FrameLayout {
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) {
@@ -71,41 +58,49 @@ public class DateTimePicker extends FrameLayout {
updateDateControl();
onDateTimeChanged();
}
- };
-
+ };//OnValueChangeListener,这是时间改变监听器,这里主要是对日期的监听
+ //将现在日期的值传递给mDate;updateDateControl是同步操作
+
private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
+ //这里是对 小时(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));
@@ -114,18 +109,22 @@ public class DateTimePicker extends FrameLayout {
}
}
};
-
+
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());
@@ -143,9 +142,10 @@ public class DateTimePicker extends FrameLayout {
onDateTimeChanged();
}
};
-
+
private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
+ //对AM和PM的监听
+ @Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
mIsAm = !mIsAm;
if (mIsAm) {
@@ -157,63 +157,66 @@ public class DateTimePicker extends FrameLayout {
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 = (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) {
@@ -226,12 +229,14 @@ public class DateTimePicker extends FrameLayout {
mAmPmSpinner.setEnabled(enabled);
mIsEnabled = enabled;
}
-
+ //存在疑问!!!!!!!!!!!!!setEnabled的作用
+ //下面的代码通过原程序的注释已经比较清晰,另外可以通过函数名来判断
+ //下面的各函数主要是对上面代码引用到的各函数功能的实现
@Override
public boolean isEnabled() {
return mIsEnabled;
}
-
+
/**
* Get the current date in millis
*
@@ -239,8 +244,8 @@ public class DateTimePicker extends FrameLayout {
*/
public long getCurrentDateInTimeMillis() {
return mDate.getTimeInMillis();
- }
-
+ }//实现函数——得到当前的秒数
+
/**
* Set the current date
*
@@ -251,8 +256,8 @@ public class DateTimePicker extends FrameLayout {
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
*
@@ -269,17 +274,18 @@ public class DateTimePicker extends FrameLayout {
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
*
@@ -293,7 +299,7 @@ public class DateTimePicker extends FrameLayout {
updateDateControl();
onDateTimeChanged();
}
-
+
/**
* Get current month in the year
*
@@ -302,7 +308,7 @@ public class DateTimePicker extends FrameLayout {
public int getCurrentMonth() {
return mDate.get(Calendar.MONTH);
}
-
+
/**
* Set current month in the year
*
@@ -316,7 +322,7 @@ public class DateTimePicker extends FrameLayout {
updateDateControl();
onDateTimeChanged();
}
-
+
/**
* Get current day of the month
*
@@ -325,7 +331,7 @@ public class DateTimePicker extends FrameLayout {
public int getCurrentDay() {
return mDate.get(Calendar.DAY_OF_MONTH);
}
-
+
/**
* Set current day of the month
*
@@ -339,7 +345,7 @@ public class DateTimePicker extends FrameLayout {
updateDateControl();
onDateTimeChanged();
}
-
+
/**
* Get current hour in 24 hour mode, in the range (0~23)
* @return The current hour in 24 hour mode
@@ -347,7 +353,7 @@ public class DateTimePicker extends FrameLayout {
public int getCurrentHourOfDay() {
return mDate.get(Calendar.HOUR_OF_DAY);
}
-
+
private int getCurrentHour() {
if (mIs24HourView){
return getCurrentHourOfDay();
@@ -360,7 +366,7 @@ public class DateTimePicker extends FrameLayout {
}
}
}
-
+
/**
* Set current hour in 24 hour mode, in the range (0~23)
*
@@ -388,7 +394,7 @@ public class DateTimePicker extends FrameLayout {
mHourSpinner.setValue(hourOfDay);
onDateTimeChanged();
}
-
+
/**
* Get currentMinute
*
@@ -397,7 +403,7 @@ public class DateTimePicker extends FrameLayout {
public int getCurrentMinute() {
return mDate.get(Calendar.MINUTE);
}
-
+
/**
* Set current minute
*/
@@ -409,14 +415,14 @@ public class DateTimePicker extends FrameLayout {
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.
*
@@ -433,7 +439,7 @@ public class DateTimePicker extends FrameLayout {
setCurrentHour(hour);
updateAmPmControl();
}
-
+
private void updateDateControl() {
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(mDate.getTimeInMillis());
@@ -446,8 +452,8 @@ public class DateTimePicker extends FrameLayout {
mDateSpinner.setDisplayedValues(mDateDisplayValues);
mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2);
mDateSpinner.invalidate();
- }
-
+ }// 对于星期几的算法
+
private void updateAmPmControl() {
if (mIs24HourView) {
mAmPmSpinner.setVisibility(View.GONE);
@@ -455,9 +461,9 @@ public class DateTimePicker extends FrameLayout {
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);
@@ -465,9 +471,9 @@ public class DateTimePicker extends FrameLayout {
} 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
@@ -475,11 +481,11 @@ public class DateTimePicker extends FrameLayout {
public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) {
mOnDateTimeChangedListener = callback;
}
-
+
private void onDateTimeChanged() {
if (mOnDateTimeChangedListener != null) {
mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(),
getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute());
- }
+ }
}
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/ui/DateTimePickerDialog.java
similarity index 74%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to src/ui/DateTimePickerDialog.java
index 2c47ba4..c11de32 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/ui/DateTimePickerDialog.java
@@ -1,49 +1,40 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.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();
+ //创建一个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) {
@@ -52,26 +43,31 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
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 |
@@ -79,12 +75,13 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
DateUtils.FORMAT_SHOW_TIME;
flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
- }
-
+ }//android开发中常见日期管理工具类(API)——DateUtils:按照上下午显示时间
+
public void onClick(DialogInterface arg0, int arg1) {
if (mOnDateTimeSetListener != null) {
mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
}
- }
-
+ }//第一个参数arg0是接收到点击事件的对话框
+ //第二个参数arg1是该对话框上的按钮
+
}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/ui/DropdownMenu.java
similarity index 65%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to src/ui/DropdownMenu.java
index 613dc74..4c4cf90 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/ui/DropdownMenu.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -24,38 +8,42 @@ 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);
- }
-}
+ }//布局文件,设置标题
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/ui/FoldersListAdapter.java
similarity index 72%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to src/ui/FoldersListAdapter.java
index 96b77da..4fbe285 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/ui/FoldersListAdapter.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -23,31 +7,36 @@ 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) {
- return new FolderListItem(context);
- }
-
+ //ViewGroup是容器
+ return new FolderListItem(context);
+ }//创建一个文件夹,对于各文件夹中子标签的初始化
+
@Override
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof FolderListItem) {
@@ -55,26 +44,28 @@ public class FoldersListAdapter extends CursorAdapter {
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
((FolderListItem) view).bind(folderName);
}
- }
-
+ }//将各个布局文件绑定起来
+
public String getFolderName(Context context, int position) {
Cursor cursor = (Cursor) getItem(position);
return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
- }
-
+ }//根据数据库中标签的ID得到标签的各项内容
+
private class FolderListItem extends LinearLayout {
private TextView mName;
-
+
public FolderListItem(Context context) {
super(context);
+ //操作数据库
inflate(context, R.layout.folder_list_item, this);
+ //根据布局文件的名字等信息将其找出来
mName = (TextView) findViewById(R.id.tv_folder_name);
}
-
+
public void bind(String name) {
mName.setText(name);
}
}
-
-}
+
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/ui/NoteEditActivity.java
similarity index 76%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to src/ui/NoteEditActivity.java
index 0bbc25d..35c9bad 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/ui/NoteEditActivity.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -51,7 +35,7 @@ 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;
@@ -64,26 +48,28 @@ 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);
@@ -91,8 +77,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
+ //put函数是将指定值和指定键相连
}
-
+
private static final Map sBgSelectorSelectionMap = new HashMap();
static {
sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
@@ -100,67 +87,73 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
+ //put函数是将指定值和指定键相连
}
-
+
private static final Map sFontSizeBtnsMap = new HashMap();
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;
-
- private WorkingNote mWorkingNote;
-
+ //私有化一个界面操作mNoteEditorPanel,文本编辑的控制板
+ //private WorkingNote mWorkingNote;
+ public WorkingNote mWorkingNote;
+ //对模板WorkingNote的初始化
private SharedPreferences mSharedPrefs;
+ //私有化SharedPreferences的数据存储方式
+ //它的本质是基于XML文件存储key-value键值对数据
private int mFontSizeId;
-
+ //用于操作字体的大小
private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
-
+
private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
-
+
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
@@ -176,9 +169,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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,
@@ -188,34 +181,42 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
mUserQuery = "";
-
+ //如果用户实例化标签时,系统并未给出标签ID
/**
* Starting from the searched result
*/
+ //根据键值查找ID
if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
}
-
+ //如果ID在数据库中未找到
if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
Intent jump = new Intent(this, NotesListActivity.class);
startActivity(jump);
+ //程序将跳转到上面声明的intent——jump
showToast(R.string.error_note_not_exist);
finish();
return false;
- } else {
+ }
+ //ID在数据库中找到
+ else {
mWorkingNote = WorkingNote.load(this, noteId);
if (mWorkingNote == null) {
Log.e(TAG, "load note failed with note id" + noteId);
+ //打印出红色的错误信息
finish();
return false;
}
}
+ //setSoftInputMode——软键盘输入模式
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
| WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
} else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
- // New note
+ // intent.getAction()
+ // 大多用于broadcast发送广播时给机制(intent)设置一个action,就是一个字符串
+ // 用户可以通过receive(接受)intent,通过 getAction得到的字符串,来决定做什么
long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID);
@@ -223,7 +224,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Notes.TYPE_WIDGET_INVALIDE);
int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
ResourceParser.getDefaultBgId(this));
-
+ // intent.getInt(Long、String)Extra是对各变量的语法分析
// Parse call-record note
String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
@@ -240,16 +241,18 @@ public class NoteEditActivity extends Activity implements OnClickListener,
finish();
return false;
}
+ //将电话号码与手机的号码簿相关
} else {
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
widgetType, bgResId);
mWorkingNote.convertToCallNote(phoneNumber, callDate);
+ //
}
} else {
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
bgResId);
- }
-
+ }//创建一个新的WorkingNote
+
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
| WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@ -261,16 +264,18 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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 {
@@ -282,42 +287,45 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
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 {
+ }
+ //如果系统时间大于了闹钟设置的时间,那么闹钟失效
+ 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);
@@ -329,26 +337,29 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (!mWorkingNote.existInDatabase()) {
saveNote();
}
+ //在创建一个新的标签时,先在数据库中匹配
+ //如果不存在,那么先在数据库中存储
outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
}
-
+
@Override
+ //MotionEvent是对屏幕触控的传递机制
public boolean dispatchTouchEvent(MotionEvent ev) {
if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mNoteBgColorSelector, ev)) {
mNoteBgColorSelector.setVisibility(View.GONE);
return true;
- }
-
+ }//颜色选择器在屏幕上可见
+
if (mFontSizeSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mFontSizeSelector, ev)) {
mFontSizeSelector.setVisibility(View.GONE);
return true;
- }
+ }//字体大小选择器在屏幕上可见
return super.dispatchTouchEvent(ev);
}
-
+ //对屏幕触控的坐标进行操作
private boolean inRangeOfView(View view, MotionEvent ev) {
int []location = new int[2];
view.getLocationOnScreen(location);
@@ -357,12 +368,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (ev.getX() < x
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
- || ev.getY() > (y + view.getHeight())) {
+ || ev.getY() > (y + view.getHeight()))
+ //如果触控的位置超出了给定的范围,返回false
+ {
return false;
}
return true;
}
-
+
private void initResources() {
mHeadViewPanel = findViewById(R.id.note_title);
mNoteHeaderHolder = new HeadViewHolder();
@@ -377,13 +390,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
for (int id : sBgSelectorBtnsMap.keySet()) {
ImageView iv = (ImageView) findViewById(id);
iv.setOnClickListener(this);
- }
-
+ }//对标签各项属性内容的初始化
+
mFontSizeSelector = findViewById(R.id.font_size_selector);
for (int id : sFontSizeBtnsMap.keySet()) {
View view = findViewById(id);
view.setOnClickListener(this);
- };
+ };//对字体大小的选择
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
/**
@@ -396,7 +409,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
}
-
+
@Override
protected void onPause() {
super.onPause();
@@ -405,7 +418,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
clearSettingState();
}
-
+ //和桌面小工具的同步
private void updateWidget() {
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -416,15 +429,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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) {
@@ -450,18 +463,18 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
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);
@@ -472,15 +485,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
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;
@@ -489,6 +503,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
menu.clear();
if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
getMenuInflater().inflate(R.menu.call_note_edit, menu);
+ // MenuInflater是用来实例化Menu目录下的Menu布局文件的
} else {
getMenuInflater().inflate(R.menu.note_edit, menu);
}
@@ -504,47 +519,73 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
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:
@@ -552,112 +593,171 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
return true;
}
-
+
+ /*
+ * 函数功能:建立事件提醒器
+ * 函数实现:如下注释
+ */
private void setReminder() {
DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+ // 建立修改时间日期的对话框
d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
public void OnDateTimeSet(AlertDialog dialog, long date) {
mWorkingNote.setAlertDate(date , true);
+ //选择提醒的日期
}
- });
+ });
+ //建立时间日期的监听器
d.show();
+ //显示对话框
}
-
+
/**
* Share note to apps that support {@link Intent#ACTION_SEND} action
* and {@text/plain} type
*/
+ /*
+ * 函数功能:共享便签
+ * 函数实现:如下注释
+ */
private void sendTo(Context context, String info) {
Intent intent = new Intent(Intent.ACTION_SEND);
+ //建立intent链接选项
intent.putExtra(Intent.EXTRA_TEXT, info);
+ //将需要传递的便签信息放入text文件中
intent.setType("text/plain");
+ //编辑连接器的类型
context.startActivity(intent);
+ //在acti中进行链接
}
-
+
+ /*
+ * 函数功能:创建一个新的便签
+ * 函数实现:如下注释
+ */
private void createNewNote() {
// Firstly, save current editing notes
+ //保存当前便签
saveNote();
-
+
// For safety, start a new NoteEditActivity
finish();
Intent intent = new Intent(this, NoteEditActivity.class);
+ //设置链接器
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ //该活动定义为创建或编辑
intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+ //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中
startActivity(intent);
+ //开始activity并链接
}
-
+
+ /*
+ * 函数功能:删除当前便签
+ * 函数实现:如下注释
+ */
private void deleteCurrentNote() {
if (mWorkingNote.existInDatabase()) {
+ //假如当前运行的便签内存有数据
HashSet ids = new HashSet();
long id = mWorkingNote.getNoteId();
if (id != Notes.ID_ROOT_FOLDER) {
ids.add(id);
+ //如果不是头文件夹建立一个hash表把便签id存起来
} else {
Log.d(TAG, "Wrong note id, should not happen");
+ //否则报错
}
if (!isSyncMode()) {
+ //在非同步模式情况下
+ //删除操作
if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
Log.e(TAG, "Delete Note error");
}
} else {
+ //同步模式
+ //移动至垃圾文件夹的操作
if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens");
}
}
}
mWorkingNote.markDeleted(true);
+ //将这些标签的删除标记置为true
}
-
+
+ /*
+ * 函数功能:判断是否为同步模式
+ * 函数实现:直接看NotesPreferenceActivity中同步名称是否为空
+ */
private boolean isSyncMode() {
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
-
+
+ /*
+ * 函数功能:设置提醒时间
+ * 函数实现:如下注释
+ */
public void onClockAlertChanged(long date, boolean set) {
/**
* User could set clock to an unsaved note, so before setting the
* alert clock, we should save the note first
*/
if (!mWorkingNote.existInDatabase()) {
+ //首先保存已有的便签
saveNote();
}
if (mWorkingNote.getNoteId() > 0) {
Intent intent = new Intent(this, AlarmReceiver.class);
intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+ //若有有运行的便签就是建立一个链接器将标签id都存在uri中
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
+ //设置提醒管理器
showAlertHeader();
if(!set) {
alarmManager.cancel(pendingIntent);
} else {
alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
}
+ //如果用户设置了时间,就通过提醒管理器设置一个监听事项
} else {
/**
* There is the condition that user has input nothing (the note is
* not worthy saving), we have no note id, remind the user that he
* should input something
- */
+ */
+ //没有运行的便签就报错
Log.e(TAG, "Clock alert setting error");
showToast(R.string.error_note_empty_for_clock);
}
}
-
+
+ /*
+ * 函数功能:Widget发生改变的所触发的事件
+ */
public void onWidgetChanged() {
- updateWidget();
+ updateWidget();//更新Widget
}
-
+
+ /*
+ * 函数功能: 删除编辑文本框所触发的事件
+ * 函数实现:如下注释
+ */
public void onEditTextDelete(int index, String text) {
int childCount = mEditTextList.getChildCount();
if (childCount == 1) {
return;
}
-
+ //没有编辑框的话直接返回
for (int i = index + 1; i < childCount; i++) {
((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
.setIndex(i - 1);
+ //通过id把编辑框存在便签编辑框中
}
-
+
mEditTextList.removeViewAt(index);
+ //删除特定位置的视图
NoteEditText edit = null;
if(index == 0) {
edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
@@ -666,69 +766,101 @@ public class NoteEditActivity extends Activity implements OnClickListener,
edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
R.id.et_edit_text);
}
+ //通过id把编辑框存在空的NoteEditText中
int length = edit.length();
edit.append(text);
- edit.requestFocus();
- edit.setSelection(length);
+ edit.requestFocus();//请求优先完成该此 编辑
+ edit.setSelection(length);//定位到length位置处的条目
}
-
+
+ /*
+ * 函数功能:进入编辑文本框所触发的事件
+ * 函数实现:如下注释
+ */
public void onEditTextEnter(int index, String text) {
/**
* Should not happen, check for debug
*/
if(index > mEditTextList.getChildCount()) {
Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
+ //越界把偶偶
}
-
+
View view = getListItem(text, index);
mEditTextList.addView(view, index);
+ //建立一个新的视图并添加到编辑文本框内
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
- edit.requestFocus();
- edit.setSelection(0);
+ edit.requestFocus();//请求优先操作
+ edit.setSelection(0);//定位到起始位置
for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
.setIndex(i);
+ //遍历子文本框并设置对应对下标
}
}
-
+
+ /*
+ * 函数功能:切换至列表模式
+ * 函数实现:如下注释
+ */
private void switchToListMode(String text) {
mEditTextList.removeAllViews();
String[] items = text.split("\n");
int index = 0;
+ //清空所有视图,初始化下标
for (String item : items) {
if(!TextUtils.isEmpty(item)) {
mEditTextList.addView(getListItem(item, index));
index++;
+ //遍历所有文本单元并添加到文本框中
}
}
mEditTextList.addView(getListItem("", index));
mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
-
+ //优先请求此操作
+
mNoteEditor.setVisibility(View.GONE);
+ //便签编辑器不可见
mEditTextList.setVisibility(View.VISIBLE);
+ //将文本编辑框置为可见
}
-
+
+ /*
+ * 函数功能:获取高亮效果的反馈情况
+ * 函数实现:如下注释
+ */
private Spannable getHighlightQueryResult(String fullText, String userQuery) {
SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
+ //新建一个效果选项
if (!TextUtils.isEmpty(userQuery)) {
mPattern = Pattern.compile(userQuery);
+ //将用户的询问进行解析
Matcher m = mPattern.matcher(fullText);
+ //建立一个状态机检查Pattern并进行匹配
int start = 0;
while (m.find(start)) {
spannable.setSpan(
new BackgroundColorSpan(this.getResources().getColor(
R.color.user_query_highlight)), m.start(), m.end(),
Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ //设置背景颜色
start = m.end();
+ //跟新起始位置
}
}
return spannable;
}
-
+
+ /*
+ * 函数功能:获取列表项
+ * 函数实现:如下注释
+ */
private View getListItem(String item, int index) {
View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
+ //创建一个视图
final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ //创建一个文本编辑框并设置可见性
CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -739,75 +871,111 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
});
-
+ //建立一个打钩框并设置监听器
+
if (item.startsWith(TAG_CHECKED)) {
+ //选择勾选
cb.setChecked(true);
edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
item = item.substring(TAG_CHECKED.length(), item.length()).trim();
} else if (item.startsWith(TAG_UNCHECKED)) {
+ //选择不勾选
cb.setChecked(false);
edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
}
-
+
edit.setOnTextViewChangeListener(this);
edit.setIndex(index);
edit.setText(getHighlightQueryResult(item, mUserQuery));
+ //运行编辑框的监听器对该行为作出反应,并设置下标及文本内容
return view;
}
-
+
+ /*
+ * 函数功能:便签内容发生改变所 触发的事件
+ * 函数实现:如下注释
+ */
public void onTextChange(int index, boolean hasText) {
if (index >= mEditTextList.getChildCount()) {
Log.e(TAG, "Wrong index, should not happen");
return;
+ //越界报错
}
if(hasText) {
mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
} else {
mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
}
+ //如果内容不为空则将其子编辑框可见性置为可见,否则不可见
}
-
+
+ /*
+ * 函数功能:检查模式和列表模式的切换
+ * 函数实现:如下注释
+ */
public void onCheckListModeChanged(int oldMode, int newMode) {
if (newMode == TextNote.MODE_CHECK_LIST) {
switchToListMode(mNoteEditor.getText().toString());
+ //检查模式切换到列表模式
} else {
if (!getWorkingText()) {
mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
""));
}
+ //若是获取到文本就改变其检查标记
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
mEditTextList.setVisibility(View.GONE);
mNoteEditor.setVisibility(View.VISIBLE);
+ //修改文本编辑器的内容和可见性
}
}
-
+
+ /*
+ * 函数功能:设置勾选选项表并返回是否勾选的标记
+ * 函数实现:如下注释
+ */
private boolean getWorkingText() {
boolean hasChecked = false;
+ //初始化check标记
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 若模式为CHECK_LIST
StringBuilder sb = new StringBuilder();
+ //创建可变字符串
for (int i = 0; i < mEditTextList.getChildCount(); i++) {
View view = mEditTextList.getChildAt(i);
+ //遍历所有子编辑框的视图
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
if (!TextUtils.isEmpty(edit.getText())) {
+ //若文本不为空
if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
+ //该选项框已打钩
sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
hasChecked = true;
+ //扩展字符串为已打钩并把标记置true
} else {
sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
+ //扩展字符串添加未打钩
}
}
}
mWorkingNote.setWorkingText(sb.toString());
+ //利用编辑好的字符串设置运行便签的内容
} else {
mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+ // 若不是该模式直接用编辑器中的内容设置运行中标签的内容
}
return hasChecked;
}
-
+
+ /*
+ * 函数功能:保存便签
+ * 函数实现:如下注释
+ */
private boolean saveNote() {
getWorkingText();
boolean saved = mWorkingNote.saveNote();
+ //运行 getWorkingText()之后保存
if (saved) {
/**
* There are two modes from List view to edit view, open one note,
@@ -816,11 +984,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
* new node requires to the top of the list. This code
* {@link #RESULT_OK} is used to identify the create/edit state
*/
+ //如英文注释所说链接RESULT_OK是为了识别保存的2种情况,一是创建后保存,二是修改后保存
setResult(RESULT_OK);
}
return saved;
}
-
+
+ /*
+ * 函数功能:将便签发送至桌面
+ * 函数实现:如下注释
+ */
private void sendToDesktop() {
/**
* Before send message to home, we should make sure that current
@@ -829,12 +1002,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
if (!mWorkingNote.existInDatabase()) {
saveNote();
+ //若不存在数据也就是新的标签就保存起来先
}
-
+
if (mWorkingNote.getNoteId() > 0) {
+ //若是有内容
Intent sender = new Intent();
Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
+ //建立发送到桌面的连接器
shortcutIntent.setAction(Intent.ACTION_VIEW);
+ //链接为一个视图
shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
sender.putExtra(Intent.EXTRA_SHORTCUT_NAME,
@@ -842,9 +1019,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
sender.putExtra("duplicate", true);
+ //将便签的相关信息都添加到要发送的文件里
sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+ //设置sneder的行为是发送
showToast(R.string.info_note_enter_desktop);
sendBroadcast(sender);
+ //显示到桌面
} else {
/**
* There is the condition that user has input nothing (the note is
@@ -853,26 +1033,35 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
Log.e(TAG, "Send to desktop error");
showToast(R.string.error_note_empty_for_send_to_desktop);
+ //空便签直接报错
}
}
-
+
+ /*
+ * 函数功能:编辑小图标的标题
+ * 函数实现:如下注释
+ */
private String makeShortcutIconTitle(String content) {
content = content.replace(TAG_CHECKED, "");
content = content.replace(TAG_UNCHECKED, "");
return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
SHORTCUT_ICON_TITLE_MAX_LEN) : content;
- }
-
+ //直接设置为content中的内容并返回,有勾选和未勾选2种
+ }
+
+ /*
+ * 函数功能:显示提示的视图
+ * 函数实现:根据下标显示对应的提示
+ */
private void showToast(int resId) {
showToast(resId, Toast.LENGTH_SHORT);
}
-
+
+ /*
+ * 函数功能:持续显示提示的视图
+ * 函数实现:根据下标和持续的时间(duration)编辑提示视图并显示
+ */
private void showToast(int resId, int duration) {
Toast.makeText(this, resId, duration).show();
}
-
-
- public void OnOpenMenu(View view) {
- openOptionsMenu();
- }
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/ui/NoteEditText.java
similarity index 60%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to src/ui/NoteEditText.java
index 2afe2a8..fa3db89 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/ui/NoteEditText.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -31,187 +15,256 @@ 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 {
+
+//继承edittext,设置便签设置文本框
+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:" ;
-
+
+ ///建立一个字符和整数的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(context, null);//用super引用父类变量
mIndex = 0;
}
-
+
+ //设置当前光标
public void setIndex(int index) {
mIndex = index;
}
-
+
+ //初始化文本修改标记
public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
mOnTextViewChangeListener = listener;
}
-
- public NoteEditText(Context context, AttributeSet attrs) {
+
+ //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 constructor stub
- }
-
+ // 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 (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/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/ui/NoteItemData.java
similarity index 79%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to src/ui/NoteItemData.java
index 0f5a878..7b9be8d 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/ui/NoteItemData.java
@@ -1,31 +1,15 @@
-/*
- * 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,
@@ -41,7 +25,7 @@ public class NoteItemData {
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;
@@ -54,7 +38,7 @@ public class NoteItemData {
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;
@@ -69,14 +53,15 @@ public class NoteItemData {
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) {
+ //初始化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);
@@ -91,134 +76,139 @@ public class NoteItemData {
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)) {
+ 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;
-
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
+
+ //主要是设置上诉2标记
+ if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {
+ if (cursor.moveToPrevious()) {//获取光标位置后看上一行
if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
+ || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;
+ mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
} else {
- mIsOneNoteFollowingFolder = true;
+ mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
}
}
- if (!cursor.moveToNext()) {
+ if (!cursor.moveToNext()) {//若不能再往下走则报错
throw new IllegalStateException("cursor move to previous but can't move back");
}
}
}
}
-
+///以下都是获取标记没什么好说的,不过倒数第二个需要说明下,很具体看下面
public boolean isOneFollowingFolder() {
return mIsOneNoteFollowingFolder;
}
-
+
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);
}
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/ui/NotesListActivity.java
similarity index 89%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to src/ui/NotesListActivity.java
index 2fa42ce..1e6b10d 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/ui/NotesListActivity.java
@@ -1,22 +1,5 @@
-/*
- * 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.R.menu;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -60,6 +43,7 @@ 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;
@@ -71,104 +55,118 @@ 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 {
+//主界面,一进入就是这个界面
+/**
+ * @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";
-
+
+ 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 Button mMenuSet;
-
+
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(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ // 创建类
+ 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
+ // 结果值 和 要求值 符合要求
+ 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 {
- in = getResources().openRawResource(R.raw.introduction);
+ // 把资源文件放到应用程序的/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];
+ char [] buf = new char[1024]; // 自行定义的数值,使用者不知道有什么意义
int len = 0;
while ((len = br.read(buf)) > 0) {
sb.append(buf, 0, len);
@@ -181,7 +179,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
e.printStackTrace();
return;
} finally {
- if(in != null) {
+ if (in != null) {
try {
in.close();
} catch (IOException e) {
@@ -190,12 +188,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
}
-
+
+ // 创建空的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");
@@ -203,28 +203,30 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
}
-
+
@Override
protected void onStart() {
super.onStart();
startAsyncNotesListQuery();
}
-
+
+ // 初始化资源
private void initResources() {
- mContentResolver = this.getContentResolver();
+ mContentResolver = this.getContentResolver(); // 获取应用程序的数据,得到类似数据表的东西
mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
- mNotesListView = (ListView) findViewById(R.id.notes_list);
+
+ // 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);
+ mAddNewNote = (Button) findViewById(R.id.btn_new_note);// 在activity中要获取该按钮
mAddNewNote.setOnClickListener(this);
mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
- mMenuSet = (Button) findViewById(R.id.btn_set);
mDispatch = false;
mDispatchY = 0;
mOriginY = 0;
@@ -232,16 +234,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mState = ListEditState.NOTE_LIST;
mModeCallBack = new ModeCallback();
}
-
+
+ // 继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener
private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
private DropdownMenu mDropDownMenu;
private ActionMode mActionMode;
- private Menu menu;
private MenuItem mMoveMenu;
-
+
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
getMenuInflater().inflate(R.menu.note_list_options, menu);
- this.menu = menu;
menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
mMoveMenu = menu.findItem(R.id.move);
if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
@@ -255,8 +256,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mNotesListAdapter.setChoiceMode(true);
mNotesListView.setLongClickable(false);
mAddNewNote.setVisibility(View.GONE);
- mMenuSet.setVisibility(View.GONE);
-
+
View customView = LayoutInflater.from(NotesListActivity.this).inflate(
R.layout.note_list_dropdown_menu, null);
mode.setCustomView(customView);
@@ -264,21 +264,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
(Button) customView.findViewById(R.id.selection_menu),
R.menu.note_list_dropdown);
mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
- public boolean onMenuItemClick(MenuItem item) {
+ 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);
+ mDropDownMenu.setTitle(format); // 更改标题
MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
if (item != null) {
if (mNotesListAdapter.isAllSelected()) {
@@ -290,63 +291,40 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
}
-
+
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.clearChoices();
- mNotesListView.setItemChecked(0,true);
- mNotesListView.setItemChecked(0,false);
-
mNotesListView.setLongClickable(true);
- System.out.println("-----------------onDestroyActionMode------------------");
- mNotesListAdapter.notifyDataSetChanged();
-// closeOptionsMenu();
-// mNotesListView.invalidate();
mAddNewNote.setVisibility(View.VISIBLE);
- mMenuSet.setVisibility(View.VISIBLE);
-
-
-
-// mNotesListView.setChoiceMode(ListView.CHOICE_MODE_NONE);
-
-// menu.clear();
-// menu.close();
}
-
-
-
+
public void finishActionMode() {
mActionMode.finish();
- mActionMode = null;
- mNotesListAdapter.setChoiceMode(false);
- mNotesListView.setLongClickable(true);
}
-
-
-
+
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);
@@ -373,10 +351,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
return true;
}
}
-
-
+
private class NewNoteOnTouchListener implements OnTouchListener {
-
+
public boolean onTouch(View v, MotionEvent event) {
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN: {
@@ -395,7 +372,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
/**
* 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)
+ * "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
@@ -434,9 +411,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return false;
}
-
+
};
-
+
private void startAsyncNotesListQuery() {
String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
: NORMAL_SELECTION;
@@ -445,12 +422,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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) {
@@ -469,13 +446,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
}
-
+
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));
@@ -490,14 +467,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
});
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) {
@@ -519,7 +496,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return widgets;
}
-
+
@Override
protected void onPostExecute(HashSet widgets) {
if (widgets != null) {
@@ -534,13 +511,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}.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,
@@ -561,21 +538,20 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
}
-
+
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);
- mMenuSet.setVisibility(View.GONE);
} else {
mState = ListEditState.SUB_FOLDER;
}
@@ -586,7 +562,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
mTitleBar.setVisibility(View.VISIBLE);
}
-
+
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_new_note:
@@ -596,19 +572,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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);
@@ -626,14 +602,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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() {
@@ -666,7 +642,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
dialog.dismiss();
}
});
-
+
if (TextUtils.isEmpty(etName.getText())) {
positive.setEnabled(false);
}
@@ -676,9 +652,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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);
@@ -686,19 +662,20 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
positive.setEnabled(true);
}
}
-
+
public void afterTextChanged(Editable s) {
// TODO Auto-generated method stub
-
+
}
});
}
-
+
+ /* (non-Javadoc)
+ * @see android.app.Activity#onBackPressed()
+ * 按返回键时根据情况更改类中的数据
+ */
@Override
- public void onBackPressed() {
-
- System.out.println("-------onBackPressed---00000");
- switch (mState) {
+ public void onBackPressed() { switch (mState) {
case SUB_FOLDER:
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
@@ -709,19 +686,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
mAddNewNote.setVisibility(View.VISIBLE);
- mMenuSet.setVisibility(View.VISIBLE);
mTitleBar.setVisibility(View.GONE);
startAsyncNotesListQuery();
break;
case NOTE_LIST:
- System.out.println("-------onBackPressed---");
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) {
@@ -732,15 +712,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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) {
@@ -751,7 +734,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
};
-
+
@Override
public void onContextMenuClosed(Menu menu) {
if (mNotesListView != null) {
@@ -759,7 +742,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
super.onContextMenuClosed(menu);
}
-
+
+ /* (non-Javadoc)
+ * @see android.app.Activity#onContextItemSelected(android.view.MenuItem)
+ * 针对menu中不同的选择进行不同的处理,里面详细注释
+ */
@Override
public boolean onContextItemSelected(MenuItem item) {
if (mFocusNoteDataItem == null) {
@@ -768,10 +755,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
switch (item.getItemId()) {
case MENU_FOLDER_VIEW:
- openFolder(mFocusNoteDataItem);
+ openFolder(mFocusNoteDataItem);//打开对应文件
break;
case MENU_FOLDER_DELETE:
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ 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));
@@ -782,7 +769,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
});
builder.setNegativeButton(android.R.string.cancel, null);
- builder.show();
+ builder.show();//显示对话框
break;
case MENU_FOLDER_CHANGE_NAME:
showCreateOrModifyFolderDialog(false);
@@ -790,10 +777,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
default:
break;
}
-
+
return true;
}
-
+
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear();
@@ -811,7 +798,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return true;
}
-
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
@@ -851,22 +838,29 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
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) {
@@ -896,22 +890,33 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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();
@@ -923,7 +928,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return;
}
-
+
switch (mState) {
case NOTE_LIST:
if (item.getType() == Notes.TYPE_FOLDER
@@ -948,14 +953,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
}
-
+
}
-
+
+ /**
+ * 查询目标文件
+ */
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,
@@ -968,7 +976,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
},
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();
@@ -985,8 +999,4 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return false;
}
-
- public void OnOpenMenu(View view) {
- openOptionsMenu();
- }
-}
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/ui/NotesListAdapter.java
similarity index 58%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
rename to src/ui/NotesListAdapter.java
index 51c9cb9..ea7f9f9 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/ui/NotesListAdapter.java
@@ -1,85 +1,109 @@
-/*
- * 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.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;
-
+ 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();
+ 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) {
@@ -87,30 +111,47 @@ public class NotesListAdapter extends CursorAdapter {
}
}
}
+ //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
}
-
+
+ /*
+ * 函数功能:建立选择项的下标列表
+ * 函数实现:如下注释
+ */
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();
@@ -127,58 +168,90 @@ public class NotesListAdapter extends CursorAdapter {
}
return itemSet;
}
-
+
+ /*
+ * 函数功能:获取选项个数
+ * 函数实现:如下注释
+ */
public int getSelectedCount() {
Collection values = mSelectedIndex.values();
+ //首先获取选项下标的值
if (null == values) {
return 0;
}
Iterator iter = values.iterator();
+ //初始化叠加器
int count = 0;
while (iter.hasNext()) {
if (true == iter.next()) {
+ //若value值为真计数+1
count++;
}
}
return count;
}
-
+
+ /*
+ * 函数功能:判断是否全部选中
+ * 函数实现:如下注释
+ */
public boolean isAllSelected() {
int checkedCount = getSelectedCount();
return (checkedCount != 0 && checkedCount == mNotesCount);
+ //获取选项数看是否等于便签的个数
}
-
+
+ /*
+ * 函数功能:判断是否为选项表
+ * 函数实现:通过传递的下标来确定
+ */
public boolean isSelectedItem(final int position) {
if (null == mSelectedIndex.get(position)) {
return false;
}
return mSelectedIndex.get(position);
}
-
+
@Override
+ /*
+ * 函数功能:在activity内容发生局部变动的时候回调该函数计算便签的数量
+ * 函数实现:如下注释
+ */
protected void onContentChanged() {
super.onContentChanged();
+ //执行基类函数
calcNotesCount();
}
-
+
@Override
+ /*
+ * 函数功能:在activity光标发生局部变动的时候回调该函数计算便签的数量
+ */
public void changeCursor(Cursor cursor) {
super.changeCursor(cursor);
+ //执行基类函数
calcNotesCount();
}
-
+
+ /*
+ * 函数功能:计算便签数量
+ *
+ */
private void calcNotesCount() {
mNotesCount = 0;
for (int i = 0; i < getCount(); i++) {
+ //获取总数同时遍历
Cursor c = (Cursor) getItem(i);
if (c != null) {
if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
mNotesCount++;
+ //若该位置不为空并且文本类型为便签就+1
}
} else {
Log.e(TAG, "Invalid cursor");
return;
}
+ //否则报错
}
- }
-}
+ }
+}
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/ui/NotesListItem.java
similarity index 65%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
rename to src/ui/NotesListItem.java
index 1221e80..08a8017 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/ui/NotesListItem.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -23,44 +7,50 @@ 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;
-
+ 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);
+ 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);
+ 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);
@@ -69,8 +59,9 @@ public class NotesListItem extends LinearLayout {
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.setImageResource(R.drawable.clock);//图片来源的设置
mAlert.setVisibility(View.VISIBLE);
} else {
mAlert.setVisibility(View.GONE);
@@ -78,7 +69,7 @@ public class NotesListItem extends LinearLayout {
} 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,
@@ -87,36 +78,39 @@ public class NotesListItem extends LinearLayout {
} else {
mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
if (data.hasAlert()) {
- mAlert.setImageResource(R.drawable.clock);
+ mAlert.setImageResource(R.drawable.clock);///设置图片来源
mAlert.setVisibility(View.VISIBLE);
} else {
mAlert.setVisibility(View.GONE);
}
}
}
- mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
-
+ ///设置内容,获取相关时间,从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()) {
+ } else if (data.isLast()) {//是最后一个数据
setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
- } else if (data.isFirst() || data.isMultiFollowingFolder()) {
+ } 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/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/ui/NotesPreferenceActivity.java
similarity index 67%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to src/ui/NotesPreferenceActivity.java
index 07c5f7e..4ae4976 100644
--- a/src/MiNotes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/ui/NotesPreferenceActivity.java
@@ -1,21 +1,5 @@
-/*
- * 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;
@@ -41,108 +25,151 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
-
+
import net.micode.notes.R;
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.gtask.remote.GTaskSyncService;
-
-
+
+/*
+ *该类功能:NotesPreferenceActivity,在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+ * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+ */
public class NotesPreferenceActivity extends PreferenceActivity {
public static final String PREFERENCE_NAME = "notes_preferences";
-
+ //优先名
public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
-
+ //同步账号
public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
-
+ //同步时间
public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
-
+
private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
-
+ //同步密码
private static final String AUTHORITIES_FILTER_KEY = "authorities";
-
+ //本地密码
private PreferenceCategory mAccountCategory;
-
+ //账户分组
private GTaskReceiver mReceiver;
-
+ //同步任务接收器
private Account[] mOriAccounts;
-
+ //账户
private boolean mHasAddedAccount;
-
+ //账户的hash标记
+
@Override
+ /*
+ *函数功能:创建一个activity,在函数里要完成所有的正常静态设置
+ *参数:Bundle icicle:存放了 activity 当前的状态
+ *函数实现:如下注释
+ */
protected void onCreate(Bundle icicle) {
+ //先执行父类的创建函数
super.onCreate(icicle);
-
+
/* using the app icon for navigation */
getActionBar().setDisplayHomeAsUpEnabled(true);
-
+ //给左上角图标的左边加上一个返回的图标
+
addPreferencesFromResource(R.xml.preferences);
+ //添加xml来源并显示 xml
mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
+ //根据同步账户关键码来初始化分组
mReceiver = new GTaskReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
registerReceiver(mReceiver, filter);
-
+ //初始化同步组件
+
mOriAccounts = null;
View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
+ //获取listvivew,ListView的作用:用于列出所有选择
getListView().addHeaderView(header, null, true);
+ //在listview组件上方添加其他组件
}
-
+
@Override
+ /*
+ * 函数功能:activity交互功能的实现,用于接受用户的输入
+ * 函数实现:如下注释
+ */
protected void onResume() {
+ //先执行父类 的交互实现
super.onResume();
-
+
// need to set sync account automatically if user has added a new
// account
if (mHasAddedAccount) {
+ //若用户新加了账户则自动设置同步账户
Account[] accounts = getGoogleAccounts();
+ //获取google同步账户
if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
- for (Account accountNew : accounts) {
+ //若原账户不为空且当前账户有增加
+ 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();
@@ -150,22 +177,30 @@ public class NotesPreferenceActivity extends PreferenceActivity {
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() {
@@ -173,50 +208,67 @@ public class NotesPreferenceActivity extends PreferenceActivity {
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;
@@ -224,84 +276,120 @@ public class NotesPreferenceActivity extends PreferenceActivity {
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();
-
- // clean up last sync time
+ //提交修改的数据
+
+
setLastSyncTime(this, 0);
-
+ //将最后同步时间清零
+
// clean up local gtask related info
new Thread(new Runnable() {
public void run() {
@@ -311,24 +399,34 @@ public class NotesPreferenceActivity extends PreferenceActivity {
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() {
@@ -338,51 +436,79 @@ public class NotesPreferenceActivity extends PreferenceActivity {
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)) {
- TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
+ //获取随广播而来的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;
}
}
}
+
\ No newline at end of file
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
rename to src/widget/NoteWidgetProvider.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to src/widget/NoteWidgetProvider_2x.java
diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from src/MiNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to src/widget/NoteWidgetProvider_4x.java