新增标签管理和按标签搜索以及笔记内容搜索功能

src/Notes-master/res/drawable/action_underline.xml

@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
+
     <path android:fillColor="@android:color/black" android:strokeColor="@android:color/black" android:strokeWidth="2" android:pathData="M5,15 L19,15"/>
-    
+
 </vector>

src/Notes-master/res/layout/note_edit.xml

@@ -259,7 +259,7 @@
             </HorizontalScrollView>
         </LinearLayout>
 
-        
+
 
         <!-- 富文本工具栏 - 放置在页面底部 -->
 

src/Notes-master/res/layout/note_list.xml

@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="10dip">
-            
+
             <!-- 搜索栏 -->
             <LinearLayout
                 android:id="@+id/search_bar"
@@ -75,7 +75,7 @@
                     android:padding="10dip"
                     android:tint="#FFFFFF" />
             </LinearLayout>
-            
+
             <!-- 工具栏按钮 -->
             <LinearLayout
                 android:layout_width="fill_parent"

src/Notes-master/res/menu/note_edit.xml

@@ -49,7 +49,7 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
-    
+
     <item
         android:id="@+id/menu_tag_management"
         android:title="标签管理" />

src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java

@@ -2078,7 +2078,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     // 添加富文本功能按钮初始化方法
     private void initRichEditorButtons() {
         // 撤销功能
-        findViewById(R.id.action_undo).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.action_undo).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 mNoteEditor.undo();
@@ -2086,7 +2086,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         });
 
         // 加粗功能
-        findViewById(R.id.action_bold).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.action_bold).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 mNoteEditor.setBold();
@@ -2094,7 +2094,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         });
 
         // 斜体功能
-        findViewById(R.id.action_italic).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.action_italic).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 mNoteEditor.setItalic();
@@ -2102,7 +2102,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         });
 
         // 下划线功能
-        findViewById(R.id.action_underline).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.action_underline).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 mNoteEditor.setUnderline();

src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java

@@ -674,6 +674,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                     ") OR (" + Notes.DataColumns.MIME_TYPE + "=?" +
                     " AND " + Notes.DataColumns.CONTENT + " LIKE ?" +
                     "))";
+
+            // 将整个基础查询条件用括号括起来，确保搜索条件应用到所有笔记
+            // 这是修复搜索功能的关键：解决SQL操作符优先级问题
+            selection = "(" + selection + ")";
             selection += searchFilter;
         }
 
@@ -823,7 +827,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         @Override
         protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
             Log.d(TAG, "onQueryComplete called with token: " + token + ", cursor: " + cursor + ", count: " + (cursor != null ? cursor.getCount() : -1));
-            
+
             switch (token) {
                 case FOLDER_NOTE_LIST_QUERY_TOKEN:
                     // 查询笔记列表完成，更新适配器
@@ -1498,10 +1502,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private void setSearchMode(boolean isSearchMode, String searchQuery) {
         mIsSearchMode = isSearchMode;
         mSearchQuery = searchQuery;
-        
+
         // 移除任何待执行的搜索任务，避免状态冲突
         mSearchEditText.removeCallbacks(mSearchRunnable);
-        
+
         startAsyncNotesListQuery();
 
         // 更新UI，显示或隐藏搜索相关控件