新增了便签密码登陆功能文档

src/main/.scannerwork/report-task.txt

@@ -0,0 +1,6 @@
+projectKey=myNotes
+serverUrl=http://127.0.0.1:9000
+serverVersion=9.5.0.56709
+dashboardUrl=http://127.0.0.1:9000/dashboard?id=myNotes
+ceTaskId=AYRIh5EzuqDImpFV-sUP
+ceTaskUrl=http://127.0.0.1:9000/api/ce/task?id=AYRIh5EzuqDImpFV-sUP

src/main/AndroidManifest.xml

@@ -38,6 +38,58 @@
     <application
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
+
+        <activity
+            android:name=".ui.SplashActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/FullscreenTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ui.LoginActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+            <!--android:uiOptions="splitActionBarWhenNarrow"-->
+            <!--<intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>-->
+        </activity>
+
+        <activity
+            android:name=".ui.ChangingPassword"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+        </activity>
+
+        <activity
+            android:name=".ui.SettingPassword"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+        </activity>
+
+        <activity
+            android:name=".ui.DeletingPassword"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+        </activity>
+
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -47,10 +99,10 @@
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
 
-            <intent-filter>
+            <!--<intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            </intent-filter>-->
         </activity>
 
         <activity

src/main/java/net/micode/notes/data/Contact.java

@@ -36,9 +36,11 @@ public class Contact {
             + " FROM phone_lookup"
             + " WHERE min_match = '+')";
 
+    private Contact(){}
+
     public static String getContact(Context context, String phoneNumber) {
         if(sContactCache == null) {
-            sContactCache = new HashMap<String, String>();
+            sContactCache = new HashMap<>();
         }
 
         if(sContactCache.containsKey(phoneNumber)) {

src/main/java/net/micode/notes/data/Notes.java

@@ -20,6 +20,7 @@ import android.net.Uri;
 public class Notes {
     public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";
+    public static final String CONTENT_ = "content://";
     public static final int TYPE_NOTE     = 0;
     public static final int TYPE_FOLDER   = 1;
     public static final int TYPE_SYSTEM   = 2;
@@ -47,6 +48,7 @@ public class Notes {
     public static final int TYPE_WIDGET_4X            = 1;
 
     public static class DataConstants {
+        private DataConstants(){}
         public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
         public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
     }
@@ -54,12 +56,12 @@ public class Notes {
     /**
      * Uri to query all notes and folders
      */
-    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
+    public static final Uri CONTENT_NOTE_URI = Uri.parse(CONTENT_ + AUTHORITY + "/note");
 
     /**
      * Uri to query data
      */
-    public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
+    public static final Uri CONTENT_DATA_URI = Uri.parse(CONTENT_ + AUTHORITY + "/data");
 
     public interface NoteColumns {
         /**
@@ -206,6 +208,8 @@ public class Notes {
          */
         public static final String CONTENT = "content";
 
+        public static final String LOCATION = "location";
+
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
@@ -248,6 +252,8 @@ public class Notes {
          * Mode to indicate the text in check list mode or not
          * <P> Type: Integer 1:check list mode 0: normal mode </P>
          */
+        private TextNote(){}
+
         public static final String MODE = DATA1;
 
         public static final int MODE_CHECK_LIST = 1;
@@ -256,7 +262,7 @@ public class Notes {
 
         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 Uri CONTENT_URI = Uri.parse(CONTENT_ + AUTHORITY + "/text_note");
     }
 
     public static final class CallNote implements DataColumns {
@@ -264,6 +270,9 @@ public class Notes {
          * Call date for this record
          * <P> Type: INTEGER (long) </P>
          */
+
+        private CallNote(){}
+
         public static final String CALL_DATE = DATA1;
 
         /**
@@ -276,6 +285,6 @@ public class Notes {
 
         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");
+        public static final Uri CONTENT_URI = Uri.parse(CONTENT_ + AUTHORITY + "/call_note");
     }
 }

src/main/java/net/micode/notes/data/NotesDatabaseHelper.java

@@ -76,7 +76,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             DataColumns.DATA2 + " INTEGER," +
             DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
             DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
-            DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
+            DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''," +
+            DataColumns.LOCATION + " TEXT NOT NULL DEFAULT ''" +
         ")";
 
     private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
@@ -328,6 +329,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             oldVersion++;
         }
 
+        if (oldVersion == 5) {
+            upgradeToV6(db);
+            oldVersion++;
+        }
+
         if (reCreateTriggers) {
             reCreateNoteTableTriggers(db);
             reCreateDataTableTriggers(db);
@@ -371,4 +377,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
                 + " INTEGER NOT NULL DEFAULT 0");
     }
 
+    private void upgradeToV6(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + TABLE.DATA + " ADD COLUMN " + DataColumns.LOCATION
+                + "TEXT NOT NULL DEFAULT ''");
+    }
 }

src/main/java/net/micode/notes/ui/ChangingPassword.java

@@ -0,0 +1,69 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+public class ChangingPassword extends Activity {
+    EditText OldPassword;
+    EditText NewPassword;
+    EditText AckPassword;
+    Button Acknowledged;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_change_password);
+        getWindow().setSoftInputMode(
+                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                        | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        OldPassword=(EditText) findViewById(R.id.old_password);
+        NewPassword=(EditText) findViewById(R.id.new_password);
+        AckPassword=(EditText) findViewById(R.id.ack_password);
+        Acknowledged=(Button)findViewById(R.id.Acknowledged);
+        Acknowledged.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String old_password = OldPassword.getText().toString();
+                String new_password = NewPassword.getText().toString();
+                String ack_password = AckPassword.getText().toString();
+                SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+                String login_password=pref.getString("password","");
+                if(old_password.equals("")==true || new_password.equals("")==true || ack_password.equals("")==true) {
+                    Toast.makeText(ChangingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
+                }else if (new_password.equals(ack_password) == false) {
+                    Toast.makeText(ChangingPassword.this, "新建密码与重复密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show();
+                    AckPassword.setText("");
+                }else if(old_password.equals(login_password) == false){
+                    Toast.makeText(ChangingPassword.this, "原有密码错误，请重新输入密码", Toast.LENGTH_SHORT).show();
+                    OldPassword.setText("");
+                }
+                else if (new_password.equals(ack_password) == true && old_password.equals(login_password) == true){
+                    SharedPreferences.Editor editor=getSharedPreferences("user management", MODE_PRIVATE).edit();
+                    editor.putString("password",new_password);
+                    editor.apply();
+                    Toast.makeText(ChangingPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show();
+                    Intent intent=new Intent(ChangingPassword.this,NotesListActivity.class);
+                    startActivity(intent);
+                    finish();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onBackPressed() {
+        Intent intent=new Intent(ChangingPassword.this,NotesListActivity.class);
+        startActivity(intent);
+        finish();
+    }
+}
+

src/main/java/net/micode/notes/ui/DeletingPassword.java

@@ -0,0 +1,63 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+public class DeletingPassword extends Activity {
+    EditText Dt_password;
+    Button Acknowledged;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_delete_password);
+        getWindow().setSoftInputMode(
+                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                        | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        Dt_password=(EditText) findViewById(R.id.thepassword);
+        Acknowledged=(Button)findViewById(R.id.Dt_Acknowledged);
+        Acknowledged.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String text02 = Dt_password.getText().toString();
+                if(text02.equals("")==true)
+                    Toast.makeText(DeletingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
+                SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+                String password = pref.getString("password","");
+                if(password.equals("")==false&&password.equals(text02)==true){
+                    SharedPreferences.Editor editor=getSharedPreferences("user management",
+                            MODE_PRIVATE).edit();
+                    editor.putBoolean("user",false);//false表示已经设置登录密码
+                    editor.putString("password","");
+                    editor.apply();
+
+                    Toast.makeText(DeletingPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show();
+                    Intent intent=new Intent(DeletingPassword.this,NotesListActivity.class);
+                    startActivity(intent);
+                    finish();
+                }
+                else{
+                    Toast.makeText(DeletingPassword.this, "密码错误", Toast.LENGTH_SHORT).show();
+                    Dt_password.setText("");//把密码框内输入过的错误密码清空
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onBackPressed() {
+        Intent intent=new Intent(DeletingPassword.this,NotesListActivity.class);
+        startActivity(intent);
+        finish();
+    }
+}
+

src/main/java/net/micode/notes/ui/LoginActivity.java

@@ -0,0 +1,57 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+public class LoginActivity extends Activity {
+
+    EditText lg_password;
+    Button lg_login;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+        boolean User_boolean = pref.getBoolean("user",false);//获取用户是否设置了密码
+        if(!User_boolean) //User_boolean = false时，（没有设置密码），直接跳转到便签主界面
+        {
+            Intent intent=new Intent(LoginActivity.this,NotesListActivity.class);
+            startActivity(intent);
+            finish();
+        }
+
+        setContentView(R.layout.activity_login);
+        getWindow().setSoftInputMode(
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        lg_password=(EditText) findViewById(R.id.lg_password);
+        lg_login=(Button)findViewById(R.id.login);
+        lg_login.setOnClickListener(new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View v) {
+                                            SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+                                            String password=pref.getString("password","");
+                                            if(password.equals("")==false&&password.equals(lg_password.getText().toString())==true){
+                                                Intent intent=new Intent(LoginActivity.this,NotesListActivity.class);
+                                                startActivity(intent);
+                                                finish();
+                                            }
+                                            else{
+                                                Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show();
+                                                lg_password.setText("");//把密码框内输入过的错误密码清空
+                                            }
+                                        }
+                                    }
+        );
+
+    }
+}

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

@@ -103,6 +103,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -135,6 +136,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
+
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
         sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
@@ -144,6 +146,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
     private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
+
     static {
         sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
         sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
@@ -153,6 +156,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
+
     static {
         sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
         sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
@@ -161,6 +165,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
     private static final Map<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
+
     static {
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
@@ -188,7 +193,6 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     private int mFontSizeId;
 
 
-
     private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
 
     private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
@@ -210,6 +214,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     private AlertDialog alertDialog2;
     private CharSequence restore_translate = null;
 
+    private boolean mIsRvoke = false;
 
 
     private LinearLayout mEditTextList;
@@ -244,9 +249,6 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
 
-
-
-
     /**
      * Current activity may be killed when the memory is low. Once it is killed, for another time
      * user load this activity, we should restore the former state
@@ -468,8 +470,28 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
         mNoteHeaderHolder.tvToptext = (TextView) findViewById(R.id.tv_set_top);
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
+
         mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
         mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
+        mNoteEditor.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {//文本更改后
+                if (!mIsRvoke) {
+                    saveMyChanged();
+                } else {
+                    mIsRvoke = false;
+                }
+            }
+        });
         mNoteEditorPanel = findViewById(R.id.sv_note_edit);
         mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
         for (int id : sBgSelectorBtnsMap.keySet()) {
@@ -481,7 +503,8 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         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);
         /**
@@ -498,6 +521,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         speech_sum();
         local_sel();
         translate();
+
     }
 
     @Override
@@ -511,7 +535,6 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
 
-
     private void updateWidget() {
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -622,6 +645,9 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             case R.id.menu_new_note:
                 createNewNote();
                 break;
+            case R.id.menu_revoke:
+                doRevoke();
+                break;
             case R.id.menu_set_top:
                 mWorkingNote.setTop((mWorkingNote.getTopId()) == 1 ? "0" : "1");
                 break;
@@ -667,6 +693,21 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             case R.id.menu_font_select:
                 showSingleAlertDiglog();
                 break;
+            case R.id.menu_count_word://数字统计
+                AlertDialog.Builder builder1 = new AlertDialog.Builder(this);//对话框对象
+                builder1.setIcon(android.R.drawable.ic_dialog_alert);//对话框图标
+                TextView content = (TextView) findViewById(R.id.note_edit_view);
+                int c = content.length();
+                builder1.setMessage("带符号字数总和统计为：" + c);
+                builder1.setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                finish();
+                            }
+                        });//确定按钮
+                builder1.setNegativeButton(android.R.string.cancel, null);//取消按钮
+                builder1.show();//对话框启动
+                break;
             default:
                 break;
         }
@@ -1012,14 +1053,12 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
 
-
-
-
     private String getLocation() {
         //1.获取位置管理器
         String city = null;
         locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
 
+
         //2.获取位置提供器，GPS或是NetWork
         List<String> providers = locationManager.getProviders(true);
 
@@ -1080,14 +1119,17 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         @Override
         public void onStatusChanged(String provider, int status, Bundle extras) {
         }
+
         // Provider被enable时触发此函数，比如GPS被打开
         @Override
         public void onProviderEnabled(String provider) {
         }
+
         // Provider被disable时触发此函数，比如GPS被关闭
         @Override
         public void onProviderDisabled(String provider) {
         }
+
         //当坐标改变时触发此函数，如果Provider传进相同的坐标，它就不会被触发
         @Override
         public void onLocationChanged(Location location) {
@@ -1159,10 +1201,6 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
 
-
-
-
-
     private void local_sel() {
         final Button get_local = findViewById(R.id.location);
         get_local.setOnClickListener(new OnClickListener() {
@@ -1228,6 +1266,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
             }
+
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 tmp[0] = cutOfimage(operateText(s.toString())).length();
@@ -1241,6 +1280,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
                     }
                 });
             }
+
             @Override
             public void afterTextChanged(Editable s) {
             }
@@ -1268,7 +1308,6 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
 
-
     private void convertToImage() {
         NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
         Editable editable = noteEditText.getText();
@@ -1305,7 +1344,6 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
 
-
     @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
@@ -1566,6 +1604,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
                 editable.setText(result);
                 Log.d(TAG, "中译英结果" + result);
             }
+
             @Override
             public void onFailure(retrofit2.Call<RespondBean> call, Throwable t) {
                 Log.d(TAG, "onResponse: 请求失败 " + t);
@@ -1602,6 +1641,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
                 editable.setText(result);
                 Log.d(TAG, "中译英结果" + result);
             }
+
             @Override
             public void onFailure(retrofit2.Call<RespondBean> call, Throwable t) {
                 Log.d(TAG, "onResponse: 请求失败 " + t);
@@ -1609,9 +1649,41 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         });
     }
 
+    private static final int MAX_TIME_OF_RVOKE_TIME = 100;
+    private int MAX_OF_RVOKE_TIME = 100;
+    private Vector<SpannableString> mChanged = new Vector<SpannableString>(MAX_OF_RVOKE_TIME);
 
-
+    private void saveMyChanged() {
-
+        SpannableString text = new SpannableString(mNoteEditor.getText());//用getText方法获取每次编辑的内容
+        if (mChanged.size() >= MAX_TIME_OF_RVOKE_TIME) {//如果栈中的数据大于最大撤销次数，就把第一次修改的内容删除
+            mChanged.removeElementAt(0);
+        }
+        mChanged.add(text);//然后把本次修改的内容加入栈中
     }
 
-
+    private void doRevoke() {
+        int size = mChanged.size();//获取当前栈大小
+        AlertDialog.Builder dialog = new AlertDialog.Builder(this);//创建一个alertdialog窗口
+        dialog.setTitle(R.string.tips_of_revoke);//设置title信息
+        dialog.setCancelable(true);//设置为可取消
+        dialog.setPositiveButton("OK", new DialogInterface.OnClickListener() {//只需要设置一个OK键即可
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+            }
+        });
+        mIsRvoke = true;//把是否已执行撤销的标记设置为true
+        if (size <= 1) {//如果栈中元素过少，打印提示信息
+            dialog.setMessage(R.string.have_not_input_anything);//提示用户您还没有输入任何信息
+            dialog.show();//显示当前alertdialog
+            return;
+        } else {
+            mNoteEditor.setText((CharSequence) mChanged.elementAt(size - 2));//在textview中设置撤销的内容
+            mNoteEditor.setSelection(mNoteEditor.length());
+            mChanged.removeElementAt(size - 1);//删除元素
+            if (size == 2) {
+                dialog.setMessage(R.string.can_not_revoke);//如果只有一次操作，那么提示用户不能再撤销了
+                dialog.show();//显示当前alertdialog
+            }
+        }
+    }
+}

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

@@ -16,6 +16,7 @@
 
 package net.micode.notes.ui;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.support.v7.app.AppCompatActivity;
 import android.app.AlertDialog;
@@ -80,6 +81,8 @@ import java.io.InputStreamReader;
 import java.util.HashSet;
 
 public class NotesListActivity extends AppCompatActivity 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;
@@ -416,10 +419,34 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
     private void startAsyncNotesListQuery() {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
                 : NORMAL_SELECTION;
+        String str1 = "0123456789";
+        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,
+                NoteColumns.TOP,
+        };
+        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.TOP + " DESC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+        } else {
+            mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+                    Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{
+                            String.valueOf(mCurrentFolderId)
+                    }, NoteColumns.TOP + " DESC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+        }
     }
 
     private final class BackgroundQueryHandler extends AsyncQueryHandler {
@@ -452,6 +479,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
         final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
         builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
 
+            @SuppressLint("StringFormatInvalid")
             public void onClick(DialogInterface dialog, int which) {
                 DataUtils.batchMoveToFolder(mContentResolver,
                         mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
@@ -612,6 +640,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
         final Dialog dialog = builder.setView(view).show();
         final Button positive = (Button)dialog.findViewById(android.R.id.button1);
         positive.setOnClickListener(new OnClickListener() {
+            @SuppressLint("StringFormatInvalid")
             public void onClick(View v) {
                 hideSoftInput(etName);
                 String name = etName.getText().toString();
@@ -817,6 +846,61 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
             case R.id.menu_search:
                 onSearchRequested();
                 break;
+            case R.id.LoginSetting: {  //设置登录密码功能
+                SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+                String password=pref.getString("password","");
+                if(password.equals(""))//没有设置密码
+                    set_the_password();
+                else if(!password.equals(""))//已经设置密码
+                    change_the_password();
+                break;
+            }
+            case R.id.delete_password:{
+                delete_the_password();
+                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_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;
         }
@@ -956,4 +1040,20 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
         }
         return false;
     }
+
+    private void set_the_password() {
+        Intent intent=new Intent(NotesListActivity.this,SettingPassword.class);
+        startActivity(intent);
+        finish();
+    }
+    private void change_the_password() {
+        Intent intent=new Intent(NotesListActivity.this,ChangingPassword.class);
+        startActivity(intent);
+        finish();
+    }
+    private void delete_the_password() {
+        Intent intent=new Intent(NotesListActivity.this,DeletingPassword.class);
+        startActivity(intent);
+        finish();
+    }
 }

src/main/java/net/micode/notes/ui/SettingPassword.java

@@ -0,0 +1,67 @@
+package net.micode.notes.ui;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+public class SettingPassword extends Activity {
+    EditText password;
+    EditText password_ack;
+    Button acknowledge;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_set_loginpassword);
+        getWindow().setSoftInputMode(
+                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                        | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        password=(EditText) findViewById(R.id.password);
+        password_ack=(EditText) findViewById(R.id.password_ack);
+        acknowledge=(Button)findViewById(R.id.acknowledge);
+        acknowledge.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String text02 = password.getText().toString();
+                String text03 = password_ack.getText().toString();
+                if(text02.equals("")==true) {
+                    Toast.makeText(SettingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
+                }else if (text02.equals(text03) == false) {
+                    Toast.makeText(SettingPassword.this, "密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show();
+                    password_ack.setText("");
+                }else if (text02.equals(text03) == true){
+                    SharedPreferences.Editor editor=getSharedPreferences("user management",
+                            MODE_PRIVATE).edit();
+                    editor.putBoolean("user",true);//true表示已经设置登录密码
+                    editor.putString("password",text02);
+                    editor.apply();
+                    Log.d("RegisterLoginPassword","password is "+text02);
+                    Toast.makeText(SettingPassword.this, "设置密码成功", Toast.LENGTH_SHORT).show();
+                    Intent intent=new Intent(SettingPassword.this,NotesListActivity.class);
+                    startActivity(intent);
+                    finish();
+                }
+
+            }
+        });
+    }
+
+    @Override
+    public void onBackPressed() {
+        Intent intent=new Intent(SettingPassword.this,NotesListActivity.class);
+        startActivity(intent);
+        finish();
+    }
+
+}

src/main/java/net/micode/notes/ui/SplashActivity.java

@@ -0,0 +1,31 @@
+package net.micode.notes.ui;
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowInsets;
+import net.micode.notes.R;
+public class SplashActivity extends AppCompatActivity {
+    Handler mHandler=new Handler();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState); //加载启动界面
+        setContentView(R.layout.activity_splash); //加载启动
+// 当计时结束时，跳转至NotesListActivity
+        mHandler.postDelayed(new Runnable() {
+
+            @Override
+            public void run() {
+                Intent intent=new Intent();
+                intent.setClass(SplashActivity.this, LoginActivity.class);
+                startActivity(intent);
+                finish(); //销毁欢迎页面
+            }}, 2000); // 2 秒后跳转}
+    }
+}