From 7533b5809c9e46c7c21dbb8e682db85c9a370570 Mon Sep 17 00:00:00 2001
From: "tm61857897@163.com" <df756115lq>
Date: Tue, 3 Jun 2025 22:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E4=BA=86=E7=A7=81=E5=AF=86?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Notesmaster/.idea/vcs.xml                     |  1 +
 .../micode/notes/ui/NotesListActivity.java    | 83 ++++++++++++++++++-
 .../app/src/main/res/menu/note_list.xml       | 30 +++----
 .../app/src/main/res/menu/sub_folder.xml      |  9 ++
 .../app/src/main/res/values/strings.xml       |  4 +
 5 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/Notesmaster/.idea/vcs.xml b/Notesmaster/.idea/vcs.xml
index 1d65783..432e3e3 100644
--- a/Notesmaster/.idea/vcs.xml
+++ b/Notesmaster/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$/Notesmaster/lwp_gitpractice" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/lwp_gitpractice" vcs="Git" />
   </component>
diff --git a/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 4f3d850..29b1be7 100644
--- a/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -80,6 +80,7 @@ import java.util.HashSet;
 
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
     private int mode = -1;  //首页背景切换
+    public static int secret_mode = 0;  //私密模式切换
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
@@ -413,10 +414,35 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private void startAsyncNotesListQuery() {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
                 : NORMAL_SELECTION;
-        mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
-                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
-                        String.valueOf(mCurrentFolderId)
-                }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+        if(secret_mode == 0) {
+            mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+                    Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
+                            String.valueOf(mCurrentFolderId)
+                    }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+        }
+        else{
+            String str1 = "520";
+            String [] PROJECTION = new String [] {  //定义一个新的PROJECTION数组，只换掉SNIPPET
+                    NoteColumns.ID,
+                    NoteColumns.ALERTED_DATE,
+                    NoteColumns.BG_COLOR_ID,
+                    NoteColumns.CREATED_DATE,
+                    NoteColumns.HAS_ATTACHMENT,
+                    NoteColumns.MODIFIED_DATE,
+                    NoteColumns.NOTES_COUNT,
+                    NoteColumns.PARENT_ID,
+//                    NoteColumns.SNIPPET,
+                    str1,
+                    NoteColumns.TYPE,
+                    NoteColumns.WIDGET_ID,
+                    NoteColumns.WIDGET_TYPE,
+            };
+            mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+                    Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{
+                            String.valueOf(mCurrentFolderId)
+                    }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+
+        }
     }
 
     private final class BackgroundQueryHandler extends AsyncQueryHandler {
@@ -786,6 +812,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             menu.findItem(R.id.menu_background_picture3).setVisible(false);
         }
 
+        if(secret_mode == 1)
+            menu.findItem(R.id.menu_secret).setVisible(false);
+        else
+            menu.findItem(R.id.menu_quit_secret).setVisible(false);
+
         return true;
     }
 
@@ -793,6 +824,50 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
 
+            case R.id.menu_secret: {    //进入私密模式
+                secret_mode = 1;
+                AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+                dialog.setTitle("重要提醒");
+                dialog.setMessage("您确认进入私密模式吗？");
+                dialog.setCancelable(false);
+                dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        startAsyncNotesListQuery();
+                        Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+                    }
+                });
+                dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which){}
+                });
+                dialog.show();
+                startAsyncNotesListQuery();
+                Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+                break;
+            }
+
+            case R.id.menu_quit_secret:{    //退出私密模式
+                secret_mode = 0;
+                AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+                dialog.setTitle("重要提醒");
+                dialog.setMessage("您确认退出私密模式吗？");
+                dialog.setCancelable(false);
+                dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        startAsyncNotesListQuery();
+                        Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show();
+                    }
+                });
+                dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which){}
+                });
+                dialog.show();
+                break;
+            }
+
             case R.id.menu_background_picture1:{
                 mode = 1;
                 getWindow().setBackgroundDrawableResource(R.drawable.picture1);
diff --git a/Notesmaster/app/src/main/res/menu/note_list.xml b/Notesmaster/app/src/main/res/menu/note_list.xml
index b734741..aaf88d6 100644
--- a/Notesmaster/app/src/main/res/menu/note_list.xml
+++ b/Notesmaster/app/src/main/res/menu/note_list.xml
@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!-- 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.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_new_folder"
         android:title="@string/menu_create_folder"/>
@@ -49,4 +32,13 @@
     <item
         android:id="@+id/menu_background_picture3"
         android:title="更换背景3" />
-</menu>
+
+    <!-- 新增秘密功能菜单项 -->
+    <item
+        android:id="@+id/menu_secret"
+        android:title="@string/menu_secret"/>
+
+    <item
+        android:id="@+id/menu_quit_secret"
+        android:title="@string/menu_quit_secret"/>
+</menu>
\ No newline at end of file
diff --git a/Notesmaster/app/src/main/res/menu/sub_folder.xml b/Notesmaster/app/src/main/res/menu/sub_folder.xml
index b00de26..cd6c696 100644
--- a/Notesmaster/app/src/main/res/menu/sub_folder.xml
+++ b/Notesmaster/app/src/main/res/menu/sub_folder.xml
@@ -21,4 +21,13 @@
     <item
         android:id="@+id/menu_new_note"
         android:title="@string/notelist_menu_new"/>
+
+    <item
+        android:id="@+id/menu_secret"
+        android:title="@string/menu_secret"/>
+
+    <item
+        android:id="@+id/menu_quit_secret"
+        android:title="@string/menu_quit_secret"/>
+
 </menu>
\ No newline at end of file
diff --git a/Notesmaster/app/src/main/res/values/strings.xml b/Notesmaster/app/src/main/res/values/strings.xml
index 0382d6a..fa765df 100644
--- a/Notesmaster/app/src/main/res/values/strings.xml
+++ b/Notesmaster/app/src/main/res/values/strings.xml
@@ -45,6 +45,10 @@
     <string name="menu_picture2">Background:picture2</string>
     <string name="menu_picture3">Background:picture3</string>
 
+    <!-- 私密模式 -->
+    <string name="menu_secret">私密模式</string>
+    <string name="menu_quit_secret">退出私密模式</string>
+
     <string name="format_folder_files_count">(%d)</string>
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_export_text">Export text</string>