2024/6/5

01src/.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="AlarmAlertActivity">
+        <State />
+      </entry>
+      <entry key="NoteEditActivity">
+        <State />
+      </entry>
+      <entry key="app">
+        <State>
+          <targetSelectedWithDropDown>
+            <Target>
+              <type value="QUICK_BOOT_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="VIRTUAL_DEVICE_PATH" />
+                  <value value="C:\Users\86198\.android\avd\Pixel_2_API_28.avd" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </targetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-05-11T13:21:46.175192100Z" />
+        </State>
+      </entry>
+    </value>
+  </component>
+</project>

01src/app/build.gradle.kts

@@ -41,14 +41,9 @@ dependencies {
     implementation(libs.material)
     implementation(libs.activity)
     implementation(libs.constraintlayout)
-//    implementation(fileTree(mapOf(
-//            "dir" to "E:\\AS-Projects\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
-//            "include" to listOf("*.aar", "*.jar"),
-//            "exclude" to listOf("")
-//    )))
-    implementation(files("E:\\AS-Projects\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
-    implementation(files("E:\\AS-Projects\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
-    implementation(files("E:\\AS-Projects\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
+    implementation(files("D:\\AS_projects\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
+    implementation(files("D:\\AS_projects\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
+    implementation(files("D:\\AS_projects\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)

01src/app/src/main/AndroidManifest.xml

@@ -46,6 +46,7 @@
             android:theme="@style/NoteTheme"
             android:exported="true">
 
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />

01src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java

@@ -81,7 +81,8 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
 //                pendingIntent);
 //        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
 //    }
-private void showNotification(int tickerId, String content) {
+
+    private void showNotification(int tickerId, String content) {
         PendingIntent pendingIntent;
         if (tickerId != R.string.ticker_success) {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
@@ -99,7 +100,7 @@ private void showNotification(int tickerId, String content) {
                 .setOngoing(true);
         Notification notification=builder.getNotification();
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
-}
+    }
 
     @Override
     protected Integer doInBackground(Void... unused) {

01src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java

@@ -41,24 +41,32 @@ 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) {
         super.onCreate(savedInstanceState);
+        //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的
+        //savedInstanceState方法是用来保存Activity的状态的
+        //能从onCreate的参数savedInstanceState中获得状态数据
         requestWindowFeature(Window.FEATURE_NO_TITLE);
+        //界面显示——无标题
 
         final Window win = getWindow();
         win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
 
         if (!isScreenOn()) {
             win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                    //保持窗体点亮
                     | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                    //将窗体点亮
                     | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+                    //允许窗体点亮时锁屏
                     | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
+                    //在手机锁屏后如果到了闹钟提示时间，点亮屏幕
         }
 
         Intent intent = getIntent();
@@ -66,31 +74,49 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         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 +127,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 +154,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;
         }
     }

01src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java

@@ -35,17 +35,21 @@ public class AlarmInitReceiver extends BroadcastReceiver {
         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) },
-                null);
+                null);//将long变量currentData转化为字符串
+        //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
 
         if (c != null) {
             if (c.moveToFirst()) {
@@ -61,5 +65,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
             }
             c.close();
         }
+        //然而通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤
+        //如新建Intent、PendingIntent以及AlarmManager等
+        //这里就是根据数据库里的闹钟时间创建一个闹钟机制
     }
 }

01src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java

@@ -24,7 +24,12 @@ public class AlarmReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         intent.setClass(context, AlarmAlertActivity.class);
+        //启动AlarmAlertActivity
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈
+        //所以要新起一个栈装入启动的activity
         context.startActivity(intent);
     }
 }
+//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
+//作用还学要深究但是对于setClass和addFlags的

01src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java

@@ -29,6 +29,8 @@ import android.widget.FrameLayout;
 import android.widget.NumberPicker;
 
 public class DateTimePicker extends FrameLayout {
+    //FrameLayout是布局模板之一
+    //所有的子元素全部在屏幕的右上方
 
     private static final boolean DEFAULT_ENABLE_STATE = true;
 
@@ -45,13 +47,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类型的变量mData，用于操作时间
     private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
 
     private boolean mIsAm;
@@ -71,41 +75,49 @@ public class DateTimePicker extends FrameLayout {
             updateDateControl();
             onDateTimeChanged();
         }
-    };
+    };//OnDateChangedListener，这是时间改变监听器，这里主要时对日期的监听
+    //将现在的日期的值传递给mDate；updateDateControl是同步操作
 
     private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
+        //这里是对小时（Hour）的监听
         @Override
         public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
             boolean isDateChanged = false;
             Calendar cal = Calendar.getInstance();
+            //声明一个Calendar的变量cal，便于后续的操作
             if (!mIs24HourView) {
                 if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) {
                     cal.setTimeInMillis(mDate.getTimeInMillis());
                     cal.add(Calendar.DAY_OF_YEAR, 1);
                     isDateChanged = true;
+                    //这里是对于12小时制时，晚上11点和12点交替时对日期的更改
                 } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
                     cal.setTimeInMillis(mDate.getTimeInMillis());
                     cal.add(Calendar.DAY_OF_YEAR, -1);
                     isDateChanged = true;
                 }
+                //这里是对于12小时制时，凌晨11点和12点交替时对日期的更改
                 if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY ||
                         oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
                     mIsAm = !mIsAm;
                     updateAmPmControl();
-                }
+                }//这里是对12小时制时，中午11点和12点交替时对AM和PM的更改
             } else {
                 if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
                     cal.setTimeInMillis(mDate.getTimeInMillis());
                     cal.add(Calendar.DAY_OF_YEAR, 1);
                     isDateChanged = true;
+                    //这里是对24小时制时，晚上11点和12点交替时对日期的更改
                 } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
                     cal.setTimeInMillis(mDate.getTimeInMillis());
                     cal.add(Calendar.DAY_OF_YEAR, -1);
                     isDateChanged = true;
                 }
-            }
+            }//这里是24小时制时，凌晨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 +129,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,6 +161,7 @@ public class DateTimePicker extends FrameLayout {
     };
 
     private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
+        //对AM和PM的监听
         @Override
         public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
             mIsAm = !mIsAm;
@@ -165,19 +182,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);
@@ -226,7 +246,9 @@ public class DateTimePicker extends FrameLayout {
         mAmPmSpinner.setEnabled(enabled);
         mIsEnabled = enabled;
     }
-
+    //存在疑问！！！！！！！！！！！！！setEnabled的作用
+    //下面的代码通过原程序的注释已经比较清晰，另外可以通过函数名来判断
+    //下面的各函数主要是对上面代码引用到的各函数功能的实现
     @Override
     public boolean isEnabled() {
         return mIsEnabled;
@@ -239,7 +261,7 @@ public class DateTimePicker extends FrameLayout {
      */
     public long getCurrentDateInTimeMillis() {
         return mDate.getTimeInMillis();
-    }
+    }//实现函数-得到当前的秒数
 
     /**
      * Set the current date
@@ -251,7 +273,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,7 +291,7 @@ public class DateTimePicker extends FrameLayout {
         setCurrentDay(dayOfMonth);
         setCurrentHour(hourOfDay);
         setCurrentMinute(minute);
-    }
+    }//实现函数功能——设置当前的时间，参数是各详细的变量
 
     /**
      * Get current year
@@ -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);
-        }
+        }//对与小时的算法
     }
 
     /**

01src/app/src/main/java/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();
+    //创建1个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,12 @@ 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是该对话框上的按钮

01src/app/src/main/java/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();
@@ -49,13 +53,13 @@ public class DropdownMenu {
         if (mPopupMenu != null) {
             mPopupMenu.setOnMenuItemClickListener(listener);
         }
-    }
+    }//设置菜单的监听
 
     public MenuItem findItem(int id) {
         return mMenu.findItem(id);
-    }
+    }//对于菜单选项的初始化，根据索引搜索菜单需要的选项
 
     public void setTitle(CharSequence title) {
         mButton.setText(title);
-    }
+    }//布局文件，设置标题
 }

01src/app/src/main/java/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) {
+        //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);
         }
 

01src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -16,6 +16,7 @@
 
 package net.micode.notes.ui;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
@@ -28,6 +29,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Paint;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.Spannable;
@@ -67,13 +69,20 @@ import net.micode.notes.widget.NoteWidgetProvider_4x;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+//新加功能
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TextToSpeech.OnInitListener;
+
 
 public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
+    //该类主要是针对标签的编辑
+    //继承了系统内部许多和监听有关的类
     private class HeadViewHolder {
         public TextView tvModified;
 
@@ -83,7 +92,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
         public ImageView ibSetBgColor;
     }
-
+    //使用Map实现数据存储
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -91,6 +100,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<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
@@ -100,6 +110,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<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
@@ -108,6 +119,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<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
@@ -116,6 +128,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,19 +136,29 @@ 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;
+    //私有化一个界面操作mNoteEditorPanel，文本编辑的控制板
 
     private WorkingNote mWorkingNote;
+    //对模板WorkingNote的初始化
 
     private SharedPreferences mSharedPrefs;
+    //私有化SharedPreferences的数据存储方式
+    //它的本质是基于XML文件存储key-value键值对数据
+
     private int mFontSizeId;
+    //用于操作字体的大小
 
     private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
 
@@ -153,6 +176,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();
@@ -176,7 +200,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 return;
             }
             Log.d(TAG, "Restoring from killed activity");
-        }
+        }//为防止内存不足时程序的终止，在这里有一个保存现场的函数
     }
 
     private boolean initActivityState(Intent intent) {
@@ -188,34 +212,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 +255,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,6 +272,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                         finish();
                         return false;
                     }
+                    //将电话号码与手机的号码簿相关
                 } else {
                     mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
                             widgetType, bgResId);
@@ -248,6 +281,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             } else {
                 mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
                         bgResId);
+                //创建一个新的WorkingNote
             }
 
             getWindow().setSoftInputMode(
@@ -269,8 +303,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,19 +330,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 {
+        }//显示闹钟开始的图标
+        else {
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
         };
@@ -329,26 +367,30 @@ 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,13 +399,44 @@ 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;
     }
 
+    //从这开始维护
+    @TargetApi(Build.VERSION_CODES.DONUT)
+    private void texttoSpeech(){
+        mTTS.speak(mNoteEditor.getText().toString(),TextToSpeech.QUEUE_FLUSH,null);
+    }
+
+    //在这里提供mTTS
+    private TextToSpeech mTTS;
+    @TargetApi(Build.VERSION_CODES.DONUT)
+
     private void initResources() {
+        mTTS=new TextToSpeech(this, new OnInitListener() {
+            @Override
+            public void onInit(int status) {
+
+                if(status==TextToSpeech.SUCCESS)
+                {
+                    //设置朗读语言
+                    int result = mTTS.setLanguage(Locale.US);
+
+                    if(result!=TextToSpeech.LANG_COUNTRY_AVAILABLE
+                            &&result!=TextToSpeech.LANG_AVAILABLE)
+                    {
+                        mTTS.setLanguage(Locale.US);
+                        Toast.makeText(NoteEditActivity.this,"TTS暂时不支持这种语言朗读",Toast.LENGTH_LONG).show();
+                    }
+                }
+            }
+        });
+
         mHeadViewPanel = findViewById(R.id.note_title);
         mNoteHeaderHolder = new HeadViewHolder();
         mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
@@ -377,13 +450,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);
         /**
@@ -406,6 +479,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) {
@@ -481,6 +555,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     @Override
+    //对选择菜单的准备
     public boolean onPrepareOptionsMenu(Menu menu) {
         if (isFinishing()) {
             return true;
@@ -489,7 +564,8 @@ 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);
-        } else {
+        }//MenuInflater是用来实例化Menu目录下的Menu布局文件的
+        else {
             getMenuInflater().inflate(R.menu.note_edit, menu);
         }
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
@@ -506,86 +582,173 @@ 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;
+            case R.id.menu_Read:
+                mTTS.speak(mNoteEditor.getText().toString(),TextToSpeech.QUEUE_FLUSH,null);
+                break;
             default:
                 break;
         }
         return true;
     }
 
+    /*
+    函数功能：建立时间提醒器
+    函数实现：如下注释
+     */
     private void setReminder() {
         DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+        //建立修改时间日期的对话框
         d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
             public void OnDateTimeSet(AlertDialog dialog, long date) {
                 mWorkingNote.setAlertDate(date	, true);
+                //选择提醒的日期
             }
         });
+        //建立时间日期的监听器
         d.show();
+        //显示对话框
     }
 
     /**
      * Share note to apps that support {@link Intent#ACTION_SEND} action
      * and {@text/plain} type
      */
+    /*
+    函数功能：共享便签
+    函数实现：如下注释
+     */
     private void sendTo(Context context, String info) {
         Intent intent = new Intent(Intent.ACTION_SEND);
+        //建立intent链接选项
         intent.putExtra(Intent.EXTRA_TEXT, info);
+        //将需要传递的便签信息放入text文件中
         intent.setType("text/plain");
+        //编辑连接器的类型
         context.startActivity(intent);
+        //在acti中进行链接
     }
 
+    /*
+    函数功能：创建一个新的便签
+    函数实现：如下注释
+     */
     private void createNewNote() {
         // Firstly, save current editing notes
+        //保存当前便签
         saveNote();
 
         // For safety, start a new NoteEditActivity
         finish();
         Intent intent = new Intent(this, NoteEditActivity.class);
+        //设置链接器
         intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+        //该活动定义为创建或编辑
         intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+        //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中
         startActivity(intent);
+        //开始activity并链接
     }
-
+    /*
+    函数功能：删除当前便签
+    函数实现：如下注释
+    */
+//    private void deleteCurrentNote() {
+//        if (mWorkingNote.existInDatabase()) {
+//            //假如当前运行的便签内存有数据
+//            HashSet<Long> ids = new HashSet<Long>();
+//            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
+//    }
+    //https://www.learnerhub.net/#/spaces/2699/resources-docs/26017
     private void deleteCurrentNote() {
         if (mWorkingNote.existInDatabase()) {
             HashSet<Long> ids = new HashSet<Long>();
@@ -595,69 +758,90 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             } 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 (!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);
-    }
+    }//end
 
+    /*
+    函数功能：判断是否为同步模式
+    函数实现：直接看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 +850,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) {
@@ -738,13 +954,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
                 }
             }
-        });
+        });//建立一个打勾框并设置监听器
 
         if (item.startsWith(TAG_CHECKED)) {
+            //选择勾选
             cb.setChecked(true);
             edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
             item = item.substring(TAG_CHECKED.length(), item.length()).trim();
         } else if (item.startsWith(TAG_UNCHECKED)) {
+            //选择不勾选
             cb.setChecked(false);
             edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
             item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
@@ -753,61 +971,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 +1067,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 +1085,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 +1102,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,21 +1116,37 @@ 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();
     }
+
+
 }

01src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -79,6 +79,7 @@ import java.io.InputStreamReader;
 import java.util.HashSet;
 
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+    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;
@@ -408,14 +409,49 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     };
 
-    private void startAsyncNotesListQuery() {
+//    private void startAsyncNotesListQuery() {
+//        String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
+//                : NORMAL_SELECTION;
+//        mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+//                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
+//                    String.valueOf(mCurrentFolderId)
+//                }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+//    }
+
+//    修改，私密模式
+private void startAsyncNotesListQuery() {
     String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
             : NORMAL_SELECTION;
+    if(secret_mode == 0) {
         mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
-                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
+                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
                         String.valueOf(mCurrentFolderId)
                 }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
     }
+    else{
+        String str1 = "0.618";
+        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 {
         public BackgroundQueryHandler(ContentResolver contentResolver) {
@@ -469,20 +505,58 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
     }
 
+//    private void batchDelete() {
+//        new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
+//            protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
+//                HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
+//                if (!isSyncMode()) {
+//                    // if not synced, delete notes directly
+//                    if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
+//                            .getSelectedItemIds())) {
+//                    } else {
+//                        Log.e(TAG, "Delete notes error, should not happens");
+//                    }
+//                } else {
+//                    // in sync mode, we'll move the deleted note into the trash
+//                    // folder
+//                    if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
+//                            .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
+//                        Log.e(TAG, "Move notes to trash folder error, should not happens");
+//                    }
+//                }
+//                return widgets;
+//            }
+//
+//
+//            @Override
+//            protected void onPostExecute(HashSet<AppWidgetAttribute> widgets) {
+//                if (widgets != null) {
+//                    for (AppWidgetAttribute widget : widgets) {
+//                        if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+//                                && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+//                            updateWidget(widget.widgetId, widget.widgetType);
+//                        }
+//                    }
+//                }
+//                mModeCallBack.finishActionMode();
+//            }
+//        }.execute();
+//    }
+
+    //https://www.learnerhub.net/#/spaces/2699/resources-docs/26017
     private void batchDelete() {
         new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
                 HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
-                if (!isSyncMode()) {
-                    // if not synced, delete notes directly
+                if (mCurrentFolderId == Notes.ID_TRASH_FOLER){
+                    // if in trash, really delete notes
                     if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds())) {
                     } else {
                         Log.e(TAG, "Delete notes error, should not happens");
                     }
                 } else {
-                    // in sync mode, we'll move the deleted note into the trash
-                    // folder
+                    // move the deleted note into the trash folder
                     if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
                         Log.e(TAG, "Move notes to trash folder error, should not happens");
@@ -505,8 +579,36 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             }
         }.execute();
     }
-
-    private void deleteFolder(long folderId) {
+    //end
+
+//    private void deleteFolder(long folderId) {
+//        if (folderId == Notes.ID_ROOT_FOLDER) {
+//            Log.e(TAG, "Wrong folder id, should not happen " + folderId);
+//            return;
+//        }
+//
+//        HashSet<Long> ids = new HashSet<Long>();
+//        ids.add(folderId);
+//        HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
+//                folderId);
+//        if (!isSyncMode()) {
+//            // if not synced, delete folder directly
+//            DataUtils.batchDeleteNotes(mContentResolver, ids);
+//        } else {
+//            // in sync mode, we'll move the deleted folder into the trash folder
+//            DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
+//        }
+//        if (widgets != null) {
+//            for (AppWidgetAttribute widget : widgets) {
+//                if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+//                        && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+//                    updateWidget(widget.widgetId, widget.widgetType);
+//                }
+//            }
+//        }
+//    }
+    //https://www.learnerhub.net/#/spaces/2699/resources-docs/26017
+private void deleteFolder(long folderId) {
     if (folderId == Notes.ID_ROOT_FOLDER) {
         Log.e(TAG, "Wrong folder id, should not happen " + folderId);
         return;
@@ -516,11 +618,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     ids.add(folderId);
     HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
             folderId);
-        if (!isSyncMode()) {
-            // if not synced, delete folder directly
+    if (mCurrentFolderId == Notes.ID_TRASH_FOLER) {
+        // if in trash, delete folder directly
         DataUtils.batchDeleteNotes(mContentResolver, ids);
     } else {
-            // in sync mode, we'll move the deleted folder into the trash folder
+        //move the deleted folder into the trash folder
         DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
     }
     if (widgets != null) {
@@ -531,7 +633,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             }
         }
     }
-    }
+}//end
 
     private void openNode(NoteItemData data) {
         Intent intent = new Intent(this, NoteEditActivity.class);
@@ -775,6 +877,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         } else {
             Log.e(TAG, "Wrong state:" + mState);
         }
+        if(secret_mode == 1)
+            menu.findItem(R.id.menu_secret).setVisible(false);
+        else
+            menu.findItem(R.id.menu_quit_secret).setVisible(false);
         return true;
     }
 
@@ -809,9 +915,101 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 createNewNote();
                 break;
             }
-            case R.id.menu_search:
+            case R.id.menu_search: {
                 onSearchRequested();
                 break;
+            }
+            case R.id.menu_trash: {
+                openTrashFolder();
+                break;
+            }
+//            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_secret:{         //进入私密模式（好1）
+//                AlertDialog.Builder enterSecretModeDialog = new AlertDialog.Builder(NotesListActivity.this);
+//                enterSecretModeDialog.setTitle("重要提醒");
+//                enterSecretModeDialog.setMessage("您确认进入私密模式吗？");
+//                enterSecretModeDialog.setCancelable(false);
+//                enterSecretModeDialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+//                    @Override
+//                    public void onClick(DialogInterface dialog, int which) {
+//                        secret_mode = 1;
+//                        startAsyncNotesListQuery();
+//                        Toast.makeText(NotesListActivity.this, "您已进入私密模式", Toast.LENGTH_SHORT).show();
+//                    }
+//                });
+//                enterSecretModeDialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+//                    @Override
+//                    public void onClick(DialogInterface dialog, int which) {
+//                        // 用户取消进入私密模式，不进行任何操作
+//                    }
+//                });
+//                enterSecretModeDialog.show();
+//                break;
+//            }
+            case R.id.menu_secret: {    //进入私密模式（好2）
+                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) {
+                        secret_mode = 1;
+                        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;
+            }
             default:
                 break;
         }
@@ -951,4 +1149,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
         return false;
     }
+
+    private void openTrashFolder() {
+        // 将当前列表的编辑状态设置为子文件夹模式
+        mState = ListEditState.SUB_FOLDER;
+        // 将当前文件夹 ID 设置为回收站的 ID
+        mCurrentFolderId = Notes.ID_TRASH_FOLER;
+        //查询已删除笔记的列表
+        startAsyncNotesListQuery();
+        // 不显示底部的“写便签”
+        mAddNewNote.setVisibility(View.GONE);
+        // 将顶部栏设置为 data.getSnippet 文件夹名称
+        mTitleBar.setText(NotesListActivity.this
+                .getString(R.string.menu_trash));
+        mTitleBar.setVisibility(View.VISIBLE);
+    }
 }