图片定位重命名，历史记录

app/build.gradle

@@ -70,4 +70,5 @@ dependencies {
     implementation 'com.github.sahooz:ImageMapView:1.0.1'
     implementation 'com.github.getActivity:XXPermissions:20.0'
     implementation 'androidx.databinding:databinding-runtime:4.0.0'
+    implementation 'com.github.zrunker:ZImageView:v1.0'
 }

app/src/main/AndroidManifest.xml

@@ -26,7 +26,11 @@
         <activity
             android:name=".HistoryActivity"
             android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
         <meta-data
@@ -58,11 +62,12 @@
         <activity
             android:name=".MainActivity"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ShowImageActivity"
+            android:exported="true">
+
         </activity>
     </application>
 

app/src/main/java/com/cfmlg/mlg/CustomImageView.java

@@ -4,7 +4,11 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
+import android.graphics.Point;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 
 public class CustomImageView extends View {
@@ -36,7 +40,8 @@ public class CustomImageView extends View {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         if (bitmap != null) {
-            canvas.drawBitmap(bitmap, 0, 0, null);
+            Point p = getCenter();
+            canvas.drawBitmap(bitmap, p.x / 2 - bitmap.getWidth() / 2, p.y / 2 - bitmap.getHeight() / 2, null);
         }
     }
 
@@ -45,4 +50,45 @@ public class CustomImageView extends View {
         this.bitmap = bitmap;
         invalidate(); // 重新绘制视图
     }
+
+    int startX, startY, startLeft, startTop, statusHeight;
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+
+        switch (event.getAction())
+        {
+            case MotionEvent.ACTION_DOWN:
+                startX=(int)event.getRawX();
+                startY=(int)event.getRawY();
+                startLeft=(int)(startX-event.getX());
+                startTop= (int)(startY-event.getY())-statusHeight;
+
+                Point p = getCenter();
+                if(startX < p.x / 2 && startY < p.y / 2) {
+                    Video.position = 1;
+                } else if(startX > p.x / 2 && startY < p.y / 2) {
+                    Video.position = 2;
+                } else if(startX < p.x / 2 && startY > p.y / 2) {
+                    Video.position = 4;
+                } else if(startX > p.x / 2 && startY > p.y / 2) {
+                    Video.position = 3;
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                break;
+            case MotionEvent.ACTION_UP:
+                break;
+        }
+        return false;
+    }
+
+    private Point getCenter() {
+        DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
+        Point point = new Point();
+        point.x = displayMetrics.widthPixels;
+        point.y = displayMetrics.heightPixels;
+        Log.e("czb", point.x + " " + point.y);
+        return point;
+    }
 }

app/src/main/java/com/cfmlg/mlg/DateUtils.java

@@ -0,0 +1,293 @@
+package com.cfmlg.mlg;
+
+
+import android.text.TextUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+public class DateUtils {
+    private static final String UNIT_MONTH = "月前";
+    private static final String UNIT_DAY = "天前";
+    private static final String UNIT_HOUR = "小时前";
+    private static final String UNIT_MINUTE = "分钟前";
+
+    public static final String TYPE_CHAR_FORMAT_DAY = "yyyy年MM月dd日HH时mm分ss秒";
+    public static final String TYPE_FULL_COMMON_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    public static final String TYPE_COMMON_FORMAT_DAY = "yyyy-MM-dd";
+    public static final String TYPE_TIME_COMMON_FORMAT = "HH:mm:ss";
+
+    public static final String TYPE_FORMAT_MONTH = "yyyy-MM";
+    public static final String TYPE_MONTHY_DAY = "MM-dd";
+
+
+    public static String formatDate(String oldDateType, String newDateType, String value) {
+        final SimpleDateFormat format = new SimpleDateFormat(oldDateType);
+        Date date = null;
+        try {
+            date = format.parse(value);
+        } catch (ParseException e) {
+            return value;
+        }
+        final SimpleDateFormat newFormat = new SimpleDateFormat(newDateType);
+        return newFormat.format(date);
+    }
+
+    public static String getCharFormatDay() {
+        final SimpleDateFormat format = new SimpleDateFormat(TYPE_CHAR_FORMAT_DAY);
+        Date date = new Date();
+        return format.format(date);
+    }
+
+    public static String getCommonFormatDay() {
+        final SimpleDateFormat format = new SimpleDateFormat(TYPE_COMMON_FORMAT_DAY);
+        Date date = new Date();
+        return format.format(date);
+    }
+
+    public static String getCommonTime() {
+        final SimpleDateFormat format = new SimpleDateFormat(TYPE_TIME_COMMON_FORMAT);
+        Date date = new Date();
+        return format.format(date);
+    }
+
+    /**
+     * 传入时间及格式
+     *
+     * @param format 格式
+     * @param value  时间
+     * @return 特定格式时间
+     */
+    public static String getShowTime(String format, String value) {
+        SimpleDateFormat sf = new SimpleDateFormat(format);
+        try {
+            Date date = sf.parse(value);
+            long targetTime = date.getTime();
+            return getShowTime(targetTime);
+        } catch (ParseException e) {
+            return 1 + UNIT_MINUTE;
+        }
+    }
+
+
+    /**
+     * 传入时间及格式
+     *
+     * @param time long类型时间
+     * @return 特定格式时间
+     */
+    public static String getShowTime(long time) {
+        Date nowDate = new Date();
+        long nowTime = nowDate.getTime();
+        long differTime = nowTime - time;
+        long minute = 1000 * 60;
+        if (differTime <= 0 || differTime < minute) {
+            return 1 + UNIT_MINUTE;
+        }
+
+        long hour = 1000 * 60 * 60;
+        if (differTime < hour) {
+            long showMinute = (differTime / minute) % 60;
+            return (showMinute == 0 ? 1 : showMinute) + UNIT_MINUTE;
+        }
+        long day = 24 * hour;
+        if (differTime < day) {
+            long showHour = (differTime / hour) % 24;
+            return (showHour == 0 ? 1 : showHour) + UNIT_HOUR;
+        }
+        long month = 30 * day;
+        if (differTime < month) {
+            long showDay = (differTime / day) % 30;
+            return (showDay == 0 ? 1 : showDay) + UNIT_DAY;
+        }
+        long year = 12 * month;
+        if (differTime < year) {
+            long showMonth = (differTime / month) % 12;
+            return (showMonth == 0 ? 1 : showMonth) + UNIT_MONTH;
+        }
+        return 12 + UNIT_MONTH;
+    }
+
+    public static long getDateToLong(String format, String date) {
+        SimpleDateFormat sf = new SimpleDateFormat(format);
+        try {
+            Date parse = sf.parse(date);
+            return parse.getTime();
+        } catch (ParseException e) {
+            return new Date().getTime();
+        }
+    }
+
+    public static String getDataByFormat(String format, long data) {
+        SimpleDateFormat sf = new SimpleDateFormat(format);
+        return sf.format(new Date(data));
+    }
+
+    public static int getMonthByDate() {
+        // 获取日期实例
+        Calendar calendar = Calendar.getInstance();
+        // 这里要注意，月份是从0开始。
+        int month = calendar.get(Calendar.MONTH);
+        return month + 1;
+    }
+
+    public static int getYearByDate() {
+        // 获取日期实例
+        Calendar calendar = Calendar.getInstance();
+        // 这里要注意，月份是从0开始。
+        int year = calendar.get(Calendar.YEAR);
+        return year;
+    }
+
+    public static int getMonthByDate(long date) {
+        // 获取日期实例
+        Calendar calendar = Calendar.getInstance();
+        // 将日历设置为指定的时间
+        calendar.setTimeInMillis(date);
+        // 这里要注意，月份是从0开始。
+        int month = calendar.get(Calendar.MONTH);
+        return month + 1;
+    }
+
+    public static int getDayByDate() {
+        // 获取日期实例
+        Calendar calendar = Calendar.getInstance();
+        // 这里要注意，月份是从0开始。
+        int day = calendar.get(Calendar.DAY_OF_MONTH);
+        return day;
+    }
+
+    public static String getPreOrNextMonth(long time, boolean isPre) {
+        Calendar ca = Calendar.getInstance();//得到一个Calendar的实例
+        ca.setTimeInMillis(time);
+        Date now = ca.getTime();
+        if (isPre) {
+            ca.add(Calendar.MONTH, -1); //月份减1
+        } else {
+            ca.add(Calendar.MONTH, +1); //月份减1
+        }
+        Date lastMonth = ca.getTime(); //结果
+        SimpleDateFormat sf = new SimpleDateFormat(TYPE_COMMON_FORMAT_DAY);
+        return sf.format(lastMonth);
+    }
+
+    public static String getPreOrNextMonth(long time, boolean isPre, String formatType) {
+        Calendar ca = Calendar.getInstance();//得到一个Calendar的实例
+        ca.setTimeInMillis(time);
+        Date now = ca.getTime();
+        if (isPre) {
+            ca.add(Calendar.MONTH, -1); //月份减1
+        } else {
+            ca.add(Calendar.MONTH, +1); //月份减1
+        }
+        Date lastMonth = ca.getTime(); //结果
+        SimpleDateFormat sf = new SimpleDateFormat(formatType);
+        return sf.format(lastMonth);
+    }
+
+    public static String getPreOrNextDay(long time, boolean isPre) {
+        Calendar ca = Calendar.getInstance();//得到一个Calendar的实例
+        ca.setTimeInMillis(time);
+        Date now = ca.getTime();
+        if (isPre) {
+            ca.add(Calendar.DATE, -1);
+        } else {
+            ca.add(Calendar.DATE, +1);
+        }
+        Date lastMonth = ca.getTime(); //结果
+        SimpleDateFormat sf = new SimpleDateFormat(TYPE_COMMON_FORMAT_DAY);
+        return sf.format(lastMonth);
+    }
+
+    public static Date getPreOrNextDayToDate(long time, boolean isPre) {
+        Calendar ca = Calendar.getInstance();//得到一个Calendar的实例
+        ca.setTimeInMillis(time);
+        Date now = ca.getTime();
+        if (isPre) {
+            ca.add(Calendar.DATE, -1);
+        } else {
+            ca.add(Calendar.DATE, +1);
+        }
+        Date lastMonth = ca.getTime(); //结果
+        return lastMonth;
+    }
+
+    public static String[] WEEK_DAYS = {"周日", "周一", "周二", "周三", "周四", "周五", "周六"};
+
+    /**
+     * 获取日期是周几
+     *
+     * @param dt 日期
+     * @return 周几的角标
+     */
+    public static int getWeekOfDate(Date dt) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(dt);
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0)
+            w = 0;
+        return w;
+    }
+
+    /**
+     * 获取每月多少天
+     *
+     * @param formatType 日期的格式化
+     * @param date       日期
+     * @return 当月总天数
+     */
+    public static int getDaysByMonth(String formatType, String date) {
+        Calendar c = Calendar.getInstance();
+        if (date == null) {
+            return c.getActualMaximum(Calendar.DAY_OF_MONTH);
+        } else {
+            SimpleDateFormat sf = new SimpleDateFormat(formatType);
+            try {
+                Date d = sf.parse(date);
+                c.setTime(d);
+                return c.getActualMaximum(Calendar.DAY_OF_MONTH);
+            } catch (ParseException e) {
+                return 30;
+            }
+        }
+    }
+
+    public static String convertStringToDateForCST(String currentTimeType, String time) {
+        if (TextUtils.isEmpty(time)) {
+            return null;
+        }
+        try {
+            SimpleDateFormat formatter = new SimpleDateFormat("EEE d MMM yyyy", Locale.ENGLISH);
+            SimpleDateFormat sdt = new SimpleDateFormat(currentTimeType);
+            Date date = sdt.parse(time);
+            return formatter.format(date);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String getNowHour() {
+        String hour = "";
+
+        Date today = new Date();
+        SimpleDateFormat sf = new SimpleDateFormat("HH");
+        hour = sf.format(today);
+
+        return hour;
+    }
+
+    public static String getNowMinute() {
+        String minute = "";
+
+        Date today = new Date();
+        SimpleDateFormat sf = new SimpleDateFormat("mm");
+        minute = sf.format(today);
+
+        return minute;
+    }
+}

app/src/main/java/com/cfmlg/mlg/DrawingView.java

@@ -0,0 +1,262 @@
+package com.cfmlg.mlg;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.annotation.ColorInt;
+
+import java.util.LinkedList;
+
+public class DrawingView extends View {
+    private static final String TAG = "czb";
+    private static final float TOUCH_TOLERANCE = 4;
+    private Bitmap mBitmap;
+    private Bitmap mOriginBitmap;
+    private Canvas mCanvas;
+    private Path mPath;
+    private Paint mBitmapPaint;
+    private Paint mPaint;
+    private boolean mDrawMode;
+    private float mX, mY;
+    private float mProportion = 0;
+    private LinkedList<DrawPath> savePath;
+    private DrawPath mLastDrawPath;
+    private Matrix matrix;
+    private float mPaintBarPenSize;
+    private int mPaintBarPenColor;
+
+    public DrawingView(Context c) {
+        this(c, null);
+    }
+
+    public DrawingView(Context c, AttributeSet attrs) {
+        this(c, attrs, 0);
+    }
+
+    public DrawingView(Context c, AttributeSet attrs, int defStyle) {
+        super(c, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        Log.d(TAG, "init: ");
+        mBitmapPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
+        mDrawMode = false;
+        savePath = new LinkedList<>();
+        matrix = new Matrix();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+
+        if (mBitmap != null) {
+            if ((mBitmap.getHeight() > heightSize) && (mBitmap.getHeight() > mBitmap.getWidth())) {
+                widthSize = heightSize * mBitmap.getWidth() / mBitmap.getHeight();
+            } else if ((mBitmap.getWidth() > widthSize) && (mBitmap.getWidth() > mBitmap.getHeight())) {
+                heightSize = widthSize * mBitmap.getHeight() / mBitmap.getWidth();
+            } else {
+                heightSize = mBitmap.getHeight();
+                widthSize = mBitmap.getWidth();
+            }
+        }
+        Log.d(TAG, "onMeasure: heightSize: " + heightSize + " widthSize: " + widthSize);
+        setMeasuredDimension(widthSize, heightSize);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        if (mBitmap == null) {
+            mBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+        }
+        mCanvas = new Canvas(mBitmap);
+        mCanvas.drawColor(Color.TRANSPARENT);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        // 根据图片尺寸缩放图片，同样只考虑了高大于宽的情况
+        float proportion = (float) canvas.getHeight() / mBitmap.getHeight();
+        if (proportion < 1) {
+            mProportion = proportion;
+            matrix.reset();
+            matrix.postScale(proportion, proportion);
+            matrix.postTranslate((canvas.getWidth() - mBitmap.getWidth() * proportion) / 2, 0);
+            canvas.drawBitmap(mBitmap, matrix, mBitmapPaint);
+        } else {
+            mProportion = 0;
+            canvas.drawBitmap(mBitmap, 0, 0, mBitmapPaint);
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        // 如果你的界面有多个模式，你需要有个变量来判断当前是否可draw
+        if (!mDrawMode) {
+            return false;
+        }
+        float x;
+        float y;
+        if (mProportion != 0) {
+            x = (event.getX()) / mProportion;
+            y = event.getY() / mProportion;
+        } else {
+            x = event.getX();
+            y = event.getY();
+        }
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                // This happens when we undo a path
+                if (mLastDrawPath != null) {
+                    mPaint.setColor(mPaintBarPenColor);
+                    mPaint.setStrokeWidth(mPaintBarPenSize);
+                }
+                mPath = new Path();
+                mPath.reset();
+                mPath.moveTo(x, y);
+                mX = x;
+                mY = y;
+                mCanvas.drawPath(mPath, mPaint);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                float dx = Math.abs(x - mX);
+                float dy = Math.abs(y - mY);
+                if (dx >= TOUCH_TOLERANCE || dy >= TOUCH_TOLERANCE) {
+                    mPath.quadTo(mX, mY, (x + mX) / 2, (y + mY) / 2);
+                    mX = x;
+                    mY = y;
+                }
+                mCanvas.drawPath(mPath, mPaint);
+                break;
+            case MotionEvent.ACTION_UP:
+                mPath.lineTo(mX, mY);
+                mCanvas.drawPath(mPath, mPaint);
+                mLastDrawPath = new DrawPath(mPath, mPaint.getColor(), mPaint.getStrokeWidth());
+                savePath.add(mLastDrawPath);
+                mPath = null;
+                break;
+            default:
+                break;
+        }
+        invalidate();
+        return true;
+    }
+
+    public void initializePen() {
+        mDrawMode = true;
+        mPaint = null;
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setDither(true);
+        mPaint.setFilterBitmap(true);
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setStrokeJoin(Paint.Join.ROUND);
+        mPaint.setStrokeCap(Paint.Cap.ROUND);
+        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
+    }
+
+    @Override
+    public void setBackgroundColor(int color) {
+        mCanvas.drawColor(color);
+        super.setBackgroundColor(color);
+    }
+
+    /**
+     * This method should ONLY be called by clicking paint toolbar(outer class)
+     */
+    public void setPenSize(float size) {
+        mPaintBarPenSize = size;
+        mPaint.setStrokeWidth(size);
+    }
+
+    public float getPenSize() {
+        return mPaint.getStrokeWidth();
+    }
+
+    /**
+     * This method should ONLY be called by clicking paint toolbar(outer class)
+     */
+    public void setPenColor(@ColorInt int color) {
+        mPaintBarPenColor = color;
+        mPaint.setColor(color);
+    }
+
+    public
+    @ColorInt
+    int getPenColor() {
+        return mPaint.getColor();
+    }
+
+    /**
+     * @return 当前画布上的内容
+     */
+    public Bitmap getImageBitmap() {
+        return mBitmap;
+    }
+
+    public void loadImage(Bitmap bitmap) {
+        Log.d(TAG, "loadImage: ");
+        mOriginBitmap = bitmap;
+        mBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+        mCanvas = new Canvas(mBitmap);
+        invalidate();
+    }
+
+    public void undo() {
+        Log.d(TAG, "undo: recall last path");
+        if (savePath != null && savePath.size() > 0) {
+            // 清空画布
+            mCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+            loadImage(mOriginBitmap);
+
+            savePath.removeLast();
+
+            // 将路径保存列表中的路径重绘在画布上 遍历绘制
+            for (DrawPath dp : savePath) {
+                mPaint.setColor(dp.getPaintColor());
+                mPaint.setStrokeWidth(dp.getPaintWidth());
+                mCanvas.drawPath(dp.path, mPaint);
+            }
+            invalidate();
+        }
+    }
+
+    /**
+     * 路径对象
+     */
+    private class DrawPath {
+        Path path;
+        int paintColor;
+        float paintWidth;
+
+        DrawPath(Path path, int paintColor, float paintWidth) {
+            this.path = path;
+            this.paintColor = paintColor;
+            this.paintWidth = paintWidth;
+        }
+
+        int getPaintColor() {
+            return paintColor;
+        }
+
+        float getPaintWidth() {
+            return paintWidth;
+        }
+    }
+}

app/src/main/java/com/cfmlg/mlg/ShowImageActivity.java

@@ -0,0 +1,81 @@
+package com.cfmlg.mlg;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ShowImageActivity extends AppCompatActivity implements View.OnClickListener {
+
+    //private ImageView imageView;
+    private Button save;
+    private Button reset;
+    private Bitmap panel;
+    private Canvas canvas;
+    private Paint paint;
+    private float downX;
+    private float downY;
+    private ImageView mDrawingView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_show_image);
+        initView();
+    }
+
+    private void initView() {
+        mDrawingView = (ImageView) findViewById(R.id.hw);
+        mDrawingView.setImageBitmap(BitmapFactory.decodeFile(getIntent().getStringExtra("imgPath")));
+    }
+
+    private Handler mHandler = new Handler();
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+
+    }
+
+    private void saveMyBitmap(){
+        File f = new File(getIntent().getStringExtra("imgPath"));
+        try {
+            if(!f.exists())
+                f.createNewFile();
+        } catch (IOException e) {
+            Log.e("czb", "e1 ", e);
+            e.printStackTrace();
+        }
+        FileOutputStream fOut = null;
+        try {
+            fOut = new FileOutputStream(f);
+        } catch (Exception e) {
+            Log.e("czb", "e2 ", e);
+            e.printStackTrace();
+        }
+        try {
+            fOut.flush();
+        } catch (IOException e) {
+            Log.e("czb", "e3 ", e);
+            e.printStackTrace();
+        }
+        try {
+            fOut.close();
+        } catch (IOException e) {
+            Log.e("czb", "e4 ", e);
+            e.printStackTrace();
+        }
+    }
+}

app/src/main/java/com/cfmlg/mlg/Video.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.SurfaceTexture;
 import android.media.MediaPlayer;
 import android.media.SoundPool;
@@ -97,6 +98,8 @@ public class Video extends AppCompatActivity {
 
     private native int GetJPGFileData(byte[] in, byte[] data, byte[] name);
 
+    public static int position = 0;
+
     private native int DeleteAllJPG();
 
     private native int GetVersion(byte[] out);
@@ -143,6 +146,8 @@ public class Video extends AppCompatActivity {
         long period1 = 1;
         service.scheduleAtFixedRate(new Task1(), initialDelay1, period1, TimeUnit.SECONDS);
 
+        binding.imv.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.ya));
+
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -152,43 +157,75 @@ public class Video extends AppCompatActivity {
         binding.handleCap.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                handler.postDelayed(new Runnable() {
-                    @Override
+                binding.imv.setVisibility(View.VISIBLE);
+                new Thread() {
                     public void run() {
-                        totalTime--;
-                        countdownTextView.setText(String.valueOf(totalTime));
-                        countdownTextView.setVisibility(View.VISIBLE);
-                        if (totalTime > 0) {
-                            handler.postDelayed(this, 1000);
-                        } else {
-                            totalTime = 4;
-                            countdownTextView.setVisibility(View.GONE);
-                            SoundPool soundPool = new SoundPool.Builder().setMaxStreams(1).build();
-                            int soundId = soundPool.load(Video.this, R.raw.kuaimen, 1); // 加载音频资源
-                            soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
-                                @Override
-                                public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
-                                    soundPool.play(soundId, 1, 1, 1, 0, 1); // 播放音频
-                                }
-                            });
-                            Bitmap bitmap = binding.mSurfaceview.getBitmap(1920, 1080);
-                            saveImageToGallery(getApplicationContext(), bitmap);
+                        while (position == 0) {
                             try {
-                                File file = new File(getSdPath(), System.currentTimeMillis() + ".jpg");
-                                OutputStream outputStream = new FileOutputStream(file);
-
-                                bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
-
-                                outputStream.close();
-                                Toast.makeText(Video.this, "图片已保存到" + getSdPath() + "目录", Toast.LENGTH_SHORT).show();
-                            } catch (FileNotFoundException e) {
-                                throw new RuntimeException(e);
-                            } catch (IOException e) {
+                                Thread.sleep(1000);
+                            } catch (InterruptedException e) {
                                 throw new RuntimeException(e);
                             }
                         }
+
+                        handler.postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                binding.imv.setVisibility(View.GONE);
+                                totalTime--;
+                                countdownTextView.setText(String.valueOf(totalTime));
+                                countdownTextView.setVisibility(View.VISIBLE);
+                                if (totalTime > 0) {
+                                    handler.postDelayed(this, 1000);
+                                } else {
+                                    totalTime = 4;
+                                    countdownTextView.setVisibility(View.GONE);
+                                    SoundPool soundPool = new SoundPool.Builder().setMaxStreams(1).build();
+                                    int soundId = soundPool.load(Video.this, R.raw.kuaimen, 1); // 加载音频资源
+                                    soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
+                                        @Override
+                                        public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
+                                            soundPool.play(soundId, 1, 1, 1, 0, 1); // 播放音频
+                                        }
+                                    });
+                                    Bitmap bitmap = binding.mSurfaceview.getBitmap(1920, 1080);
+                                    saveImageToGallery(getApplicationContext(), bitmap);
+                                    try {
+                                        String name = "1";
+                                        switch (position) {
+                                            case 1:
+                                                name = "左上";
+                                                break;
+                                            case 2:
+                                                name = "右上";
+                                                break;
+                                            case 3:
+                                                name = "左下";
+                                                break;
+                                            case 4:
+                                                name = "右下";
+                                                break;
+                                        }
+                                        File file = new File(getSdPath(), name + "_" + DateUtils.getCharFormatDay() + ".jpg");
+                                        OutputStream outputStream = new FileOutputStream(file);
+
+                                        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
+
+                                        outputStream.close();
+                                        position = 0;
+                                    } catch (FileNotFoundException e) {
+                                        throw new RuntimeException(e);
+                                    } catch (IOException e) {
+                                        throw new RuntimeException(e);
+                                    }
+                                }
+
+                            }
+                        }, 50);
                     }
-                }, 1000);
+                }.start();
+
+
 
             }
         });
@@ -326,6 +363,14 @@ public class Video extends AppCompatActivity {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        binding.imv.setVisibility(View.VISIBLE);
+                        while (position == 0) {
+                            try {
+                                Thread.sleep(1000);
+                            } catch (InterruptedException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }
                         totalTime--;
                         countdownTextView.setText(String.valueOf(totalTime));
                         countdownTextView.setVisibility(View.VISIBLE);
@@ -358,10 +403,12 @@ public class Video extends AppCompatActivity {
                                 throw new RuntimeException(e);
                             }
                         }
+
+                        binding.imv.setVisibility(View.GONE);
+                        position = 0;
                     }
                 }, 1000);
 
-
                 inputStream.close();
                 socket.close();
             }

app/src/main/res/layout/activity_history.xml

@@ -4,60 +4,433 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
+        <variable
+            name="imageUrl1"
+            type="String" />
+
+        <variable
+            name="imageUrl2"
+            type="String" />
+
+        <variable
+            name="imageUrl3"
+            type="String" />
+
+        <variable
+            name="imageUrl4"
+            type="String" />
+
+        <variable
+            name="imageUrl5"
+            type="String" />
+
+        <variable
+            name="imageUrl6"
+            type="String" />
+
+        <variable
+            name="imageUrl7"
+            type="String" />
+
+        <variable
+            name="imageUrl8"
+            type="String" />
+
+        <variable
+            name="imageUrl9"
+            type="String" />
+
+        <variable
+            name="imageUrl10"
+            type="String" />
+
+        <variable
+            name="imageUrl11"
+            type="String" />
+
+        <variable
+            name="imageUrl12"
+            type="String" />
+
+        <variable
+            name="imageUrl13"
+            type="String" />
+
+        <variable
+            name="imageUrl14"
+            type="String" />
+
+        <variable
+            name="imageUrl15"
+            type="String" />
+
+        <variable
+            name="imageUrl16"
+            type="String" />
+
+        <variable
+            name="imageUrl17"
+            type="String" />
+
+        <variable
+            name="imageUrl18"
+            type="String" />
+
+        <variable
+            name="imageUrl19"
+            type="String" />
+
+        <variable
+            name="imageUrl20"
+            type="String" />
+
+        <variable
+            name="imageUrl21"
+            type="String" />
+
+        <variable
+            name="imageUrl22"
+            type="String" />
+
         <variable
-            name="imageUrl"
+            name="imageUrl23"
+            type="String" />
+
+        <variable
+            name="imageUrl24"
             type="String" />
     </data>
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="10dp"
-        tools:context=".HistoryActivity">
+        android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:text="图片"
-            android:textSize="17sp"
-            android:textStyle="bold" />
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:padding="10dp"
+                tools:context=".HistoryActivity">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?android:attr/actionBarSize"
+                    android:gravity="center"
+                    android:titleTextColor="@android:color/black">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="历史记录"
+                        android:textColor="@color/black"
+                        android:textSize="20sp" />
+                </androidx.appcompat.widget.Toolbar>
+
+                <TextView
+                    android:id="@+id/tv1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="图片"
+                    android:textSize="17sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/img1"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl1}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img2"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl2}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img3"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl3}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img4"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl4}"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/img5"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl5}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img6"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl6}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img7"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl7}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img8"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl8}"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/img9"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl9}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img10"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl10}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img11"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl11}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img12"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl12}"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tv2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="视频"
+                    android:textSize="17sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/img13"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl13}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img14"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl14}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img15"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl15}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img16"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl16}"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/img17"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl17}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img18"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl18}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img19"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl19}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img20"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl20}"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/img21"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl21}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img22"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl22}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img23"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl23}"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/img24"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_margin="5dp"
+                        android:background="#000000"
+                        android:src="@{imageUrl24}"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/img1"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_margin="5dp"
-                android:background="#000000"
-                android:src="@{imageUrl}" />
+            android:layout_gravity="bottom">
 
-            <ImageView
-                android:id="@+id/img2"
-                android:layout_width="80dp"
+            <ImageButton
+                android:id="@+id/imgTime"
+                android:layout_width="0dp"
                 android:layout_height="80dp"
-                android:layout_margin="5dp"
-                android:src="@drawable/camera" />
+                android:layout_weight="1"
+                android:scaleType="fitCenter"
+                android:src="@drawable/time" />
 
-            <ImageView
-                android:id="@+id/img3"
-                android:layout_width="80dp"
+            <ImageButton
+                android:id="@+id/imgTeam"
+                android:layout_width="0dp"
                 android:layout_height="80dp"
-                android:layout_margin="5dp"
-                android:src="@drawable/camera" />
-
-            <ImageView
-                android:id="@+id/img4"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_margin="5dp"
-                android:src="@drawable/camera" />
-
+                android:layout_weight="1"
+                android:scaleType="fitCenter"
+                android:src="@drawable/team" />
         </LinearLayout>
-    </LinearLayout>
+    </FrameLayout>
 </layout>

app/src/main/res/layout/activity_show_image.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:id="@+id/hw"/>
+
+</RelativeLayout>

app/src/main/res/layout/activity_video.xml

@@ -27,13 +27,17 @@
         app:srcCompat="@drawable/fan" />
     <com.cfmlg.mlg.CustomImageView
         android:id="@+id/imv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintVertical_bias="0.5"
         android:src="@drawable/ya"
-        android:visibility="visible"
-
-        />
+        android:visibility="gone"
+        tools:ignore="MissingConstraints" />
     <LinearLayout
         android:id="@+id/blakgrond"
         android:layout_width="wrap_content"