From 4cea143bbe247352c4d7b28b2c4bf52bc1b835c4 Mon Sep 17 00:00:00 2001 From: JackyMa <2433069615@qq.com> Date: Wed, 3 Nov 2021 10:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=9D=E5=AE=AB=E6=A0=BC=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...源-开源软件维护方案及成果.docx | Bin 0 -> 21749 bytes src/java/net/micode/notes/data/Notes.java | 2 + .../notes/data/NotesDatabaseHelper.java | 3 +- .../net/micode/notes/model/WorkingNote.java | 29 ++ src/java/net/micode/notes/tool/Point.java | 113 +++++ .../net/micode/notes/ui/LockPatternView.java | 385 ++++++++++++++++++ .../net/micode/notes/ui/NoteEditActivity.java | 48 ++- .../net/micode/notes/ui/NoteItemData.java | 6 + .../net/micode/notes/ui/NotesListItem.java | 10 + .../net/micode/notes/ui/SetLockActivity.java | 95 +++++ .../net/micode/notes/ui/UnlockActivity.java | 56 +++ src/res/color/primary_text_dark.xml | 2 +- src/res/color/secondary_text_dark.xml | 2 +- src/res/drawable-hdpi/bitmap_error.png | Bin 0 -> 3754 bytes src/res/drawable-hdpi/bitmap_normal.png | Bin 0 -> 3788 bytes src/res/drawable-hdpi/bitmap_pressed.png | Bin 0 -> 3757 bytes src/res/drawable-hdpi/line_error.png | Bin 0 -> 2806 bytes src/res/drawable-hdpi/line_pressed.png | Bin 0 -> 2807 bytes src/res/drawable-hdpi/lock.png | Bin 0 -> 1221 bytes src/res/drawable-hdpi/splash.jpg | Bin 0 -> 107507 bytes src/res/drawable-hdpi/star.png | Bin 0 -> 1221 bytes .../drawable/settings_launcher_background.xml | 74 ++++ src/res/layout/activity_lock.xml | 20 + src/res/layout/activity_set_lock.xml | 32 ++ src/res/layout/activity_splash.xml | 52 +++ src/res/layout/note_item.xml | 7 + src/res/layout/widget_lock_view.xml | 10 + src/res/menu/note_edit.xml | 8 + src/res/values-zh-rCN/strings.xml | 3 + src/res/values-zh-rTW/strings.xml | 3 + src/res/values/attrs.xml | 6 + src/res/values/colors.xml | 5 + src/res/values/strings.xml | 5 + src/res/values/styles.xml | 17 +- src/res/values/themes.xml | 16 + 35 files changed, 995 insertions(+), 14 deletions(-) create mode 100644 doc/实践资源-开源软件维护方案及成果.docx create mode 100644 src/java/net/micode/notes/tool/Point.java create mode 100644 src/java/net/micode/notes/ui/LockPatternView.java create mode 100644 src/java/net/micode/notes/ui/SetLockActivity.java create mode 100644 src/java/net/micode/notes/ui/UnlockActivity.java create mode 100644 src/res/drawable-hdpi/bitmap_error.png create mode 100644 src/res/drawable-hdpi/bitmap_normal.png create mode 100644 src/res/drawable-hdpi/bitmap_pressed.png create mode 100644 src/res/drawable-hdpi/line_error.png create mode 100644 src/res/drawable-hdpi/line_pressed.png create mode 100644 src/res/drawable-hdpi/lock.png create mode 100644 src/res/drawable-hdpi/splash.jpg create mode 100644 src/res/drawable-hdpi/star.png create mode 100644 src/res/drawable/settings_launcher_background.xml create mode 100644 src/res/layout/activity_lock.xml create mode 100644 src/res/layout/activity_set_lock.xml create mode 100644 src/res/layout/activity_splash.xml create mode 100644 src/res/layout/widget_lock_view.xml create mode 100644 src/res/values/attrs.xml create mode 100644 src/res/values/themes.xml diff --git a/doc/实践资源-开源软件维护方案及成果.docx b/doc/实践资源-开源软件维护方案及成果.docx new file mode 100644 index 0000000000000000000000000000000000000000..0b7e6eadd93ea2334378eab53576e07fc0fb462d GIT binary patch literal 21749 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 BXbS)U literal 0 HcmV?d00001 diff --git a/src/java/net/micode/notes/data/Notes.java b/src/java/net/micode/notes/data/Notes.java index 1db29017..8d2e6c21 100644 --- a/src/java/net/micode/notes/data/Notes.java +++ b/src/java/net/micode/notes/data/Notes.java @@ -169,6 +169,8 @@ public class Notes { public static final String TOP = "top"; public static final String STAR = "star"; + + public static final String PASSCODE = "passcode"; } public interface DataColumns { diff --git a/src/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/java/net/micode/notes/data/NotesDatabaseHelper.java index f5ce9566..e9619734 100644 --- a/src/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -62,7 +62,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT 1," + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.TOP + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.STAR + " INTEGER NOT NULL DEFAULT 0" + + NoteColumns.STAR + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.PASSCODE + " TEXT NOT NULL DEFAULT ''"+ ")"; private static final String CREATE_DATA_TABLE_SQL = diff --git a/src/java/net/micode/notes/model/WorkingNote.java b/src/java/net/micode/notes/model/WorkingNote.java index d886280d..df3de87a 100644 --- a/src/java/net/micode/notes/model/WorkingNote.java +++ b/src/java/net/micode/notes/model/WorkingNote.java @@ -61,8 +61,15 @@ public class WorkingNote { private boolean mIsDeleted; + /**记录便签已设置密码*/ + private String mPasscode = ""; + + /**记录已置顶便签*/ private String mTop = "0"; + /**记录便签所属类别*/ + private int mClass; + private String mStar = "0"; private NoteSettingChangedListener mNoteSettingStatusListener; @@ -86,6 +93,7 @@ public class WorkingNote { NoteColumns.MODIFIED_DATE, NoteColumns.TOP, NoteColumns.STAR, + NoteColumns.PASSCODE, }; private static final int DATA_ID_COLUMN = 0; @@ -112,6 +120,8 @@ public class WorkingNote { private static final int NOTE_STAR_COLUMN = 7; + private static final int NOTE_PASSCODE_COLUMN = 8; + // New note construct private WorkingNote(Context context, long folderId) { mContext = context; @@ -125,6 +135,7 @@ public class WorkingNote { mWidgetType = Notes.TYPE_WIDGET_INVALIDE; mTop = String.valueOf(getTopId()); mStar = String.valueOf(getStarId()); + mPasscode = String.valueOf(getPasscode()); } // Existing note construct @@ -152,6 +163,7 @@ public class WorkingNote { mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); mTop = cursor.getString(NOTE_TOP_COLUMN); mStar = cursor.getString(NOTE_STAR_COLUMN); + mPasscode = cursor.getString(NOTE_PASSCODE_COLUMN); } cursor.close(); } else { @@ -268,6 +280,7 @@ public class WorkingNote { } + public void setAlertDate(long date, boolean set) { if (date != mAlertDate) { mAlertDate = date; @@ -337,6 +350,22 @@ public class WorkingNote { return (mAlertDate > 0 ? true : false); } + /**判断是否已经设置密码*/ + public boolean hasPasscode() { + return !mPasscode.equals(""); + } + + /**设置便签访问密码，并存入数据库*/ + public void setPasscode(String passcode) { + mPasscode = passcode; + mNote.setNoteValue(NoteColumns.PASSCODE, passcode); + } + + /**获取设置的密码*/ + public String getPasscode() { + return mPasscode; + } + public int getTopId() { if (mTop.equals("1")) { return 1; diff --git a/src/java/net/micode/notes/tool/Point.java b/src/java/net/micode/notes/tool/Point.java new file mode 100644 index 00000000..f3d8e4ee --- /dev/null +++ b/src/java/net/micode/notes/tool/Point.java @@ -0,0 +1,113 @@ +package net.micode.notes.tool; + +public class Point { + public static int BITMAP_NORMAL = 0; // 正常 + public static int BITMAP_ERROR = 1; // 错误 + public static int BITMAP_PRESS = 2; // 按下 + + //九宫格中的点的下标（即每个点代表一个值） + private String index; + //点的状态 + private int state; + //点的坐标 + private float x; + private float y; + + public Point() { + super(); + } + + public Point(int x, int y) { + this.x = x; + this.y = y; + } + + public String getIndex() { + return index; + } + + public int getState() { + return state; + } + + public float getX() { + return x; + } + + public float getY() { + return y; + } + + public void setIndex(String index) { + this.index = index; + } + + public void setState(int state) { + this.state = state; + } + + public void setX(float x) { + this.x = x; + } + + public void setY(float y) { + this.y = y; + } + + /** + * 判断屏幕上的九宫格中的点能否可以进行连线 + * + * @param a + * @param moveX + * @param moveY + * @param radius 点bitmap的半径 + * @return 布尔型 + */ + public boolean isWith(Point a, float moveX, float moveY, float radius) { + float result = (float) Math.sqrt((a.getX() - moveX) + * (a.getX() - moveX) + (a.getY() - moveY) + * (a.getY() - moveY)); + if (result < 5 * radius / 4) { + return true; + } + return false; + } + + public static float getDegrees(Point a, Point b) { + float degrees = 0; + float ax = a.getX(); + float ay = a.getY(); + float bx = b.getX(); + float by = b.getY(); + + if (ax == bx) { + if (by > ay) { + degrees = 90; + } else { + degrees = 270; + } + } else if (by == ay) { + if (ax > bx) { + degrees = 180; + } else { + degrees = 0; + } + } else { + if (ax > bx) { + if (ay > by) { // 第三象限 + degrees = 180 + (float) (Math.atan2(ay - by, ax - bx) * 180 / Math.PI); + } else { // 第二象限 + degrees = 180 - (float) (Math.atan2(by - ay, ax - bx) * 180 / Math.PI); + } + } else { + if (ay > by) { // 第四象限 + degrees = 360 - (float) (Math.atan2(ay - by, bx - ax) * 180 / Math.PI); + } else { // 第一象限 + degrees = (float) (Math.atan2(by - ay, bx - ax) * 180 / Math.PI); + } + } + } + return degrees; + } +} + diff --git a/src/java/net/micode/notes/ui/LockPatternView.java b/src/java/net/micode/notes/ui/LockPatternView.java new file mode 100644 index 00000000..0218d439 --- /dev/null +++ b/src/java/net/micode/notes/ui/LockPatternView.java @@ -0,0 +1,385 @@ +package net.micode.notes.ui; + +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Canvas; +import android.graphics.Matrix; +import android.graphics.Paint; +import android.util.AttributeSet; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; + +import net.micode.notes.R; +import net.micode.notes.tool.Point; + +import java.util.ArrayList; +import java.util.List; + + +public class LockPatternView extends View { + //判断线的状态 + private static boolean isLineState = true; + //判断点是否被实例化了 + private static boolean isInitPoint = false; + //判断手指是否离开屏幕 + private static boolean isFinish = false; + //判断手指点击屏幕时是否选中了九宫格中的点 + private static boolean isSelect = false; + // 创建MyPoint的数组 + private Point[][] mPoints = new Point[3][3]; + // 声明屏幕的宽和高 + private int mScreenHeight; + private int mScreenWidth; + // 声明点线的图片的半径 + private float mPointRadius; + // 声明线的图片的高（即是半径） + private float mLineHeight; + // 声明鼠标移动的x，y坐标 + private float mMoveX, mMoveY; + // 声明屏幕上的宽和高的偏移量 + private int mScreenHeightOffSet = 0; + private int mScreenWidthOffSet = 0; + // 创建一个画笔 + private Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + // 声明资源图片 + private Bitmap mBitmapNormal; + private Bitmap mBitmapPressed; + private Bitmap mBitmapError; + private Bitmap mLinePressed; + private Bitmap mLineError; + // 创建一个矩阵 + private Matrix mMatrix = new Matrix(); + // 创建MyPoint的列表 + private List mPointList = new ArrayList(); + // 实例化鼠标点 + private Point mMousePoint = new Point(); + // 用获取从activity中传过来的密码字符串 + private String mPassword = ""; + private final static String TAG = "LockPatternView"; + + private Context mContext; + private OnLockListener mListener; + + public LockPatternView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + mContext = context; + } + + public LockPatternView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public LockPatternView(Context context) { + super(context); + } + + /** + * 画点和画线 + */ + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + if (!isInitPoint) { + initPoint(); // 先初始化 + } + + canvasPoint(canvas); // 开始画点 + + // 开始画线 + if (mPointList.size() > 0) { + Point b = null; + Point a = mPointList.get(0); + for (int i = 1; i < mPointList.size(); i++) { + b = mPointList.get(i); + canvasLine(a, b, canvas); + a = b; + } + if (!isFinish) { + canvasLine(a, mMousePoint, canvas); + } + } + } + + /** + * 手指点击手机屏幕 + */ + @Override + public boolean onTouchEvent(MotionEvent event) { + mMoveX = event.getX(); + mMoveY = event.getY(); + // 设置移动点的坐标 + mMousePoint.setX(mMoveX); + mMousePoint.setY(mMoveY); + Point mPoint = null; + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + isLineState = true; + isFinish = false; + // 每次点击时就会将pointList中元素设置转化成正常状态 + for (int i = 0; i < mPointList.size(); i++) { + mPointList.get(i).setState(Point.BITMAP_NORMAL); + } + // 将pointList中的元素清除掉 + mPointList.clear(); + // 判断是否点中了九宫格中的点 + mPoint = getIsSelectedPoint(mMoveX, mMoveY); + if (mPoint != null) { + isSelect = true; + } + break; + case MotionEvent.ACTION_MOVE: + if (isSelect == true) { + mPoint = getIsSelectedPoint(mMoveX, mMoveY); + } + + break; + case MotionEvent.ACTION_UP: + isFinish = true; + isSelect = false; + // 规定至少要有4个点被连线才有可能是正确 + // 其他种情况都是错误的 + if (mPointList.size() >= 4) {// 正确情况 + for (int j = 0; j < mPointList.size(); j++) { + mPassword += mPointList.get(j).getIndex(); + } + //将连线后得到的密码传给activity + mListener.getStringPassword(mPassword); + mPassword = ""; + //经过activity判断传过来是否正确 + if (mListener.isPassword()) { + for (int i = 0; i < mPointList.size(); i++) { + mPointList.get(i).setState(Point.BITMAP_PRESS); + } + } else { + for (int i = 0; i < mPointList.size(); i++) { + mPointList.get(i).setState(Point.BITMAP_ERROR); + } + isLineState = false; + } + // 错误情况 + } else if (mPointList.size() < 4 && mPointList.size() > 1) { + for (int i = 0; i < mPointList.size(); i++) { + mPointList.get(i).setState(Point.BITMAP_ERROR); + } + isLineState = false; + // 如果只有一个点被点中时为正常情况 + } else if (mPointList.size() == 1) { + for (int i = 0; i < mPointList.size(); i++) { + mPointList.get(i).setState(Point.BITMAP_NORMAL); + } + } + break; + } + // 将mPoint添加到pointList中 + if (isSelect && mPoint != null) { + if (mPoint.getState() == Point.BITMAP_NORMAL) { + mPoint.setState(Point.BITMAP_PRESS); + mPointList.add(mPoint); + } + } + // 每次发生OnTouchEvent()后都刷新View + postInvalidate(); + return true; + } + + /** + * 判断九宫格中的某个点是否被点中了，或者某个点能否被连线 + * + * @param moveX + * @param moveY + * @return + */ + private Point getIsSelectedPoint(float moveX, float moveY) { + Point myPoint = null; + for (int i = 0; i < mPoints.length; i++) { + for (int j = 0; j < mPoints[i].length; j++) { + if (mPoints[i][j].isWith(mPoints[i][j], moveX, moveY, + mPointRadius)) { + myPoint = mPoints[i][j]; + } + } + } + + return myPoint; + } + + /** + * 画线 + * + * @param a 起始点 + * @param b 目的点 + * @param canvas 画布 + */ + private void canvasLine(Point a, Point b, Canvas canvas) { + // Math.sqrt(平方+平方) + float abInstance = (float) Math.sqrt( + (a.getX() - b.getX()) * (a.getX() - b.getX()) + + (a.getY() - b.getY()) * (a.getY() - b.getY()) + ); + canvas.rotate(Point.getDegrees(a, b), a.getX(), a.getY()); + + mMatrix.setScale(abInstance / mLineHeight, 1); + mMatrix.postTranslate(a.getX(), a.getY()); + if (isLineState) { + canvas.drawBitmap(mLinePressed, mMatrix, mPaint); + } else { + canvas.drawBitmap(mLineError, mMatrix, mPaint); + } + + canvas.rotate(-Point.getDegrees(a, b), a.getX(), a.getY()); + } + + /** + * 画点 + * + * @param canvas + */ + private void canvasPoint(Canvas canvas) { + for (int i = 0; i < mPoints.length; i++) { + for (int j = 0; j < mPoints[i].length; j++) { + if (mPoints[i][j]==null) { + //重启view时，new的变量被销毁，其他未被销毁，导致设置一次开启app，第二次进入时 + //isinitpoint 变量已为true，可是点实例未初始化； + initPoint(); + } + if (mPoints[i][j].getState() == Point.BITMAP_NORMAL) { + canvas.drawBitmap(mBitmapNormal, + mPoints[i][j].getX() - mPointRadius, + mPoints[i][j].getY() - mPointRadius, mPaint); + } else if (mPoints[i][j].getState() == Point.BITMAP_PRESS) { + canvas.drawBitmap(mBitmapPressed, + mPoints[i][j].getX() - mPointRadius, + mPoints[i][j].getY() - mPointRadius, mPaint); + } else { + canvas.drawBitmap(mBitmapError, + mPoints[i][j].getX() - mPointRadius, + mPoints[i][j].getY() - mPointRadius, mPaint); + } + } + } + } + + private void minitPoint(){ + /** + * 开始实例化九宫格中点 + */ + mPoints[0][0] = new Point(mScreenWidthOffSet + mScreenWidth / 4, + mScreenHeightOffSet + mScreenHeight / 4); + mPoints[0][1] = new Point(mScreenWidthOffSet + mScreenWidth / 2, + mScreenHeightOffSet + mScreenHeight / 4); + mPoints[0][2] = new Point(mScreenWidthOffSet + mScreenWidth * 3 / 4, + mScreenHeightOffSet + mScreenHeight / 4); + + mPoints[1][0] = new Point(mScreenWidthOffSet + mScreenWidth / 4, + mScreenHeightOffSet + mScreenHeight / 2); + mPoints[1][1] = new Point(mScreenWidthOffSet + mScreenWidth / 2, + mScreenHeightOffSet + mScreenHeight / 2); + mPoints[1][2] = new Point(mScreenWidthOffSet + mScreenWidth * 3 / 4, + mScreenHeightOffSet + mScreenHeight / 2); + + mPoints[2][0] = new Point(mScreenWidthOffSet + mScreenWidth / 4, + mScreenHeightOffSet + mScreenHeight * 3 / 4); + mPoints[2][1] = new Point(mScreenWidthOffSet + mScreenWidth / 2, + mScreenHeightOffSet + mScreenHeight * 3 / 4); + mPoints[2][2] = new Point(mScreenWidthOffSet + mScreenWidth * 3 / 4, + mScreenHeightOffSet + mScreenHeight * 3 / 4); + + + // 设置九宫格中的各个index + int index = 1; + for (int i = 0; i < mPoints.length; i++) { + for (int j = 0; j < mPoints[i].length; j++) { + mPoints[i][j].setIndex(index + ""); + // 在没有任何操作的情况下默認点的状态 + mPoints[i][j].setState(Point.BITMAP_NORMAL); + index++; + } + } + } + + /** + * 实例化九宫格中所有点和所有的资源图片 + */ + private void initPoint() { + // 获取View的宽高 + mScreenWidth = getWidth(); + mScreenHeight = getHeight(); + if (mScreenHeight > mScreenWidth) { + // 获取y轴上的偏移量 + mScreenHeightOffSet = (mScreenHeight - mScreenWidth) / 2; + // 将屏幕高的变量设置成与宽相等，目的是为了new Point(x,y)时方便操作 + mScreenHeight = mScreenWidth; + } else { + // 获取x轴上的偏移量 + mScreenWidthOffSet = (mScreenWidth - mScreenHeight) / 2; + // 将屏幕宽的变量设置成与高相等，目的是为了new Point(x,y)时方便操作 + mScreenWidth = mScreenHeight; + } + + /** + * 实例化所有的资源图片 + */ + mBitmapError = BitmapFactory.decodeResource(getResources(), R.drawable.bitmap_error); + mBitmapNormal = BitmapFactory.decodeResource(getResources(), R.drawable.bitmap_normal); + mBitmapPressed = BitmapFactory.decodeResource(getResources(), R.drawable.bitmap_pressed); + mLineError = BitmapFactory.decodeResource(getResources(), R.drawable.line_error); + mLinePressed = BitmapFactory.decodeResource(getResources(), R.drawable.line_pressed); + + mPointRadius = mBitmapNormal.getWidth() / 2; + mLineHeight = mLinePressed.getHeight(); + + /** + * 开始实例化九宫格中点 + */ + mPoints[0][0] = new Point(mScreenWidthOffSet + mScreenWidth / 4, + mScreenHeightOffSet + mScreenHeight / 4); + mPoints[0][1] = new Point(mScreenWidthOffSet + mScreenWidth / 2, + mScreenHeightOffSet + mScreenHeight / 4); + mPoints[0][2] = new Point(mScreenWidthOffSet + mScreenWidth * 3 / 4, + mScreenHeightOffSet + mScreenHeight / 4); + + mPoints[1][0] = new Point(mScreenWidthOffSet + mScreenWidth / 4, + mScreenHeightOffSet + mScreenHeight / 2); + mPoints[1][1] = new Point(mScreenWidthOffSet + mScreenWidth / 2, + mScreenHeightOffSet + mScreenHeight / 2); + mPoints[1][2] = new Point(mScreenWidthOffSet + mScreenWidth * 3 / 4, + mScreenHeightOffSet + mScreenHeight / 2); + + mPoints[2][0] = new Point(mScreenWidthOffSet + mScreenWidth / 4, + mScreenHeightOffSet + mScreenHeight * 3 / 4); + mPoints[2][1] = new Point(mScreenWidthOffSet + mScreenWidth / 2, + mScreenHeightOffSet + mScreenHeight * 3 / 4); + mPoints[2][2] = new Point(mScreenWidthOffSet + mScreenWidth * 3 / 4, + mScreenHeightOffSet + mScreenHeight * 3 / 4); + + + // 设置九宫格中的各个index + int index = 1; + for (int i = 0; i < mPoints.length; i++) { + for (int j = 0; j < mPoints[i].length; j++) { + mPoints[i][j].setIndex(index + ""); + // 在没有任何操作的情况下默認点的状态 + mPoints[i][j].setState(Point.BITMAP_NORMAL); + index++; + } + } + + // 将isInitPoint设置为true + isInitPoint = true; + } + + public interface OnLockListener { + public void getStringPassword(String password); + + public boolean isPassword(); + } + + + public void setLockListener(OnLockListener listener) { + this.mListener = listener; + } + +} + diff --git a/src/java/net/micode/notes/ui/NoteEditActivity.java b/src/java/net/micode/notes/ui/NoteEditActivity.java index 821ddc26..5f1658ab 100644 --- a/src/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/java/net/micode/notes/ui/NoteEditActivity.java @@ -523,6 +523,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, } else { menu.findItem(R.id.menu_delete_remind).setVisible(false); } + //如果一设置密码，显示删除密码选项，否则，显示设置密码选项 + if (mWorkingNote.hasPasscode()) { + menu.findItem(R.id.menu_set_passcode).setVisible(false); + } else { + menu.findItem(R.id.menu_delete_passcode).setVisible(false); + } return true; } @@ -534,15 +540,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, break; case R.id.menu_set_top: mWorkingNote.setTop((mWorkingNote.getTopId())==1 ? "0" : "1"); - finish(); break; case R.id.menu_cancel_top: mWorkingNote.setTop((mWorkingNote.getTopId())==0 ? "1" : "0"); - finish(); break; case R.id.menu_set_star: mWorkingNote.setStar(mWorkingNote.getStarId()==1? "0" : "1"); - finish(); + break; + //设置密码 + case R.id.menu_set_passcode: + setPasscode(); + break; + //删除密码 + case R.id.menu_delete_passcode: + deletePasscode(); break; case R.id.menu_delete: AlertDialog.Builder builder = new AlertDialog.Builder(this); @@ -658,9 +669,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, * User could set clock to an unsaved note, so before setting the * alert clock, we should save the note first */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } + saveNote(); if (mWorkingNote.getNoteId() > 0) { showTopHeader(); } else { @@ -679,9 +688,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, * User could set clock to an unsaved note, so before setting the * alert clock, we should save the note first */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } + saveNote(); } public void onClockAlertChanged(long date, boolean set) { @@ -893,6 +900,29 @@ public class NoteEditActivity extends Activity implements OnClickListener, return saved; } + /** + * 弹出设置密码界面 + */ + private void setPasscode() { + //确保笔记已写入数据库 + saveNote(); + //初始化一个新的意图，用以跳转至设置密码界面 + Intent intent = new Intent(this,SetLockActivity.class); + //给意图传入当前便签的id参数，便于从设置密码活动中跳转回编辑便签活动 + intent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); + startActivity(intent); + finish(); + } + + /** + * 删除便签密码 + */ + private void deletePasscode() { + mWorkingNote.setPasscode(""); + saveNote(); + Toast.makeText(NoteEditActivity.this,R.string.note_passcode_deleted,Toast.LENGTH_SHORT).show(); + } + private void sendToDesktop() { /** * Before send message to home, we should make sure that current diff --git a/src/java/net/micode/notes/ui/NoteItemData.java b/src/java/net/micode/notes/ui/NoteItemData.java index a9a90702..ac063721 100644 --- a/src/java/net/micode/notes/ui/NoteItemData.java +++ b/src/java/net/micode/notes/ui/NoteItemData.java @@ -42,6 +42,7 @@ public class NoteItemData { NoteColumns.WIDGET_TYPE, NoteColumns.TOP, NoteColumns.STAR, + NoteColumns.PASSCODE, }; private static final int ID_COLUMN = 0; @@ -58,6 +59,7 @@ public class NoteItemData { private static final int WIDGET_TYPE_COLUMN = 11; private static final int TOP_ID_COLUMN = 12; private static final int STAR_ID_COLUMN = 13; + private static final int PASSCODE_COLUMN = 14; private long mId; private long mAlertDate; @@ -75,6 +77,7 @@ public class NoteItemData { private String mPhoneNumber; private String mTop; private String mStar; + private String mPasscode; private boolean mIsLastItem; private boolean mIsFirstItem; @@ -99,6 +102,7 @@ public class NoteItemData { mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); mTop = cursor.getString(TOP_ID_COLUMN); mStar = cursor.getString(STAR_ID_COLUMN); + mPasscode = cursor.getString(PASSCODE_COLUMN); mPhoneNumber = ""; if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { @@ -186,6 +190,8 @@ public class NoteItemData { return mId; } + public boolean hasLock() { return !mPasscode.equals(""); } + public long getAlertDate() { return mAlertDate; } diff --git a/src/java/net/micode/notes/ui/NotesListItem.java b/src/java/net/micode/notes/ui/NotesListItem.java index f4691cb4..ea55907c 100644 --- a/src/java/net/micode/notes/ui/NotesListItem.java +++ b/src/java/net/micode/notes/ui/NotesListItem.java @@ -39,6 +39,7 @@ public class NotesListItem extends LinearLayout { private CheckBox mCheckBox; private ImageView mTop; private ImageView mStar; + private ImageView mLock; public NotesListItem(Context context) { super(context); @@ -50,6 +51,7 @@ public class NotesListItem extends LinearLayout { mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); mTop = (ImageView) findViewById(R.id.iv_top_icon); mStar =(ImageView) findViewById(R.id.iv_star_icon); + mLock = (ImageView) findViewById(R.id.iv_lock); } public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { @@ -107,6 +109,14 @@ public class NotesListItem extends LinearLayout { } else{ mStar.setVisibility(View.GONE); } + 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())); diff --git a/src/java/net/micode/notes/ui/SetLockActivity.java b/src/java/net/micode/notes/ui/SetLockActivity.java new file mode 100644 index 00000000..a45109f7 --- /dev/null +++ b/src/java/net/micode/notes/ui/SetLockActivity.java @@ -0,0 +1,95 @@ +package net.micode.notes.ui; + + +import android.content.Intent; +import android.os.Bundle; +import androidx.appcompat.app.AppCompatActivity; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; + +import net.micode.notes.model.WorkingNote; +import net.micode.notes.R; +import net.micode.notes.ui.LockPatternView; + +public class SetLockActivity extends AppCompatActivity { + + private TextView mTitleTv; + private LockPatternView mLockPatternView; + // private LinearLayout mBottomLayout; + private Button mClearBtn; +// private Button mConfirmBtn; + + private String mPassword; + /** + * 是否是第一次输入密码 + */ + private boolean isFirst = true; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_set_lock); + + initViews(); + initEvents(); + } + + private void initEvents() { + mLockPatternView.setLockListener(new LockPatternView.OnLockListener() { + @Override + public void getStringPassword(String password) { + if (isFirst) { + mPassword = password; + mTitleTv.setText("再次输入手势密码"); + isFirst = false; + mClearBtn.setVisibility(View.VISIBLE); + } else { + if (password.equals(mPassword)) { + Intent pre = getIntent(); + //将密码写入数据库 + long noteId = pre.getLongExtra(Intent.EXTRA_UID, 0); + WorkingNote mWorkingNote = WorkingNote.load(SetLockActivity.this,noteId); + mWorkingNote.setPasscode(password); + boolean saved = mWorkingNote.saveNote();//保存便签 + Intent intent = new Intent(SetLockActivity.this, NoteEditActivity.class); + intent.setAction(Intent.ACTION_VIEW); + intent.putExtra("lock",0); + intent.putExtra(Intent.EXTRA_UID, noteId); + startActivity(intent); + SetLockActivity.this.finish(); + }else { + Toast.makeText(SetLockActivity.this,"两次密码不一致，请重新设置",Toast.LENGTH_SHORT).show(); + mPassword = ""; + mTitleTv.setText("设置手势密码"); + isFirst = true; + mClearBtn.setVisibility(View.GONE); + } + } + } + + @Override + public boolean isPassword() { + return false; + } + }); + + mClearBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mPassword = ""; + isFirst = true; + mClearBtn.setVisibility(View.GONE); + } + }); + + } + + + private void initViews() { + mTitleTv = (TextView) findViewById(R.id.tv_activity_set_lock_title); + mLockPatternView = (LockPatternView) findViewById(R.id.lockView); + mClearBtn = (Button) findViewById(R.id.btn_password_clear); + } +} diff --git a/src/java/net/micode/notes/ui/UnlockActivity.java b/src/java/net/micode/notes/ui/UnlockActivity.java new file mode 100644 index 00000000..4ff18475 --- /dev/null +++ b/src/java/net/micode/notes/ui/UnlockActivity.java @@ -0,0 +1,56 @@ +package net.micode.notes.ui; + + +import android.content.Intent; +import android.os.Bundle; +import androidx.appcompat.app.AppCompatActivity; +import android.widget.Toast; + +import net.micode.notes.model.WorkingNote; +import net.micode.notes.R; +import net.micode.notes.ui.LockPatternView; + +public class UnlockActivity extends AppCompatActivity { + + private LockPatternView mLockPatternView; + private String mPasswordStr; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_lock); + + mLockPatternView = (LockPatternView) findViewById(R.id.lockView); + Intent pre = getIntent(); + final Long noteId = pre.getLongExtra(Intent.EXTRA_UID, 0); + + mLockPatternView.setLockListener(new LockPatternView.OnLockListener() { + WorkingNote mWorkingNote = WorkingNote.load(UnlockActivity.this,noteId); + String password = mWorkingNote.getPasscode(); + @Override + public void getStringPassword(String password) { + mPasswordStr = password; + } + + @Override + public boolean isPassword() { + if (mPasswordStr.equals(password)) { + Toast.makeText(UnlockActivity.this, "密码正确", Toast.LENGTH_SHORT).show(); + Intent intent = new Intent(UnlockActivity.this, NoteEditActivity.class); + intent.setAction(Intent.ACTION_VIEW); + intent.putExtra("lock",0); + intent.putExtra(Intent.EXTRA_UID, noteId); + startActivity(intent); + UnlockActivity.this.finish(); + //TODO comment or not + //return true; + } else { + Toast.makeText(UnlockActivity.this, "密码不正确", Toast.LENGTH_SHORT).show(); + } + return false; + } + }); + + } + +} diff --git a/src/res/color/primary_text_dark.xml b/src/res/color/primary_text_dark.xml index 7c854599..8ad98e31 100644 --- a/src/res/color/primary_text_dark.xml +++ b/src/res/color/primary_text_dark.xml @@ -1,4 +1,4 @@ - + }Q+yMak6Lbkf5@ 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 J1LEIC{ueHO9oGN= literal 0 HcmV?d00001 diff --git a/src/res/drawable-hdpi/star.png b/src/res/drawable-hdpi/star.png new file mode 100644 index 0000000000000000000000000000000000000000..f72b66999ebbb43b3556906471c3b30e28050a0b GIT binary patch literal 1221 zcmV;$1UmbPP)Px(e@R3^RCr$PnoWosWf;f*&t&J#_9TcxshdgYX1kN!7JH~)px9MG1wRU6JrqT~ z$sY7ly|}cOp45vdNDmgOAnm~-DuO6T!A}UTLd>MQWwVnCu8X%8nn`9J32bCtlFU1K z-BotYI^fp7 zNNN)k1>j`GB`{L9>peAc04mnx!;IjYmT?30WKvs@*akS3xB%ez*5p4=Y6}tpP|8d^ zkRs#q_O%a)o|s#&e;M~tNCZH|66YCseuvpawjg!@l_~RXHt6S0llEaeGVk8}HqI@G zAAlv!G4Ns+ld*3>tN=z>{o_^bNtXmKpfGb&12pE6J zOqRh%3T~q)qgBTX`gsirlGbb1st4ly;78zezdUw zh&cVWkBheJJ=c$^C^5SZpq!h`Q4p*}Y3jc%V9L+b>R0=Tm5tdo0Hrwy^M;sa#_K)q z{hoa?aGn`&ZKS-_g(_~!nu?-R2C#C+o~fqEd4v5tGvxtH18Du610bR_(@o2aCK1*M zTm_73z+5H5D*Lot__KaRrG^xMtNU?_*EI7fqFJAD$N&y9a0ozFrMSLW{u`hwfE5t^ z7BH4guf9C<7dFFcbOo?tiMar{$iRG9l0kl-fRX_mpK-m8-$8nAz_3FIGv69q=n)uJ z2r}lS0JKEI20_-mG=O1(5XF2X0K)(ws`=KBILh!FZU-#36kf}mnv3BVvg zP&Ka%AV~;1%xeLV1O#2?wE>6|f==^V0ko1iR(ccQ+jjHeh`}2Lx3O1OjnHQS*+Q*f zfTXUAx~yJBcl~xx94VrqlA|4~4Zupyyw?xtM;%Rt<_K`7ea-tlR3{rofJ#Oj zW5OlXW}?J%5G)j~HNT4z(@CoZK-m(f2{;w8nIAyL68p`7h)#j%Xry@NSL|BjgGezQ z#99D2miQRJ3CU)PM6@)!UjJ&lzC1N?Gztg?zgut{uS(YJD$@d>l9jpvibOawyYBTo zDo%FtAq4)C#71bj36udaU^tf8>~RAWnek4c=6w=nT23zg82sRkZXjAW!3DRm?=%oZ z$-7gl44{%R?_#1~Iy6xP^ZRzKaZaT{CnKH)__aEY5zG&^^#EEv&v!0F4Mk00000NkvXXu0mjf3_C3K literal 0 HcmV?d00001 diff --git a/src/res/drawable/settings_launcher_background.xml b/src/res/drawable/settings_launcher_background.xml new file mode 100644 index 00000000..ca3826a4 --- /dev/null +++ b/src/res/drawable/settings_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/layout/activity_lock.xml b/src/res/layout/activity_lock.xml new file mode 100644 index 00000000..f26cd81e --- /dev/null +++ b/src/res/layout/activity_lock.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/src/res/layout/activity_set_lock.xml b/src/res/layout/activity_set_lock.xml new file mode 100644 index 00000000..2d5f203f --- /dev/null +++ b/src/res/layout/activity_set_lock.xml @@ -0,0 +1,32 @@ + + + + + + + + +