src/main/AndroidManifest.xml

@@ -31,17 +31,6 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- 蓝牙录音使用，不需要可以去除 -->
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
 
     <application
         android:icon="@drawable/icon_app"
@@ -88,7 +77,6 @@
         android:windowSoftInputMode="adjustPan" >
         </activity>
 
-
         <activity
             android:name=".ui.SearchActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -217,20 +205,6 @@
             android:theme="@android:style/Theme.Holo.Light" >
         </activity>
 
-        <activity
-            android:name="net.micode.notes.ui.SetLockActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
-
-        <activity
-            android:name="net.micode.notes.ui.UnlockActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
-
         <service
             android:name="net.micode.notes.gtask.remote.GTaskSyncService"
             android:exported="false" >

src/main/java/net/micode/notes/PaintView.java

@@ -23,7 +23,7 @@ import android.view.View;
 
 /**
  *
- * @category: View实现改变颜色、粗细、涂鸦、撤销以及重做功能
+ * @category: View实现涂鸦、撤销以及重做功能
  * @author: dingruihua
  * @date: 2022.10.10
  *
@@ -34,7 +34,7 @@ public class PaintView extends View  {
     private Canvas  mCanvas;
     private Path    mPath;
     private Paint   mBitmapPaint;
-    public Bitmap  mBitmap;
+    private Bitmap  mBitmap;
     private Paint mPaint;
 
     private ArrayList<DrawPath> savePath;
@@ -47,9 +47,6 @@ public class PaintView extends View  {
     private int bitmapWidth;
     private int bitmapHeight;
 
-    private int changed_width=0;
-    private int changed_color=0;
-
     public PaintView(Context c) {
         super(c);
         //得到屏幕的分辨率
@@ -83,7 +80,7 @@ public class PaintView extends View  {
         mPaint = new Paint();
         mPaint.setAntiAlias(true);
         mPaint.setDither(true);
-        mPaint.setColor(0xFF000000);
+        mPaint.setColor(0xFF00FF00);
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setStrokeJoin(Paint.Join.ROUND);
         mPaint.setStrokeCap(Paint.Cap.ROUND);
@@ -104,29 +101,7 @@ public class PaintView extends View  {
 
     }
 
-    public void changewidth(){
-        if (changed_width==0) {
-            mPaint.setStrokeWidth(50);
-            changed_width = 1;
-        }
-        else{
-            mPaint.setStrokeWidth(10);
-            changed_width = 0;
-        }
-
-    }
 
-    public void changecolor(){
-        if (changed_color==0) {
-            mPaint.setColor(0xFFFF0000);
-            changed_color = 1;
-        }
-        else{
-            mPaint.setColor(0xFF000000);
-            changed_color = 0;
-        }
-
-    }
     @Override
     protected void onDraw(Canvas canvas) {
 
@@ -151,16 +126,8 @@ public class PaintView extends View  {
 
         System.out.println(savePath.size()+"--------------");
         if(savePath != null && savePath.size() > 0){
-            //清空画布
+            //调用初始化画布函数以清空画布
-            mBitmapPaint = new Paint(Paint.DITHER_FLAG);
+            initCanvas();
-            //画布大小
-            mBitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
-                    Bitmap.Config.RGB_565);
-            mCanvas = new Canvas(mBitmap);  //所有mCanvas画的东西都被保存在了mBitmap中
-
-            mCanvas.drawColor(Color.WHITE);
-            mPath = new Path();
-            mBitmapPaint = new Paint(Paint.DITHER_FLAG);
 
             //将路径保存列表中的最后一个元素删除 ,并将其保存在路径删除列表中
             DrawPath drawPath = savePath.get(savePath.size() - 1);
@@ -201,15 +168,52 @@ public class PaintView extends View  {
     public void removeAllPaint(){
         //调用初始化画布函数以清空画布
         initCanvas();
-        changed_color=0;
-        changed_width=0;
         invalidate();//刷新
         savePath.clear();
         deletePath.clear();
     }
 
+/*
+     * 保存所绘图形
+     * 返回绘图文件的存储路径
+     *
+    public String saveBitmap(){
+        //获得系统当前时间，并以该时间作为文件名
+        SimpleDateFormat   formatter   =   new   SimpleDateFormat   ("yyyyMMddHHmmss");
+        Date   curDate   =   new   Date(System.currentTimeMillis());//获取当前时间
+        String   str   =   formatter.format(curDate);
+        String paintPath = "";
+        str = str + "paint.png";
+        File dir = new File("/sdcard/notes/");
+        File file = new File("/sdcard/notes/",str);
+        if (!dir.exists()) {
+            dir.mkdir();
+        }
+        else{
+            if(file.exists()){
+                file.delete();
+            }
+        }
 
+        try {
+            FileOutputStream out = new FileOutputStream(file);
+            mBitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
+            out.flush();
+            out.close();
+            //保存绘图文件路径
+            paintPath = "/sdcard/notes/" + str;
+
+
+        } catch (FileNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
 
+        return paintPath;
+    }*/
 
 
     private void touch_start(float x, float y) {

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

@@ -165,12 +165,6 @@ public class Notes {
          * <P> Type : INTEGER (long) </P>
          */
         public static final String VERSION = "version";
-
-        /**
-         * The password
-         * <P> Type : TEXT </P>
-         */
-        public static final String PASSWORD = "password";
     }
 
     public interface DataColumns {

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

@@ -60,8 +60,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
-                    NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0,''," +
+            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
-                    NoteColumns.PASSWORD + " TEXT NOT NULL DEFAULT ''" +
         ")";
 
     private static final String CREATE_DATA_TABLE_SQL =
@@ -323,11 +322,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             oldVersion++;
         }
 
-        if (oldVersion == 4) {
-            upgradeToV5(db);
-            oldVersion++;
-        }
-
         if (reCreateTriggers) {
             reCreateNoteTableTriggers(db);
             reCreateDataTableTriggers(db);
@@ -365,9 +359,4 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
     }
-
-    private void upgradeToV5(SQLiteDatabase db) {
-        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.PASSWORD
-                + " TEXT NOT NULL DEFAULT ''");
-    }
 }

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

@@ -64,6 +64,10 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
     }
 
     private void showNotification(int tickerId, String content) {
+        Notification notification = new Notification(R.drawable.notification, mContext
+                .getString(tickerId), System.currentTimeMillis());
+        notification.defaults = Notification.DEFAULT_LIGHTS;
+        notification.flags = Notification.FLAG_AUTO_CANCEL;
         PendingIntent pendingIntent;
         if (tickerId != R.string.ticker_success) {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
@@ -73,15 +77,8 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
                     NotesListActivity.class), 0);
         }
-        Notification notification = new Notification.Builder(mContext)
+        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-                .setAutoCancel(true)
+                pendingIntent);
-                .setContentTitle("title")
-                .setContentText("describe")
-                .setContentIntent(pendingIntent)
-                .setWhen(System.currentTimeMillis())
-                .build();
-        notification.defaults = Notification.DEFAULT_LIGHTS;
-        notification.flags = Notification.FLAG_AUTO_CANCEL;
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
     }
 

src/main/java/net/micode/notes/model/WorkingNote.java

@@ -60,27 +60,8 @@ public class WorkingNote {
 
     private boolean mIsDeleted;
 
-    private String mPassword = "";
-
-
     private NoteSettingChangedListener mNoteSettingStatusListener;
 
-    /**判断是否已经设置密码*/
-    public boolean hasPassword() {
-        return !mPassword.equals("");
-    }
-
-    /**设置便签访问密码，并存入数据库*/
-    public void setPassword(String passcode) {
-        mPassword = passcode;
-        mNote.setNoteValue(NoteColumns.PASSWORD, passcode);
-    }
-
-    /**获取设置的密码*/
-    public String getPassword() {
-        return mPassword;
-    }
-
     public static final String[] DATA_PROJECTION = new String[] {
             DataColumns.ID,
             DataColumns.CONTENT,
@@ -97,8 +78,7 @@ public class WorkingNote {
             NoteColumns.BG_COLOR_ID,
             NoteColumns.WIDGET_ID,
             NoteColumns.WIDGET_TYPE,
-            NoteColumns.MODIFIED_DATE,
+            NoteColumns.MODIFIED_DATE
-            NoteColumns.PASSWORD
     };
 
     private static final int DATA_ID_COLUMN = 0;
@@ -121,10 +101,6 @@ public class WorkingNote {
 
     private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
 
-    private static final int NOTE_PASSWORD_COLUMN = 6;
-
-
-
     // New note construct
     private WorkingNote(Context context, long folderId) {
         mContext = context;
@@ -138,7 +114,6 @@ public class WorkingNote {
         mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
     }
 
-
     // Existing note construct
     private WorkingNote(Context context, long noteId, long folderId) {
         mContext = context;
@@ -162,7 +137,6 @@ public class WorkingNote {
                 mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
                 mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
                 mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
-                mPassword = cursor.getString(NOTE_PASSWORD_COLUMN);
             }
             cursor.close();
         } else {

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

@@ -0,0 +1,46 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageButton;
+
+import net.micode.notes.PaintView;
+import net.micode.notes.R;
+
+public class BoardActivity extends Activity {
+    private PaintView paintView;
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState); //调用父类的功能
+        this.setContentView(R.layout.activity_paint);
+        //根据id获取添加图片按钮
+        final ImageButton undo = (ImageButton) findViewById(R.id.undo);
+        //为点击图片按钮设置监听器
+        undo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                paintView.undo();
+            }
+        });
+
+        final ImageButton paint_reset = (ImageButton) findViewById(R.id.paint_reset);
+        //为点击图片按钮设置监听器
+        paint_reset.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                paintView.redo();
+            }
+        });
+
+        final ImageButton paint_delete = (ImageButton) findViewById(R.id.paint_delete);
+        //为点击图片按钮设置监听器
+        paint_delete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                paintView.removeAllPaint();
+            }
+        });
+        paintView = (PaintView)findViewById(R.id.paint_layout);
+    }
+}

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

@@ -16,11 +16,9 @@
 
 package net.micode.notes.ui;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.PendingIntent;
 import android.app.SearchManager;
 import android.appwidget.AppWidgetManager;
@@ -31,12 +29,10 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
-import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -44,17 +40,14 @@ import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.speech.tts.TextToSpeech;
 import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ImageSpan;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -62,8 +55,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -73,16 +64,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.baidu.speech.EventListener;
-import com.baidu.speech.EventManager;
-import com.baidu.speech.EventManagerFactory;
-import com.baidu.speech.asr.SpeechConstant;
 
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
@@ -97,24 +78,16 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.io.FileNotFoundException;
-import java.text.BreakIterator;
-import java.util.Locale;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
 public class NoteEditActivity extends Activity implements OnClickListener,
-        NoteSettingChangedListener, OnTextViewChangeListener, EventListener {
+        NoteSettingChangedListener, OnTextViewChangeListener {
-    private AlertDialog alertDialog2;
     private class HeadViewHolder {
         public TextView tvModified;
 
@@ -123,12 +96,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         public TextView tvAlertDate;
 
         public ImageView ibSetBgColor;
-        public BreakIterator text_num;
-        public TextView  text_nums;
     }
 
     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);
@@ -138,7 +108,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     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);
@@ -148,7 +117,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     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);
@@ -157,7 +125,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     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);
@@ -196,71 +163,18 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private String mUserQuery;
     private Pattern mPattern;
 
-    private static final int GET_STORAGE_PERMISSION = 2;
-
     private final int PHOTO_REQUEST = 1;//请求码
 
-    private static final int REQUEST_SET_PASSCODE = 2;
-
-    private static final int REQUEST_UNLOCK = 3;
-
-    private boolean Locked; /* 用以判断是否已解锁 */
-
-    private EditText editText;
-    private TextView textView;
-
-    protected EditText txtResult;//识别结果
-    protected Button startBtn;//开始识别  一直不说话会自动停止，需要再次打开
-
-    private EventManager asr;//语音识别核心库
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.setContentView(R.layout.note_edit);
 
-        if (savedInstanceState == null && !initActivityState(getIntent())) {
-            finish();
-            return;
-        }
-        editText = (EditText) findViewById(R.id.note_edit_view);
-
-        this.setContentView(R.layout.note_edit);
-
         if (savedInstanceState == null && !initActivityState(getIntent())) {
             finish();
             return;
         }
         initResources();
-        speech_sum();
-        initView();
-        txtResult = findViewById(R.id.note_edit_view);
-        asr = EventManagerFactory.create(this, "asr");
-//注册自己的输出事件类
-        asr.registerListener(this); //  EventListener 中 onEvent方法
-        startBtn.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                int action = event.getAction();
-                switch (action) {
-                    case MotionEvent.ACTION_DOWN:
-                        start();
-                /*mStartSpeechButton.setBackgroundResource(
-                        R.drawable.bdspeech_btn_orangelight_pressed);*/
-                        break;
-                    case MotionEvent.ACTION_UP:
-                        stop();
-                /*mStartSpeechButton.setBackgroundResource(
-                        R.drawable.bdspeech_btn_orangelight_normal);*/
-                        break;
-                    default:
-                        return false;
-                }
-
-                return true;
-            }
-        });
 
 
         //根据id获取添加图片按钮
@@ -269,10 +183,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         add_img_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (ContextCompat.checkSelfPermission(NoteEditActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                    //没有授权进行权限申请
-                    ActivityCompat.requestPermissions(NoteEditActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, GET_STORAGE_PERMISSION);
-                } else {
                 Log.d(TAG, "onClick: click add image button");
                 //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据，并返回（特殊种类的数据：照一张相片或录一段音）
                 Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
@@ -282,112 +192,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 loadImage.setType("image/*");
                 startActivityForResult(loadImage, PHOTO_REQUEST);
             }
-            }
-        });
-    }
-
-    public void speech_sum(){
-        EditText editable = findViewById(R.id.note_edit_view);
-        //Toast.makeText(NoteEditActivity.this, editable.getText().toString(), Toast.LENGTH_SHORT).show();
-        final Button speak = findViewById(R.id.iatBtn);
-        final int[] tmp = new int[1];
-        final TextToSpeech[] tts = new TextToSpeech[1];
-        tts[0] = new TextToSpeech(NoteEditActivity.this, new TextToSpeech.OnInitListener() {
-            @Override
-            public void onInit(int status) {
-                tts[0].setLanguage(Locale.US);
-            }
-        });
-        editable.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) {
-                tmp[0] = cutOfimage(operateText(s.toString())).length();
-                TextView number_word = findViewById(R.id.text_nums);
-                number_word.setText("字符数："+ tmp[0]);
-                final String temp = cutOfimage(s.toString());
-                speak.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        tts[0].speak(temp.toString(),TextToSpeech.QUEUE_FLUSH,null);
-                    }
-                });
-            }
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
         });
     }
 
-    public String operateText(String str){
-        String dest = "";
-        Pattern p = Pattern.compile("\\s*|t|r|n");
-        Matcher m = p.matcher(str);
-        dest = m.replaceAll("");
-        return dest;
-    }
-
-    public String cutOfimage(String str){
-        String dest = str;
-        int index1 = dest.indexOf("[local]");
-        int index2 = dest.indexOf("[/local]");
-        while(index1 != -1 && index2 != -1){
-            dest = dest.substring(0,index1) + dest.substring(index2+8);
-            index1 = dest.indexOf("[local]");
-            index2 = dest.indexOf("[/local]");
-        }
-        return dest;
-    }
-
-    private String Textchange(String oriText){
-        StringBuffer stringBuffer = new StringBuffer(oriText);
-        int Flag1 = -1;
-        int Flag2 = -1;
-        do {//不计入表示图片的字符
-            Flag1 = stringBuffer.indexOf("<img");
-            Flag2 = stringBuffer.indexOf(">");
-            if (Flag1 != -1 && Flag2 != -1) {
-                stringBuffer = stringBuffer.replace(Flag1, Flag2+1, "");
-            }
-        } while (Flag1 != -1 && Flag2 != -1);
-
-        do {//不计入换行字符
-            Flag1 = stringBuffer.indexOf("\n");
-
-            if (Flag1 != -1){
-                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
-            }
-        } while (Flag1 != -1);
-        do {//不计入空格字符
-            Flag1 = stringBuffer.indexOf(" ");
-
-            if (Flag1 != -1) {
-                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
-            }
-        } while (Flag1 != -1);
-        return stringBuffer.toString();
-    }
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        switch (requestCode) {
-            case GET_STORAGE_PERMISSION:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
-                    //Category属性用于指定当前动作（Action）被执行的环境.
-                    //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
-                    loadImage.addCategory(Intent.CATEGORY_OPENABLE);
-                    loadImage.setType("image/*");
-                    startActivityForResult(loadImage, PHOTO_REQUEST);
-                } else {
-                    Toast.makeText(this, "You denied the permission", Toast.LENGTH_SHORT).show();
-                }
-                break;
-
-        }
-    }
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -483,10 +290,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             return false;
         }
         mWorkingNote.setOnSettingStatusChangedListener(this);
-        Locked = mWorkingNote.hasPassword();//设置便签解锁状态;
-        if (intent.hasExtra("lock")) {
-            Locked = false;
-        }
         return true;
     }
 
@@ -514,21 +317,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
                         | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
                         | DateUtils.FORMAT_SHOW_YEAR));
+
         showAlertHeader();
         //将有图片路径的位置转换为图片
         convertToImage();
-        unlockNote();
-    }
-
-    private void unlockNote(){
-        //如果设置了密码，启动输入密码页面
-        if (mWorkingNote.hasPassword() && Locked) {
-            saveNote();
-            Intent intent = new Intent(this,UnlockActivity.class);
-            intent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
-            startActivityForResult(intent,REQUEST_SET_PASSCODE);
-            finish();
-        }
     }
 
     private void showAlertHeader() {
@@ -545,8 +337,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         } else {
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
-        }
+        };
-        ;
     }
 
     //路径字符串格式 转换为 图片image格式
@@ -648,7 +439,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mNoteHeaderHolder = new HeadViewHolder();
         mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
         mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
-        mNoteHeaderHolder.text_nums = (TextView) findViewById(R.id.text_nums);
         mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
         mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
@@ -664,8 +454,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         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);
         /**
@@ -786,38 +575,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         } else {
             menu.findItem(R.id.menu_delete_remind).setVisible(false);
         }
-        //如果一设置密码，显示删除密码选项，否则，显示设置密码选项
-        if (mWorkingNote.hasPassword()) {
-            menu.findItem(R.id.menu_set_passcode).setVisible(false);
-        } else {
-            menu.findItem(R.id.menu_delete_passcode).setVisible(false);
-        }
         return true;
     }
 
-    /**
-     * 弹出设置密码界面
-     */
-    private void setPassword() {
-        //确保笔记已写入数据库
-        saveNote();
-        //初始化一个新的意图，用以跳转至设置密码界面
-        Intent intent = new Intent(this,SetLockActivity.class);
-        //给意图传入当前便签的id参数，便于从设置密码活动中跳转回编辑便签活动
-        intent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
-        startActivity(intent);
-        finish();
-    }
-
-    /**
-     * 删除便签密码
-     */
-    private void deletePassword() {
-        mWorkingNote.setPassword("");
-        saveNote();
-        Toast.makeText(NoteEditActivity.this,R.string.note_passcode_deleted,Toast.LENGTH_SHORT).show();
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -861,19 +621,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             case R.id.menu_delete_remind:
                 mWorkingNote.setAlertDate(0, false);
                 break;
-            case R.id.menu_font_select:
+
-                showSingleAlertDiglog();
-                break;
-            case R.id.menu_set_passcode:
-                setPassword();
-                //设置提示
-                Toast.makeText(NoteEditActivity.this, "设置密码成功", Toast.LENGTH_SHORT).show();
-                break;
-            case R.id.menu_delete_passcode:
-                deletePassword();
-                //设置提示
-                Toast.makeText(NoteEditActivity.this, "解除密码成功", Toast.LENGTH_SHORT).show();
-                break;
             default:
                 break;
         }
@@ -1272,7 +1020,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 return getDataColumn(context, contentUri, null, null);
             }
             // MediaProvider
-            else if (isMediaDocument(uri)) {
+            else
+                if (isMediaDocument(uri)) {
                 final String docId = DocumentsContract.getDocumentId(uri);
                 final String[] split = docId.split(":");
                 final String type = split[0];
@@ -1335,93 +1084,4 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     public boolean isMediaDocument(Uri uri) {
         return "com.android.providers.media.documents".equals(uri.getAuthority());
     }
-    public void showSingleAlertDiglog(){
-        final String[] items={"仿宋","黑体","楷体","宋体","新宋体"};
-        AlertDialog.Builder alertBuilder=new AlertDialog.Builder(this);
-        alertBuilder.setTitle("字体选择");
-        alertBuilder.setSingleChoiceItems(items,0,(dialogInterface, i) ->  {
-            switch (i) {
-                case 0:
-                    Typeface typeface0 = Typeface.createFromAsset(getAssets(), "Fonts/simfang.ttf");
-                    mNoteEditor.setTypeface(typeface0);
-                    break;
-                case 1:
-                    Typeface typeface1 = Typeface.createFromAsset(getAssets(), "Fonts/simhei.ttf");
-                    mNoteEditor.setTypeface(typeface1);
-                    break;
-                case 2:
-                    Typeface typeface2 = Typeface.createFromAsset(getAssets(), "Fonts/simkai.ttf");
-                    mNoteEditor.setTypeface(typeface2);
-                    break;
-                case 3:
-                    Typeface typeface3 = Typeface.createFromAsset(getAssets(), "Fonts/simsunb.ttf");
-                    mNoteEditor.setTypeface(typeface3);
-                    break;
-                case 4:
-                    Typeface typeface4 = Typeface.createFromAsset(getAssets(), "Fonts/simsun.ttc");
-                    mNoteEditor.setTypeface(typeface4);
-                    break;
-            }
-            Toast.makeText(NoteEditActivity.this,items[i],Toast.LENGTH_SHORT).show();
-        });
-        alertBuilder.setPositiveButton("确定",(dialogInterface, i) -> {
-            alertDialog2.dismiss();
-        });
-        alertBuilder.setNegativeButton("取消",(dialogInterface, i) -> {
-            alertDialog2.dismiss();
-        });
-        alertDialog2=alertBuilder.create();
-        alertDialog2.show();
-    }    
-
-
-    private void start() {
-        Toast.makeText(NoteEditActivity.this, "请开始说话", Toast.LENGTH_SHORT).show();
-        Map<String, Object> params = new LinkedHashMap<>();//传递Map<String,Object>的参数，会将Map自动序列化为json
-        String event = null;
-        event = SpeechConstant.ASR_START;
-        params.put(SpeechConstant.ACCEPT_AUDIO_VOLUME, false);//回调当前音量
-        String json = null;
-        json = new JSONObject(params).toString();//demo用json数据来做数据交换的方式
-        asr.send(event, json, null, 0, 0);// 初始化EventManager对象,这个实例只能创建一次，就是我们上方创建的asr，此处开始传入
-    }
-
-    private void stop() {
-        //txtResult.append("停止识别：ASR_STOP");
-        asr.send(SpeechConstant.ASR_STOP, null, null, 0, 0);//此处停止
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        asr.send(SpeechConstant.ASR_CANCEL, "{}", null, 0, 0);
-        asr.unregisterListener(this);//退出事件管理器
-        // 必须与registerListener成对出现，否则可能造成内存泄露
-    }
-
-    public void onEvent(String name, String params, byte[] data, int offset, int length) {
-        String resultTxt = null;
-        //Log.i(TAG, params);
-        if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL)) {//识别结果参数
-            if (params.contains("\"final_result\"")) {//语义结果值
-                try {
-                    JSONObject json = new JSONObject(params);
-                    String result = json.getString("best_result");//取得key的识别结果
-                    resultTxt = result;
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        if (resultTxt != null) {
-            resultTxt += "\n";
-            txtResult.append(resultTxt);
-        }
-    }
-
-    private void initView() {
-        txtResult = findViewById(R.id.note_edit_view);
-        startBtn = findViewById(R.id.listen);
-        //stopBtn = findViewById(R.id.stop);
-    }
 }

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

@@ -40,7 +40,6 @@ public class NoteItemData {
         NoteColumns.TYPE,
         NoteColumns.WIDGET_ID,
         NoteColumns.WIDGET_TYPE,
-            NoteColumns.PASSWORD
     };
 
     private static final int ID_COLUMN                    = 0;
@@ -55,7 +54,6 @@ public class NoteItemData {
     private static final int TYPE_COLUMN                  = 9;
     private static final int WIDGET_ID_COLUMN             = 10;
     private static final int WIDGET_TYPE_COLUMN           = 11;
-    private static final int PASSWORD_COLUMN              = 12;
 
     private long mId;
     private long mAlertDate;
@@ -71,7 +69,6 @@ public class NoteItemData {
     private int mWidgetType;
     private String mName;
     private String mPhoneNumber;
-    private String mPassword = "";
 
     private boolean mIsLastItem;
     private boolean mIsFirstItem;
@@ -94,7 +91,6 @@ public class NoteItemData {
         mType = cursor.getInt(TYPE_COLUMN);
         mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
         mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
-        mPassword = cursor.getString(PASSWORD_COLUMN);
 
         mPhoneNumber = "";
         if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
@@ -112,8 +108,6 @@ public class NoteItemData {
         }
         checkPostion(cursor);
     }
-    // NoteItemData类
-    public boolean hasLock() { return !mPassword.equals(""); }
 
     private void checkPostion(Cursor cursor) {
         mIsLastItem = cursor.isLast() ? true : false;

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

@@ -542,7 +542,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     private void openNode(NoteItemData data) {
-        Log.i("open","Node");
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(Intent.EXTRA_UID, data.getId());
@@ -805,10 +804,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 getWindow().setBackgroundDrawableResource(R.drawable.menu_girl);
                 break;
             }
-            case R.id.menu_countallNotes: {
-                showNumberofNotes();
-                break;
-            }
             case R.id.menu_sea: {
                 mode = 2;
                 getWindow().setBackgroundDrawableResource(R.drawable.menu_sea);
@@ -1047,10 +1042,4 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
         return false;
     }
-    private void showNumberofNotes() {
-        AlertDialog.Builder btr =new AlertDialog.Builder(this);
-        btr.setTitle("目前便签数");
-        btr.setMessage("目前有 "+Integer.toString(mNotesListAdapter.retCount())+"个便签");
-        btr.show();
-    }
 }

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

@@ -181,22 +181,4 @@ public class NotesListAdapter extends CursorAdapter {
             }
         }
     }
-    public int retCount(){
-        int NotesCount=mNotesCount;
-        int ItemCount=getCount();
-        for (int i = 0; i < ItemCount; i++) {
-            Cursor c = (Cursor) getItem(i);
-            if (c != null) {
-                if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
-                    NoteItemData NoteItem=new NoteItemData(mContext,c);
-                    NotesCount+=NoteItem.getNotesCount();
-                }
-            } else {
-                Log.e(TAG, "Invalid cursor");
-                return -1;
-            }
-        }
-        return NotesCount;
-    }
-
 }

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

@@ -37,7 +37,6 @@ public class NotesListItem extends LinearLayout {
     private TextView mCallName;
     private NoteItemData mItemData;
     private CheckBox mCheckBox;
-    private ImageView mLock;
 
     public NotesListItem(Context context) {
         super(context);
@@ -47,7 +46,6 @@ public class NotesListItem extends LinearLayout {
         mTime = (TextView) findViewById(R.id.tv_time);
         mCallName = (TextView) findViewById(R.id.tv_name);
         mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
-        mLock = (ImageView) findViewById(R.id.iv_lock);
     }
 
     public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
@@ -57,6 +55,7 @@ public class NotesListItem extends LinearLayout {
         } else {
             mCheckBox.setVisibility(View.GONE);
         }
+
         mItemData = data;
         if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
             mCallName.setVisibility(View.GONE);
@@ -95,14 +94,6 @@ public class NotesListItem extends LinearLayout {
                 }
             }
         }
-        if (data.hasLock()) {
-            mLock.setImageResource(R.drawable.lock);
-            mLock.setVisibility(View.VISIBLE);
-            String text = "已加密";
-            mTitle.setText(text);
-        } else {
-            mLock.setVisibility(View.GONE);
-        }
         mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
 
         setBackground(data);