diff --git a/src/Notes-master/.checkstyle b/src/Notes-master/.checkstyle
new file mode 100644
index 0000000..75246d3
--- /dev/null
+++ b/src/Notes-master/.checkstyle
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/src/Notes-master/.gitignore b/src/Notes-master/.gitignore
new file mode 100644
index 0000000..7df8dff
--- /dev/null
+++ b/src/Notes-master/.gitignore
@@ -0,0 +1,9 @@
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+project.properties
+.settings/
+.classpath
+.project
diff --git a/src/Notes-master/.idea/.name b/src/Notes-master/.idea/.name
new file mode 100644
index 0000000..7efc0ae
--- /dev/null
+++ b/src/Notes-master/.idea/.name
@@ -0,0 +1 @@
+Notes-master
\ No newline at end of file
diff --git a/src/Notes-master/.idea/Notes-master.iml b/src/Notes-master/.idea/Notes-master.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/src/Notes-master/.idea/Notes-master.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/compiler.xml b/src/Notes-master/.idea/compiler.xml
new file mode 100644
index 0000000..96cc43e
--- /dev/null
+++ b/src/Notes-master/.idea/compiler.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/copyright/profiles_settings.xml b/src/Notes-master/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/src/Notes-master/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml
new file mode 100644
index 0000000..01efd97
--- /dev/null
+++ b/src/Notes-master/.idea/misc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/modules.xml b/src/Notes-master/.idea/modules.xml
new file mode 100644
index 0000000..a1d3884
--- /dev/null
+++ b/src/Notes-master/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/vcs.xml b/src/Notes-master/.idea/vcs.xml
new file mode 100644
index 0000000..6564d52
--- /dev/null
+++ b/src/Notes-master/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/.idea/workspace.xml b/src/Notes-master/.idea/workspace.xml
new file mode 100644
index 0000000..5b1321d
--- /dev/null
+++ b/src/Notes-master/.idea/workspace.xml
@@ -0,0 +1,360 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1439184983736
+
+ 1439184983736
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/AndroidManifest.xml b/src/Notes-master/AndroidManifest.xml
similarity index 78%
rename from src/notesmaster/app/src/main/AndroidManifest.xml
rename to src/Notes-master/AndroidManifest.xml
index e061ed5..0571a3a 100644
--- a/src/notesmaster/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master/AndroidManifest.xml
@@ -1,6 +1,25 @@
+
+
+
+ android:versionCode="1"
+ android:versionName="0.1" package="net.micode.notes">
+
+
@@ -13,16 +32,8 @@
-
+ android:icon="@drawable/icon_app"
+ android:label="@string/app_name" >
+ android:windowSoftInputMode="adjustPan" >
@@ -43,8 +53,7 @@
android:name=".ui.NoteEditActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTop"
- android:theme="@style/NoteTheme"
- android:exported="true">
+ android:theme="@style/NoteTheme" >
@@ -70,7 +79,6 @@
android:resource="@xml/searchable" />
-
+ android:label="@string/app_widget2x2" >
@@ -92,8 +99,7 @@
+ android:label="@string/app_widget4x4" >
@@ -106,8 +112,7 @@
android:resource="@xml/widget_4x_info" />
-
+
@@ -140,17 +145,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/Notes-master/NOTICE b/src/Notes-master/NOTICE
new file mode 100644
index 0000000..9a54521
--- /dev/null
+++ b/src/Notes-master/NOTICE
@@ -0,0 +1,190 @@
+
+ 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.
+
+ 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.
+
+
+ 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
+
diff --git a/src/Notes-master/README b/src/Notes-master/README
new file mode 100644
index 0000000..fc0d824
--- /dev/null
+++ b/src/Notes-master/README
@@ -0,0 +1,23 @@
+[中文]
+
+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/notesmaster/app/src/main/res/color/primary_text_dark.xml b/src/Notes-master/res/color/primary_text_dark.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/color/primary_text_dark.xml
rename to src/Notes-master/res/color/primary_text_dark.xml
diff --git a/src/notesmaster/app/src/main/res/color/secondary_text_dark.xml b/src/Notes-master/res/color/secondary_text_dark.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/color/secondary_text_dark.xml
rename to src/Notes-master/res/color/secondary_text_dark.xml
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Notes-master/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
rename to src/Notes-master/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Notes-master/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
rename to src/Notes-master/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/call_record.png b/src/Notes-master/res/drawable-hdpi/call_record.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/call_record.png
rename to src/Notes-master/res/drawable-hdpi/call_record.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/clock.png b/src/Notes-master/res/drawable-hdpi/clock.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/clock.png
rename to src/Notes-master/res/drawable-hdpi/clock.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/delete.png b/src/Notes-master/res/drawable-hdpi/delete.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/delete.png
rename to src/Notes-master/res/drawable-hdpi/delete.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notes-master/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
rename to src/Notes-master/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Notes-master/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_blue.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_blue.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Notes-master/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_green.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_green.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Notes-master/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_red.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_red.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Notes-master/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Notes-master/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_green.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_title_green.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Notes-master/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_red.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_title_red.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Notes-master/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_white.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_title_white.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Notes-master/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Notes-master/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_white.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_white.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notes-master/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/edit_yellow.9.png
rename to src/Notes-master/res/drawable-hdpi/edit_yellow.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/font_large.png b/src/Notes-master/res/drawable-hdpi/font_large.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/font_large.png
rename to src/Notes-master/res/drawable-hdpi/font_large.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/font_normal.png b/src/Notes-master/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/font_normal.png
rename to src/Notes-master/res/drawable-hdpi/font_normal.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
rename to src/Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/font_small.png b/src/Notes-master/res/drawable-hdpi/font_small.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/font_small.png
rename to src/Notes-master/res/drawable-hdpi/font_small.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/font_super.png b/src/Notes-master/res/drawable-hdpi/font_super.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/font_super.png
rename to src/Notes-master/res/drawable-hdpi/font_super.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/icon_app.png b/src/Notes-master/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/icon_app.png
rename to src/Notes-master/res/drawable-hdpi/icon_app.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_background.png b/src/Notes-master/res/drawable-hdpi/list_background.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_background.png
rename to src/Notes-master/res/drawable-hdpi/list_background.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Notes-master/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_down.9.png
rename to src/Notes-master/res/drawable-hdpi/list_blue_down.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Notes-master/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
rename to src/Notes-master/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Notes-master/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_single.9.png
rename to src/Notes-master/res/drawable-hdpi/list_blue_single.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Notes-master/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_blue_up.9.png
rename to src/Notes-master/res/drawable-hdpi/list_blue_up.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Notes-master/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_folder.9.png
rename to src/Notes-master/res/drawable-hdpi/list_folder.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Notes-master/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
rename to src/Notes-master/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Notes-master/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_green_down.9.png
rename to src/Notes-master/res/drawable-hdpi/list_green_down.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Notes-master/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_green_middle.9.png
rename to src/Notes-master/res/drawable-hdpi/list_green_middle.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Notes-master/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_green_single.9.png
rename to src/Notes-master/res/drawable-hdpi/list_green_single.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Notes-master/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_green_up.9.png
rename to src/Notes-master/res/drawable-hdpi/list_green_up.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Notes-master/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_red_down.9.png
rename to src/Notes-master/res/drawable-hdpi/list_red_down.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Notes-master/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_red_middle.9.png
rename to src/Notes-master/res/drawable-hdpi/list_red_middle.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Notes-master/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_red_single.9.png
rename to src/Notes-master/res/drawable-hdpi/list_red_single.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Notes-master/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_red_up.9.png
rename to src/Notes-master/res/drawable-hdpi/list_red_up.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Notes-master/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_white_down.9.png
rename to src/Notes-master/res/drawable-hdpi/list_white_down.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Notes-master/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_white_middle.9.png
rename to src/Notes-master/res/drawable-hdpi/list_white_middle.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Notes-master/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_white_single.9.png
rename to src/Notes-master/res/drawable-hdpi/list_white_single.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Notes-master/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_white_up.9.png
rename to src/Notes-master/res/drawable-hdpi/list_white_up.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Notes-master/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
rename to src/Notes-master/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Notes-master/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
rename to src/Notes-master/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Notes-master/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
rename to src/Notes-master/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Notes-master/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
rename to src/Notes-master/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Notes-master/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/menu_delete.png
rename to src/Notes-master/res/drawable-hdpi/menu_delete.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/menu_move.png b/src/Notes-master/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/menu_move.png
rename to src/Notes-master/res/drawable-hdpi/menu_move.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Notes-master/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/new_note_normal.png
rename to src/Notes-master/res/drawable-hdpi/new_note_normal.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Notes-master/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/new_note_pressed.png
rename to src/Notes-master/res/drawable-hdpi/new_note_pressed.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to src/Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/notification.png b/src/Notes-master/res/drawable-hdpi/notification.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/notification.png
rename to src/Notes-master/res/drawable-hdpi/notification.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/search_result.png b/src/Notes-master/res/drawable-hdpi/search_result.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/search_result.png
rename to src/Notes-master/res/drawable-hdpi/search_result.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/selected.png b/src/Notes-master/res/drawable-hdpi/selected.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/selected.png
rename to src/Notes-master/res/drawable-hdpi/selected.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/title_alert.png b/src/Notes-master/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/title_alert.png
rename to src/Notes-master/res/drawable-hdpi/title_alert.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Notes-master/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
rename to src/Notes-master/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Notes-master/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_blue.png
rename to src/Notes-master/res/drawable-hdpi/widget_2x_blue.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Notes-master/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_green.png
rename to src/Notes-master/res/drawable-hdpi/widget_2x_green.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Notes-master/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_red.png
rename to src/Notes-master/res/drawable-hdpi/widget_2x_red.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Notes-master/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_white.png
rename to src/Notes-master/res/drawable-hdpi/widget_2x_white.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Notes-master/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
rename to src/Notes-master/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Notes-master/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_blue.png
rename to src/Notes-master/res/drawable-hdpi/widget_4x_blue.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Notes-master/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_green.png
rename to src/Notes-master/res/drawable-hdpi/widget_4x_green.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Notes-master/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_red.png
rename to src/Notes-master/res/drawable-hdpi/widget_4x_red.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Notes-master/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_white.png
rename to src/Notes-master/res/drawable-hdpi/widget_4x_white.png
diff --git a/src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Notes-master/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
rename to src/Notes-master/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/src/notesmaster/app/src/main/res/drawable/new_note.xml b/src/Notes-master/res/drawable/new_note.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/drawable/new_note.xml
rename to src/Notes-master/res/drawable/new_note.xml
diff --git a/src/notesmaster/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master/res/layout/account_dialog_title.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/account_dialog_title.xml
rename to src/Notes-master/res/layout/account_dialog_title.xml
diff --git a/src/notesmaster/app/src/main/res/layout/add_account_text.xml b/src/Notes-master/res/layout/add_account_text.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/add_account_text.xml
rename to src/Notes-master/res/layout/add_account_text.xml
diff --git a/src/notesmaster/app/src/main/res/layout/datetime_picker.xml b/src/Notes-master/res/layout/datetime_picker.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/datetime_picker.xml
rename to src/Notes-master/res/layout/datetime_picker.xml
diff --git a/src/notesmaster/app/src/main/res/layout/dialog_edit_text.xml b/src/Notes-master/res/layout/dialog_edit_text.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/dialog_edit_text.xml
rename to src/Notes-master/res/layout/dialog_edit_text.xml
diff --git a/src/notesmaster/app/src/main/res/layout/folder_list_item.xml b/src/Notes-master/res/layout/folder_list_item.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/folder_list_item.xml
rename to src/Notes-master/res/layout/folder_list_item.xml
diff --git a/src/notesmaster/app/src/main/res/layout/note_edit.xml b/src/Notes-master/res/layout/note_edit.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/note_edit.xml
rename to src/Notes-master/res/layout/note_edit.xml
diff --git a/src/notesmaster/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master/res/layout/note_edit_list_item.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/note_edit_list_item.xml
rename to src/Notes-master/res/layout/note_edit_list_item.xml
diff --git a/src/notesmaster/app/src/main/res/layout/note_item.xml b/src/Notes-master/res/layout/note_item.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/note_item.xml
rename to src/Notes-master/res/layout/note_item.xml
diff --git a/src/notesmaster/app/src/main/res/layout/note_list.xml b/src/Notes-master/res/layout/note_list.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/note_list.xml
rename to src/Notes-master/res/layout/note_list.xml
diff --git a/src/notesmaster/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/Notes-master/res/layout/note_list_dropdown_menu.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/note_list_dropdown_menu.xml
rename to src/Notes-master/res/layout/note_list_dropdown_menu.xml
diff --git a/src/notesmaster/app/src/main/res/layout/note_list_footer.xml b/src/Notes-master/res/layout/note_list_footer.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/note_list_footer.xml
rename to src/Notes-master/res/layout/note_list_footer.xml
diff --git a/src/notesmaster/app/src/main/res/layout/settings_header.xml b/src/Notes-master/res/layout/settings_header.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/settings_header.xml
rename to src/Notes-master/res/layout/settings_header.xml
diff --git a/src/notesmaster/app/src/main/res/layout/widget_2x.xml b/src/Notes-master/res/layout/widget_2x.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/widget_2x.xml
rename to src/Notes-master/res/layout/widget_2x.xml
diff --git a/src/notesmaster/app/src/main/res/layout/widget_4x.xml b/src/Notes-master/res/layout/widget_4x.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/layout/widget_4x.xml
rename to src/Notes-master/res/layout/widget_4x.xml
diff --git a/src/notesmaster/app/src/main/res/menu/call_note_edit.xml b/src/Notes-master/res/menu/call_note_edit.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/menu/call_note_edit.xml
rename to src/Notes-master/res/menu/call_note_edit.xml
diff --git a/src/notesmaster/app/src/main/res/menu/call_record_folder.xml b/src/Notes-master/res/menu/call_record_folder.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/menu/call_record_folder.xml
rename to src/Notes-master/res/menu/call_record_folder.xml
diff --git a/src/notesmaster/app/src/main/res/menu/note_edit.xml b/src/Notes-master/res/menu/note_edit.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/menu/note_edit.xml
rename to src/Notes-master/res/menu/note_edit.xml
diff --git a/src/notesmaster/app/src/main/res/menu/note_list.xml b/src/Notes-master/res/menu/note_list.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/menu/note_list.xml
rename to src/Notes-master/res/menu/note_list.xml
diff --git a/src/notesmaster/app/src/main/res/menu/note_list_dropdown.xml b/src/Notes-master/res/menu/note_list_dropdown.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/menu/note_list_dropdown.xml
rename to src/Notes-master/res/menu/note_list_dropdown.xml
diff --git a/src/notesmaster/app/src/main/res/menu/note_list_options.xml b/src/Notes-master/res/menu/note_list_options.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/menu/note_list_options.xml
rename to src/Notes-master/res/menu/note_list_options.xml
diff --git a/src/notesmaster/app/src/main/res/menu/sub_folder.xml b/src/Notes-master/res/menu/sub_folder.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/menu/sub_folder.xml
rename to src/Notes-master/res/menu/sub_folder.xml
diff --git a/src/notesmaster/app/src/main/res/raw-zh-rCN/introduction b/src/Notes-master/res/raw-zh-rCN/introduction
similarity index 100%
rename from src/notesmaster/app/src/main/res/raw-zh-rCN/introduction
rename to src/Notes-master/res/raw-zh-rCN/introduction
diff --git a/src/notesmaster/app/src/main/res/raw/introduction b/src/Notes-master/res/raw/introduction
similarity index 100%
rename from src/notesmaster/app/src/main/res/raw/introduction
rename to src/Notes-master/res/raw/introduction
diff --git a/src/notesmaster/app/src/main/res/values-zh-rCN/arrays.xml b/src/Notes-master/res/values-zh-rCN/arrays.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values-zh-rCN/arrays.xml
rename to src/Notes-master/res/values-zh-rCN/arrays.xml
diff --git a/src/notesmaster/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master/res/values-zh-rCN/strings.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values-zh-rCN/strings.xml
rename to src/Notes-master/res/values-zh-rCN/strings.xml
diff --git a/src/notesmaster/app/src/main/res/values-zh-rTW/arrays.xml b/src/Notes-master/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values-zh-rTW/arrays.xml
rename to src/Notes-master/res/values-zh-rTW/arrays.xml
diff --git a/src/notesmaster/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master/res/values-zh-rTW/strings.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values-zh-rTW/strings.xml
rename to src/Notes-master/res/values-zh-rTW/strings.xml
diff --git a/src/notesmaster/app/src/main/res/values/arrays.xml b/src/Notes-master/res/values/arrays.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values/arrays.xml
rename to src/Notes-master/res/values/arrays.xml
diff --git a/src/notesmaster/app/src/main/res/values/colors.xml b/src/Notes-master/res/values/colors.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values/colors.xml
rename to src/Notes-master/res/values/colors.xml
diff --git a/src/notesmaster/app/src/main/res/values/dimens.xml b/src/Notes-master/res/values/dimens.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values/dimens.xml
rename to src/Notes-master/res/values/dimens.xml
diff --git a/src/notesmaster/app/src/main/res/values/strings.xml b/src/Notes-master/res/values/strings.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values/strings.xml
rename to src/Notes-master/res/values/strings.xml
diff --git a/src/notesmaster/app/src/main/res/values/styles.xml b/src/Notes-master/res/values/styles.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/values/styles.xml
rename to src/Notes-master/res/values/styles.xml
diff --git a/src/notesmaster/app/src/main/res/xml/preferences.xml b/src/Notes-master/res/xml/preferences.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/xml/preferences.xml
rename to src/Notes-master/res/xml/preferences.xml
diff --git a/src/notesmaster/app/src/main/res/xml/searchable.xml b/src/Notes-master/res/xml/searchable.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/xml/searchable.xml
rename to src/Notes-master/res/xml/searchable.xml
diff --git a/src/notesmaster/app/src/main/res/xml/widget_2x_info.xml b/src/Notes-master/res/xml/widget_2x_info.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/xml/widget_2x_info.xml
rename to src/Notes-master/res/xml/widget_2x_info.xml
diff --git a/src/notesmaster/app/src/main/res/xml/widget_4x_info.xml b/src/Notes-master/res/xml/widget_4x_info.xml
similarity index 100%
rename from src/notesmaster/app/src/main/res/xml/widget_4x_info.xml
rename to src/Notes-master/res/xml/widget_4x_info.xml
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master/src/net/micode/notes/data/Contact.java
similarity index 61%
rename from src/notesmaster/app/src/main/java/net/micode/notes/data/Contact.java
rename to src/Notes-master/src/net/micode/notes/data/Contact.java
index b658581..dc1eb30 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/data/Contact.java
+++ b/src/Notes-master/src/net/micode/notes/data/Contact.java
@@ -17,6 +17,7 @@
package net.micode.notes.data;
import android.content.Context;
+
import android.database.Cursor;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.Data;
@@ -24,63 +25,61 @@ import android.telephony.PhoneNumberUtils;
import android.util.Log;
import java.util.HashMap;
-
-// Contact类用于获取与电话号码关联的联系人姓名
-public class Contact {
- // 缓存已查询的电话号码和对应的联系人姓名
+//change
+public class Contact { //联系人
private static HashMap sContactCache;
- // 日志标签，用于调试和错误日志
private static final String TAG = "Contact";
- // 用于查询联系人的SQL选择语句，其中"+"将被替换为电话号码的最小匹配值
- private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
- + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
- + " AND " + Data.RAW_CONTACT_ID + " IN "
+ // 定义字符串CALLER_ID_SELECTION
+ private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL("
+
++ Phone.NUMBER
+ + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+ + " AND " + Data.RAW_CONTACT_ID + " IN "
+ "(SELECT raw_contact_id "
+ " FROM phone_lookup"
+ " WHERE min_match = '+')";
-
- // 根据电话号码获取联系人姓名的方法
+
+ // 获取联系人
public static String getContact(Context context, String phoneNumber) {
- // 如果缓存为空，则初始化缓存
if(sContactCache == null) {
sContactCache = new HashMap();
}
-
- // 如果缓存中已存在该电话号码对应的联系人姓名，则直接返回
+
+ // 查找HashMap中是否已有phoneNumber信息
if(sContactCache.containsKey(phoneNumber)) {
return sContactCache.get(phoneNumber);
}
- // 替换SQL选择语句中的"+"为电话号码的最小匹配值
String selection = CALLER_ID_SELECTION.replace("+",
PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
- // 查询联系人数据
+ // 查找数据库中phoneNumber的信息
Cursor cursor = context.getContentResolver().query(
Data.CONTENT_URI,
- new String [] { Phone.DISPLAY_NAME }, // 查询联系人姓名
+ new String [] { Phone.DISPLAY_NAME },
selection,
- new String[] { phoneNumber }, // 查询条件为电话号码
+ new String[] { phoneNumber },
null);
-
- // 如果查询结果不为空且能够移动到第一条记录，则获取联系人姓名
+
+ // 判定查询结果
+ // moveToFirst()返回第一条
if (cursor != null && cursor.moveToFirst()) {
try {
- String name = cursor.getString(0); // 获取联系人姓名
- sContactCache.put(phoneNumber, name); // 将结果存入缓存
+ // 找到相关信息
+ String name = cursor.getString(0);
+ sContactCache.put(phoneNumber, name);
return name;
+ // 异常
} catch (IndexOutOfBoundsException e) {
- // 如果发生异常，记录错误日志并返回null
Log.e(TAG, " Cursor get string error " + e.toString());
return null;
} finally {
- cursor.close(); // 关闭游标释放资源
+ cursor.close();
}
+ // 未找到相关信息
} else {
- // 如果没有找到匹配的联系人，记录调试信息并返回null
Log.d(TAG, "No contact matched with number:" + phoneNumber);
return null;
}
}
}
-
diff --git a/src/Notes-master/src/net/micode/notes/data/Notes.java b/src/Notes-master/src/net/micode/notes/data/Notes.java
new file mode 100644
index 0000000..fb90c63
--- /dev/null
+++ b/src/Notes-master/src/net/micode/notes/data/Notes.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.data;
+
+import android.content.ContentUris;
+import android.net.Uri;
+// Notes 类中定义了很多常量，这些常量大多是int型和string型
+public class Notes {
+ public static final String AUTHORITY = "micode_notes";
+ public static final String TAG = "Notes";
+
+ //以下三个常量对NoteColumns.TYPE的值进行设置时会用到
+ public static final int TYPE_NOTE = 0;
+ public static final int TYPE_FOLDER = 1;
+ public static final int TYPE_SYSTEM = 2;
+
+ /**
+ * Following IDs are system folders' identifiers
+ * {@link Notes#ID_ROOT_FOLDER } is default folder
+ * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
+ * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
+ */
+ public static final int ID_ROOT_FOLDER = 0;
+ public static final int ID_TEMPARAY_FOLDER = -1;
+ public static final int ID_CALL_RECORD_FOLDER = -2;
+ public static final int ID_TRASH_FOLER = -3;
+
+ public static final String INTENT_EXTRA_ALERT_DATE =
+
+"net.micode.notes.alert_date";
+ public static final String INTENT_EXTRA_BACKGROUND_ID =
+
+"net.micode.notes.background_color_id";
+ public static final String INTENT_EXTRA_WIDGET_ID =
+
+"net.micode.notes.widget_id";
+ public static final String INTENT_EXTRA_WIDGET_TYPE =
+
+"net.micode.notes.widget_type";
+ public static final String INTENT_EXTRA_FOLDER_ID =
+
+"net.micode.notes.folder_id";
+ public static final String INTENT_EXTRA_CALL_DATE =
+
+"net.micode.notes.call_date";
+
+ public static final int TYPE_WIDGET_INVALIDE = -1;
+ public static final int TYPE_WIDGET_2X = 0;
+ public static final int TYPE_WIDGET_4X = 1;
+
+ public static class DataConstants {
+ public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
+ public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
+ }
+
+ /**
+ * Uri to query all notes and folders
+ */
+ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" +
+
+AUTHORITY + "/note");//定义查询便签和文件夹的指针。
+
+
+
+// public static final Uri my_URI = ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI , 10);
+
+
+
+
+ /**
+ * Uri to query data
+ */
+ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" +
+
+AUTHORITY + "/data");//定义查找数据的指针。
+
+ // 定义NoteColumns的常量,用于后面创建数据库的表头
+ public interface NoteColumns {
+ /**
+ * The unique ID for a row
+ *
Type: INTEGER (long)
+ */
+ public static final String ID = "_id";
+
+ /**
+ * The parent's id for note or folder
+ *
Type: INTEGER (long)
+ */
+ public static final String PARENT_ID = "parent_id";//为什么会有parent_id
+
+ /**
+ * Created data for note or folder
+ *
Type: INTEGER (long)
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ * Latest modified date
+ *
Type: INTEGER (long)
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+
+ /**
+ * Alert date
+ *
Type: INTEGER (long)
+ */
+ public static final String ALERTED_DATE = "alert_date";
+
+ /**
+ * Folder's name or text content of note
+ *
Type: TEXT
+ */
+ public static final String SNIPPET = "snippet";
+
+ /**
+ * Note's widget id
+ *
Type: INTEGER (long)
+ */
+ public static final String WIDGET_ID = "widget_id";
+
+ /**
+ * Note's widget type
+ *
Type: INTEGER (long)
+ */
+ public static final String WIDGET_TYPE = "widget_type";
+
+ /**
+ * Note's background color's id
+ *
Type: INTEGER (long)
+ */
+ public static final String BG_COLOR_ID = "bg_color_id";
+
+ /**
+ * For text note, it doesn't has attachment, for multi-media
+ * note, it has at least one attachment
+ *
Type: INTEGER
+ */
+ public static final String HAS_ATTACHMENT = "has_attachment";
+
+ /**
+ * Folder's count of notes
+ *
Type: INTEGER (long)
+ */
+ public static final String NOTES_COUNT = "notes_count";
+
+ /**
+ * The file type: folder or note
+ *
Type: INTEGER
+ */
+ public static final String TYPE = "type";
+
+ /**
+ * The last sync id
+ *
Type: INTEGER (long)
+ */
+ public static final String SYNC_ID = "sync_id";//同步
+
+ /**
+ * Sign to indicate local modified or not
+ *
Type: INTEGER
+ */
+ public static final String LOCAL_MODIFIED = "local_modified";
+
+ /**
+ * Original parent id before moving into temporary folder
+ *
Type : INTEGER
+ */
+ public static final String ORIGIN_PARENT_ID = "origin_parent_id";
+
+ /**
+ * The gtask id
+ *
Type : TEXT
+ */
+ public static final String GTASK_ID = "gtask_id";
+
+ /**
+ * The version code
+ *
Type : INTEGER (long)
+ */
+ public static final String VERSION = "version";
+ }//这些常量主要是定义便签的属性的。
+
+ // 定义DataColumns的常量,用于后面创建数据库的表头
+ public interface DataColumns {
+ /**
+ * The unique ID for a row
+ *
Type: INTEGER (long)
+ */
+ public static final String ID = "_id";
+
+ /**
+ * The MIME type of the item represented by this row.
+ *
Type: Text
+ */
+ public static final String MIME_TYPE = "mime_type";
+
+ /**
+ * The reference id to note that this data belongs to
+ *
Type: INTEGER (long)
+ */
+ public static final String NOTE_ID = "note_id";
+
+ /**
+ * Created data for note or folder
+ *
Type: INTEGER (long)
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ * Latest modified date
+ *
Type: INTEGER (long)
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+ /**
+ * Data's content
+ *
Type: TEXT
+ */
+ public static final String CONTENT = "content";
+
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific,
+
+used for
+ * integer data type
+ *
Type: INTEGER
+ */
+ public static final String DATA1 = "data1";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific,
+
+used for
+ * integer data type
+ *
Type: INTEGER
+ */
+ public static final String DATA2 = "data2";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific,
+
+used for
+ * TEXT data type
+ *
Type: TEXT
+ */
+ public static final String DATA3 = "data3";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific,
+
+used for
+ * TEXT data type
+ *
Type: TEXT
+ */
+ public static final String DATA4 = "data4";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific,
+
+used for
+ * TEXT data type
+ *
Type: TEXT
+ */
+ public static final String DATA5 = "data5";
+ }//主要是定义存储便签内容数据的
+ public static final class TextNote implements DataColumns {
+ /**
+ * Mode to indicate the text in check list mode or not
+ *
Type: Integer 1:check list mode 0: normal mode
+ */
+ public static final String MODE = DATA1;
+
+ public static final int MODE_CHECK_LIST = 1;
+
+ public static final String CONTENT_TYPE =
+
+"vnd.android.cursor.dir/text_note";
+
+ public static final String CONTENT_ITEM_TYPE =
+
+"vnd.android.cursor.item/text_note";
+
+ public static final Uri CONTENT_URI = Uri.parse("content://" +
+
+AUTHORITY + "/text_note");
+ }//文本内容的数据结构
+
+ public static final class CallNote implements DataColumns {
+ /**
+ * Call date for this record
+ *
Type: INTEGER (long)
+ */
+ public static final String CALL_DATE = DATA1;
+
+ /**
+ * Phone number for this record
+ *
Type: TEXT
+ */
+ public static final String PHONE_NUMBER = DATA3;
+
+ public static final String CONTENT_TYPE =
+
+"vnd.android.cursor.dir/call_note";
+
+ public static final String CONTENT_ITEM_TYPE =
+
+"vnd.android.cursor.item/call_note";
+
+ public static final Uri CONTENT_URI = Uri.parse("content://" +
+
+AUTHORITY + "/call_note");
+ }//电话内容的数据结构
+}
diff --git a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
new file mode 100644
index 0000000..5761f90
--- /dev/null
+++ b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.data;
+
+import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。
+import android.content.Context;//加载和访问资源。（android中主要是这两个功能，但是这里具体不清楚）
+import android.database.sqlite.SQLiteDatabase;//主要提供了对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values
+import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新
+import android.util.Log;
+
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+//数据库操作，用SQLOpenhelper,对一些note和文件进行数据库的操作，比如删除文件后，将文件里的note也相应删除
+
+public class NotesDatabaseHelper extends SQLiteOpenHelper {
+ private static final String DB_NAME = "note.db";
+
+ private static final int DB_VERSION = 4;
+
+ public interface TABLE { //接口，分成note和data，在后面的程序里分别使用过
+ public static final String NOTE = "note";
+
+ public static final String DATA = "data";
+ }
+
+ private static final String TAG = "NotesDatabaseHelper";
+
+ private static NotesDatabaseHelper mInstance;
+
+ private static final String CREATE_NOTE_TABLE_SQL =
+ "CREATE TABLE " + TABLE.NOTE + "(" +
+ NoteColumns.ID + " INTEGER PRIMARY KEY," +
+ NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
+ NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
+ ")";//数据库中需要存储的项目的名称，就相当于创建一个表格的表头的内容。
+
+ private static final String CREATE_DATA_TABLE_SQL =
+ "CREATE TABLE " + TABLE.DATA + "(" +
+ DataColumns.ID + " INTEGER PRIMARY KEY," +
+ DataColumns.MIME_TYPE + " TEXT NOT NULL," +
+ DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
+ DataColumns.DATA1 + " INTEGER," +
+ DataColumns.DATA2 + " INTEGER," +
+ DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
+ DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
+ DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
+ ")";//和上面的功能一样，主要是存储的项目不同
+
+ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
+ "CREATE INDEX IF NOT EXISTS note_id_index ON " +
+ TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";//存储便签编号的一个数据表格
+
+ /**
+ * Increase folder's note count when move note to the folder
+ */
+ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
+ "CREATE TRIGGER increase_folder_count_on_update "+
+ " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
+ " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
+ " END";//在文件夹中移入一个Note之后需要更改的数据的表格。
+
+ /**
+ * Decrease folder's note count when move note from folder
+ */
+ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
+ "CREATE TRIGGER decrease_folder_count_on_update " +
+ " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
+ " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
+ " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
+ " END";//在文件夹中移出一个Note之后需要更改的数据的表格。
+
+ /**
+ * Increase folder's note count when insert new note to the folder
+ */
+ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
+ "CREATE TRIGGER increase_folder_count_on_insert " +
+ " AFTER INSERT ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
+ " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
+ " END";//在文件夹中插入一个Note之后需要更改的数据的表格。
+
+ /**
+ * Decrease folder's note count when delete note from the folder
+ */
+ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER decrease_folder_count_on_delete " +
+ " AFTER DELETE ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
+ " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
+ " AND " + NoteColumns.NOTES_COUNT + ">0;" +
+ " END";//在文件夹中删除一个Note之后需要更改的数据的表格。
+
+ /**
+ * Update note's content when insert data with type {@link DataConstants#NOTE}
+ */
+ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
+ "CREATE TRIGGER update_note_content_on_insert " +
+ " AFTER INSERT ON " + TABLE.DATA +
+ " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
+ " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
+ " END";//在文件夹中对一个Note导入新的数据之后需要更改的数据的表格。
+
+ /**
+ * Update note's content when data with {@link DataConstants#NOTE} type has changed
+ */
+ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
+ "CREATE TRIGGER update_note_content_on_update " +
+ " AFTER UPDATE ON " + TABLE.DATA +
+ " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
+ " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
+ " END";//Note数据被修改后需要更改的数据的表格。
+
+ /**
+ * Update note's content when data with {@link DataConstants#NOTE} type has deleted
+ */
+ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER update_note_content_on_delete " +
+ " AFTER delete ON " + TABLE.DATA +
+ " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.SNIPPET + "=''" +
+ " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
+ " END";//Note数据被删除后需要更改的数据的表格。
+
+ /**
+ * Delete datas belong to note which has been deleted
+ */
+ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER delete_data_on_delete " +
+ " AFTER DELETE ON " + TABLE.NOTE +
+ " BEGIN" +
+ " DELETE FROM " + TABLE.DATA +
+ " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
+ " END";//删除已删除的便签的数据后需要更改的数据的表格。
+
+ /**
+ * Delete notes belong to folder which has been deleted
+ */
+ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER folder_delete_notes_on_delete " +
+ " AFTER DELETE ON " + TABLE.NOTE +
+ " BEGIN" +
+ " DELETE FROM " + TABLE.NOTE +
+ " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
+ " END";//删除已删除的文件夹的便签后需要更改的数据的表格。
+
+ /**
+ * Move notes belong to folder which has been moved to trash folder
+ */
+ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
+ "CREATE TRIGGER folder_move_notes_on_trash " +
+ " AFTER UPDATE ON " + TABLE.NOTE +
+ " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+ " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
+ " END";//还原垃圾桶中便签后需要更改的数据的表格。
+
+ public NotesDatabaseHelper(Context context) {
+ super(context, DB_NAME, null, DB_VERSION);
+ }//构造函数，传入数据库的名称和版本
+
+ public void createNoteTable(SQLiteDatabase db) {
+ db.execSQL(CREATE_NOTE_TABLE_SQL);
+ reCreateNoteTableTriggers(db);
+ createSystemFolder(db);
+ Log.d(TAG, "note table has been created");
+ }//创建表格（用来存储标签属性）
+
+ private void reCreateNoteTableTriggers(SQLiteDatabase db) {
+ db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
+
+ db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
+ db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
+ db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
+ db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
+ db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
+ }//execSQL是数据库操作的API，主要是更改行为的SQL语句。
+ //在这里主要是用来重新创建上述定义的表格用的，先删除原来有的数据库的触发器再重新创建新的数据库
+
+ private void createSystemFolder(SQLiteDatabase db) {
+ ContentValues values = new ContentValues();
+
+ /**
+ * call record foler for call notes
+ */
+ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * root folder which is default folder
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * temporary folder which is used for moving note
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * create trash folder
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+ }//创建几个系统文件夹
+
+ public void createDataTable(SQLiteDatabase db) {
+ db.execSQL(CREATE_DATA_TABLE_SQL);
+ reCreateDataTableTriggers(db);
+ db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
+ Log.d(TAG, "data table has been created");
+ }//创建表格（用来存储标签内容）
+
+ private void reCreateDataTableTriggers(SQLiteDatabase db) {
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
+
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
+ }//同上面的execSQL
+
+ static synchronized NotesDatabaseHelper getInstance(Context context) {
+ if (mInstance == null) {
+ mInstance = new NotesDatabaseHelper(context);
+ }
+ return mInstance;
+ }//上网查是为解决同一时刻只能有一个线程执行.
+ //在写程序库代码时，有时有一个类需要被所有的其它类使用，
+ //但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ createNoteTable(db);
+ createDataTable(db);
+ }//实现两个表格（上面创建的两个表格）
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ boolean reCreateTriggers = false;
+ boolean skipV2 = false;
+
+ if (oldVersion == 1) {
+ upgradeToV2(db);
+ skipV2 = true; // this upgrade including the upgrade from v2 to v3
+ oldVersion++;
+ }
+
+ if (oldVersion == 2 && !skipV2) {
+ upgradeToV3(db);
+ reCreateTriggers = true;
+ oldVersion++;
+ }
+
+ if (oldVersion == 3) {
+ upgradeToV4(db);
+ oldVersion++;
+ }
+
+ if (reCreateTriggers) {
+ reCreateNoteTableTriggers(db);
+ reCreateDataTableTriggers(db);
+ }
+
+ if (oldVersion != newVersion) {
+ throw new IllegalStateException("Upgrade notes database to version " + newVersion
+ + "fails");
+ }
+ }//数据库版本的更新（数据库内容的更改）
+
+ private void upgradeToV2(SQLiteDatabase db) {
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
+ createNoteTable(db);
+ createDataTable(db);
+ }//更新到V2版本
+
+ private void upgradeToV3(SQLiteDatabase db) {
+ // drop unused triggers
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
+ // add a column for gtask id
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+ + " TEXT NOT NULL DEFAULT ''");
+ // add a trash system folder
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+ }//更新到V3版本
+
+ private void upgradeToV4(SQLiteDatabase db) {
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ + " INTEGER NOT NULL DEFAULT 0");
+ }//更新到V4版本,但是不知道V2、V3、V4是什么意思
+}
diff --git a/src/Notes-master/src/net/micode/notes/data/NotesProvider.java b/src/Notes-master/src/net/micode/notes/data/NotesProvider.java
new file mode 100644
index 0000000..e06717b
--- /dev/null
+++ b/src/Notes-master/src/net/micode/notes/data/NotesProvider.java
@@ -0,0 +1,337 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.data;
+
+
+import android.app.SearchManager;
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.NotesDatabaseHelper.TABLE;
+//为存储和获取数据提供接口。可以在不同的应用程序之间共享数据
+//ContentProvider提供的方法
+//query：查询
+//insert：插入
+//update：更新
+//delete：删除
+//getType：得到数据类型
+public class NotesProvider extends ContentProvider {
+ // UriMatcher用于匹配Uri
+ private static final UriMatcher mMatcher;
+
+ private NotesDatabaseHelper mHelper;
+
+ private static final String TAG = "NotesProvider";
+
+ private static final int URI_NOTE = 1;
+ private static final int URI_NOTE_ITEM = 2;
+ private static final int URI_DATA = 3;
+ private static final int URI_DATA_ITEM = 4;
+
+ private static final int URI_SEARCH = 5;
+ private static final int URI_SEARCH_SUGGEST = 6;
+
+ static {
+ // 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码
+ mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+ // 把需要匹配Uri路径全部给注册上
+ mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
+ mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
+ mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
+ mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM);
+ mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);
+ mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);
+ mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
+ }
+
+ /**
+ * x'0A' represents the '\n' character in sqlite. For title and content in the search result,
+ * we will trim '\n' and white space in order to show more information.
+ */
+ // 声明 NOTES_SEARCH_PROJECTION
+ private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
+ + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
+ + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
+ + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
+ + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
+ + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
+ + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
+ // 声明NOTES_SNIPPET_SEARCH_QUERY
+ private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
+ + " FROM " + TABLE.NOTE
+ + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
+ + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
+ + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
+
+ @Override
+ // Context只有在onCreate()中才被初始化
+ // 对mHelper进行实例化
+ public boolean onCreate() {
+ mHelper = NotesDatabaseHelper.getInstance(getContext());
+ return true;
+ }
+
+ @Override
+ // 查询uri在数据库中对应的位置
+ public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+ String sortOrder) {
+ Cursor c = null;
+ // 获取可读数据库
+ SQLiteDatabase db = mHelper.getReadableDatabase();
+ String id = null;
+ // 匹配查找uri
+ switch (mMatcher.match(uri)) {
+ // 对于不同的匹配值，在数据库中查找相应的条目
+ case URI_NOTE:
+ c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ break;
+ case URI_NOTE_ITEM:
+ id = uri.getPathSegments().get(1);
+ c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs, null, null, sortOrder);
+ break;
+ case URI_DATA:
+ c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ break;
+ case URI_DATA_ITEM:
+ id = uri.getPathSegments().get(1);
+ c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs, null, null, sortOrder);
+ break;
+ case URI_SEARCH:
+ case URI_SEARCH_SUGGEST:
+ if (sortOrder != null || projection != null) {
+ // 不合法的参数异常
+ throw new IllegalArgumentException(
+ "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
+ }
+
+ String searchString = null;
+ if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
+ if (uri.getPathSegments().size() > 1) {
+ // getPathSegments()方法得到一个String的List，
+ // 在uri.getPathSegments().get(1)为第2个元素
+ searchString = uri.getPathSegments().get(1);
+ }
+ } else {
+ searchString = uri.getQueryParameter("pattern");
+ }
+
+ if (TextUtils.isEmpty(searchString)) {
+ return null;
+ }
+
+ try {
+ searchString = String.format("%%%s%%", searchString);
+ c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
+ new String[] { searchString });
+ } catch (IllegalStateException ex) {
+ Log.e(TAG, "got exception: " + ex.toString());
+ }
+ break;
+ default:
+ // 抛出异常
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+ if (c != null) {
+ c.setNotificationUri(getContext().getContentResolver(), uri);
+ }
+ return c;
+ }
+
+ @Override
+ // 插入一个uri
+ public Uri insert(Uri uri, ContentValues values) {
+ // 获得可写的数据库
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ long dataId = 0, noteId = 0, insertedId = 0;
+ switch (mMatcher.match(uri)) {
+ // 新增一个条目
+ case URI_NOTE:
+ insertedId = noteId = db.insert(TABLE.NOTE, null, values);
+ break;
+ // 如果存在，查找NOTE_ID
+ case URI_DATA:
+ if (values.containsKey(DataColumns.NOTE_ID)) {
+ noteId = values.getAsLong(DataColumns.NOTE_ID);
+ } else {
+ Log.d(TAG, "Wrong data format without note id:" + values.toString());
+ }
+ insertedId = dataId = db.insert(TABLE.DATA, null, values);
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+ // Notify the note uri
+ // notifyChange获得一个ContextResolver对象并且更新里面的内容
+ if (noteId > 0) {
+ getContext().getContentResolver().notifyChange(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
+ }
+
+ // Notify the data uri
+ if (dataId > 0) {
+ getContext().getContentResolver().notifyChange(
+ ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
+ }
+
+ // 返回插入的uri的路径
+ return ContentUris.withAppendedId(uri, insertedId);
+ }
+
+ @Override
+ // 删除一个uri
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ //Uri代表要操作的数据，Android上可用的每种资源 -包括 图像、视频片段、音频资源等都可以用Uri来表示。
+ int count = 0;
+ String id = null;
+ // 获得可写的数据库
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ boolean deleteData = false;
+ switch (mMatcher.match(uri)) {
+ case URI_NOTE:
+ selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
+ count = db.delete(TABLE.NOTE, selection, selectionArgs);
+ break;
+ case URI_NOTE_ITEM:
+ id = uri.getPathSegments().get(1);
+ /**
+ * ID that smaller than 0 is system folder which is not allowed to
+ * trash
+ */
+ long noteId = Long.valueOf(id);
+ if (noteId <= 0) {
+ break;
+ }
+ count = db.delete(TABLE.NOTE,
+ NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+ break;
+ case URI_DATA:
+ count = db.delete(TABLE.DATA, selection, selectionArgs);
+ deleteData = true;
+ break;
+ case URI_DATA_ITEM:
+ id = uri.getPathSegments().get(1);
+ count = db.delete(TABLE.DATA,
+ DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+ deleteData = true;
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+ if (count > 0) {
+ if (deleteData) {
+ getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+ }
+ getContext().getContentResolver().notifyChange(uri, null);
+ }
+ return count;
+ }
+
+ @Override
+ // 更新一个uri
+ public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ int count = 0;
+ String id = null;
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ boolean updateData = false;
+ switch (mMatcher.match(uri)) {
+ case URI_NOTE:
+ increaseNoteVersion(-1, selection, selectionArgs);
+ count = db.update(TABLE.NOTE, values, selection, selectionArgs);
+ break;
+ case URI_NOTE_ITEM:
+ id = uri.getPathSegments().get(1);
+ increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
+ count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs);
+ break;
+ case URI_DATA:
+ count = db.update(TABLE.DATA, values, selection, selectionArgs);
+ updateData = true;
+ break;
+ case URI_DATA_ITEM:
+ id = uri.getPathSegments().get(1);
+ count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs);
+ updateData = true;
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+
+ if (count > 0) {
+ if (updateData) {
+ getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+ }
+ getContext().getContentResolver().notifyChange(uri, null);
+ }
+ return count;
+ }
+
+ // 将字符串解析成规定格式
+ private String parseSelection(String selection) {
+ return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
+ }
+
+ //增加一个noteVersion
+ private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
+ StringBuilder sql = new StringBuilder(120);
+ sql.append("UPDATE ");
+ sql.append(TABLE.NOTE);
+ sql.append(" SET ");
+ sql.append(NoteColumns.VERSION);
+ sql.append("=" + NoteColumns.VERSION + "+1 ");
+
+ if (id > 0 || !TextUtils.isEmpty(selection)) {
+ sql.append(" WHERE ");
+ }
+ if (id > 0) {
+ sql.append(NoteColumns.ID + "=" + String.valueOf(id));
+ }
+ if (!TextUtils.isEmpty(selection)) {
+ String selectString = id > 0 ? parseSelection(selection) : selection;
+ for (String args : selectionArgs) {
+ selectString = selectString.replaceFirst("\\?", args);
+ }
+ sql.append(selectString);
+ }
+
+ // execSQL()方法可以执行insert、delete、update和CREATE TABLE之类有更改行为的SQL语句
+ mHelper.getWritableDatabase().execSQL(sql.toString());
+ }
+
+ @Override
+ public String getType(Uri uri) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
diff --git a/src/Notes-master/src/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master/src/net/micode/notes/gtask/data/MetaData.java
new file mode 100644
index 0000000..924b4d0
--- /dev/null
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/MetaData.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Description：
+ * 元数据（Metadata），又称中介数据、中继数据，为描述数据的数据（data about data）
+ * 主要是描述数据属性（property）的信息，用来支持如指示存储位置、历史数据、资源查找、文件记录等功能。
+ * 元数据算是一种电子式目录，为了达到编制目录的目的，必须在描述并收藏数据的内容或特色，进而达成协助数据检索的目的。
+ * 本类继承于Task,主要用于记录数据的变化
+ * Made By Cuican
+ */
+
+package net.micode.notes.gtask.data;
+
+import android.database.Cursor;
+import android.util.Log;
+
+import net.micode.notes.tool.GTaskStringUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class MetaData extends Task {
+ /*
+ * 功能描述：得到类的简写名称存入字符串TAG中
+ * 实现过程：调用getSimpleName ()函数
+ * Made By CuiCan
+ */
+ private final static String TAG = MetaData.class.getSimpleName();
+ private String mRelatedGid = null;
+ /*
+ * 功能描述：设置数据，即生成元数据库
+ * 实现过程：调用JSONObject库函数put ()，Task类中的setNotes ()和setName ()函数
+ * 参数注解：
+ * Made By CuiCan
+ */
+ 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");
+ /*
+ * 输出错误信息
+ * Made By Cui Can
+ */
+ }
+ setNotes(metaInfo.toString());
+ setName(GTaskStringUtils.META_NOTE_NAME);
+ }
+ /*
+ * 功能描述：获取相关联的Gid
+ * Made By CuiCan
+ */
+ public String getRelatedGid() {
+ return mRelatedGid;
+ }
+ /*
+ * 功能描述：判断当前数据是否为空，若为空则返回真即值得保存
+ * Made By CuiCan
+ */
+ @Override
+ public boolean isWorthSaving() {
+ return getNotes() != null;
+ }
+ /*
+ * 功能描述：使用远程json数据对象设置元数据内容
+ * 实现过程：调用父类Task中的setContentByRemoteJSON ()函数，并
+ * 参数注解：
+ * Made By CuiCan
+ */
+ @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");
+ /*
+ * 输出警告信息
+ * Made By Cui Can
+ */
+ 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");
+ /*
+ * 传递非法参数异常
+ * Made By Cui Can
+ */
+ }
+ /*
+ * 功能描述：从元数据内容中获取本地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
+ */
+ }
+
+}
diff --git a/src/Notes-master/src/net/micode/notes/gtask/data/Node.java b/src/Notes-master/src/net/micode/notes/gtask/data/Node.java
new file mode 100644
index 0000000..3b7baca
--- /dev/null
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/Node.java
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * @author TTS
+ */
+public abstract class Node {
+ //定义了各种用于表征同步状态的常量
+ public static final int SYNC_ACTION_NONE = 0;// 本地和云端都无可更新内容（即本地和云端内容一致）
+
+ public static final int SYNC_ACTION_ADD_REMOTE = 1;// 需要在远程云端增加内容
+
+ public static final int SYNC_ACTION_ADD_LOCAL = 2;// 需要在本地增加内容
+
+ public static final int SYNC_ACTION_DEL_REMOTE = 3;// 需要在远程云端删除内容
+
+ public static final int SYNC_ACTION_DEL_LOCAL = 4;// 需要在本地删除内容
+
+ public static final int SYNC_ACTION_UPDATE_REMOTE = 5;// 需要将本地内容更新到远程云端
+
+ public static final int SYNC_ACTION_UPDATE_LOCAL = 6;// 需要将远程云端内容更新到本地
+
+ public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;// 同步出现冲突
+
+ public static final int SYNC_ACTION_ERROR = 8;// 同步出现错误
+
+ private String mGid;
+
+ private String mName;
+
+ private long mLastModified;//记录最后一次修改时间
+
+ private boolean mDeleted;//表征是否被删除
+
+ public Node() {
+ mGid = null;
+ mName = "";
+ mLastModified = 0;
+ mDeleted = false;
+ }
+
+ public abstract JSONObject getCreateAction(int actionId);
+
+ public abstract JSONObject getUpdateAction(int actionId);
+
+ public abstract void setContentByRemoteJSON(JSONObject js);
+
+ public abstract void setContentByLocalJSON(JSONObject js);
+
+ public abstract JSONObject getLocalJSONFromContent();
+
+ public abstract int getSyncAction(Cursor c);
+
+ public void setGid(String gid) {
+ this.mGid = gid;
+ }
+
+ public void setName(String name) {
+ this.mName = name;
+ }
+
+ public void setLastModified(long lastModified) {
+ this.mLastModified = lastModified;
+ }
+
+ public void setDeleted(boolean deleted) {
+ this.mDeleted = deleted;
+ }
+
+ public String getGid() {
+ return this.mGid;
+ }
+
+ public String getName() {
+ return this.mName;
+ }
+
+ public long getLastModified() {
+ return this.mLastModified;
+ }
+
+ public boolean getDeleted() {
+ return this.mDeleted;
+ }
+
+}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master/src/net/micode/notes/gtask/data/SqlData.java
similarity index 74%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
rename to src/Notes-master/src/net/micode/notes/gtask/data/SqlData.java
index d3ec3be..4a44201 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/SqlData.java
@@ -12,10 +12,19 @@
* 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.
+ *
+ * Description：用于支持小米便签最底层的数据库相关操作，和sqlnote的关系上是子集关系，即data是note的子集（节点）。
+ * SqlData其实就是也就是所谓数据中的数据
+ *
*/
package net.micode.notes.gtask.data;
-
+/*
+ * 功能描述：
+ * 实现过程：
+ * 参数注解：
+ * Made By CuiCan
+ */
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -34,17 +43,30 @@ import net.micode.notes.gtask.exception.ActionFailureException;
import org.json.JSONException;
import org.json.JSONObject;
-
public class SqlData {
+ /*
+ * 功能描述：得到类的简写名称存入字符串TAG中
+ * 实现过程：调用getSimpleName ()函数
+ * Made By CuiCan
+ */
private static final String TAG = SqlData.class.getSimpleName();
- private static final int INVALID_ID = -99999;
+ private static final int INVALID_ID = -99999;//为mDataId置初始值-99999
+
+ /**
+ * 来自Notes类中定义的DataColumn中的一些常量
+ */
+
+ // 集合了interface DataColumns中所有SF常量
public static final String[] PROJECTION_DATA = new String[] {
DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
DataColumns.DATA3
};
+ /**
+ * 以下五个变量作为sql表中5列的编号
+ */
public static final int DATA_ID_COLUMN = 0;
public static final int DATA_MIME_TYPE_COLUMN = 1;
@@ -56,7 +78,7 @@ public class SqlData {
public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
private ContentResolver mContentResolver;
-
+ //判断是否直接用Content生成，是为true，否则为false
private boolean mIsCreate;
private long mDataId;
@@ -71,10 +93,17 @@ public class SqlData {
private ContentValues mDiffDataValues;
+ /*
+ * 功能描述：构造函数，用于初始化数据
+ * 参数注解：mContentResolver用于获取ContentProvider提供的数据
+ * 参数注解： mIsCreate表征当前数据是用哪种方式创建（两种构造函数的参数不同）
+ * 参数注解：
+ * Made By CuiCan
+ */
public SqlData(Context context) {
mContentResolver = context.getContentResolver();
mIsCreate = true;
- mDataId = INVALID_ID;
+ mDataId = INVALID_ID;//mDataId置初始值-99999
mDataMimeType = DataConstants.NOTE;
mDataContent = "";
mDataContentData1 = 0;
@@ -82,6 +111,14 @@ public class SqlData {
mDiffDataValues = new ContentValues();
}
+
+ /*
+ * 功能描述：构造函数，初始化数据
+ * 参数注解：mContentResolver用于获取ContentProvider提供的数据
+ * 参数注解： mIsCreate表征当前数据是用哪种方式创建（两种构造函数的参数不同）
+ * 参数注解：
+ * Made By CuiCan
+ */
public SqlData(Context context, Cursor c) {
mContentResolver = context.getContentResolver();
mIsCreate = false;
@@ -89,6 +126,11 @@ public class SqlData {
mDiffDataValues = new ContentValues();
}
+ /*
+ * 功能描述：从光标处加载数据
+ * 从当前的光标处将五列的数据加载到该类的对象
+ * Made By CuiCan
+ */
private void loadFromCursor(Cursor c) {
mDataId = c.getLong(DATA_ID_COLUMN);
mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
@@ -97,7 +139,14 @@ public class SqlData {
mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
}
+
+ /*
+ * 功能描述：设置用于共享的数据，并提供异常抛出与处理机制
+ * 参数注解：
+ * Made By CuiCan
+ */
public void setContent(JSONObject js) throws JSONException {
+ //如果传入的JSONObject对象中有DataColumns.ID这一项，则设置，否则设为INVALID_ID
long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
if (mIsCreate || mDataId != dataId) {
mDiffDataValues.put(DataColumns.ID, dataId);
@@ -130,11 +179,18 @@ public class SqlData {
mDataContentData3 = dataContentData3;
}
+
+ /*
+ * 功能描述：获取共享的数据内容，并提供异常抛出与处理机制
+ * 参数注解：
+ * Made By CuiCan
+ */
public JSONObject getContent() throws JSONException {
if (mIsCreate) {
Log.e(TAG, "it seems that we haven't created this in database yet");
return null;
}
+ //创建JSONObject对象。并将相关数据放入其中，并返回。
JSONObject js = new JSONObject();
js.put(DataColumns.ID, mDataId);
js.put(DataColumns.MIME_TYPE, mDataMimeType);
@@ -144,6 +200,11 @@ public class SqlData {
return js;
}
+ /*
+ * 功能描述：commit函数用于把当前造作所做的修改保存到数据库
+ * 参数注解：
+ * Made By CuiCan
+ */
public void commit(long noteId, boolean validateVersion, long version) {
if (mIsCreate) {
@@ -183,6 +244,12 @@ public class SqlData {
mIsCreate = false;
}
+ /*
+ * 功能描述：获取当前id
+ * 实现过程：
+ * 参数注解：
+ * Made By CuiCan
+ */
public long getId() {
return mDataId;
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
similarity index 82%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
rename to src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
index 79a4095..6e6452c 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
@@ -12,10 +12,18 @@
* 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.
+ *
+ * Description：用于支持小米便签最底层的数据库相关操作，和sqldata的关系上是父集关系，即note是data的子父集。
+ * 和SqlData相比，SqlNote算是真正意义上的数据了。
*/
package net.micode.notes.gtask.data;
-
+/*
+ * 功能描述：
+ * 实现过程：
+ * 参数注解：
+ * Made By CuiCan
+ */
import android.appwidget.AppWidgetManager;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -37,12 +45,16 @@ import org.json.JSONObject;
import java.util.ArrayList;
-
public class SqlNote {
+ /*
+ * 功能描述：得到类的简写名称存入字符串TAG中
+ * 实现过程：调用getSimpleName ()函数
+ * Made By CuiCan
+ */
private static final String TAG = SqlNote.class.getSimpleName();
private static final int INVALID_ID = -99999;
-
+ // 集合了interface NoteColumns中所有SF常量（17个）
public static final String[] PROJECTION_NOTE = new String[] {
NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
@@ -52,6 +64,7 @@ public class SqlNote {
NoteColumns.VERSION
};
+ //以下设置17个列的编号
public static final int ID_COLUMN = 0;
public static final int ALERTED_DATE_COLUMN = 1;
@@ -86,6 +99,7 @@ public class SqlNote {
public static final int VERSION_COLUMN = 16;
+ //一下定义了17个内部的变量，其中12个可以由content中获得，5个需要初始化为0或者new
private Context mContext;
private ContentResolver mContentResolver;
@@ -122,6 +136,13 @@ public class SqlNote {
private ArrayList mDataList;
+ /*
+ * 功能描述：构造函数
+ * 参数注解： mIsCreate用于标示构造方式
+ * 参数注解：
+ * Made By CuiCan
+ */
+ //构造函数只有context，对所有的变量进行初始化
public SqlNote(Context context) {
mContext = context;
mContentResolver = context.getContentResolver();
@@ -129,9 +150,9 @@ public class SqlNote {
mId = INVALID_ID;
mAlertDate = 0;
mBgColorId = ResourceParser.getDefaultBgId(context);
- mCreatedDate = System.currentTimeMillis();
+ mCreatedDate = System.currentTimeMillis();//调用系统函数获得创建时间
mHasAttachment = 0;
- mModifiedDate = System.currentTimeMillis();
+ mModifiedDate = System.currentTimeMillis();//最后一次修改时间初始化为创建时间
mParentId = 0;
mSnippet = "";
mType = Notes.TYPE_NOTE;
@@ -143,17 +164,33 @@ public class SqlNote {
mDataList = new ArrayList();
}
+
+ /*
+ * 功能描述：构造函数
+ * 参数注解： mIsCreate用于标示构造方式
+ * 参数注解：
+ * Made By CuiCan
+ */
+ //构造函数有context和一个数据库的cursor，多数变量通过cursor指向的一条记录直接进行初始化
public SqlNote(Context context, Cursor c) {
mContext = context;
mContentResolver = context.getContentResolver();
mIsCreate = false;
loadFromCursor(c);
mDataList = new ArrayList();
+ //
if (mType == Notes.TYPE_NOTE)
loadDataContent();
mDiffNoteValues = new ContentValues();
}
+
+ /*
+ * 功能描述：构造函数
+ * 参数注解： mIsCreate用于标示构造方式
+ * 参数注解：
+ * Made By CuiCan
+ */
public SqlNote(Context context, long id) {
mContext = context;
mContentResolver = context.getContentResolver();
@@ -166,16 +203,21 @@ public class SqlNote {
}
+ /*
+ * 功能描述：通过id从光标处加载数据
+ * Made By CuiCan
+ */
private void loadFromCursor(long id) {
Cursor c = null;
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
new String[] {
String.valueOf(id)
- }, null);
+ }, null);//通过id获得对应的ContentResolver中的cursor
if (c != null) {
c.moveToNext();
- loadFromCursor(c);
+ loadFromCursor(c);//然后加载数据进行初始化，这样函数
+ //SqlNote(Context context, long id)与SqlNote(Context context, long id)的实现方式基本相同
} else {
Log.w(TAG, "loadFromCursor: cursor = null");
}
@@ -185,7 +227,12 @@ public class SqlNote {
}
}
+ /*
+ * 功能描述：通过游标从光标处加载数据
+ * Made By CuiCan
+ */
private void loadFromCursor(Cursor c) {
+ //直接从一条记录中的获得以下变量的初始值
mId = c.getLong(ID_COLUMN);
mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
@@ -200,6 +247,11 @@ public class SqlNote {
mVersion = c.getLong(VERSION_COLUMN);
}
+ /*
+ * 功能描述：通过content机制获取共享数据并加载到数据库当前游标处
+ * 参数注解：
+ * Made By CuiCan
+ */
private void loadDataContent() {
Cursor c = null;
mDataList.clear();
@@ -226,6 +278,11 @@ public class SqlNote {
}
}
+ /*
+ * 功能描述：设置通过content机制用于共享的数据信息
+ * 参数注解：
+ * Made By CuiCan
+ */
public boolean setContent(JSONObject js) {
try {
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
@@ -267,7 +324,6 @@ public class SqlNote {
mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
}
mBgColorId = bgColorId;
-
long createDate = note.has(NoteColumns.CREATED_DATE) ? note
.getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
if (mIsCreate || mCreatedDate != createDate) {
@@ -359,6 +415,11 @@ public class SqlNote {
return true;
}
+ /*
+ * 功能描述：获取content机制提供的数据并加载到note中
+ * 参数注解：
+ * Made By CuiCan
+ */
public JSONObject getContent() {
try {
JSONObject js = new JSONObject();
@@ -369,7 +430,7 @@ public class SqlNote {
}
JSONObject note = new JSONObject();
- if (mType == Notes.TYPE_NOTE) {
+ if (mType == Notes.TYPE_NOTE) {//类型为note时
note.put(NoteColumns.ID, mId);
note.put(NoteColumns.ALERTED_DATE, mAlertDate);
note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
@@ -392,7 +453,7 @@ public class SqlNote {
}
}
js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
- } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
+ } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {//类型为文件夹或者
note.put(NoteColumns.ID, mId);
note.put(NoteColumns.TYPE, mType);
note.put(NoteColumns.SNIPPET, mSnippet);
@@ -407,39 +468,84 @@ public class SqlNote {
return null;
}
+ /*
+ * 功能描述：给当前id设置父id
+ * 参数注解：
+ * Made By CuiCan
+ */
public void setParentId(long id) {
mParentId = id;
mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
}
+ /*
+ * 功能描述：给当前id设置Gtaskid
+ * 参数注解：
+ * Made By CuiCan
+ */
public void setGtaskId(String gid) {
mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
}
+ /*
+ * 功能描述：给当前id设置同步id
+ * 参数注解：
+ * Made By CuiCan
+ */
public void setSyncId(long syncId) {
mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
}
+ /*
+ * 功能描述：初始化本地修改，即撤销所有当前修改
+ * 参数注解：
+ * Made By CuiCan
+ */
public void resetLocalModified() {
mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
}
+ /*
+ * 功能描述：获得当前id
+ * 参数注解：
+ * Made By CuiCan
+ */
public long getId() {
return mId;
}
+ /*
+ * 功能描述：获得当前id的父id
+ * 参数注解：
+ * Made By CuiCan
+ */
public long getParentId() {
return mParentId;
}
+ /*
+ * 功能描述：获取小片段即用于显示的部分便签内容
+ * 参数注解：
+ * Made By CuiCan
+ */
public String getSnippet() {
return mSnippet;
}
+ /*
+ * 功能描述：判断是否为便签类型
+ * 参数注解：
+ * Made By CuiCan
+ */
public boolean isNoteType() {
return mType == Notes.TYPE_NOTE;
}
+ /*
+ * 功能描述：commit函数用于把当前造作所做的修改保存到数据库
+ * 参数注解：
+ * Made By CuiCan
+ */
public void commit(boolean validateVersion) {
if (mIsCreate) {
if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
@@ -458,7 +564,7 @@ public class SqlNote {
}
if (mType == Notes.TYPE_NOTE) {
- for (SqlData sqlData : mDataList) {
+ for (SqlData sqlData : mDataList) {//直接使用sqldata中的实现
sqlData.commit(mId, false, -1);
}
}
@@ -470,7 +576,7 @@ public class SqlNote {
if (mDiffNoteValues.size() > 0) {
mVersion ++;
int result = 0;
- if (!validateVersion) {
+ if (!validateVersion) {//构造字符串
result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ NoteColumns.ID + "=?)", new String[] {
String.valueOf(mId)
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master/src/net/micode/notes/gtask/data/Task.java
similarity index 94%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java
rename to src/Notes-master/src/net/micode/notes/gtask/data/Task.java
index 6a19454..513d5c5 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/Task.java
@@ -32,25 +32,29 @@ import org.json.JSONException;
import org.json.JSONObject;
+/**
+ * @author k
+ *
+ */
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 JSONObject mMetaInfo;//将在实例中存储数据的类型
- private Task mPriorSibling;
+ private Task mPriorSibling;//对应的优先兄弟Task的指针（待完善）
- private TaskList mParent;
+ 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;
}
@@ -80,14 +84,18 @@ public class Task extends Node {
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) {
@@ -175,7 +183,7 @@ 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");
@@ -186,7 +194,7 @@ public class Task extends Node {
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;
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master/src/net/micode/notes/gtask/data/TaskList.java
similarity index 85%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
rename to src/Notes-master/src/net/micode/notes/gtask/data/TaskList.java
index 4ea21c5..7baf535 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/TaskList.java
@@ -30,12 +30,16 @@ import org.json.JSONObject;
import java.util.ArrayList;
+/**
+ * @author k
+ *
+ */
public class TaskList extends Node {
- private static final String TAG = TaskList.class.getSimpleName();
+ private static final String TAG = TaskList.class.getSimpleName();//tag标记
- private int mIndex;
+ private int mIndex;//当前TaskList的指针
- private ArrayList mChildren;
+ private ArrayList mChildren;//类中主要的保存数据的单元，用来实现一个以Task为元素的ArrayList
public TaskList() {
super();
@@ -43,6 +47,10 @@ public class TaskList extends Node {
mIndex = 1;
}
+ /* (non-Javadoc)
+ * @see net.micode.notes.gtask.data.Node#getCreateAction(int)
+ * 生成并返回一个包含了一定数据的JSONObject实体
+ */
public JSONObject getCreateAction(int actionId) {
JSONObject js = new JSONObject();
@@ -58,7 +66,7 @@ public class TaskList extends Node {
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,
@@ -74,6 +82,10 @@ public class TaskList extends Node {
return js;
}
+ /* (non-Javadoc)
+ * @see net.micode.notes.gtask.data.Node#getUpdateAction(int)
+ * 生成并返回一个包含了一定数据的JSONObject实体
+ */
public JSONObject getUpdateAction(int actionId) {
JSONObject js = new JSONObject();
@@ -216,10 +228,19 @@ public class TaskList extends Node {
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,11 +250,19 @@ 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");
@@ -260,6 +289,11 @@ public class TaskList extends Node {
return true;
}
+ /**
+ * @param task
+ * @return 返回删除是否成功
+ * 功能：删除TaskList中的一个Task
+ */
public boolean removeChildTask(Task task) {
boolean ret = false;
int index = mChildren.indexOf(task);
@@ -281,6 +315,12 @@ 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()) {
@@ -297,8 +337,14 @@ public class TaskList extends Node {
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);
@@ -309,10 +355,20 @@ 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");
@@ -321,8 +377,13 @@ 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;
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 58%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
rename to src/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java
index 15504be..83821dc 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java
@@ -12,17 +12,30 @@
* 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.
+ *
+ * Description：支持小米便签运行过程中的运行异常处理。
*/
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);
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 58%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to src/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java
index b08cfb1..ded9de9 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java
@@ -12,17 +12,31 @@
* 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.
+ *
+ * Description：支持小米便签运行过程中的网络异常处理。
*/
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/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 56%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to src/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
index a1deb99..6475568 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -28,9 +28,16 @@ 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 +64,52 @@ public class GTaskASyncTask extends AsyncTask {
mTaskManager.cancelSync();
}
- public void publishProgess(String message) {
+ public void publishProgess(String message) { // 发布进度单位，系统将会调用onProgressUpdate()方法更新这些值
publishProgress(new String[] {
message
});
}
private void showNotification(int tickerId, String content) {
- PendingIntent pendingIntent;
+ Notification notification = new Notification(R.drawable.notification, mContext
+ .getString(tickerId), System.currentTimeMillis());
+ notification.defaults = Notification.DEFAULT_LIGHTS; // 调用系统自带灯光
+ notification.flags = Notification.FLAG_AUTO_CANCEL; // 点击清除按钮或点击通知后会自动消失
+ PendingIntent pendingIntent; //一个描述了想要启动一个Activity、Broadcast或是Service的意图
if (tickerId != R.string.ticker_success) {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE);
+ NotesPreferenceActivity.class), 0); //如果同步不成功，那么从系统取得一个用于启动一个NotesPreferenceActivity的PendingIntent对象
+
} else {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE);
+ NotesListActivity.class), 0); //如果同步成功，那么从系统取得一个用于启动一个NotesListActivity的PendingIntent对象
}
- Notification.Builder builder = new Notification.Builder(mContext)
- .setAutoCancel(true)
- .setContentTitle(mContext.getString(R.string.app_name))
- .setContentText(content)
- .setContentIntent(pendingIntent)
- .setWhen(System.currentTimeMillis())
- .setOngoing(true);
- Notification notification=builder.getNotification();
- mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+ 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,12 +117,12 @@ 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() {
- mOnCompleteListener.onComplete();
+ public void run() { //完成后的操作，使用onComplete()将所有值都重新初始化，相当于完成一次操作
+ mOnCompleteListener.onComplete();
}
}).start();
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 74%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
rename to src/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java
index c67dfdf..b4f6ce0 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java
@@ -49,6 +49,7 @@ import org.apache.http.params.HttpProtocolParams;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.junit.Before;
import java.io.BufferedReader;
import java.io.IOException;
@@ -61,10 +62,14 @@ 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";
@@ -89,7 +94,7 @@ public class GTaskClient {
private Account mAccount;
private JSONArray mUpdateArray;
-
+
private GTaskClient() {
mHttpClient = null;
mGetUrl = GTASK_GET_URL;
@@ -101,50 +106,62 @@ public class GTaskClient {
mAccount = null;
mUpdateArray = null;
}
-
+
+ /*用来获取的实例化对象
+ * 使用 getInstance()
+ * 返回mInstance这个实例化对象
+ */
public static synchronized GTaskClient getInstance() {
if (mInstance == null) {
mInstance = new GTaskClient();
}
return mInstance;
}
-
+
+ /*用来实现登录操作的函数，传入的参数是一个Activity
+ * 设置登录操作限制时间，如果超时则需要重新登录
+ * 有两种登录方式，使用用户自己的URL登录或者使用谷歌官方的URL登录
+ * 返回true或者false，即最后是否登陆成功
+ */
public boolean login(Activity activity) {
// we suppose that the cookie would expire after 5 minutes
// then we need to re-login
+ //判断距离最后一次登录操作是否超过5分钟
final long interval = 1000 * 60 * 5;
if (mLastLoginTime + interval < System.currentTimeMillis()) {
mLoggedin = false;
}
- // need to re-login after account switch
+ // need to re-login after account switch 重新登录操作
if (mLoggedin
&& !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
.getSyncAccountName(activity))) {
mLoggedin = false;
}
-
+
+ //如果没超过时间，则不需要重新登录
if (mLoggedin) {
Log.d(TAG, "already logged in");
return true;
}
-
- mLastLoginTime = System.currentTimeMillis();
- String authToken = loginGoogleAccount(activity, false);
+
+ 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,8 +169,9 @@ public class GTaskClient {
}
// try to login with google official url
+ //如果用户账户无法登录，则使用谷歌官方的URI进行登录
if (!mLoggedin) {
- mGetUrl = GTASK_GET_URL;
+ mGetUrl = GTASK_GET_URL;
mPostUrl = GTASK_POST_URL;
if (!tryToLoginGtask(activity, authToken)) {
return false;
@@ -163,11 +181,16 @@ public class GTaskClient {
mLoggedin = true;
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 +199,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 +214,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);
@@ -206,11 +232,13 @@ 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
+ if (!loginGtask(authToken)) {
+ // maybe the auth token is out of authTokedate, now let's invalidate the
// token and try again
+ //删除过一个无效的authToken，申请一个新的后再次尝试登陆
authToken = loginGoogleAccount(activity, true);
if (authToken == null) {
Log.e(TAG, "login google account failed");
@@ -224,26 +252,28 @@ 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 +286,7 @@ public class GTaskClient {
}
// get the client version
+ //获取client的内容，具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容，也就是gtask_url的内容
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -283,32 +314,40 @@ public class GTaskClient {
private int getActionId() {
return mActionId++;
}
-
+
+ /*实例化创建一个用于向网络传输数据的对象
+ * 使用HttpPost类
+ * 返回一个httpPost实例化对象，但里面还没有内容
+ */
private HttpPost createHttpPost() {
HttpPost httpPost = new HttpPost(mPostUrl);
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
httpPost.setHeader("AT", "1");
return httpPost;
}
-
+
+ /*通过URL获取响应后返回的数据，也就是网络上的数据和资源
+ * 使用getContentEncoding()获取网络上的资源和数据
+ * 返回值就是获取到的资源
+ */
private String getResponseContent(HttpEntity entity) throws IOException {
String contentEncoding = null;
- if (entity.getContentEncoding() != null) {
+ 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) {
@@ -322,21 +361,29 @@ public class GTaskClient {
input.close();
}
}
-
+
+ /*通过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);
@@ -359,7 +406,13 @@ public class GTaskClient {
throw new ActionFailureException("error occurs when posting request");
}
}
-
+
+ /*创建单个任务
+ * 传入参数是一个.gtask.data.Task包里Task类的对象
+ * 利用json获取Task里的内容,并且创建相应的jsPost
+ * 利用postRequest得到任务的返回信息
+ * 使用task.setGid设置task的new_ID
+ */
public void createTask(Task task) throws NetworkFailureException {
commitUpdate();
try {
@@ -385,7 +438,10 @@ public class GTaskClient {
throw new ActionFailureException("create task: handing jsonobject failed");
}
}
-
+
+ /*
+ * 创建一个任务列表，与createTask几乎一样，区别就是最后设置的是tasklist的gid
+ */
public void createTaskList(TaskList tasklist) throws NetworkFailureException {
commitUpdate();
try {
@@ -411,7 +467,12 @@ public class GTaskClient {
throw new ActionFailureException("create tasklist: handing jsonobject failed");
}
}
-
+
+ /*
+ * 同步更新操作
+ * 使用JSONObject进行数据存储，使用jsPost.put，Put的信息包括UpdateArray和ClientVersion
+ * 使用postRequest发送这个jspost,进行处理
+ */
public void commitUpdate() throws NetworkFailureException {
if (mUpdateArray != null) {
try {
@@ -432,7 +493,11 @@ public class GTaskClient {
}
}
}
-
+
+ /*
+ * 添加更新的事项
+ * 调用commitUpdate()实现
+ */
public void addUpdateNode(Node node) throws NetworkFailureException {
if (node != null) {
// too many update items may result in an error
@@ -446,7 +511,13 @@ public class GTaskClient {
mUpdateArray.put(node.getUpdateAction(getActionId()));
}
}
-
+
+ /*
+ * 移动task,比如讲task移动到不同的task列表中去
+ * 通过getGid获取task所属列表的gid
+ * 通过JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值，从而达到移动的目的
+ * 最后还是通过postRequest进行更新后的发送
+ */
public void moveTask(Task task, TaskList preParent, TaskList curParent)
throws NetworkFailureException {
commitUpdate();
@@ -463,15 +534,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
@@ -485,7 +558,12 @@ public class GTaskClient {
throw new ActionFailureException("move task: handing jsonobject failed");
}
}
-
+
+ /*
+ * 删除操作节点
+ * 还是利用JSON
+ * 删除过后使用postRequest发送删除后的结果
+ */
public void deleteNode(Node node) throws NetworkFailureException {
commitUpdate();
try {
@@ -494,7 +572,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
@@ -508,7 +586,12 @@ public class GTaskClient {
throw new ActionFailureException("delete node: handing jsonobject failed");
}
}
-
+
+ /*
+ * 获取任务列表
+ * 首先通过GetURI使用getResponseContent从网上获取数据
+ * 然后筛选出"_setup("到)}的部分，并且从中获取GTASK_JSON_LISTS的内容返回
+ */
public JSONArray getTaskLists() throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
@@ -521,6 +604,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 +615,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());
@@ -546,7 +631,10 @@ public class GTaskClient {
throw new ActionFailureException("get task lists: handing jasonobject failed");
}
}
-
+
+ /*
+ * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务
+ */
public JSONArray getTaskList(String listGid) throws NetworkFailureException {
commitUpdate();
try {
@@ -557,8 +645,8 @@ public class GTaskClient {
// action_list
action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
- action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
- action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid);
+ action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
+ action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); //这里设置为传入的listGid
action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
actionList.put(action);
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
@@ -578,7 +666,8 @@ public class GTaskClient {
public Account getSyncAccount() {
return mAccount;
}
-
+
+ //重置更新的内容
public void resetUpdateArray() {
mUpdateArray = null;
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 75%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
rename to src/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java
index d2b4082..77b3e70 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java
@@ -59,7 +59,7 @@ public class GTaskManager {
public static final int STATE_SYNC_IN_PROGRESS = 3;
- public static final int STATE_SYNC_CANCELLED = 4;
+ public static final int STATE_SYNC_CANCELLED = 4;
private static GTaskManager mInstance = null;
@@ -81,39 +81,58 @@ public class GTaskManager {
private TaskList mMetaList;
- private HashSet mLocalDeleteIdMap;
+ 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 +147,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 +159,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 +187,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 +242,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();
+ TaskList tasklist = new TaskList(); //继承自Node
tasklist.setContentByRemoteJSON(object);
- mGTaskListHashMap.put(gid, tasklist);
- mGTaskHashMap.put(gid, tasklist);
+ mGTaskListHashMap.put(gid, tasklist);
+ mGTaskHashMap.put(gid, tasklist); //为什么加两遍？？？
// load tasks
JSONArray jsTasks = client.getTaskList(gid);
@@ -247,13 +275,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 +334,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 +360,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 +384,11 @@ public class GTaskManager {
}
+ /**
+ * 功能：
+ * @author TTS
+ * @throws NetworkFailureException
+ */
private void syncFolder() throws NetworkFailureException {
Cursor c = null;
String gid;
@@ -476,6 +514,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 +568,12 @@ public class GTaskManager {
}
}
+ /**
+ * 功能：本地增加Node
+ * @author TTS
+ * @param node
+ * @throws NetworkFailureException
+ */
private void addLocalNode(Node node) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -596,6 +648,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 +680,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,12 +705,13 @@ 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中增加子结点
- GTaskClient.getInstance().createTask(task);
+ //登录远程服务器，创建Task
+ GTaskClient.getInstance().createTask(task);
n = (Node) task;
// add meta
@@ -656,7 +728,8 @@ public class GTaskManager {
else
folderName += sqlNote.getSnippet();
- Iterator> iter = mGTaskListHashMap.entrySet().iterator();
+ //iterator迭代器，通过统一的接口迭代所有的map元素
+ Iterator> iter = mGTaskListHashMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry entry = iter.next();
String gid = entry.getKey();
@@ -687,11 +760,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 +783,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);
@@ -709,16 +791,20 @@ public class GTaskManager {
// move task if necessary
if (sqlNote.isNoteType()) {
Task task = (Task) node;
- TaskList preParentList = task.getParent();
-
+ 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 +813,19 @@ public class GTaskManager {
// clear local modified flag
sqlNote.resetLocalModified();
- sqlNote.commit(true);
+ //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 +842,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 +864,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,10 +892,19 @@ 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;
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 68%
rename from src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to src/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java
index cca36f7..111d17e 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -23,6 +23,22 @@ 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";
@@ -41,21 +57,23 @@ public class GTaskSyncService extends Service {
private static GTaskASyncTask mSyncTask = null;
private static String mSyncProgress = "";
-
+
+ //开始一个同步的工作
private void startSync() {
if (mSyncTask == null) {
mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
public void onComplete() {
mSyncTask = null;
sendBroadcast("");
- stopSelf();
+ stopSelf();
}
});
sendBroadcast("");
- mSyncTask.execute();
+ mSyncTask.execute(); //这个函数让任务是以单线程队列方式或线程池队列方式运行
}
}
-
+
+
private void cancelSync() {
if (mSyncTask != null) {
mSyncTask.cancelSync();
@@ -63,7 +81,7 @@ public class GTaskSyncService extends Service {
}
@Override
- public void onCreate() {
+ public void onCreate() { //初始化一个service
mSyncTask = null;
}
@@ -72,6 +90,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 +100,7 @@ public class GTaskSyncService extends Service {
default:
break;
}
- return START_STICKY;
+ return START_STICKY; //等待新的intent来是这个service继续运行
}
return super.onStartCommand(intent, flags, startId);
}
@@ -93,26 +112,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);
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master/src/net/micode/notes/model/Note.java
similarity index 80%
rename from src/notesmaster/app/src/main/java/net/micode/notes/model/Note.java
rename to src/Notes-master/src/net/micode/notes/model/Note.java
index 6706cf6..a7a4c2f 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/model/Note.java
+++ b/src/Notes-master/src/net/micode/notes/model/Note.java
@@ -13,17 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+//
package net.micode.notes.model;
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.util.Log;
+
+//by zzc
+import android.content.ContentProviderOperation;//批量的更新、插入、删除数据。
+import android.content.ContentProviderResult;//操作的结果
+import android.content.ContentUris;//用于添加和获取Uri后面的ID
+import android.content.ContentValues;//一种用来存储基本数据类型数据的存储机制
+import android.content.Context;//需要用该类来弄清楚调用者的实例
+import android.content.OperationApplicationException;//操作应用程序容错
+import android.net.Uri;//表示待操作的数据
+import android.os.RemoteException;//远程容错
+import android.util.Log;//输出日志，比如说出错、警告等
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.CallNote;
@@ -33,11 +35,12 @@ import net.micode.notes.data.Notes.TextNote;
import java.util.ArrayList;
-
public class Note {
- private ContentValues mNoteDiffValues;
+ // private ContentValues mNoteDiffValues;
+ ContentValues mNoteDiffValues;//
private NoteData mNoteData;
private static final String TAG = "Note";
+
/**
* Create a new note id for adding a new note to databases
*/
@@ -49,16 +52,17 @@ public class Note {
values.put(NoteColumns.MODIFIED_DATE, createdTime);
values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
values.put(NoteColumns.LOCAL_MODIFIED, 1);
- values.put(NoteColumns.PARENT_ID, folderId);
+ values.put(NoteColumns.PARENT_ID, folderId);//将数据写入数据库表格
Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
-
+ //ContentResolver()主要是实现外部应用对ContentProvider中的数据
+ //进行添加、删除、修改和查询操作
long noteId = 0;
try {
noteId = Long.valueOf(uri.getPathSegments().get(1));
} catch (NumberFormatException e) {
Log.e(TAG, "Get note id error :" + e.toString());
noteId = 0;
- }
+ }//try-catch异常处理
if (noteId == -1) {
throw new IllegalStateException("Wrong note id:" + noteId);
}
@@ -68,37 +72,37 @@ public class Note {
public Note() {
mNoteDiffValues = new ContentValues();
mNoteData = new NoteData();
- }
+ }//定义两个变量用来存储便签的数据，一个是存储便签属性、一个是存储便签内容
public void setNoteValue(String key, String value) {
mNoteDiffValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }
+ }//设置数据库表格的标签属性数据
public void setTextData(String key, String value) {
mNoteData.setTextData(key, value);
- }
+ }//设置数据库表格的标签文本内容的数据
public void setTextDataId(long id) {
mNoteData.setTextDataId(id);
- }
+ }//设置文本数据的ID
public long getTextDataId() {
return mNoteData.mTextDataId;
- }
+ }//得到文本数据的ID
public void setCallDataId(long id) {
mNoteData.setCallDataId(id);
- }
+ }//设置电话号码数据的ID
public void setCallData(String key, String value) {
mNoteData.setCallData(key, value);
- }
+ }//得到电话号码数据的ID
public boolean isLocalModified() {
return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
- }
+ }//判断是否是本地修改
public boolean syncNote(Context context, long noteId) {
if (noteId <= 0) {
@@ -128,16 +132,16 @@ public class Note {
}
return true;
- }
+ }//判断数据是否同步
- private class NoteData {
+ private class NoteData {//定义一个基本的便签内容的数据类，主要包含文本数据和电话号码数据
private long mTextDataId;
- private ContentValues mTextDataValues;
+ private ContentValues mTextDataValues;//文本数据
private long mCallDataId;
- private ContentValues mCallDataValues;
+ private ContentValues mCallDataValues;//电话号码数据
private static final String TAG = "NoteData";
@@ -147,7 +151,7 @@ public class Note {
mTextDataId = 0;
mCallDataId = 0;
}
-
+ //下面是上述几个函数的具体实现
boolean isLocalModified() {
return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
}
@@ -177,17 +181,17 @@ public class Note {
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
}
-
+ //下面函数的作用是将新的数据通过Uri的操作存储到数据库
Uri pushIntoContentResolver(Context context, long noteId) {
/**
* Check for safety
*/
if (noteId <= 0) {
throw new IllegalArgumentException("Wrong note id:" + noteId);
- }
+ }//判断数据是否合法
ArrayList operationList = new ArrayList();
- ContentProviderOperation.Builder builder = null;
+ ContentProviderOperation.Builder builder = null;//数据库的操作列表
if(mTextDataValues.size() > 0) {
mTextDataValues.put(DataColumns.NOTE_ID, noteId);
@@ -209,7 +213,7 @@ public class Note {
operationList.add(builder.build());
}
mTextDataValues.clear();
- }
+ }//把文本数据存入DataColumns
if(mCallDataValues.size() > 0) {
mCallDataValues.put(DataColumns.NOTE_ID, noteId);
@@ -231,7 +235,7 @@ public class Note {
operationList.add(builder.build());
}
mCallDataValues.clear();
- }
+ }//把电话号码数据存入DataColumns
if (operationList.size() > 0) {
try {
@@ -246,7 +250,7 @@ public class Note {
Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
return null;
}
- }
+ }//存储过程中的异常处理
return null;
}
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master/src/net/micode/notes/model/WorkingNote.java
similarity index 80%
rename from src/notesmaster/app/src/main/java/net/micode/notes/model/WorkingNote.java
rename to src/Notes-master/src/net/micode/notes/model/WorkingNote.java
index be081e4..0886c78 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/Notes-master/src/net/micode/notes/model/WorkingNote.java
@@ -61,7 +61,8 @@ public class WorkingNote {
private boolean mIsDeleted;
private NoteSettingChangedListener mNoteSettingStatusListener;
-
+
+ // 声明 DATA_PROJECTION字符串数组
public static final String[] DATA_PROJECTION = new String[] {
DataColumns.ID,
DataColumns.CONTENT,
@@ -71,7 +72,8 @@ public class WorkingNote {
DataColumns.DATA3,
DataColumns.DATA4,
};
-
+
+ // 声明 NOTE_PROJECTION字符串数组
public static final String[] NOTE_PROJECTION = new String[] {
NoteColumns.PARENT_ID,
NoteColumns.ALERTED_DATE,
@@ -102,7 +104,7 @@ public class WorkingNote {
private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
// New note construct
- private WorkingNote(Context context, long folderId) {
+ public WorkingNote(Context context, long folderId) {
mContext = context;
mAlertDate = 0;
mModifiedDate = System.currentTimeMillis();
@@ -113,7 +115,8 @@ public class WorkingNote {
mMode = 0;
mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
}
-
+
+ // WorkingNote的构造函数
// Existing note construct
private WorkingNote(Context context, long noteId, long folderId) {
mContext = context;
@@ -123,12 +126,15 @@ public class WorkingNote {
mNote = new Note();
loadNote();
}
-
+
+ // 加载Note
+ // 通过数据库调用query函数找到第一个条目
private void loadNote() {
Cursor cursor = mContext.getContentResolver().query(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
null, null);
-
+
+ // 若存在，储存相应信息
if (cursor != null) {
if (cursor.moveToFirst()) {
mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
@@ -139,6 +145,7 @@ public class WorkingNote {
mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
}
cursor.close();
+ // 若不存在，报错
} else {
Log.e(TAG, "No note with id:" + mNoteId);
throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
@@ -146,6 +153,7 @@ public class WorkingNote {
loadNoteData();
}
+ // 加载NoteData
private void loadNoteData() {
Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
DataColumns.NOTE_ID + "=?", new String[] {
@@ -153,7 +161,8 @@ public class WorkingNote {
}, null);
if (cursor != null) {
- if (cursor.moveToFirst()) {
+ // 查到信息不为空
+ if (cursor.moveToFirst()) { // 查看第一项是否存在
do {
String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
if (DataConstants.NOTE.equals(type)) {
@@ -165,7 +174,7 @@ public class WorkingNote {
} else {
Log.d(TAG, "Wrong note type with type:" + type);
}
- } while (cursor.moveToNext());
+ } while (cursor.moveToNext());//查阅所有项,直到为空
}
cursor.close();
} else {
@@ -174,9 +183,12 @@ public class WorkingNote {
}
}
+ // 创建空的Note
+ // 传参：context，文件夹id，widget，背景颜色
public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
int widgetType, int defaultBgColorId) {
WorkingNote note = new WorkingNote(context, folderId);
+ // 设定相关属性
note.setBgColorId(defaultBgColorId);
note.setWidgetId(widgetId);
note.setWidgetType(widgetType);
@@ -187,9 +199,10 @@ public class WorkingNote {
return new WorkingNote(context, id, 0);
}
+ // 保存Note
public synchronized boolean saveNote() {
- if (isWorthSaving()) {
- if (!existInDatabase()) {
+ if (isWorthSaving()) { //是否值得保存
+ if (!existInDatabase()) { // 是否存在数据库中
if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
Log.e(TAG, "Create new note fail with id:" + mNoteId);
return false;
@@ -212,11 +225,14 @@ public class WorkingNote {
}
}
+ // 是否在数据库中存在
public boolean existInDatabase() {
return mNoteId > 0;
}
+ // 是否值得保存
private boolean isWorthSaving() {
+ // 被删除，或（不在数据库中 内容为空），或 本地已保存过
if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
|| (existInDatabase() && !mNote.isLocalModified())) {
return false;
@@ -225,10 +241,14 @@ public class WorkingNote {
}
}
+
+ // 设置mNoteSettingStatusListener
public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
mNoteSettingStatusListener = l;
}
+ // 设置AlertDate
+ // 若 mAlertDate与data不同，则更改mAlertDate并设定NoteValue
public void setAlertDate(long date, boolean set) {
if (date != mAlertDate) {
mAlertDate = date;
@@ -238,17 +258,21 @@ public class WorkingNote {
mNoteSettingStatusListener.onClockAlertChanged(date, set);
}
}
-
+
+ // 设定删除标记
public void markDeleted(boolean mark) {
+ // 设定标记
mIsDeleted = mark;
if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
&& mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
mNoteSettingStatusListener.onWidgetChanged();
+ // 调用mNoteSettingStatusListener的 onWidgetChanged方法
}
}
+ // 设定背景颜色
public void setBgColorId(int id) {
- if (id != mBgColorId) {
+ if (id != mBgColorId) { //设定条件 id != mBgColorId
mBgColorId = id;
if (mNoteSettingStatusListener != null) {
mNoteSettingStatusListener.onBackgroundColorChanged();
@@ -257,8 +281,10 @@ public class WorkingNote {
}
}
+ // 设定检查列表模式
+ // 参数：mode
public void setCheckListMode(int mode) {
- if (mMode != mode) {
+ if (mMode != mode) { //设定条件 mMode != mode
if (mNoteSettingStatusListener != null) {
mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
}
@@ -266,83 +292,110 @@ public class WorkingNote {
mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
}
}
+
+ // 设定WidgetType
+ // 参数：type
public void setWidgetType(int type) {
- if (type != mWidgetType) {
+ if (type != mWidgetType) {//设定条件 type != mWidgetType
mWidgetType = type;
mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
+ // 调用Note的setNoteValue方法更改WidgetType
}
}
-
+
+ // 设定WidgetId
+ // 参数：id
public void setWidgetId(int id) {
- if (id != mWidgetId) {
+ if (id != mWidgetId) {//设定条件 id != mWidgetId
mWidgetId = id;
mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
+ // 调用Note的setNoteValue方法更改WidgetId
}
}
+ // 设定WorkingTex
+ // 参数：更改的text
public void setWorkingText(String text) {
- if (!TextUtils.equals(mContent, text)) {
+ if (!TextUtils.equals(mContent, text)) {//设定条件 mContent, text内容不同
mContent = text;
mNote.setTextData(DataColumns.CONTENT, mContent);
+ // 调用Note的setTextData方法更改WorkingText
}
}
+ // 转变mNote的CallData及CallNote信息
+ // 参数：String phoneNumber, long callDate
public void convertToCallNote(String phoneNumber, long callDate) {
mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
}
+ // 判断是否有时钟题型
public boolean hasClockAlert() {
return (mAlertDate > 0 ? true : false);
}
+ // 获取Content
public String getContent() {
return mContent;
}
+ // 获取AlertDate
public long getAlertDate() {
return mAlertDate;
}
+ // 获取ModifiedDate
public long getModifiedDate() {
return mModifiedDate;
}
+ // 获取背景颜色来源id
public int getBgColorResId() {
return NoteBgResources.getNoteBgResource(mBgColorId);
}
+ // 获取背景颜色id
public int getBgColorId() {
return mBgColorId;
}
+ // 获取标题背景颜色id
public int getTitleBgResId() {
return NoteBgResources.getNoteTitleBgResource(mBgColorId);
}
+ // 获取CheckListMode
public int getCheckListMode() {
return mMode;
}
+ // 获取便签id
public long getNoteId() {
return mNoteId;
}
+ // 获取文件夹id
public long getFolderId() {
return mFolderId;
}
+ // 获取WidgetId
public int getWidgetId() {
return mWidgetId;
}
+ // 获取WidgetType
public int getWidgetType() {
return mWidgetType;
}
- public interface NoteSettingChangedListener {
+ // 创建接口 NoteSettingChangedListener,便签更新监视
+ // 为NoteEditActivity提供接口
+ // 提供函数有
+ public interface NoteSettingChangedListener {
/**
* Called when the background color of current note has just changed
*/
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master/src/net/micode/notes/tool/BackupUtils.java
similarity index 81%
rename from src/notesmaster/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to src/Notes-master/src/net/micode/notes/tool/BackupUtils.java
index 39f6ec4..fa457fa 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/tool/BackupUtils.java
+++ b/src/Notes-master/src/net/micode/notes/tool/BackupUtils.java
@@ -12,10 +12,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package net.micode.notes.tool;
-
+
import android.content.Context;
import android.database.Cursor;
import android.os.Environment;
@@ -37,12 +37,16 @@ import java.io.PrintStream;
public class BackupUtils {
- private static final String TAG = "BackupUtils";
+ private static final String TAG = "BackupUtils";
// Singleton stuff
- private static BackupUtils sInstance;
+ private static BackupUtils sInstance; //类里面为什么可以定义自身类的对象？
public static synchronized BackupUtils getInstance(Context context) {
+ //ynchronized 关键字，代表这个方法加锁,相当于不管哪一个线程（例如线程A）
+ //运行到这个方法时,都要检查有没有其它线程B（或者C、 D等）正在用这个方法(或者该类的其他同步方法)，有的话要等正在使用synchronized方法的线程B（或者C 、D）运行完这个方法后再运行此线程A,没有的话,锁定调用者,然后直接运行。
+ //它包括两种用法：synchronized 方法和 synchronized 块。
if (sInstance == null) {
+ //如果当前备份不存在，则新声明一个
sInstance = new BackupUtils(context);
}
return sInstance;
@@ -52,24 +56,24 @@ public class BackupUtils {
* Following states are signs to represents backup or restore
* status
*/
- // Currently, the sdcard is not mounted
- public static final int STATE_SD_CARD_UNMOUONTED = 0;
- // The backup file not exist
+ // Currently, the sdcard is not mounted SD卡没有被装入手机
+ public static final int STATE_SD_CARD_UNMOUONTED = 0;
+ // The backup file not exist 备份文件夹不存在
public static final int STATE_BACKUP_FILE_NOT_EXIST = 1;
- // The data is not well formated, may be changed by other programs
+ // The data is not well formated, may be changed by other programs 数据已被破坏，可能被修改
public static final int STATE_DATA_DESTROIED = 2;
- // Some run-time exception which causes restore or backup fails
+ // Some run-time exception which causes restore or backup fails 超时异常
public static final int STATE_SYSTEM_ERROR = 3;
- // Backup or restore success
+ // Backup or restore success 成功存储
public static final int STATE_SUCCESS = 4;
private TextExport mTextExport;
- private BackupUtils(Context context) {
+ private BackupUtils(Context context) { //初始化函数
mTextExport = new TextExport(context);
}
- private static boolean externalStorageAvailable() {
+ private static boolean externalStorageAvailable() { //外部存储功能是否可用
return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
}
@@ -128,34 +132,34 @@ public class BackupUtils {
public TextExport(Context context) {
TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
mContext = context;
- mFileName = "";
+ mFileName = ""; //为什么为空?
mFileDirectory = "";
}
- private String getFormat(int id) {
+ private String getFormat(int id) { //获取文本的组成部分
return TEXT_FORMAT[id];
}
/**
* Export the folder identified by folder id to text
*/
- private void exportFolderToText(String folderId, PrintStream ps) {
- // Query notes belong to this folder
+ private void exportFolderToText(String folderId, PrintStream ps) {
+ // Query notes belong to this folder 通过查询parent id是文件夹id的note来选出制定ID文件夹下的Note
Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI,
NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] {
folderId
}, null);
- if (notesCursor != null) {
+ if (notesCursor != null) {
if (notesCursor.moveToFirst()) {
do {
- // Print note's last modified date
+ // Print note's last modified date ps里面保存有这份note的日期
ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
mContext.getString(R.string.format_datetime_mdhm),
notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
// Query data belong to this note
String noteId = notesCursor.getString(NOTE_COLUMN_ID);
- exportNoteToText(noteId, ps);
+ exportNoteToText(noteId, ps); //将文件导出到text
} while (notesCursor.moveToNext());
}
notesCursor.close();
@@ -165,13 +169,13 @@ public class BackupUtils {
/**
* Export note identified by id to a print stream
*/
- private void exportNoteToText(String noteId, PrintStream ps) {
+ private void exportNoteToText(String noteId, PrintStream ps) {
Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
noteId
}, null);
- if (dataCursor != null) {
+ if (dataCursor != null) { //利用光标来扫描内容，区别为callnote和note两种，靠ps.printline输出
if (dataCursor.moveToFirst()) {
do {
String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);
@@ -181,7 +185,7 @@ public class BackupUtils {
long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE);
String location = dataCursor.getString(DATA_COLUMN_CONTENT);
- if (!TextUtils.isEmpty(phoneNumber)) {
+ if (!TextUtils.isEmpty(phoneNumber)) { //判断是否为空字符
ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
phoneNumber));
}
@@ -218,7 +222,7 @@ public class BackupUtils {
/**
* Note will be exported as text which is user readable
*/
- public int exportToText() {
+ public int exportToText() { //总函数，调用上面的exportFolder和exportNote
if (!externalStorageAvailable()) {
Log.d(TAG, "Media was not mounted");
return STATE_SD_CARD_UNMOUONTED;
@@ -229,7 +233,7 @@ public class BackupUtils {
Log.e(TAG, "get print stream error");
return STATE_SYSTEM_ERROR;
}
- // First export folder and its notes
+ // First export folder and its notes 导出文件夹，就是导出里面包含的便签
Cursor folderCursor = mContext.getContentResolver().query(
Notes.CONTENT_NOTE_URI,
NOTE_PROJECTION,
@@ -257,7 +261,7 @@ public class BackupUtils {
folderCursor.close();
}
- // Export notes in root's folder
+ // Export notes in root's folder 将根目录里的便签导出（由于不属于任何文件夹，因此无法通过文件夹导出来实现这一部分便签的导出）
Cursor noteCursor = mContext.getContentResolver().query(
Notes.CONTENT_NOTE_URI,
NOTE_PROJECTION,
@@ -285,7 +289,7 @@ public class BackupUtils {
/**
* Get a print stream pointed to the file {@generateExportedTextFile}
*/
- private PrintStream getExportToTextPrintStream() {
+ private PrintStream getExportToTextPrintStream() {
File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
R.string.file_name_txt_format);
if (file == null) {
@@ -297,7 +301,7 @@ public class BackupUtils {
PrintStream ps = null;
try {
FileOutputStream fos = new FileOutputStream(file);
- ps = new PrintStream(fos);
+ ps = new PrintStream(fos); //将ps输出流输出到特定的文件，目的就是导出到文件，而不是直接输出
} catch (FileNotFoundException e) {
e.printStackTrace();
return null;
@@ -314,16 +318,16 @@ public class BackupUtils {
*/
private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
StringBuilder sb = new StringBuilder();
- sb.append(Environment.getExternalStorageDirectory());
- sb.append(context.getString(filePathResId));
- File filedir = new File(sb.toString());
+ sb.append(Environment.getExternalStorageDirectory()); //外部（SD卡）的存储路径
+ sb.append(context.getString(filePathResId)); //文件的存储路径
+ File filedir = new File(sb.toString()); //filedir应该就是用来存储路径信息
sb.append(context.getString(
fileNameFormatResId,
DateFormat.format(context.getString(R.string.format_date_ymd),
System.currentTimeMillis())));
File file = new File(sb.toString());
- try {
+ try { //如果这些文件不存在，则新建
if (!filedir.exists()) {
filedir.mkdir();
}
@@ -336,9 +340,8 @@ public class BackupUtils {
} catch (IOException e) {
e.printStackTrace();
}
-
+// try catch 异常处理
return null;
}
}
-
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master/src/net/micode/notes/tool/DataUtils.java
similarity index 76%
rename from src/notesmaster/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to src/Notes-master/src/net/micode/notes/tool/DataUtils.java
index 2a14982..7ebfb08 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/src/Notes-master/src/net/micode/notes/tool/DataUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package net.micode.notes.tool;
import android.content.ContentProviderOperation;
@@ -37,7 +37,7 @@ import java.util.HashSet;
public class DataUtils {
public static final String TAG = "DataUtils";
- public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) {
+ public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { //直接删除多个笔记
if (ids == null) {
Log.d(TAG, "the ids is null");
return true;
@@ -47,18 +47,19 @@ public class DataUtils {
return true;
}
- ArrayList operationList = new ArrayList();
+ ArrayList operationList = new ArrayList(); //提供一个任务列表
for (long id : ids) {
if(id == Notes.ID_ROOT_FOLDER) {
Log.e(TAG, "Don't delete system folder root");
continue;
- }
+ } //如果发现是根文件夹，则不删除
ContentProviderOperation.Builder builder = ContentProviderOperation
- .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
- operationList.add(builder.build());
+ .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); //用newDelete实现删除功能
+ operationList.add(builder.build()); //
}
try {
- ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
+ ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);//主机名（或叫Authority）用于唯一标识这个ContentProvider，外部调用者可以根据这个标识来找到它。
+ //数据库事务，数据库事务是由一组数据库操作序列组成，事务作为一个整体被执行
if (results == null || results.length == 0 || results[0] == null) {
Log.d(TAG, "delete notes failed, ids:" + ids.toString());
return false;
@@ -77,7 +78,7 @@ public class DataUtils {
values.put(NoteColumns.PARENT_ID, desFolderId);
values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
values.put(NoteColumns.LOCAL_MODIFIED, 1);
- resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
+ resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); //对需要移动的便签进行数据更新，然后用update实现
}
public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids,
@@ -90,14 +91,14 @@ public class DataUtils {
ArrayList operationList = new ArrayList();
for (long id : ids) {
ContentProviderOperation.Builder builder = ContentProviderOperation
- .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
+ .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); //通过withAppendedId方法，为该Uri加上ID
builder.withValue(NoteColumns.PARENT_ID, folderId);
builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
operationList.add(builder.build());
- }
+ }//将ids里包含的每一列的数据逐次加入到operationList中，等待最后的批量处理
try {
- ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
+ ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); //applyBatch一次性处理一个操作列表
if (results == null || results.length == 0 || results[0] == null) {
Log.d(TAG, "delete notes failed, ids:" + ids.toString());
return false;
@@ -119,13 +120,13 @@ public class DataUtils {
new String[] { "COUNT(*)" },
NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
- null);
+ null); //筛选条件：源文件不为trash folder
int count = 0;
if(cursor != null) {
if(cursor.moveToFirst()) {
try {
- count = cursor.getInt(0);
+ count = cursor.getInt(0);
} catch (IndexOutOfBoundsException e) {
Log.e(TAG, "get folder count failed:" + e.toString());
} finally {
@@ -134,18 +135,18 @@ public class DataUtils {
}
}
return count;
- }
+ }
public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
+ Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), //通过withAppendedId方法，为该Uri加上ID
null,
NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
- new String [] {String.valueOf(type)},
- null);
+ new String [] {String.valueOf(type)},
+ null); //查询条件：type符合，且不属于垃圾文件夹
boolean exist = false;
if (cursor != null) {
- if (cursor.getCount() > 0) {
+ if (cursor.getCount() > 0) {//用getcount函数判断cursor是否为空
exist = true;
}
cursor.close();
@@ -187,6 +188,7 @@ public class DataUtils {
" AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
" AND " + NoteColumns.SNIPPET + "=?",
new String[] { name }, null);
+ //通过名字查询文件是否存在
boolean exist = false;
if(cursor != null) {
if(cursor.getCount() > 0) {
@@ -202,8 +204,8 @@ public class DataUtils {
new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
NoteColumns.PARENT_ID + "=?",
new String[] { String.valueOf(folderId) },
- null);
-
+ null); //查询条件：父ID是传入的folderId;
+
HashSet set = null;
if (c != null) {
if (c.moveToFirst()) {
@@ -211,13 +213,13 @@ public class DataUtils {
do {
try {
AppWidgetAttribute widget = new AppWidgetAttribute();
- widget.widgetId = c.getInt(0);
- widget.widgetType = c.getInt(1);
+ widget.widgetId = c.getInt(0); //0对应的NoteColumns.WIDGET_ID
+ widget.widgetType = c.getInt(1); //1对应的NoteColumns.WIDGET_TYPE
set.add(widget);
} catch (IndexOutOfBoundsException e) {
Log.e(TAG, e.toString());
}
- } while (c.moveToNext());
+ } while (c.moveToNext()); //查询下一条
}
c.close();
}
@@ -250,11 +252,12 @@ public class DataUtils {
+ CallNote.PHONE_NUMBER + ",?)",
new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
null);
+ //通过数据库操作，查询条件是（callDate和phoneNumber匹配传入参数的值）
if (cursor != null) {
if (cursor.moveToFirst()) {
try {
- return cursor.getLong(0);
+ return cursor.getLong(0); //0对应的CallNote.NOTE_ID
} catch (IndexOutOfBoundsException e) {
Log.e(TAG, "Get call note id fails " + e.toString());
}
@@ -269,7 +272,7 @@ public class DataUtils {
new String [] { NoteColumns.SNIPPET },
NoteColumns.ID + "=?",
new String [] { String.valueOf(noteId)},
- null);
+ null);//查询条件：noteId
if (cursor != null) {
String snippet = "";
@@ -281,8 +284,7 @@ public class DataUtils {
}
throw new IllegalArgumentException("Note is not found with id: " + noteId);
}
-
- public static String getFormattedSnippet(String snippet) {
+ public static String getFormattedSnippet(String snippet) { //对字符串进行格式处理，将字符串两头的空格去掉，同时将换行符去掉
if (snippet != null) {
snippet = snippet.trim();
int index = snippet.indexOf('\n');
@@ -292,4 +294,5 @@ public class DataUtils {
}
return snippet;
}
+
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
similarity index 90%
rename from src/notesmaster/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
rename to src/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
index 666b729..6658da4 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ b/src/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
@@ -14,9 +14,12 @@
* limitations under the License.
*/
+
+//简介：定义了很多的静态字符串，目的就是为了提供jsonObject中相应字符串的"key"。把这些静态的定义单独写到了一个类里面，这是非常好的编程规范
package net.micode.notes.tool;
-public class GTaskStringUtils {
+//这个类就是定义了一堆static string，实际就是为jsonObject提供Key，把这些定义全部写到一个类里，方便查看管理，是一个非常好的编程习惯
+public class GTaskStringUtils {
public final static String GTASK_JSON_ACTION_ID = "action_id";
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master/src/net/micode/notes/tool/ResourceParser.java
similarity index 86%
rename from src/notesmaster/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to src/Notes-master/src/net/micode/notes/tool/ResourceParser.java
index 1ad3ad6..fd58bd8 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/src/Notes-master/src/net/micode/notes/tool/ResourceParser.java
@@ -22,6 +22,22 @@ import android.preference.PreferenceManager;
import net.micode.notes.R;
import net.micode.notes.ui.NotesPreferenceActivity;
+
+/*简介：字面意义是资源分析器，实际上就是获取资源并且在程序中使用，比如颜色图片等
+ * 实现方法：主要利用R.java这个类，其中包括
+ * R.id 组件资源引用
+ * R.drawable 图片资源 （被使用）
+ * R.layout 布局资源
+ * R.menu 菜单资源
+ * R.String 文字资源
+ * R.style 主题资源 （被使用）
+ * 在按顺序设置好相应的id后，就可以编写简单的getXXX函数获取需要的资源
+ *
+ * 特殊的变量 ：
+ * @BG_DEFAULT_COLOR 默认背景颜色（黄）
+ * BG_DEFAULT_FONT_SIZE 默认文本大小（中）
+ */
+
public class ResourceParser {
public static final int YELLOW = 0;
@@ -64,8 +80,8 @@ public class ResourceParser {
return BG_EDIT_TITLE_RESOURCES[id];
}
}
-
- public static int getDefaultBgId(Context context) {
+ //直接获取默认的背景颜色。看不太懂，这个PREFERENCE_SET_BG_COLOR_KEY是个final string,也就是说getBoolean肯定执行else，为什么要这么写
+ public static int getDefaultBgId(Context context) {
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length);
@@ -161,7 +177,8 @@ public class ResourceParser {
R.style.TextAppearanceLarge,
R.style.TextAppearanceSuper
};
-
+
+ //这里有一个容错的函数，防止输入的id大于资源总量，若如此，则自动返回默认的设置结果
public static int getTexAppearanceResource(int id) {
/**
* HACKME: Fix bug of store the resource id in shared preference.
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 66%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..7aab0e8 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
@@ -41,56 +41,80 @@ 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);
@@ -101,12 +125,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
try {
mPlayer.setDataSource(this, url);
+ //方法：setDataSource(Context context, Uri uri)
+ //解释：无返回值，设置多媒体数据来源【根据 Uri】
mPlayer.prepare();
+ //准备同步
mPlayer.setLooping(true);
+ //设置是否循环播放
mPlayer.start();
+ //开始播放
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息
+ //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常
} catch (SecurityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -121,37 +152,57 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
private void showActionDialog() {
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+ //AlertDialog的构造方法全部是Protected的
+ //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
+ //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
+ //如这里的dialog就是新建了一个AlertDialog
dialog.setTitle(R.string.app_name);
+ //为对话框设置标题
dialog.setMessage(mSnippet);
+ //为对话框设置内容
dialog.setPositiveButton(R.string.notealert_ok, this);
+ //给对话框添加"Yes"按钮
if (isScreenOn()) {
dialog.setNegativeButton(R.string.notealert_enter, this);
- }
+ }//对话框添加"No"按钮
dialog.show().setOnDismissListener(this);
}
public void onClick(DialogInterface dialog, int which) {
switch (which) {
+ //用which来选择click后下一步的操作
case DialogInterface.BUTTON_NEGATIVE:
+ //这是取消操作
Intent intent = new Intent(this, NoteEditActivity.class);
+ //实现两个类间的数据传输
intent.setAction(Intent.ACTION_VIEW);
+ //设置动作属性
intent.putExtra(Intent.EXTRA_UID, mNoteId);
+ //实现key-value对
+ //EXTRA_UID为key；mNoteId为键
startActivity(intent);
+ //开始动作
break;
default:
+ //这是确定操作
break;
}
}
public void onDismiss(DialogInterface dialog) {
+ //忽略
stopAlarmSound();
+ //停止闹钟声音
finish();
+ //完成该动作
}
private void stopAlarmSound() {
if (mPlayer != null) {
mPlayer.stop();
+ //停止播放
mPlayer.release();
+ //释放MediaPlayer对象
mPlayer = null;
}
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 72%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..93e99a5 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +12,7 @@
* 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;
@@ -27,25 +27,29 @@ import android.database.Cursor;
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
-
+//�� Android �����и��ָ����Ĺ㲥�������ص�ʹ��״̬���绰�Ľ��պͶ��ŵĽ��ն������һ���㲥��Ӧ�ó�����Ҳ���Լ�����Щ�㲥�������������Ĵ���
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()) {
@@ -61,5 +65,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
}
c.close();
}
+ //然而通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤
+ //如新建Intent、PendingIntent以及AlarmManager等
+ //这里就是根据数据库里的闹钟时间创建一个闹钟机制
}
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java
similarity index 70%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
rename to src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..54f12e1 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package net.micode.notes.ui;
import android.content.BroadcastReceiver;
@@ -23,8 +23,14 @@ import android.content.Intent;
public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- intent.setClass(context, AlarmAlertActivity.class);
+ intent.setClass(context, AlarmAlertActivity.class);
+ //启动AlarmAlertActivity
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈
+ //所以要新起一个栈装入启动的activity
context.startActivity(intent);
}
}
+//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
+//作用还需要深究但是对于setClass和addFlags的
+
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
similarity index 84%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
index 496b0cd..ef9f225 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
*/
package net.micode.notes.ui;
-
+
import java.text.DateFormatSymbols;
import java.util.Calendar;
@@ -29,7 +29,8 @@ 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;
@@ -45,13 +46,15 @@ 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;
@@ -71,41 +74,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));
@@ -117,15 +128,19 @@ 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());
@@ -145,7 +160,8 @@ public class DateTimePicker extends FrameLayout {
};
private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
+ //对AM和PM的监听
+ @Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
mIsAm = !mIsAm;
if (mIsAm) {
@@ -165,19 +181,22 @@ public class DateTimePicker extends FrameLayout {
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);
@@ -185,8 +204,8 @@ public class DateTimePicker extends FrameLayout {
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);
@@ -226,7 +245,9 @@ public class DateTimePicker extends FrameLayout {
mAmPmSpinner.setEnabled(enabled);
mIsEnabled = enabled;
}
-
+ //存在疑问！！！！！！！！！！！！！setEnabled的作用
+ //下面的代码通过原程序的注释已经比较清晰，另外可以通过函数名来判断
+ //下面的各函数主要是对上面代码引用到的各函数功能的实现
@Override
public boolean isEnabled() {
return mIsEnabled;
@@ -239,7 +260,7 @@ public class DateTimePicker extends FrameLayout {
*/
public long getCurrentDateInTimeMillis() {
return mDate.getTimeInMillis();
- }
+ }//实现函数——得到当前的秒数
/**
* Set the current date
@@ -251,7 +272,7 @@ 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,13 +290,14 @@ 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);
}
@@ -347,7 +369,7 @@ public class DateTimePicker extends FrameLayout {
public int getCurrentHourOfDay() {
return mDate.get(Calendar.HOUR_OF_DAY);
}
-
+
private int getCurrentHour() {
if (mIs24HourView){
return getCurrentHourOfDay();
@@ -446,7 +468,7 @@ public class DateTimePicker extends FrameLayout {
mDateSpinner.setDisplayedValues(mDateDisplayValues);
mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2);
mDateSpinner.invalidate();
- }
+ }// 对于星期几的算法
private void updateAmPmControl() {
if (mIs24HourView) {
@@ -455,7 +477,7 @@ public class DateTimePicker extends FrameLayout {
int index = mIsAm ? Calendar.AM : Calendar.PM;
mAmPmSpinner.setValue(index);
mAmPmSpinner.setVisibility(View.VISIBLE);
- }
+ }// 对于上下午操作的算法
}
private void updateHourControl() {
@@ -465,7 +487,7 @@ public class DateTimePicker extends FrameLayout {
} else {
mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW);
mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW);
- }
+ }// 对与小时的算法
}
/**
@@ -480,6 +502,6 @@ public class DateTimePicker extends FrameLayout {
if (mOnDateTimeChangedListener != null) {
mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(),
getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute());
- }
+ }
}
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 78%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..80adcc4 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java
@@ -32,18 +32,25 @@ 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,15 +59,20 @@ 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());
}
@@ -70,7 +82,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
mOnDateTimeSetListener = callBack;
- }
+ }//将时间日期滚动选择控件实例化
private void updateTitle(long date) {
int flag =
@@ -79,12 +91,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/notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java
similarity index 85%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java
index 613dc74..3e7386c 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java
@@ -30,14 +30,18 @@ import net.micode.notes.R;
public class DropdownMenu {
private Button mButton;
private PopupMenu mPopupMenu;
+ //声明一个下拉菜单
private Menu mMenu;
public DropdownMenu(Context context, Button button, int menuId) {
mButton = button;
mButton.setBackgroundResource(R.drawable.dropdown_icon);
+ //设置这个view的背景
mPopupMenu = new PopupMenu(context, mButton);
mMenu = mPopupMenu.getMenu();
mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
+ //MenuInflater是用来实例化Menu目录下的Menu布局文件
+ //根据ID来确认menu的内容选项
mButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
mPopupMenu.show();
@@ -48,14 +52,14 @@ public class DropdownMenu {
public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
if (mPopupMenu != null) {
mPopupMenu.setOnMenuItemClickListener(listener);
- }
+ }//设置菜单的监听
}
public MenuItem findItem(int id) {
return mMenu.findItem(id);
- }
+ }//对于菜单选项的初始化，根据索引搜索菜单需要的选项
public void setTitle(CharSequence title) {
mButton.setText(title);
- }
+ }//布局文件，设置标题
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java
similarity index 80%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..43d5aa4 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java
@@ -30,10 +30,14 @@ import net.micode.notes.data.Notes.NoteColumns;
public class FoldersListAdapter extends CursorAdapter {
+ //CursorAdapter是Cursor和ListView的接口
+ //FoldersListAdapter继承了CursorAdapter的类
+ //主要作用是便签数据库和用户的交互
+ //这里就是用folder（文件夹）的形式展现给用户
public static final String [] PROJECTION = {
NoteColumns.ID,
NoteColumns.SNIPPET
- };
+ };//调用数据库中便签的ID和片段
public static final int ID_COLUMN = 0;
public static final int NAME_COLUMN = 1;
@@ -41,12 +45,13 @@ public class FoldersListAdapter extends CursorAdapter {
public FoldersListAdapter(Context context, Cursor c) {
super(context, c);
// TODO Auto-generated constructor stub
- }
+ }//数据库操作
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
- return new FolderListItem(context);
- }
+ //ViewGroup是容器
+ return new FolderListItem(context);
+ }//创建一个文件夹，对于各文件夹中子标签的初始化
@Override
public void bindView(View view, Context context, Cursor cursor) {
@@ -55,20 +60,22 @@ public class FoldersListAdapter extends CursorAdapter {
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
((FolderListItem) view).bind(folderName);
}
- }
+ }//将各个布局文件绑定起来
public String getFolderName(Context context, int position) {
Cursor cursor = (Cursor) getItem(position);
return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
- }
+ }//根据数据库中标签的ID得到标签的各项内容
private class FolderListItem extends LinearLayout {
private TextView mName;
public FolderListItem(Context context) {
super(context);
+ //操作数据库
inflate(context, R.layout.folder_list_item, this);
+ //根据布局文件的名字等信息将其找出来
mName = (TextView) findViewById(R.id.tv_folder_name);
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
similarity index 77%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..fefcc5b 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
*/
package net.micode.notes.ui;
-
+
import android.app.Activity;
import android.app.AlarmManager;
import android.app.AlertDialog;
@@ -74,6 +74,8 @@ import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
+ //该类主要是针对标签的编辑
+ //继承了系统内部许多和监听有关的类
private class HeadViewHolder {
public TextView tvModified;
@@ -83,7 +85,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public ImageView ibSetBgColor;
}
-
+ //使用Map实现数据存储
private static final Map sBgSelectorBtnsMap = new HashMap();
static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -91,6 +93,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
+ //put函数是将指定值和指定键相连
}
private static final Map sBgSelectorSelectionMap = new HashMap();
@@ -100,6 +103,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
+ //put函数是将指定值和指定键相连
}
private static final Map sFontSizeBtnsMap = new HashMap();
@@ -108,6 +112,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
+ //put函数是将指定值和指定键相连
}
private static final Map sFontSelectorSelectionMap = new HashMap();
@@ -116,6 +121,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
+ //put函数是将指定值和指定键相连
}
private static final String TAG = "NoteEditActivity";
@@ -123,20 +129,23 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private HeadViewHolder mNoteHeaderHolder;
private View mHeadViewPanel;
-
+ //私有化一个界面操作mHeadViewPanel，对表头的操作
private View mNoteBgColorSelector;
-
+ //私有化一个界面操作mNoteBgColorSelector，对背景颜色的操作
private View mFontSizeSelector;
-
+ //私有化一个界面操作mFontSizeSelector，对标签字体的操作
private EditText mNoteEditor;
-
+ //声明编辑控件，对文本操作
private View mNoteEditorPanel;
-
- private WorkingNote mWorkingNote;
-
+ //私有化一个界面操作mNoteEditorPanel，文本编辑的控制板
+ //private WorkingNote mWorkingNote;
+ public WorkingNote mWorkingNote;
+ //对模板WorkingNote的初始化
private SharedPreferences mSharedPrefs;
+ //私有化SharedPreferences的数据存储方式
+ //它的本质是基于XML文件存储key-value键值对数据
private int mFontSizeId;
-
+ //用于操作字体的大小
private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
@@ -145,7 +154,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
private LinearLayout mEditTextList;
-
+ //线性布局
private String mUserQuery;
private Pattern mPattern;
@@ -153,7 +162,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(R.layout.note_edit);
-
+ //对数据库的访问操作
if (savedInstanceState == null && !initActivityState(getIntent())) {
finish();
return;
@@ -176,7 +185,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return;
}
Log.d(TAG, "Restoring from killed activity");
- }
+ }//为防止内存不足时程序的终止，在这里有一个保存现场的函数
}
private boolean initActivityState(Intent intent) {
@@ -188,34 +197,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 +240,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Notes.TYPE_WIDGET_INVALIDE);
int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
ResourceParser.getDefaultBgId(this));
-
+ // intent.getInt（Long、String）Extra是对各变量的语法分析
// Parse call-record note
String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
@@ -240,15 +257,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
finish();
return false;
}
+ //将电话号码与手机的号码簿相关
} else {
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
widgetType, bgResId);
mWorkingNote.convertToCallNote(phoneNumber, callDate);
+ //
}
} else {
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
bgResId);
- }
+ }//创建一个新的WorkingNote
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
@@ -269,8 +288,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
private void initNoteScreen() {
+ //对界面的初始化操作
mNoteEditor.setTextAppearance(this, TextAppearanceResources
.getTexAppearanceResource(mFontSizeId));
+ //设置外观
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(mWorkingNote.getContent());
} else {
@@ -294,18 +315,21 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
showAlertHeader();
}
-
+ //设置闹钟的显示
private void showAlertHeader() {
if (mWorkingNote.hasClockAlert()) {
long time = System.currentTimeMillis();
if (time > mWorkingNote.getAlertDate()) {
mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
- } else {
+ }
+ //如果系统时间大于了闹钟设置的时间，那么闹钟失效
+ else {
mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
}
mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
+ //显示闹钟开启的图标
} else {
mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
@@ -329,26 +353,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,7 +384,9 @@ 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;
@@ -377,13 +406,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
for (int id : sBgSelectorBtnsMap.keySet()) {
ImageView iv = (ImageView) findViewById(id);
iv.setOnClickListener(this);
- }
+ }//对标签各项属性内容的初始化
mFontSizeSelector = findViewById(R.id.font_size_selector);
for (int id : sFontSizeBtnsMap.keySet()) {
View view = findViewById(id);
view.setOnClickListener(this);
- };
+ };//对字体大小的选择
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
/**
@@ -405,7 +434,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) {
@@ -450,7 +479,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
mFontSizeSelector.setVisibility(View.GONE);
}
- }
+ }//************************存在问题
@Override
public void onBackPressed() {
@@ -481,6 +510,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
+ //对选择菜单的准备
public boolean onPrepareOptionsMenu(Menu menu) {
if (isFinishing()) {
return true;
@@ -489,6 +519,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
menu.clear();
if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
getMenuInflater().inflate(R.menu.call_note_edit, menu);
+ // MenuInflater是用来实例化Menu目录下的Menu布局文件的
} else {
getMenuInflater().inflate(R.menu.note_edit, menu);
}
@@ -506,45 +537,71 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
+ /*
+ * 函数功能：动态改变菜单选项内容
+ * 函数实现：如下注释
+ */
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
+ //根据菜单的id来编剧相关项目
case R.id.menu_new_note:
+ //创建一个新的便签
createNewNote();
break;
case R.id.menu_delete:
+ //删除便签
AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ //创建关于删除操作的对话框
builder.setTitle(getString(R.string.alert_title_delete));
+ // 设置标签的标题为alert_title_delete
builder.setIcon(android.R.drawable.ic_dialog_alert);
+ //设置对话框图标
builder.setMessage(getString(R.string.alert_message_delete_note));
+ //设置对话框内容
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
+ //建立按键监听器
public void onClick(DialogInterface dialog, int which) {
+ //点击所触发事件
deleteCurrentNote();
+ // 删除单签便签
finish();
}
});
+ //添加“YES”按钮
builder.setNegativeButton(android.R.string.cancel, null);
+ //添加“NO”的按钮
builder.show();
+ //显示对话框
break;
case R.id.menu_font_size:
+ //字体大小的编辑
mFontSizeSelector.setVisibility(View.VISIBLE);
+ // 将字体选择器置为可见
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+ // 通过id找到相应的大小
break;
case R.id.menu_list_mode:
+ //选择列表模式
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0);
break;
case R.id.menu_share:
+ //菜单共享
getWorkingText();
sendTo(this, mWorkingNote.getContent());
+ // 用sendto函数将运行文本发送到遍历的本文内
break;
case R.id.menu_send_to_desktop:
+ //发送到桌面
sendToDesktop();
break;
case R.id.menu_alert:
+ //创建提醒器
setReminder();
break;
case R.id.menu_delete_remind:
+ //删除日期提醒
mWorkingNote.setAlertDate(0, false);
break;
default:
@@ -553,111 +610,170 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return true;
}
+ /*
+ * 函数功能：建立事件提醒器
+ * 函数实现：如下注释
+ */
private void setReminder() {
DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+ // 建立修改时间日期的对话框
d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
public void OnDateTimeSet(AlertDialog dialog, long date) {
mWorkingNote.setAlertDate(date , true);
+ //选择提醒的日期
}
- });
+ });
+ //建立时间日期的监听器
d.show();
+ //显示对话框
}
/**
* Share note to apps that support {@link Intent#ACTION_SEND} action
* and {@text/plain} type
*/
+ /*
+ * 函数功能：共享便签
+ * 函数实现：如下注释
+ */
private void sendTo(Context context, String info) {
Intent intent = new Intent(Intent.ACTION_SEND);
+ //建立intent链接选项
intent.putExtra(Intent.EXTRA_TEXT, info);
+ //将需要传递的便签信息放入text文件中
intent.setType("text/plain");
+ //编辑连接器的类型
context.startActivity(intent);
+ //在acti中进行链接
}
+ /*
+ * 函数功能：创建一个新的便签
+ * 函数实现：如下注释
+ */
private void createNewNote() {
// Firstly, save current editing notes
+ //保存当前便签
saveNote();
// For safety, start a new NoteEditActivity
finish();
Intent intent = new Intent(this, NoteEditActivity.class);
+ //设置链接器
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ //该活动定义为创建或编辑
intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+ //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中
startActivity(intent);
+ //开始activity并链接
}
+ /*
+ * 函数功能：删除当前便签
+ * 函数实现：如下注释
+ */
private void deleteCurrentNote() {
if (mWorkingNote.existInDatabase()) {
+ //假如当前运行的便签内存有数据
HashSet ids = new HashSet();
long id = mWorkingNote.getNoteId();
if (id != Notes.ID_ROOT_FOLDER) {
ids.add(id);
+ //如果不是头文件夹建立一个hash表把便签id存起来
} else {
Log.d(TAG, "Wrong note id, should not happen");
+ //否则报错
}
if (!isSyncMode()) {
+ //在非同步模式情况下
+ //删除操作
if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
Log.e(TAG, "Delete Note error");
}
} else {
+ //同步模式
+ //移动至垃圾文件夹的操作
if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens");
}
}
}
mWorkingNote.markDeleted(true);
+ //将这些标签的删除标记置为true
}
+ /*
+ * 函数功能：判断是否为同步模式
+ * 函数实现：直接看NotesPreferenceActivity中同步名称是否为空
+ */
private boolean isSyncMode() {
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
+ /*
+ * 函数功能：设置提醒时间
+ * 函数实现：如下注释
+ */
public void onClockAlertChanged(long date, boolean set) {
/**
* User could set clock to an unsaved note, so before setting the
* alert clock, we should save the note first
*/
if (!mWorkingNote.existInDatabase()) {
+ //首先保存已有的便签
saveNote();
}
if (mWorkingNote.getNoteId() > 0) {
Intent intent = new Intent(this, AlarmReceiver.class);
intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+ //若有有运行的便签就是建立一个链接器将标签id都存在uri中
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
+ //设置提醒管理器
showAlertHeader();
if(!set) {
alarmManager.cancel(pendingIntent);
} else {
alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
}
+ //如果用户设置了时间，就通过提醒管理器设置一个监听事项
} else {
/**
* There is the condition that user has input nothing (the note is
* not worthy saving), we have no note id, remind the user that he
* should input something
- */
+ */
+ //没有运行的便签就报错
Log.e(TAG, "Clock alert setting error");
showToast(R.string.error_note_empty_for_clock);
}
}
+ /*
+ * 函数功能：Widget发生改变的所触发的事件
+ */
public void onWidgetChanged() {
- updateWidget();
+ updateWidget();//更新Widget
}
+ /*
+ * 函数功能： 删除编辑文本框所触发的事件
+ * 函数实现：如下注释
+ */
public void onEditTextDelete(int index, String text) {
int childCount = mEditTextList.getChildCount();
if (childCount == 1) {
return;
}
-
+ //没有编辑框的话直接返回
for (int i = index + 1; i < childCount; i++) {
((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
.setIndex(i - 1);
+ //通过id把编辑框存在便签编辑框中
}
mEditTextList.removeViewAt(index);
+ //删除特定位置的视图
NoteEditText edit = null;
if(index == 0) {
edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
@@ -666,69 +782,101 @@ public class NoteEditActivity extends Activity implements OnClickListener,
edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
R.id.et_edit_text);
}
+ //通过id把编辑框存在空的NoteEditText中
int length = edit.length();
edit.append(text);
- edit.requestFocus();
- edit.setSelection(length);
+ edit.requestFocus();//请求优先完成该此 编辑
+ edit.setSelection(length);//定位到length位置处的条目
}
+ /*
+ * 函数功能：进入编辑文本框所触发的事件
+ * 函数实现：如下注释
+ */
public void onEditTextEnter(int index, String text) {
/**
* Should not happen, check for debug
*/
if(index > mEditTextList.getChildCount()) {
Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
+ //越界把偶偶
}
View view = getListItem(text, index);
mEditTextList.addView(view, index);
+ //建立一个新的视图并添加到编辑文本框内
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
- edit.requestFocus();
- edit.setSelection(0);
+ edit.requestFocus();//请求优先操作
+ edit.setSelection(0);//定位到起始位置
for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
.setIndex(i);
+ //遍历子文本框并设置对应对下标
}
}
+ /*
+ * 函数功能：切换至列表模式
+ * 函数实现：如下注释
+ */
private void switchToListMode(String text) {
mEditTextList.removeAllViews();
String[] items = text.split("\n");
int index = 0;
+ //清空所有视图，初始化下标
for (String item : items) {
if(!TextUtils.isEmpty(item)) {
mEditTextList.addView(getListItem(item, index));
index++;
+ //遍历所有文本单元并添加到文本框中
}
}
mEditTextList.addView(getListItem("", index));
mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
+ //优先请求此操作
mNoteEditor.setVisibility(View.GONE);
+ //便签编辑器不可见
mEditTextList.setVisibility(View.VISIBLE);
+ //将文本编辑框置为可见
}
+ /*
+ * 函数功能：获取高亮效果的反馈情况
+ * 函数实现：如下注释
+ */
private Spannable getHighlightQueryResult(String fullText, String userQuery) {
SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
+ //新建一个效果选项
if (!TextUtils.isEmpty(userQuery)) {
mPattern = Pattern.compile(userQuery);
+ //将用户的询问进行解析
Matcher m = mPattern.matcher(fullText);
+ //建立一个状态机检查Pattern并进行匹配
int start = 0;
while (m.find(start)) {
spannable.setSpan(
new BackgroundColorSpan(this.getResources().getColor(
R.color.user_query_highlight)), m.start(), m.end(),
Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ //设置背景颜色
start = m.end();
+ //跟新起始位置
}
}
return spannable;
}
+ /*
+ * 函数功能：获取列表项
+ * 函数实现：如下注释
+ */
private View getListItem(String item, int index) {
View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
+ //创建一个视图
final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ //创建一个文本编辑框并设置可见性
CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -739,12 +887,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
});
+ //建立一个打钩框并设置监听器
if (item.startsWith(TAG_CHECKED)) {
+ //选择勾选
cb.setChecked(true);
edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
item = item.substring(TAG_CHECKED.length(), item.length()).trim();
} else if (item.startsWith(TAG_UNCHECKED)) {
+ //选择不勾选
cb.setChecked(false);
edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
@@ -753,61 +904,94 @@ public class NoteEditActivity extends Activity implements OnClickListener,
edit.setOnTextViewChangeListener(this);
edit.setIndex(index);
edit.setText(getHighlightQueryResult(item, mUserQuery));
+ //运行编辑框的监听器对该行为作出反应，并设置下标及文本内容
return view;
}
+ /*
+ * 函数功能：便签内容发生改变所 触发的事件
+ * 函数实现：如下注释
+ */
public void onTextChange(int index, boolean hasText) {
if (index >= mEditTextList.getChildCount()) {
Log.e(TAG, "Wrong index, should not happen");
return;
+ //越界报错
}
if(hasText) {
mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
} else {
mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
}
+ //如果内容不为空则将其子编辑框可见性置为可见，否则不可见
}
+ /*
+ * 函数功能：检查模式和列表模式的切换
+ * 函数实现：如下注释
+ */
public void onCheckListModeChanged(int oldMode, int newMode) {
if (newMode == TextNote.MODE_CHECK_LIST) {
switchToListMode(mNoteEditor.getText().toString());
+ //检查模式切换到列表模式
} else {
if (!getWorkingText()) {
mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
""));
}
+ //若是获取到文本就改变其检查标记
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
mEditTextList.setVisibility(View.GONE);
mNoteEditor.setVisibility(View.VISIBLE);
+ //修改文本编辑器的内容和可见性
}
}
+ /*
+ * 函数功能：设置勾选选项表并返回是否勾选的标记
+ * 函数实现：如下注释
+ */
private boolean getWorkingText() {
boolean hasChecked = false;
+ //初始化check标记
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 若模式为CHECK_LIST
StringBuilder sb = new StringBuilder();
+ //创建可变字符串
for (int i = 0; i < mEditTextList.getChildCount(); i++) {
View view = mEditTextList.getChildAt(i);
+ //遍历所有子编辑框的视图
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
if (!TextUtils.isEmpty(edit.getText())) {
+ //若文本不为空
if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
+ //该选项框已打钩
sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
hasChecked = true;
+ //扩展字符串为已打钩并把标记置true
} else {
sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
+ //扩展字符串添加未打钩
}
}
}
mWorkingNote.setWorkingText(sb.toString());
+ //利用编辑好的字符串设置运行便签的内容
} else {
mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+ // 若不是该模式直接用编辑器中的内容设置运行中标签的内容
}
return hasChecked;
}
+ /*
+ * 函数功能：保存便签
+ * 函数实现：如下注释
+ */
private boolean saveNote() {
getWorkingText();
boolean saved = mWorkingNote.saveNote();
+ //运行 getWorkingText()之后保存
if (saved) {
/**
* There are two modes from List view to edit view, open one note,
@@ -816,11 +1000,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 +1018,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 +1035,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,20 +1049,34 @@ 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();
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master/src/net/micode/notes/ui/NoteEditText.java
similarity index 62%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to src/Notes-master/src/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..9e0b18a 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NoteEditText.java
@@ -37,7 +37,8 @@ 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;
@@ -45,7 +46,8 @@ public class NoteEditText extends EditText {
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);
@@ -56,17 +58,20 @@ public class NoteEditText extends EditText {
/**
* 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);
/**
@@ -77,43 +82,56 @@ public class NoteEditText extends EditText {
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;
}
@@ -122,96 +140,147 @@ public class NoteEditText extends EditText {
}
@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/notesmaster/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master/src/net/micode/notes/ui/NoteItemData.java
similarity index 82%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to src/Notes-master/src/net/micode/notes/ui/NoteItemData.java
index 0f5a878..ad1de5e 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NoteItemData.java
@@ -41,7 +41,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;
@@ -75,8 +75,9 @@ public class NoteItemData {
private boolean mIsOnlyOneItem;
private boolean mIsOneNoteFollowingFolder;
private boolean mIsMultiNotesFollowingFolder;
-
- public NoteItemData(Context context, Cursor cursor) {
+ //初始化NoteItemData，主要利用光标cursor获取的东西
+ public NoteItemData(Context context, Cursor cursor) {
+ //getxxx为转换格式
mId = cursor.getLong(ID_COLUMN);
mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
@@ -92,10 +93,11 @@ public class NoteItemData {
mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+ //初始化电话号码的信息
mPhoneNumber = "";
if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
- if (!TextUtils.isEmpty(mPhoneNumber)) {
+ if (!TextUtils.isEmpty(mPhoneNumber)) {//mphonenumber里有符合字符串，则用contart功能连接
mName = Contact.getContact(context, mPhoneNumber);
if (mName == null) {
mName = mPhoneNumber;
@@ -108,32 +110,35 @@ public class NoteItemData {
}
checkPostion(cursor);
}
-
+ ///根据鼠标的位置设置标记，和位置
private void checkPostion(Cursor cursor) {
+ //初始化几个标记，cursor具体功能笔记中已提到，不一一叙述
mIsLastItem = cursor.isLast() ? true : false;
mIsFirstItem = cursor.isFirst() ? true : false;
mIsOnlyOneItem = (cursor.getCount() == 1);
+ //初始化“多重子文件”“单一子文件”2个标记
mIsMultiNotesFollowingFolder = false;
mIsOneNoteFollowingFolder = false;
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
+ //主要是设置上诉2标记
+ if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {
+ if (cursor.moveToPrevious()) {//获取光标位置后看上一行
if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
+ || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;
+ mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
} else {
- mIsOneNoteFollowingFolder = true;
+ mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
}
}
- if (!cursor.moveToNext()) {
+ if (!cursor.moveToNext()) {//若不能再往下走则报错
throw new IllegalStateException("cursor move to previous but can't move back");
}
}
}
}
-
+///以下都是获取标记没什么好说的，不过倒数第二个需要说明下，很具体看下面
public boolean isOneFollowingFolder() {
return mIsOneNoteFollowingFolder;
}
@@ -214,6 +219,7 @@ public class NoteItemData {
return (mAlertDate > 0);
}
+ //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空，则isCallRecord为true
public boolean isCallRecord() {
return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
similarity index 90%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
index e843aec..8b8e430 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
@@ -77,8 +77,12 @@ 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;
@@ -89,7 +93,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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
@@ -136,8 +140,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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();
@@ -148,26 +157,32 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
@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);
@@ -180,7 +195,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) {
@@ -189,12 +204,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");
@@ -209,18 +226,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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());
mDispatch = false;
@@ -231,6 +251,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mModeCallBack = new ModeCallback();
}
+ // 继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener
private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
private DropdownMenu mDropDownMenu;
private ActionMode mActionMode;
@@ -259,7 +280,7 @@ 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;
@@ -269,11 +290,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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()) {
@@ -366,7 +388,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
@@ -664,9 +686,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
});
}
+ /* (non-Javadoc)
+ * @see android.app.Activity#onBackPressed()
+ * 按返回键时根据情况更改类中的数据
+ */
@Override
- public void onBackPressed() {
- switch (mState) {
+ public void onBackPressed() { switch (mState) {
case SUB_FOLDER:
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
@@ -688,6 +713,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ /**
+ * @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) {
@@ -707,6 +737,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
setResult(RESULT_OK, intent);
}
+ /**
+ * 声明监听器，建立菜单，包括名称，视图，删除操作，更改名称操作；
+ */
private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
if (mFocusNoteDataItem != null) {
@@ -726,6 +759,10 @@ 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) {
@@ -734,10 +771,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));
@@ -748,7 +785,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);
@@ -818,12 +855,19 @@ 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() {
@@ -866,16 +910,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}.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) {
@@ -917,6 +972,9 @@ 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:
@@ -935,6 +993,12 @@ 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();
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java
similarity index 62%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
rename to src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..e8d9898 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java
@@ -1,3 +1,4 @@
+
/*
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
@@ -19,10 +20,11 @@ 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;
@@ -31,55 +33,94 @@ 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 +128,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();
@@ -128,26 +186,42 @@ 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;
@@ -156,29 +230,45 @@ public class NotesListAdapter extends CursorAdapter {
}
@Override
+ /*
+ * 函数功能：在activity内容发生局部变动的时候回调该函数计算便签的数量
+ * 函数实现：如下注释
+ */
protected void onContentChanged() {
super.onContentChanged();
+ //执行基类函数
calcNotesCount();
}
@Override
+ /*
+ * 函数功能：在activity光标发生局部变动的时候回调该函数计算便签的数量
+ */
public void changeCursor(Cursor cursor) {
super.changeCursor(cursor);
+ //执行基类函数
calcNotesCount();
}
+ /*
+ * 函数功能：计算便签数量
+ *
+ */
private void calcNotesCount() {
mNotesCount = 0;
for (int i = 0; i < getCount(); i++) {
+ //获取总数同时遍历
Cursor c = (Cursor) getItem(i);
if (c != null) {
if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
mNotesCount++;
+ //若该位置不为空并且文本类型为便签就+1
}
} else {
Log.e(TAG, "Invalid cursor");
return;
}
+ //否则报错
}
- }
+ }
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
similarity index 69%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java
rename to src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
index 1221e80..e5af6ce 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
@@ -30,37 +30,43 @@ 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 +75,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 +85,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,35 +94,38 @@ 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;
}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 68%
rename from src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..9d16a24 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -47,66 +47,92 @@ 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;
}
}
@@ -114,35 +140,52 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
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();
@@ -151,21 +194,29 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
});
+ //根据新建首选项编辑新的账户分组
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 +224,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,83 +292,119 @@ 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() {
@@ -311,24 +415,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 +452,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;
}
}
}
+
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
rename to src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from src/notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 99%
rename from src/notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
index c12a02e..e11aaec 100644
--- a/src/notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -1,4 +1,4 @@
-/*
+ /*
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/notesmaster/.gitignore b/src/notesmaster/.gitignore
deleted file mode 100644
index aa724b7..0000000
--- a/src/notesmaster/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
diff --git a/src/notesmaster/.idea/.gitignore b/src/notesmaster/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/src/notesmaster/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/src/notesmaster/.idea/.name b/src/notesmaster/.idea/.name
deleted file mode 100644
index f33ecdc..0000000
--- a/src/notesmaster/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-notes-master
\ No newline at end of file
diff --git a/src/notesmaster/.idea/compiler.xml b/src/notesmaster/.idea/compiler.xml
deleted file mode 100644
index b86273d..0000000
--- a/src/notesmaster/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/.idea/deploymentTargetSelector.xml b/src/notesmaster/.idea/deploymentTargetSelector.xml
deleted file mode 100644
index bf83238..0000000
--- a/src/notesmaster/.idea/deploymentTargetSelector.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/.idea/deviceManager.xml b/src/notesmaster/.idea/deviceManager.xml
deleted file mode 100644
index 57a8236..0000000
--- a/src/notesmaster/.idea/deviceManager.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/.idea/gradle.xml b/src/notesmaster/.idea/gradle.xml
deleted file mode 100644
index 7b3006b..0000000
--- a/src/notesmaster/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/.idea/migrations.xml b/src/notesmaster/.idea/migrations.xml
deleted file mode 100644
index f8051a6..0000000
--- a/src/notesmaster/.idea/migrations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/.idea/misc.xml b/src/notesmaster/.idea/misc.xml
deleted file mode 100644
index b2c751a..0000000
--- a/src/notesmaster/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/.idea/runConfigurations.xml b/src/notesmaster/.idea/runConfigurations.xml
deleted file mode 100644
index 16660f1..0000000
--- a/src/notesmaster/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/.gitignore b/src/notesmaster/app/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/src/notesmaster/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/src/notesmaster/app/build.gradle.kts b/src/notesmaster/app/build.gradle.kts
deleted file mode 100644
index 6e90cae..0000000
--- a/src/notesmaster/app/build.gradle.kts
+++ /dev/null
@@ -1,61 +0,0 @@
-plugins {
- alias(libs.plugins.android.application)
-}
-
-android {
- namespace = "net.micode.notes"
- compileSdk = 34
-
- defaultConfig {
- applicationId = "net.micode.notes"
- minSdk = 34
- targetSdk = 34
- versionCode = 1
- versionName = "1.0"
-
- testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
- }
- packaging {
- resources.excludes.add("META-INF/DEPENDENCIES");
- resources.excludes.add("META-INF/NOTICE");
- resources.excludes.add("META-INF/LICENSE");
- resources.excludes.add("META-INF/LICENSE.txt");
- resources.excludes.add("META-INF/NOTICE.txt");
- }
-
- buildTypes {
- release {
- isMinifyEnabled = false
- proguardFiles(
- getDefaultProguardFile("proguard-android-optimize.txt"),
- "proguard-rules.pro"
- )
- }
- }
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- }
-}
- dependencies {
-
- implementation(libs.appcompat)
- implementation(libs.material)
- implementation(libs.activity)
- implementation(libs.constraintlayout)
- // 部分需要重新修改
- // implementation(fileTree(mapOf(
- // "dir" to "D:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
- // "include" to listOf("*.aar", "*.jar"),
- // "exclude" to listOf("")
- // )))
- //修改为如下代码：
- implementation(files("D:\\app\\notesmaster\\httpcomponents-clent-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
- implementation(files("D:\\app\\notesmaster\\httpcomponents-clent-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
- implementation(files("D:\\app\\notesmaster\\httpcomponents-clent-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
- testImplementation(libs.junit)
- androidTestImplementation(libs.ext.junit)
- androidTestImplementation(libs.espresso.core)
- }
-
-
diff --git a/src/notesmaster/app/proguard-rules.pro b/src/notesmaster/app/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/src/notesmaster/app/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/src/notesmaster/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java b/src/notesmaster/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java
deleted file mode 100644
index a889a75..0000000
--- a/src/notesmaster/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.micode.notes;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
- assertEquals("net.micode.notes", appContext.getPackageName());
- }
-}
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/MainActivity.java b/src/notesmaster/app/src/main/java/net/micode/notes/MainActivity.java
deleted file mode 100644
index 8091753..0000000
--- a/src/notesmaster/app/src/main/java/net/micode/notes/MainActivity.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package net.micode.notes;
-
-import android.os.Bundle;
-
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-public class MainActivity extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- EdgeToEdge.enable(this);
- setContentView(R.layout.activity_main);
- ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
- Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
- v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
- return insets;
- });
- }
-}
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/data/Notes.java b/src/notesmaster/app/src/main/java/net/micode/notes/data/Notes.java
deleted file mode 100644
index 53ca199..0000000
--- a/src/notesmaster/app/src/main/java/net/micode/notes/data/Notes.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.net.Uri;
-
-// Notes类，用于定义笔记应用中的常量和接口
-public class Notes {
- // 内容提供者的Authority
- public static final String AUTHORITY = "micode_notes";
- // 日志标签
- public static final String TAG = "Notes";
-
- // 笔记类型常量
- public static final int TYPE_NOTE = 0; // 普通笔记
- public static final int TYPE_FOLDER = 1; // 文件夹
- public static final int TYPE_SYSTEM = 2; // 系统文件夹
-
- // 系统文件夹ID常量
- public static final int ID_ROOT_FOLDER = 0; // 根文件夹
- public static final int ID_TEMPARAY_FOLDER = -1; // 临时文件夹，用于存放不属于任何文件夹的笔记
- public static final int ID_CALL_RECORD_FOLDER = -2; // 通话记录文件夹
- public static final int ID_TRASH_FOLER = -3; // 垃圾箱文件夹
-
- // Intent额外的键
- public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; // 提醒日期
- public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; // 背景颜色ID
- public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; // 小部件ID
- public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; // 小部件类型
- public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; // 文件夹ID
- public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; // 通话日期
-
- // 小部件类型常量
- public static final int TYPE_WIDGET_INVALIDE = -1; // 无效小部件
- public static final int TYPE_WIDGET_2X = 0; // 2x小部件
- public static final int TYPE_WIDGET_4X = 1; // 4x小部件
-
- // 数据常量类
- public static class DataConstants {
- public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; // 文本笔记
- public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; // 通话记录笔记
- }
-
- // 查询所有笔记和文件夹的Uri
- public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
-
- // 查询数据的Uri
- public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
-
- // 笔记列接口
- public interface NoteColumns {
- // 唯一ID
- public static final String ID = "_id";
-
- // 父级ID
- public static final String PARENT_ID = "parent_id";
-
- // 创建日期
- public static final String CREATED_DATE = "created_date";
-
- // 最后修改日期
- public static final String MODIFIED_DATE = "modified_date";
-
- // 提醒日期
- public static final String ALERTED_DATE = "alert_date";
-
- // 文件夹名称或笔记文本内容
- public static final String SNIPPET = "snippet";
-
- // 笔记小部件ID
- public static final String WIDGET_ID = "widget_id";
-
- // 笔记小部件类型
- public static final String WIDGET_TYPE = "widget_type";
-
- // 笔记背景颜色ID
- public static final String BG_COLOR_ID = "bg_color_id";
-
- // 笔记是否有附件
- public static final String HAS_ATTACHMENT = "has_attachment";
-
- // 文件夹中的笔记数量
- public static final String NOTES_COUNT = "notes_count";
-
- // 文件类型：文件夹或笔记
- public static final String TYPE = "type";
-
- // 最后同步ID
- public static final String SYNC_ID = "sync_id";
-
- // 本地修改标志
- public static final String LOCAL_MODIFIED = "local_modified";
-
- // 移动到临时文件夹前的原始父ID列
- public static final String ORIGIN_PARENT_ID = "origin_parent_id";
- // GTask ID列
- public static final String GTASK_ID = "gtask_id";
- // 版本号列
- public static final String VERSION = "version";
- }
-
- // 数据列接口，定义了数据表的列名和类型
- public interface DataColumns {
- // 唯一ID列
- public static final String ID = "_id";
- // MIME类型列
- public static final String MIME_TYPE = "mime_type";
- // 笔记ID列
- public static final String NOTE_ID = "note_id";
- // 创建日期列
- public static final String CREATED_DATE = "created_date";
- // 最后修改日期列
- public static final String MODIFIED_DATE = "modified_date";
- // 数据的内容
- public static final String CONTENT = "content";
- // 通用数据列，具体含义取决于MIME类型，用于整型数据类型
- public static final String DATA1 = "data1";
- // 通用数据列，具体含义取决于MIME类型，用于整型数据类型
- public static final String DATA2 = "data2";
- // 通用数据列，具体含义取决于MIME类型，用于文本数据类型
- public static final String DATA3 = "data3";
- // 通用数据列，具体含义取决于MIME类型，用于文本数据类型
- public static final String DATA4 = "data4";
- // 通用数据列，具体含义取决于MIME类型，用于文本数据类型
- public static final String DATA5 = "data5";
- }
-
- // TextNote类实现了DataColumns接口，定义了文本笔记的相关常量
- public static final class TextNote implements DataColumns {
- // 模式，用于指示文本是否处于复选框列表模式
- public static final String MODE = DATA1;
- // 复选框列表模式常量
- public static final int MODE_CHECK_LIST = 1;
- // 内容类型常量，用于目录
- public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
- // 内容项类型常量，用于单个项目
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
- // 内容URI，用于访问文本笔记的数据
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
- }
-
- // CallNote类实现了DataColumns接口，定义了通话笔记的相关常量
- public static final class CallNote implements DataColumns {
- // 通话日期列
- public static final String CALL_DATE = DATA1;
- // 电话号码列
- public static final String PHONE_NUMBER = DATA3;
- // 内容类型常量，用于目录
- public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
- // 内容项类型常量，用于单个项目
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
- // 内容URI，用于访问通话笔记的数据
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
- }
-}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
deleted file mode 100644
index d380033..0000000
--- a/src/notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-// NotesDatabaseHelper类扩展了SQLiteOpenHelper，用于管理数据库的创建和版本管理
-public class NotesDatabaseHelper extends SQLiteOpenHelper {
- // 数据库文件名
- private static final String DB_NAME = "note.db";
- // 数据库版本号
- private static final int DB_VERSION = 4;
-
- // TABLE接口定义了数据库中的表名常量
- public interface TABLE {
- public static final String NOTE = "note"; // 笔记表
- public static final String DATA = "data"; // 数据表
- }
-
- // 日志标签，用于调试和错误日志
- private static final String TAG = "NotesDatabaseHelper";
-
- // 单例模式的数据库助手实例
- private static NotesDatabaseHelper mInstance;
-
- // 创建笔记表的SQL语句
- private static final String CREATE_NOTE_TABLE_SQL = "CREATE TABLE " + TABLE.NOTE + "(...)";
- // 创建数据表的SQL语句
- private static final String CREATE_DATA_TABLE_SQL = "CREATE TABLE " + TABLE.DATA + "(...)";
- // 创建数据表上笔记ID索引的SQL语句
- private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + TABLE.DATA + "(...);";
-
- // 定义了多个触发器，用于在笔记表和数据表上的操作后自动更新相关数据
- private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER increase_folder_count_on_update ...";
- private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_update ...";
- private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert ...";
- private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete ...";
- private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert ...";
- private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update ...";
- private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete ...";
- private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete ...";
- private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete ...";
- private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash ...";
-
- // 构造函数，初始化数据库助手
- public NotesDatabaseHelper(Context context) {
- super(context, DB_NAME, null, DB_VERSION);
- }
-
- // 创建笔记表及其触发器
- public void createNoteTable(SQLiteDatabase db) {
- db.execSQL(CREATE_NOTE_TABLE_SQL);
- reCreateNoteTableTriggers(db);
- createSystemFolder(db);
- Log.d(TAG, "note table has been created");
- }
-
- // 重新创建笔记表的触发器
- private void reCreateNoteTableTriggers(SQLiteDatabase db) {
- // 删除旧的触发器
- db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
- // ... 其他触发器删除代码 ...
- // 创建新的触发器
- db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
- // ... 其他触发器创建代码 ...
- }
-
- // 创建系统文件夹
- private void createSystemFolder(SQLiteDatabase db) {
- ContentValues values = new ContentValues();
- // 创建通话记录文件夹
- values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
- // ... 其他系统文件夹创建代码 ...
- }
-
- // 创建数据表及其触发器
- public void createDataTable(SQLiteDatabase db) {
- db.execSQL(CREATE_DATA_TABLE_SQL);
- reCreateDataTableTriggers(db);
- db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
- Log.d(TAG, "data table has been created");
- }
-
- // 重新创建数据表的触发器，删除旧的触发器并创建新的触发器
- private void reCreateDataTableTriggers(SQLiteDatabase db) {
- // 删除如果存在的话，插入数据时更新笔记内容的触发器
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
- // 删除如果存在的话，更新数据时更新笔记内容的触发器
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
- // 删除如果存在的话，删除数据时更新笔记内容的触发器
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
-
- // 创建新的触发器，用于在插入数据时更新笔记内容
- db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
- // 创建新的触发器，用于在更新数据时更新笔记内容
- db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
- // 创建新的触发器，用于在删除数据时更新笔记内容
- db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
- }
-
- // 获取NotesDatabaseHelper的单例实例
- static synchronized NotesDatabaseHelper getInstance(Context context) {
- // 如果单例实例为空，则创建一个新的实例
- if (mInstance == null) {
- mInstance = new NotesDatabaseHelper(context);
- }
- // 返回单例实例
- return mInstance;
- }
-
- // 当数据库被创建时调用此方法
- @Override
- public void onCreate(SQLiteDatabase db) {
- // 创建笔记表和数据表
- createNoteTable(db);
- createDataTable(db);
- }
-
- // 当数据库需要升级时调用此方法
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- boolean reCreateTriggers = false; // 标记是否需要重新创建触发器
- boolean skipV2 = false; // 标记是否跳过版本2的升级
-
- // 如果当前版本是1，则升级到版本2
- if (oldVersion == 1) {
- upgradeToV2(db);
- skipV2 = true; // 包含从版本2到版本3的升级
- oldVersion++;
- }
-
- // 如果当前版本是2且没有跳过版本2的升级，则升级到版本3
- if (oldVersion == 2 && !skipV2) {
- upgradeToV3(db);
- reCreateTriggers = true; // 需要重新创建触发器
- oldVersion++;
- }
-
- // 如果当前版本是3，则升级到版本4
- if (oldVersion == 3) {
- upgradeToV4(db);
- oldVersion++;
- }
-
- // 如果需要重新创建触发器，则执行相关操作
- if (reCreateTriggers) {
- reCreateNoteTableTriggers(db);
- reCreateDataTableTriggers(db);
- }
-
- // 如果版本号不匹配，抛出异常
- if (oldVersion != newVersion) {
- throw new IllegalStateException("Upgrade notes database to version " + newVersion + " fails");
- }
- }
-
- // 升级数据库到版本2
- private void upgradeToV2(SQLiteDatabase db) {
- // 删除旧的笔记表和数据表
- db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
- db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
- // 创建新的笔记表和数据表
- createNoteTable(db);
- createDataTable(db);
- }
-
- // 升级数据库到版本3
- private void upgradeToV3(SQLiteDatabase db) {
- // 删除不再使用的触发器
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
- // 添加用于GTasks的ID列
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''");
- // 添加垃圾文件夹
- ContentValues values = new ContentValues();
- values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
- }
-
- // 升级数据库到版本4
- private void upgradeToV4(SQLiteDatabase db) {
- // 添加版本号列
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0");
- }
-}
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java
deleted file mode 100644
index fe82f49..0000000
--- a/src/notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.data;
-
-
-import android.app.SearchManager;
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-
-
-// NotesProvider类继承自ContentProvider，用于提供对笔记数据的访问
-public class NotesProvider extends ContentProvider {
- private static final UriMatcher mMatcher; // 用于匹配Uri的UriMatcher
- private NotesDatabaseHelper mHelper; // 数据库帮助类实例
-
- private static final String TAG = "NotesProvider"; // 日志标签
-
- // 定义Uri匹配的常量
- private static final int URI_NOTE = 1;
- private static final int URI_NOTE_ITEM = 2;
- private static final int URI_DATA = 3;
- private static final int URI_DATA_ITEM = 4;
- private static final int URI_SEARCH = 5;
- private static final int URI_SEARCH_SUGGEST = 6;
-
- static {
- // 初始化UriMatcher并添加Uri匹配规则
- mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
- mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
- mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
- mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
- mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM);
- mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);
- mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);
- mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
- }
-
- // 定义用于搜索结果的投影，去除换行符并格式化输出
- private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
- + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
- + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
- + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
- + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
- + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
- + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
-
- // 定义搜索查询的SQL语句
- private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
- + " FROM " + TABLE.NOTE
- + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
- + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
- + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
-
- // ContentProvider创建时调用
- @Override
- public boolean onCreate() {
- mHelper = NotesDatabaseHelper.getInstance(getContext()); // 获取数据库帮助类的实例
- return true;
- }
-
- // 实现ContentProvider的query方法，用于查询数据
- @Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
- String sortOrder) {
- Cursor c = null; // 初始化Cursor对象
- SQLiteDatabase db = mHelper.getReadableDatabase(); // 获取可读数据库实例
- String id = null; // 初始化ID变量，用于存储URI中的ID
-
- // 根据URI匹配结果执行不同的查询操作
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
- // 如果URI匹配到笔记列表，查询笔记表
- c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder);
- break;
- case URI_NOTE_ITEM:
- // 如果URI匹配到单个笔记，获取笔记ID并查询该笔记
- id = uri.getPathSegments().get(1); // 获取URI中的笔记ID
- c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id + parseSelection(selection),
- selectionArgs, null, null, sortOrder);
- break;
- case URI_DATA:
- // 如果URI匹配到数据列表，查询数据表
- c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, sortOrder);
- break;
- case URI_DATA_ITEM:
- // 如果URI匹配到单个数据项，获取数据项ID并查询该数据项
- id = uri.getPathSegments().get(1); // 获取URI中的数据项ID
- c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + parseSelection(selection),
- selectionArgs, null, null, sortOrder);
- break;
- case URI_SEARCH:
- case URI_SEARCH_SUGGEST:
- // 如果URI匹配到搜索或搜索建议，执行搜索查询
- if (sortOrder != null || projection != null) {
- // 如果提供了排序或投影参数，抛出异常，因为这些参数不应该用于搜索查询
- throw new IllegalArgumentException(
- "do not specify sortOrder, selection, selectionArgs, or projection with this query");
- }
-
- // 获取搜索字符串
- String searchString = null;
- if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
- // 如果是搜索建议，从URI中获取搜索字符串
- if (uri.getPathSegments().size() > 1) {
- searchString = uri.getPathSegments().get(1);
- }
- } else {
- // 如果是普通搜索，从URI的查询参数中获取搜索字符串
- searchString = uri.getQueryParameter("pattern");
- }
-
- // 如果搜索字符串为空，返回null
- if (TextUtils.isEmpty(searchString)) {
- return null;
- }
-
- // 格式化搜索字符串并执行搜索查询
- try {
- searchString = String.format("%%%s%%", searchString);
- c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, new String[]{searchString});
- } catch (IllegalStateException ex) {
- // 如果发生异常，记录日志
- Log.e(TAG, "got exception: " + ex.toString());
- }
- break;
- default:
- // 如果URI不匹配任何已知模式，抛出异常
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
-
- // 如果Cursor不为空，设置通知URI
- if (c != null) {
- c.setNotificationUri(getContext().getContentResolver(), uri);
- }
- return c; // 返回Cursor对象
- }
-
- // 实现ContentProvider的insert方法，用于插入数据
- @Override
- public Uri insert(Uri uri, ContentValues values) {
- SQLiteDatabase db = mHelper.getWritableDatabase(); // 获取可写数据库实例
- long dataId = 0, noteId = 0, insertedId = 0; // 初始化ID变量
-
- // 根据URI匹配结果执行不同的插入操作
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
- // 如果URI匹配到笔记列表，插入新笔记
- insertedId = noteId = db.insert(TABLE.NOTE, null, values); // 插入笔记并获取新笔记的ID
- break;
- case URI_DATA:
- // 如果URI匹配到数据列表，插入新数据
- if (values.containsKey(DataColumns.NOTE_ID)) {
- // 如果ContentValues包含笔记ID，则获取该ID
- noteId = values.getAsLong(DataColumns.NOTE_ID);
- } else {
- // 如果没有笔记ID，记录调试信息
- Log.d(TAG, "Wrong data format without note id:" + values.toString());
- }
- insertedId = dataId = db.insert(TABLE.DATA, null, values); // 插入数据并获取新数据的ID
- break;
- default:
- // 如果URI不匹配任何已知模式，抛出异常
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
-
- // 如果插入的是笔记，通知变更
- if (noteId > 0) {
- getContext().getContentResolver().notifyChange(
- ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
- }
-
- // 如果插入的是数据，通知变更
- if (dataId > 0) {
- getContext().getContentResolver().notifyChange(
- ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
- }
-
- // 返回插入数据的URI
- return ContentUris.withAppendedId(uri, insertedId);
- }
-
- // 实现ContentProvider的delete方法，用于删除数据
- @Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
- int count = 0; // 初始化删除计数器
- String id = null; // 初始化ID变量
- SQLiteDatabase db = mHelper.getWritableDatabase(); // 获取可写数据库实例
- boolean deleteData = false; // 标记是否删除数据
-
- // 根据URI匹配结果执行不同的删除操作
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
- // 如果URI匹配到笔记列表，删除笔记
- selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; // 确保只删除ID大于0的笔记
- count = db.delete(TABLE.NOTE, selection, selectionArgs); // 执行删除操作并获取删除计数
- break;
- case URI_NOTE_ITEM:
- // 如果URI匹配到单个笔记，获取笔记ID并删除该笔记
- id = uri.getPathSegments().get(1); // 获取URI中的笔记ID
- long noteId = Long.valueOf(id); // 将ID转换为长整型
- if (noteId <= 0) {
- // 如果ID小于等于0，表示系统文件夹，不允许删除，直接跳出
- break;
- }
- count = db.delete(TABLE.NOTE,
- NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); // 执行删除操作并获取删除计数
- break;
- case URI_DATA:
- // 如果URI匹配到数据列表，删除数据
- count = db.delete(TABLE.DATA, selection, selectionArgs); // 执行删除操作并获取删除计数
- deleteData = true; // 设置删除数据标记
- break;
- case URI_DATA_ITEM:
- // 如果URI匹配到单个数据项，获取数据项ID并删除该数据项
- id = uri.getPathSegments().get(1); // 获取URI中的数据项ID
- count = db.delete(TABLE.DATA,
- DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); // 执行删除操作并获取删除计数
- deleteData = true; // 设置删除数据标记
- break;
- default:
- // 如果URI不匹配任何已知模式，抛出异常
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
-
- // 如果删除了数据，通知变更
- if (count > 0) {
- if (deleteData) {
- // 如果删除的是数据，通知笔记URI变更
- getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
- }
- // 通知原始URI变更
- getContext().getContentResolver().notifyChange(uri, null);
- }
-
- // 返回删除的记录数
- return count;
- }
-
- // 实现ContentProvider的update方法，用于更新数据
- @Override
- public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
- int count = 0; // 初始化更新计数器
- String id = null; // 初始化ID变量
- SQLiteDatabase db = mHelper.getWritableDatabase(); // 获取可写数据库实例
- boolean updateData = false; // 标记是否更新数据
-
- // 根据URI匹配结果执行不同的更新操作
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
- // 如果URI匹配到笔记列表，增加笔记版本号并更新笔记
- increaseNoteVersion(-1, selection, selectionArgs); // 增加笔记版本号
- count = db.update(TABLE.NOTE, values, selection, selectionArgs); // 执行更新操作并获取更新计数
- break;
- case URI_NOTE_ITEM:
- // 如果URI匹配到单个笔记，获取笔记ID，增加版本号并更新该笔记
- id = uri.getPathSegments().get(1); // 获取URI中的笔记ID
- increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); // 增加笔记版本号
- count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
- + parseSelection(selection), selectionArgs); // 执行更新操作并获取更新计数
- break;
- case URI_DATA:
- // 如果URI匹配到数据列表，更新数据
- count = db.update(TABLE.DATA, values, selection, selectionArgs); // 执行更新操作并获取更新计数
- updateData = true; // 设置更新数据标记
- break;
- case URI_DATA_ITEM:
- // 如果URI匹配到单个数据项，获取数据项ID并更新该数据项
- id = uri.getPathSegments().get(1); // 获取URI中的数据项ID
- count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
- + parseSelection(selection), selectionArgs); // 执行更新操作并获取更新计数
- updateData = true; // 设置更新数据标记
- break;
- default:
- // 如果URI不匹配任何已知模式，抛出异常
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
-
- // 如果更新了数据，通知变更
- if (count > 0) {
- if (updateData) {
- // 如果更新的是数据，通知笔记URI变更
- getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
- }
- // 通知原始URI变更
- getContext().getContentResolver().notifyChange(uri, null);
- }
-
- // 返回更新的记录数
- return count;
- }
-
- // 解析选择条件，用于构建SQL语句
- private String parseSelection(String selection) {
- return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
- }
-
- // 增加笔记版本号
- private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
- StringBuilder sql = new StringBuilder(120); // 初始化StringBuilder用于构建SQL语句
- sql.append("UPDATE ");
- sql.append(TABLE.NOTE);
- sql.append(" SET ");
- sql.append(NoteColumns.VERSION);
- sql.append("=" + NoteColumns.VERSION + "+1 "); // 增加版本号
-
- // 如果有ID或者选择条件，添加WHERE子句
- if (id > 0 || !TextUtils.isEmpty(selection)) {
- sql.append(" WHERE ");
- }
- if (id > 0) {
- sql.append(NoteColumns.ID + "=" + String.valueOf(id)); // 如果有ID，添加ID条件
- }
- if (!TextUtils.isEmpty(selection)) {
- String selectString = id > 0 ? parseSelection(selection) : selection; // 解析选择条件
- for (String args : selectionArgs) {
- selectString = selectString.replaceFirst("\\?", args); // 替换选择参数
- }
- sql.append(selectString); // 添加选择条件到SQL语句
- }
-
- mHelper.getWritableDatabase().execSQL(sql.toString()); // 执行SQL语句
- }
-
- // 实现ContentProvider的getType方法，用于返回URI的MIME类型
- @Override
- public String getType(Uri uri) {
- // TODO: 根据URI返回相应的MIME类型，此处为自动生成的方法存根，需要实现具体逻辑
- return null;
- }
-}
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
deleted file mode 100644
index 88da7bf..0000000
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ /dev/null
@@ -1,89 +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;
-
-
-// MetaData类继承自Task类，用于处理元数据
-public class MetaData extends Task {
- private final static String TAG = MetaData.class.getSimpleName(); // 日志标签，用于标识日志来源
-
- private String mRelatedGid = null; // 相关的GTask ID
-
- // 设置元数据，将GTask ID和元信息放入JSONObject中，并设置笔记名称
- public void setMeta(String gid, JSONObject metaInfo) {
- try {
- metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); // 将GTask ID放入元信息中
- } catch (JSONException e) {
- Log.e(TAG, "failed to put related gid"); // 日志记录错误信息
- }
- setNotes(metaInfo.toString()); // 将JSONObject转换为字符串并设置为笔记内容
- setName(GTaskStringUtils.META_NOTE_NAME); // 设置笔记名称
- }
-
- // 获取相关的GTask ID
- public String getRelatedGid() {
- return mRelatedGid;
- }
-
- // 重写isWorthSaving方法，判断笔记内容是否不为空
- @Override
- public boolean isWorthSaving() {
- return getNotes() != null;
- }
-
- // 重写setContentByRemoteJSON方法，从远程JSON中设置内容
- @Override
- public void setContentByRemoteJSON(JSONObject js) {
- super.setContentByRemoteJSON(js); // 调用父类方法设置内容
- if (getNotes() != null) {
- try {
- JSONObject metaInfo = new JSONObject(getNotes().trim()); // 将笔记内容转换为JSONObject
- mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); // 获取GTask ID
- } catch (JSONException e) {
- Log.w(TAG, "failed to get related gid"); // 日志记录警告信息
- mRelatedGid = null; // 如果出现异常，将GTask ID设置为null
- }
- }
- }
-
- // 重写setContentByLocalJSON方法，抛出异常，因为该方法不应该被调用
- @Override
- public void setContentByLocalJSON(JSONObject js) {
- throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
- }
-
- // 重写getLocalJSONFromContent方法，抛出异常，因为该方法不应该被调用
- @Override
- public JSONObject getLocalJSONFromContent() {
- throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
- }
-
- // 重写getSyncAction方法，抛出异常，因为该方法不应该被调用
- @Override
- public int getSyncAction(Cursor c) {
- throw new IllegalAccessError("MetaData:getSyncAction should not be called");
- }
-}
-
diff --git a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java
deleted file mode 100644
index 67ef9e3..0000000
--- a/src/notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-
-import org.json.JSONObject;
-
-// Node类是一个抽象类，用于表示同步操作的节点
-public abstract class Node {
- // 同步操作常量，表示不需要执行任何同步操作
- public static final int SYNC_ACTION_NONE = 0;
- // 同步操作常量，表示需要添加远程数据
- public static final int SYNC_ACTION_ADD_REMOTE = 1;
- // 同步操作常量，表示需要添加本地数据
- public static final int SYNC_ACTION_ADD_LOCAL = 2;
- // 同步操作常量，表示需要删除远程数据
- public static final int SYNC_ACTION_DEL_REMOTE = 3;
- // 同步操作常量，表示需要删除本地数据
- public static final int SYNC_ACTION_DEL_LOCAL = 4;
- // 同步操作常量，表示需要更新远程数据
- public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
- // 同步操作常量，表示需要更新本地数据
- public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
- // 同步操作常量，表示存在更新冲突
- public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
- // 同步操作常量，表示同步操作出现错误
- public static final int SYNC_ACTION_ERROR = 8;
-
- private String mGid; // 节点的GTask ID
- private String mName; // 节点的名称
- private long mLastModified; // 节点最后修改时间
- private boolean mDeleted; // 节点是否被删除的标志
-
- // Node类的构造函数，初始化成员变量
- public Node() {
- mGid = null;
- mName = "";
- mLastModified = 0;
- mDeleted = false;
- }
-
- // 抽象方法，用于获取创建操作的JSON对象
- public abstract JSONObject getCreateAction(int actionId);
-
- // 抽象方法，用于获取更新操作的JSON对象
- public abstract JSONObject getUpdateAction(int actionId);
-
- // 抽象方法，用于根据远程JSON设置内容
- public abstract void setContentByRemoteJSON(JSONObject js);
-
- // 抽象方法，用于根据本地JSON设置内容
- public abstract void setContentByLocalJSON(JSONObject js);
-
- // 抽象方法，用于从内容获取本地JSON对象
- public abstract JSONObject getLocalJSONFromContent();
-
- // 抽象方法，用于获取同步操作类型
- public abstract int getSyncAction(Cursor c);
-
- // 设置节点的GTask ID
- 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;
- }
-
- // 获取节点的GTask ID
- public String getGid() {
- return this.mGid;
- }
-
- // 获取节点的名称
- public String getName() {
- return this.mName;
- }
-
- // 获取节点最后修改时间
- public long getLastModified() {
- return this.mLastModified;
- }
-
- // 获取节点是否被删除的标志
- public boolean getDeleted() {
- return this.mDeleted;
- }
-
-}
-
diff --git a/src/notesmaster/app/src/main/res/drawable/ic_launcher_background.xml b/src/notesmaster/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/src/notesmaster/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/notesmaster/app/src/main/res/drawable/ic_launcher_foreground.xml b/src/notesmaster/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/src/notesmaster/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/res/layout/activity_main.xml b/src/notesmaster/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 86a5d97..0000000
--- a/src/notesmaster/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 6f3b755..0000000
--- a/src/notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 6f3b755..0000000
--- a/src/notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
Binary files a/src/notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/src/notesmaster/app/src/main/res/values-night/themes.xml b/src/notesmaster/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index d2c68d1..0000000
--- a/src/notesmaster/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/res/values/themes.xml b/src/notesmaster/app/src/main/res/values/themes.xml
deleted file mode 100644
index 7c616ff..0000000
--- a/src/notesmaster/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/res/xml/backup_rules.xml b/src/notesmaster/app/src/main/res/xml/backup_rules.xml
deleted file mode 100644
index fa0f996..0000000
--- a/src/notesmaster/app/src/main/res/xml/backup_rules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/main/res/xml/data_extraction_rules.xml b/src/notesmaster/app/src/main/res/xml/data_extraction_rules.xml
deleted file mode 100644
index 9ee9997..0000000
--- a/src/notesmaster/app/src/main/res/xml/data_extraction_rules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/notesmaster/app/src/test/java/net/micode/notes/ExampleUnitTest.java b/src/notesmaster/app/src/test/java/net/micode/notes/ExampleUnitTest.java
deleted file mode 100644
index 296adc2..0000000
--- a/src/notesmaster/app/src/test/java/net/micode/notes/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package net.micode.notes;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see Testing documentation
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
diff --git a/src/notesmaster/build.gradle.kts b/src/notesmaster/build.gradle.kts
deleted file mode 100644
index 3756278..0000000
--- a/src/notesmaster/build.gradle.kts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
- alias(libs.plugins.android.application) apply false
-}
\ No newline at end of file
diff --git a/src/notesmaster/gradle.properties b/src/notesmaster/gradle.properties
deleted file mode 100644
index fd5ffa1..0000000
--- a/src/notesmaster/gradle.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. For more details, visit
-# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
-android.nonFinalResIds=false
diff --git a/src/notesmaster/gradle/libs.versions.toml b/src/notesmaster/gradle/libs.versions.toml
deleted file mode 100644
index 08c8f02..0000000
--- a/src/notesmaster/gradle/libs.versions.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[versions]
-agp = "8.7.2"
-junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-appcompat = "1.6.1"
-material = "1.10.0"
-activity = "1.8.0"
-constraintlayout = "2.1.4"
-
-[libraries]
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
-
-[plugins]
-android-application = { id = "com.android.application", version.ref = "agp" }
-
diff --git a/src/notesmaster/gradle/wrapper/gradle-wrapper.jar b/src/notesmaster/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index e708b1c..0000000
Binary files a/src/notesmaster/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/src/notesmaster/gradle/wrapper/gradle-wrapper.properties b/src/notesmaster/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index c5f85a8..0000000
--- a/src/notesmaster/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sat Nov 30 16:44:29 CST 2024
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/src/notesmaster/gradlew b/src/notesmaster/gradlew
deleted file mode 100644
index 4f906e0..0000000
--- a/src/notesmaster/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
- echo "$*"
-}
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=`expr $i + 1`
- done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/src/notesmaster/gradlew.bat b/src/notesmaster/gradlew.bat
deleted file mode 100644
index 107acd3..0000000
--- a/src/notesmaster/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/src/notesmaster/httpcomponents-clent-4.5.14-bin/LICENSE.txt b/src/notesmaster/httpcomponents-clent-4.5.14-bin/LICENSE.txt
deleted file mode 100644
index 32f01ed..0000000
--- a/src/notesmaster/httpcomponents-clent-4.5.14-bin/LICENSE.txt
+++ /dev/null
@@ -1,558 +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
-
-=========================================================================
-
-This project includes Public Suffix List copied from
-
-licensed under the terms of the Mozilla Public License, v. 2.0
-
-Full license text:
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
- means each individual or legal entity that creates, contributes to
- the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
- means the combination of the Contributions of others (if any) used
- by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
- means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
- means Source Code Form to which the initial Contributor has attached
- the notice in Exhibit A, the Executable Form of such Source Code
- Form, and Modifications of such Source Code Form, in each case
- including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
- means
-
- (a) that the initial Contributor has attached the notice described
- in Exhibit B to the Covered Software; or
-
- (b) that the Covered Software was made available under the terms of
- version 1.1 or earlier of the License, but not also under the
- terms of a Secondary License.
-
-1.6. "Executable Form"
- means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
- a separate file or files, that is not Covered Software.
-
-1.8. "License"
- means this document.
-
-1.9. "Licensable"
- means having the right to grant, to the maximum extent possible,
- whether at the time of the initial grant or subsequently, any and
- all of the rights conveyed by this License.
-
-1.10. "Modifications"
- means any of the following:
-
- (a) any file in Source Code Form that results from an addition to,
- deletion from, or modification of the contents of Covered
- Software; or
-
- (b) any new file in Source Code Form that contains any Covered
- Software.
-
-1.11. "Patent Claims" of a Contributor
- means any patent claim(s), including without limitation, method,
- process, and apparatus claims, in any patent Licensable by such
- Contributor that would be infringed, but for the grant of the
- License, by the making, using, selling, offering for sale, having
- made, import, or transfer of either its Contributions or its
- Contributor Version.
-
-1.12. "Secondary License"
- means either the GNU General Public License, Version 2.0, the GNU
- Lesser General Public License, Version 2.1, the GNU Affero General
- Public License, Version 3.0, or any later versions of those
- licenses.
-
-1.13. "Source Code Form"
- means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
- means an individual or a legal entity exercising rights under this
- License. For legal entities, "You" includes any entity that
- controls, is controlled by, or is under common control with You. For
- purposes of this definition, "control" means (a) the power, direct
- or indirect, to cause the direction or management of such entity,
- whether by contract or otherwise, or (b) ownership of more than
- fifty percent (50%) of the outstanding shares or beneficial
- ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
- Licensable by such Contributor to use, reproduce, make available,
- modify, display, perform, distribute, and otherwise exploit its
- Contributions, either on an unmodified basis, with Modifications, or
- as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
- for sale, have made, import, and otherwise transfer either its
- Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
- or
-
-(b) for infringements caused by: (i) Your and any other third party's
- modifications of Covered Software, or (ii) the combination of its
- Contributions with other software (except as part of its Contributor
- Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
- its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
- Form, as described in Section 3.1, and You must inform recipients of
- the Executable Form how they can obtain a copy of such Source Code
- Form by reasonable means in a timely manner, at a charge no more
- than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
- License, or sublicense it under different terms, provided that the
- license for the Executable Form does not attempt to limit or alter
- the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-* *
-* 6. Disclaimer of Warranty *
-* ------------------------- *
-* *
-* Covered Software is provided under this License on an "as is" *
-* basis, without warranty of any kind, either expressed, implied, or *
-* statutory, including, without limitation, warranties that the *
-* Covered Software is free of defects, merchantable, fit for a *
-* particular purpose or non-infringing. The entire risk as to the *
-* quality and performance of the Covered Software is with You. *
-* Should any Covered Software prove defective in any respect, You *
-* (not any Contributor) assume the cost of any necessary servicing, *
-* repair, or correction. This disclaimer of warranty constitutes an *
-* essential part of this License. No use of any Covered Software is *
-* authorized under this License except under this disclaimer. *
-* *
-************************************************************************
-
-************************************************************************
-* *
-* 7. Limitation of Liability *
-* -------------------------- *
-* *
-* Under no circumstances and under no legal theory, whether tort *
-* (including negligence), contract, or otherwise, shall any *
-* Contributor, or anyone who distributes Covered Software as *
-* permitted above, be liable to You for any direct, indirect, *
-* special, incidental, or consequential damages of any character *
-* including, without limitation, damages for lost profits, loss of *
-* goodwill, work stoppage, computer failure or malfunction, or any *
-* and all other commercial damages or losses, even if such party *
-* shall have been informed of the possibility of such damages. This *
-* limitation of liability shall not apply to liability for death or *
-* personal injury resulting from such party's negligence to the *
-* extent applicable law prohibits such limitation. Some *
-* jurisdictions do not allow the exclusion or limitation of *
-* incidental or consequential damages, so this exclusion and *
-* limitation may not apply to You. *
-* *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
- This Source Code Form is "Incompatible With Secondary Licenses", as
- defined by the Mozilla Public License, v. 2.0.
diff --git a/src/notesmaster/httpcomponents-clent-4.5.14-bin/NOTICE.txt b/src/notesmaster/httpcomponents-clent-4.5.14-bin/NOTICE.txt
deleted file mode 100644
index 10a2916..0000000
--- a/src/notesmaster/httpcomponents-clent-4.5.14-bin/NOTICE.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache HttpComponents Client
-Copyright 1999-2021 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/src/notesmaster/httpcomponents-clent-4.5.14-bin/RELEASE_NOTES.txt b/src/notesmaster/httpcomponents-clent-4.5.14-bin/RELEASE_NOTES.txt
deleted file mode 100644
index c1f0a0f..0000000
--- a/src/notesmaster/httpcomponents-clent-4.5.14-bin/RELEASE_NOTES.txt
+++ /dev/null
@@ -1,2613 +0,0 @@
-Release 4.5.14
--------------------
-
-This is a maintenance release that fixes several minor bugs reported discovered since
-the 4.5.13 release.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-2206: Corrected resource de-allocation by fluent response objects.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2174: URIBuilder to return a new empty list instead of unmodifiable
- Collections#emptyList.
- Contributed by Oleg Kalnichevski
-
-* Don't retry requests in case of NoRouteToHostException.
- Contributed by Jaikiran Pai
-
-* HTTPCLIENT-2144: RequestBuilder fails to correctly copy charset of requests with
- form url-encoded body.
- Contributed by Oleg Kalnichevski
-
-* PR #269: 4.5.x use array fill and more.
- - Use Arrays.fill().
- - Remove redundant modifiers.
- - Use Collections.addAll() and Collection.addAll() APIs instead of loops.
- - Remove redundant returns.
- - No need to explicitly declare an array when calling a vararg method.
- - Remote extra semicolons (;).
- - Use a 'L' instead of 'l' to make long literals more readable.
- Contributed by Gary Gregory
-
-* PublicSuffixListParser.parseByType(Reader) allocates but does not use a 256 char
- StringBuilder.
- Contributed by Gary Gregory
-
-
-
-Release 4.5.13
--------------------
-
-This is a maintenance release that fixes incorrect handling of malformed authority component
-in request URIs.
-
-
-Changelog:
--------------------
-
-* Incorrect handling of malformed authority component by URIUtils#extractHost.
- Contributed by Oleg Kalnichevski
-
-* Avoid updating Content-Length header in a 304 response.
- Contributed by Dirk Henselin
-
-* Bug fix: BasicExpiresHandler is annotated as immutable but is not (#239)
- Contributed by Gary Gregory
-
-* HTTPCLIENT-2076: Fixed NPE in LaxExpiresHandler (#222).
- Contributed by heejeongkim
-
-
-Release 4.5.12
--------------------
-
-This is a maintenance release that fixes a regression introduced by the previous release
-that caused rejection of certificates with non-standard domains.
-
-Changelog:
--------------------
-
-* HTTPCLIENT-2053: Add SC_PERMANENT_REDIRECT (308) to DefaultRedirectStrategy
- Contributed by Michael Osipov
-
-* HTTPCLIENT-2052: Fixed redirection of entity enclosing requests with non-repeatable entities
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2047: Fixed regression in DefaultHostnameVerifier causing rejection of certificates
- with non-standard domains.
- Contributed by Oleg Kalnichevski
-
-* Bug fix: Fixed handling of private domains by PublicSuffixMatcher
- Contributed by Oleg Kalnichevski
-
-
-Release 4.5.11
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.10
-and upgrades HttpCore dependency to version 4.4.13.
-
-
-Changelog:
--------------------
-
-* Improved domain name normalization by DefaultHostnameVerifier.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2033: Connection managers to immediately shut down all leased connection upon shutdown.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2020: DefaultBackoffStrategy to support TOO_MANY_REQUESTS (429).
- Contributed by Michael Osipov
-
-* HTTPCLIENT-2030: Fixed PublicSuffixMatcher#getDomainRoot behavior with invalid hostnames.
- Contributed by Niels Basjes
-
-* HTTPCLIENT-2029: URIBuilder to support parsing of non-UTF8 URIs.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2026: Fixed URIBuilder#isOpaque() logic.
- Contributed by Oleg Kalnichevski
-
-* Updated text in pool stats description
- Contributed by chao chang
-
-* HTTPCLIENT-2023: Allow nested arrays and all primitive types in DefaultHttpCacheEntrySerializer.
- Contributed by Olof Larsson
-
-* Fixed fallback PublicSuffixMatcher instance.
- Contributed by Ryan Schmitt
-
-* Added family property #145.
- Contributed by behrangsa
-
-
-Release 4.5.10
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.9
-and upgrades HttpCore dependency to version 4.4.12.
-
-
-Changelog:
--------------------
-
-* Refactor DefaultRedirectStrategy for subclassing.
- Contributed by Gary Gregory
-
-* Improved handling of request cancellation.
- Contributed by Oleg Kalnichevski
-
-* Fixed concurrent use of threading unsafe HttpUriRequest messages.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1997: Return the last domain segment instead of normalized domain name
- from PublicSuffixMatcher#getDomainRoot in case there is no match.
- Contributed by jeromedemangel
-
-* Preserve original encoding of the URI path component if the URI is valid.
- Contributed by Oleg Kalnichevski
-
-
-Release 4.5.9
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.8.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-1991: incorrect handling of non-standard DNS entries by PublicSuffixMatcher
- Contributed by Oleg Kalnichevski
-
-* Fix bug in URIBuilder#isPathEmpty method to verify if encodedPath is an empty string
- Contributed by Varun Nandi
-
-* HTTPCLIENT-1984: Add normalize URI to RequestConfig copy constructor
- Contributed by Matt Nelson
-
-* HTTPCLIENT-1976: Unsafe deserialization in DefaultHttpCacheEntrySerializer
- Contributed by Artem Smotrakov
-
-
-
-Release 4.5.8
--------------------
-
-This is a maintenance release that makes request URI normalization configurable on per request basis
-and also ports several improvements in URI handling from HttpCore master.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-1969: Filter out weak cipher suites.
- Contributed by Artem Smotrakov
-
-* HTTPCLIENT-1968: Preserve escaped PATHSAFE characters when normalizing URI path segments.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: URIBuilder to split path component into path segments when digesting a URI
- (ported from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* Improved cache key generation (ported from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: added utility methods to parse and format URI path segments (ported
- from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: Make normalization of URI paths optional.
- Contributed by Tamas Cservenak
-
-* Some well known proxies respond with Content-Length=0, when returning 304. For robustness, always use the
- cached entity's content length, as modern browsers do.
- Contributed by Author: Jayson Raymond
-
-
-
-Release 4.5.7
--------------------
-
-This is a maintenance release that corrects Automatic-Module-Name definitions added in the previous
-release and fixes a number of minor defects discovered since 4.5.6.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* Upgraded HttpCore to version 4.4.11
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1960: URIBuilder incorrect handling of multiple leading slashes in path component
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1958: PoolingHttpClientConnectionManager to throw ExecutionException in case of a lease operation
- cancellation instead of InterruptedException.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1952: Allow default User Agent to be disabled.
- Contributed by Michael Osipov
-
-* HTTPCLIENT-1956: CONNECT overwrites the main request object in the HTTP context when requests are executed
- via a proxy tunnel.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1940: deprecated SSLSocketFactory made to rethrow SocketTimeoutException as
- ConnectTimeoutException for consistency with non-deprecated code.
- Contributed by Oleg Kalnichevski
-
-* Fixed regression in BasicCookieStore serialization.
- Contributed by Author: Mark Mielke
-
-* HTTPCLIENT-1929: Corrected Automatic-Module-Name entries for HttpClient Fluent, HttpClient Windows
- and HttpClient Cache.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1927: URLEncodedUtils#parse breaks at double quotes when parsing unquoted values.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1939: Update Apache Commons Codec from 1.10 to 1.11
- Contributed by Gary Gregory
-
-
-Release 4.5.6
--------------------
-
-This is a maintenance release that adds Automatic-Module-Name to the manifest for compatibility
-with Java 9 Platform Module System and fixes a number of issues discovered since 4.5.5
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1882=: reset authentication state on I/O or runtime error for connection based
- authentication schemes (such as NTLM)
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1924]: HttpClient to shut down the connection manager if a fatal error occurs
- in the course of a request execution.
- Contributed by Oleg Kalnichevski
-
-* Add Automatic-Module-Name in manifest so Java9 modular applications can depend on this library
- Contributed by Varun Nandi
-
-* [HTTPCLIENT-1923]: fixed incorrect connection close on shutdown + fixed corresponding test
- Contributed by Aleksei Arsenev
-
-* [HTTPCLIENT-1906]: certificates containing alternative subject names other than DNS and IP
- (such as RFC822) get rejected as invalid
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1904]: check cookie domain for null
- Contributed by Hans-Peter Keck
-
-* [HTTPCLIENT-1900]: proxy protocol processor does not post-process CONNECT response messages
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1911]: Failing tests on Fedora 28 due to weak encryption algorithms in test
- keystore.
- Contributed by Gary Gregory and Michael Simacek
-
-
-Release 4.5.5
--------------------
-
-HttpClient 4.5.5 (GA) is a maintenance release that fixes a regression introduced
-by the previous release causing a NPE in SystemDefaultCredentialsProvider.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1690] Avoid merging Content-Encoding headers coming with 304 status to cache entry.
- Contributed by Sudheera Palihakkara
-
-* [HTTPCLIENT-1888] Regression in SystemDefaultCredentialsProvider#getCredentials causing NPE.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1886] Update HttpClient 4.5.x from HttpCore 4.4.7 to 4.4.9
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1889] org.apache.http.client.utils.URLEncodedUtils.parse()
- should return a new ArrayList when there are no query parameters.
- Contributed by Gary Gregory
-
-
-Release 4.5.4
--------------------
-
-HttpClient 4.5.4 (GA) is a maintenance release that fixes a number of defects found since 4.5.3.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1883] SystemDefaultCredentialsProvider to use https.proxy* system properties
- for origins with port 443.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1881] Allow truncated NTLM packets to work with this client.
- Contributed by Karl Wright
-
-* [HTTPCLIENT-1855] Disabled caching of DIGEST auth scheme instances due to unreliability of nonce counter
- when the auth cache is shared by multiple sessions.
- Contributed by Oleg Kalnichevski
-
-* BasicCookieStore uses a ReentrantReadWriteLock to avoid synchronization on #getCookies/#toString
- while maintaining thread safety.
- Contributed by Carter Kozak
-
-* [HTTPCLIENT-1865] DefaultServiceUnavailableRetryStrategy does not respect HttpEntity#isRepeatable.
- Contributed by Tomas Celaya
-
-* [HTTPCLIENT-1859] Encode Content-Disposition name and filename elements appropriately.
- Contributed by Karl Wright
-
-* Avoid fetching the cached entity twice on cache hit.
- Contributed by Leandro Nunes
-
-* [HTTPCLIENT-1835] #evictExpiredConnections no longer causes the #evictIdleConnections behaviour
- to be implicitly enabled.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1831= URIBuilder should not prepend a leading slash to relative URIs.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1833] Fix Windows Negotiate-NTLM handling of proxies.
- Contributed by Roman Stoffel
-
-* [HTTPCLIENT-1817] Add a "Trust All" TrustStrategy implementation.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1816] Update Apache Commons Codec 1.9 to 1.10.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1836] DefaultHostnameVerifier#getSubjectAltNames(X509Certificate) throws java.lang.ClassCastException.
- Contributed by Gary Gregory , Ilian Iliev
-
-* [HTTPCLIENT-1845]: Extract InputStreamFactory classes out of GzipDecompressingEntity and
- DeflateDecompressingEntity for reuse and to create less garbage.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1847] Update Ehcache from 2.6.9 to 2.6.11.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1848] Update spymemcached from 2.11.4 to 2.12.3.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1849] Update JNA from 4.1.0 to 4.4.0.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1850] Update SLF4J from 1.7.6 to 1.7.25.
- Contributed by Gary Gregory
-
-
-Release 4.5.3
--------------------
-
-HttpClient 4.5.3 (GA) is a maintenance release that fixes a number of defects found since 4.5.2.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1803] Improved handling of malformed paths by URIBuilder.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1802] Do not attempt to match SSL host to subject CN if subject alternative name of any type are given.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1788] RFC 6265 policy must not reject cookies with paths that are no prefix of the uri path.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1792] SSLConnectionSocketFactory to throw SSLPeerUnverifiedException with a better error message
- when hostname verification fails.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1779] [OSGi] support NTLM proxy authentication.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1773] [OSGi] HttpProxyConfigurationActivator does not unregister HttpClientBuilderFactory.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1771] improve OSGi webconsole display for org.apache.http.proxyconfigurator.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1770] OSGi metatype for org.apache.http.proxyconfigurator missing factoryPid.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1767] Null pointer dereference in EofSensorInputStream and ResponseEntityProxy.
- Contributed by Peter Ansell
-
-* Support changing system default ProxySelector.
- Contributed by Robin Stevens
-
-* All services registered in the OSGi service registry provide the whole bundle header dictionary as vendor
- property value.
- Contributed by Christoph Fiehe
-
-* [HTTPCLIENT-1750] OSGi support for CachingHttpClientBuilder.
- Contributed by Justin Edelson
-
-* [HTTPCLIENT-1749] OSGi client builder to use weak references to track HttpClient instances.
- Contributed by Justin Edelson
-
-* [HTTPCLIENT-1747] apply RequestConfig defaults when using HttpParams values in backward compatibility mode.
- Contributed by Oleg Kalnichevski
-
-* Override LaxRedirectStrategy's INSTANCE field.
- Contributed by Eric Wu
-
-* [HTTPCLIENT-1736] do not request cred delegation by default when using Kerberos auth.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1744] normalize hostname and certificate CN when matching to CN.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1732] SystemDefaultCredentialsProvider to take http.proxyHost and http.proxyPort system
- properties into account.
- Contributed by Oleg Kalnichevski
-
-* Revert "HTTPCLIENT-1712: SPNego schemes to take service scheme into account when generating auth token".
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1727] AbstractHttpClient#createClientConnectionManager does not account for context class loader.
- Contributed by Charles Allen
-
-* [HTTPCLIENT-1726:] Copy the SNI fix from SSLConnectionSocketFactory to the deprecated SSLSocketFactory class.
- Contributed by David Black
-
-
-Release 4.5.2
--------------------
-
-HttpClient 4.5.2 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.1.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1710, HTTPCLIENT-1718, HTTPCLEINT-1719] OSGi container compatibility improvements.
- Contributed by 212427891
-
-* [HTTPCLIENT-1717] Make fluent API Content#Content(byte[], ContentType) public.
- Contributed by Cash Costello
-
-* [HTTPCLIENT-1715] NTLMEngineImpl#Type1Message not thread safe but declared as a constant.
- Contributed by Olivier Lafontaine , Gary Gregory
-
-* [HTTPCLIENT-1714] Add HttpClientBuilder#setDnsResolver(DnsResolver).
- Contributed by Alexis Thaveau
-
-* [HTTPCLIENT-1712] SPNego schemes to take service scheme into account when generating auth token.
- Contributed by Georg Romstorfer
-
-* [HTTPCLIENT-1700] Netscape draft, browser compatibility, RFC 2109, RFC 2965 and default cookie
- specs to ignore cookies with empty name for consistency with RFC 6265 specs.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1704] IgnoreSpec#match to always return false.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1550] Fixed 'deflate' zlib header check.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1698] Fixed matching of IPv6 addresses by DefaultHostnameVerifier
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1695] RFC 6265 compliant cookie spec to ignore cookies with empty name / missing
- value.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1216] Removed ThreadLocal subclass from DateUtils.
- Contributed by Jochen Kemnade
-
-* [HTTPCLIENT-1685] PublicSuffixDomainFilter to ignore local hosts and local domains.
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.5.1
--------------------
-
-HttpClient 4.5.1 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1680] redirect of a POST request causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1673] org.apache.http.entity.mime.content.* missing from OSGi exports.
- Contributed by Benson Margulies
-
-* [HTTPCLIENT-1668] Fluent request incorrectly handles connect timeout setting.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1667] RequestBuilder does not take charset into account when creating
- UrlEncodedFormEntity.
- Contributed by Sergey Smith
-
-* [HTTPCLIENT-1655] HttpClient sends RST instead of FIN ACK sequence when using non-persistant
- connections.
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.5
--------------------
-
-HttpClient 4.5 (GA) is a minor feature release that includes several incremental enhancements
-to the exisitng functionality such as support for private domains in the Mozilla Public Suffix List.
-
-Changelog:
--------------------
-
-* Reduced default validate after inactivity setting from 5 sec to 2 sec
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1649] Fixed serialization of auth schemes
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1645]: Fluent requests to inherit config parameters of the executor.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1640]: RFC6265 lax cookie policy fails to parse 'max-age' attribute.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1633]: RFC6265CookieSpecProvider compatibility level setting has no effect.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1613]: Support for private domains in Mozilla Public Suffix List.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1651]: Add ability to disable content compression on a request basis
- Contributed by Michael Osipov
-
-* [HTTPCLIENT-1654]: Deprecate/remove RequestConfig#decompressionEnabled in favor of #contentCompressionEnabled
- Contributed by Michael Osipov
-
-
-
-Release 4.4.1
--------------------
-
-HttpClient 4.4.1 (GA) is a maintenance release that fixes a number of defects in new functionality
-introduced in version 4.4.
-
-Users of HttpClient 4.4 are encouraged to upgrade.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* Marked RFC 2109, RFC 2965, Netscape draft cookie specs as obsolete
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1633] RFC6265CookieSpecProvider compatibility level setting has no effect.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1628]: Auth cache can fail when domain name contains uppercase characters.
- Contributed by Dennis Ju
-
-* [HTTPCLIENT-1609] Stale connection check in PoolingHttpClientConnectionManager has no effect.
- Internal connection pool does not correctly implement connection validation.
- Contributed by Charles Lip
-
-
-
-Release 4.4 Final
--------------------
-
-This is the first stable (GA) release of HttpClient 4.4. Notable features and enhancements included
-in 4.4 series are:
-
-* Support for the latest HTTP state management specification (RFC 6265). Please note that the old
-cookie policy is still used by default for compatibility reasons. RFC 6265 compliant cookie
-policies need to be explicitly configured by the user. Please also note that as of next feature
-release support for Netscape draft, RFC 2109 and RFC 2965 cookie policies will be deprecated
-and disabled by default. It is recommended to use RFC 6265 compliant policies for new applications
-unless compatibility with RFC 2109 and RFC 2965 is required and to migrate existing applications
-to the default cookie policy.
-
-* Enhanced, redesigned and rewritten default SSL hostname verifier with improved RFC 2818
-compliance
-
-* Default SSL hostname verifier and default cookie policy now validate certificate identity
-and cookie domain of origin against the public suffix list maintained by Mozilla.org
-
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Authentication cache thread-safety: authentication cache used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-* Native Windows Negotiate and NTLM via SSPI through JNA: when running on Windows OS HttpClient
-configured to use native NTLM or SPNEGO authentication schemes can make use of platform specific
-functionality via JNA and current user credentials. This functionality is still considered
-experimental, known to have compatibility issues and subject to change without prior notice.
-Use at your discretion.
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-
-Changelog:
--------------------
-
-* Support for the latest HTTP state management specification (RFC 6265).
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1515] Caching of responses to HEAD requests
- Contributed by Tyrone Cutajar and
- Francois-Xavier Bonnet
-
-* [HTTPCLIENT-1560] Native Windows auth improvements
- Contributed by Michael Osipov
-
-* Update Apache Commons Logging version from 1.1.3 to 1.2.
- Contributed by Gary Gregory
-
-* Update Apache Commons Codec version from 1.6 to 1.9.
- Contributed by Gary Gregory
-
-* Update Ehcache version from 2.2.0 to 2.6.9.
- Contributed by Gary Gregory
-
-* Update Ehcache version from 2.2.0 to 2.6.9.
- Contributed by Gary Gregory
-
-* Update Spymemcached version from 2.6 to 2.11.4.
- Contributed by Gary Gregory
-
-* Update SLF4J version from 1.5.11 to 1.7.7.
- Contributed by Gary Gregory
-
-
-
-
-
-Release 4.4 BETA1
--------------------
-
-This is the first BETA release of HttpClient 4.4. Notable features and enhancements included
-in 4.4 series are:
-
-* Enhanced redesigned and rewritten default SSL hostname verifier with improved RFC 2818
-compliance
-
-* Default SSL hostname verifier and default cookie policy now validate certificate identity
-and cookie domain of origin against the public suffix list maintained by Mozilla.org
-
-
-* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use
-native NTLM or SPNEGO authentication schemes can make use of platform specific functionality
-via JNA and current user system credentials
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1547] HttpClient OSGi bundle doesn't import the package "javax.naming".
- Contributed by Willem Jiang
-
-* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principal name for Windows native
- Negotiate/NTLM auth schemes.
- Contributed by Ka-Lok Fung
-
-* Improved compliance with RFC 2818: default hostname verifier to ignore the common name of the
- certificate subject if alternative subject names (dNSName or iPAddress) are present.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1540] Support delegated credentials (ISC_REQ_DELEGATE) by Native windows
- native Negotiate/NTLM auth schemes.
- Contributed by Ka-Lok Fung
-
-
-
-Release 4.4 ALPHA1
--------------------
-
-This is the first ALPHA release of HttpClient 4.4. Notable features and enhancements included
-in the 4.4 branch are:
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use
-native NTLM or SPNEGO authentication schemes can make use of platform specific functionality
-via JNA and current user system credentials
-
-* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Please note that new features included in this release are still considered experimental and
-their API may change in the future 4.4 alpha and beta releases.
-
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1493] Indiscriminate connection checking has been deprecated in favor of conditional
- connection state validation. Persistent connections are to be re-validated only after a defined
- period inactivity prior to being leased to the consumer.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1519] Use the original HttpHost instance passed as a parameter to
- HttpClient#execute when generating 'Host' request header.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1491] Enable provision of Service Principal Name in Windows native
- auth scheme.
- Contributed by Malcolm Smith
-
-* [HTTPCLIENT-1403] Pluggable content decoders.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1461] fixed performance degradation in gzip encoded content processing
- introduced by HTTPCLIENT-1432.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by
- SystemDefaultCredentialsProvider.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1454] Make connection operator APIs public.
- Contributed by Tamas Cservenak
-
-* Update JUnit to version 4.11 from 4.9
- Contributed by Gary Gregory
-
-
-
-Release 4.3.4
--------------------
-
-HttpClient 4.3.4 (GA) is a maintenance release that improves performance in high concurrency
-scenarios. This version replaces dynamic proxies with custom proxy classes and eliminates thread
-contention in java.reflect.Proxy.newInstance() when leasing connections from the connection pool
-and processing response messages.
-
-
-Changelog:
--------------------
-
-* Replaced dynamic proxies with custom proxy classes to reduce thread contention.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1484] GzipCompressingEntity should not close the underlying output stream
- if the entity has not been fully written out due to an exception.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1474] Fixed broken entity enclosing requests in HC Fluent.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1470] CachingExec(ClientExecChain, HttpCache, CacheConfig, AsynchronousValidator)
- throws NPE if config is null
-
-
-
-
-Release 4.3.3
--------------------
-
-HttpClient 4.3.3 (GA) is a bug fix release that fixes a regression introduced by the previous
-release causing a significant performance degradation in compressed content processing.
-
-Users of HttpClient 4.3 are encouraged to upgrade.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1453] Thread safety regression in PoolingHttpClientConnectionManager
- #closeExpiredConnections that can lead to ConcurrentModificationException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1461] fixed performance degradation in compressed content processing
- introduced by HTTPCLIENT-1432.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by
- SystemDefaultCredentialsProvider.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-
-Release 4.3.2
--------------------
-
-HttpClient 4.3.2 (GA) is a maintenance release that delivers a number of improvements
-as well as bug fixes for issues reported since 4.3.1 release. SNI support for
-Oracle JRE 1.7+ is being among the most notable improvements.
-
-Users of HttpClient 4.3 are encouraged to upgrade.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1447] Clients created with HttpClients.createMinimal do not work with absolute URIs
- Contributed by Joseph Walton
-
-* [HTTPCLIENT-1446] NTLM proxy + BASIC target auth fails with 'Unexpected state:
- MSG_TYPE3_GENERATED'.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1443] HttpCache uses the physical host instead of the virtual host as a cache key.
- Contributed by Francois-Xavier Bonnet
-
-* [HTTPCLIENT-1442] Authentication header set by the user gets removed in case
- of proxy authentication (affects plan HTTP requests only).
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1441] Caching AsynchronousValidationRequest leaks connections.
- Contributed by Dominic Tootell
-
-* [HTTPCLIENT-1440] 'file' scheme in redirect location URI causes NPE.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1437] Made Executor#execute thread safe.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1119] SNI support (Oracle Java 1.7+ only).
- Contributed by Bruno Harbulot
-
-* [HTTPCLIENT-1435] Fluent Executor ignores custom request properties.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1432] Lazy decompressing of HttpEntity#getContent() to avoid EOFException
- in case of an empty response with 'Content-Encoding: gzip' header.
- Contributed by Yihua Huang
-
-* [HTTPCLIENT-1431] (Regression) deprecated connection manager cannot be used with
- a custom LayeredSchemeSocketFactory.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1425] Fixed socket closed exception thrown by caching HttpClient when the origin
- server sends a long chunked response.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1417] Fixed NPE in BrowserCompatSpec#formatCookies caused by version 1
- cookies with null cookie value.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1416] Fixed NPE in CachingHttpClientBuilder#build().
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.3.1
--------------------
-
-HttpClient 4.3.1 (GA) is a bug fix release that addresses a number of issues reported since
-release 4.3.
-
-Users of HttpClient 4.3 are strongly encouraged to upgrade.
-
-Changelog
--------------------
-
-* [HTTPCLIENT-1410] Browser compatible hostname verifier no longer rejects
- *.co., *.gov., *.info., etc as invalid.
- Contributed by Oleg Kalnichevski