diff --git a/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/LockPatternView.java b/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/LockPatternView.java
deleted file mode 100644
index e0524ad..0000000
--- a/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/LockPatternView.java
+++ /dev/null
@@ -1,399 +0,0 @@
-package com.example.administrator.myapplication.widget.patternlock;
-
-import android.app.Activity;
-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.support.design.widget.Snackbar;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.Display;
-import android.view.MotionEvent;
-import android.view.View;
-
-import com.example.administrator.myapplication.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class LockPatternView extends View {
-    //判断线的状态
-    private  boolean isLineState = true;
-    //判断点是否被实例化了
-    private  boolean isInitPoint = false;//不能被定义为static，否则很可能导致mPoints内存泄漏
-    //判断手指是否离开屏幕
-    private  boolean isFinish = false;
-    //判断手指点击屏幕时是否选中了九宫格中的点
-    private  boolean isSelect = false;
-    // 创建MyPoint的数组
-    private Point[][] mPoints;
-    // 声明屏幕的宽和高
-    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;
-    // 声明资源图片
-    private Bitmap mBitmapNormal;
-    private Bitmap mBitmapPressed;
-    private Bitmap mBitmapError;
-    private Bitmap mLinePressed;
-    private Bitmap mLineError;
-    // 创建一个矩阵
-    private Matrix mMatrix = new Matrix();
-    // 创建MyPoint的列表
-    private List<Point> mPointList = new ArrayList<Point>();
-    // 实例化鼠标点
-    private Point mMousePoint = new Point();
-    // 用获取从activity中传过来的密码字符串
-    private String mPassword = "";
-
-    private Context mContext;
-    private OnLockListener mListener;
-    private Activity activity;
-
-    public LockPatternView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mContext = context;
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mPoints = new Point[3][3];
-    }
-
-    public LockPatternView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mPoints = new Point[3][3];
-    }
-
-    public LockPatternView(Context context) {
-        super(context);
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mPoints = new Point[3][3];
-    }
-
-    /**
-     * 画点和画线
-     */
-    @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);
-            }
-        }
-        if(isFinish)
-        {
-
-            try {
-                Thread.sleep(700);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            changePointToNormal();
-            postInvalidate();
-        }
-    }
-
-
-    /**
-     * @author htq
-     */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-       //
-        Display d=activity.getWindowManager().getDefaultDisplay();
-        setMeasuredDimension(d.getWidth(),d.getWidth());
-    }
-
-
-    /**
-     * 手指点击手机屏幕
-     */
-    @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();
-                changePointToNormal();
-                // 判断是否点中了九宫格中的点
-                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();
-                    }
-                    Log.i("password",mPassword);
-                    //将连线后得到的密码传给activity
-                    mListener.getStringPassword(mPassword);
-                    mPassword = "";
-                    //经过activity判断传过来是否正确
-                    if (mListener.isPassword()) {
-                        for (int i = 0; i < mPointList.size(); i++) {
-                            mPointList.get(i).setState(com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_PRESS);
-
-                        }
-                        isLineState = true;
-                    } else {
-                        for (int i = 0; i < mPointList.size(); i++) {
-                            mPointList.get(i).setState(com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_ERROR);
-
-                        }
-                        Log.i("correct","is not correct");
-                        isLineState = false;
-                    }
-                    // 错误情况
-                } else if (mPointList.size() < 4 && mPointList.size() > 1) {
-                    for (int i = 0; i < mPointList.size(); i++) {
-                        mPointList.get(i).setState(com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_ERROR);
-                        Snackbar.make(this,"为了您的App安全，手势至少得包含4个点",Snackbar.LENGTH_LONG).show();
-                    }
-                    isLineState = false;
-                    // 如果只有一个点被点中时为普通情况
-                } else if (mPointList.size() == 1) {
-                    for (int i = 0; i < mPointList.size(); i++) {
-                        mPointList.get(i).setState(com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_NORMAL);
-                    }
-                }
-                break;
-
-        }
-        // 将mPoint添加到pointList中
-        if (isSelect && mPoint != null) {
-            if (mPoint.getState() == com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_NORMAL) {
-                mPoint.setState(com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_PRESS);
-                mPointList.add(mPoint);
-            }
-        }
-//        Log.i("draw","draw -----");
-        // 每次发生OnTouchEvent()后都刷新View
-        postInvalidate();
-        return true;
-    }
-
-    /**
-     * @author htq
-     */
-    private void changePointToNormal()
-    {
-        // 每次点击时就会将pointList中元素设置转化成普通状态
-        for (int i = 0; i < mPointList.size(); i++) {
-            mPointList.get(i).setState(com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_NORMAL);
-        }
-        // 将pointList中的元素清除掉
-        mPointList.clear();
-    }
-
-    /**
-     * 判断九宫格中的某个点是否被点中了，或者某个点能否被连线
-     *
-     * @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(com.example.administrator.myapplication.widget.patternlock.RotateDegrees.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(-com.example.administrator.myapplication.widget.patternlock.RotateDegrees.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].getState() == com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_NORMAL) {
-                    canvas.drawBitmap(mBitmapNormal,
-                            mPoints[i][j].getX() - mPointRadius,
-                            mPoints[i][j].getY() - mPointRadius, mPaint);
-                } else if (mPoints[i][j].getState() == com.example.administrator.myapplication.widget.patternlock.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 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(com.example.administrator.myapplication.widget.patternlock.Point.BITMAP_NORMAL);
-                index++;
-            }
-        }
-
-        // 将isInitPoint设置为true
-        isInitPoint = true;
-    }
-
-    public interface OnLockListener {
-        public void getStringPassword(String password);
-
-
-  //      public void setErrorMsg(String msg);
-   //     public void setSuccessMsg(String msg);
-        public boolean isPassword();
-    }
-
-
-    public void setLockListener(OnLockListener listener) {
-        this.mListener = listener;
-    }
-   public void setActivityContext(Activity aty){this.activity=aty;}
-}
diff --git a/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/Point.java b/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/Point.java
deleted file mode 100644
index ecd4d35..0000000
--- a/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/Point.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.example.administrator.myapplication.widget.patternlock;
-
-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;
-    }
-
-}
diff --git a/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/RotateDegrees.java b/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/RotateDegrees.java
deleted file mode 100644
index ea087b2..0000000
--- a/src/MyApplication/app/src/main/java/com/example/administrator/myapplication/widget/patternlock/RotateDegrees.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.example.administrator.myapplication.widget.patternlock;
-
-public class RotateDegrees {
-
-    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;
-    }
-
-}