Merge branch 'master' of https://gitee.com/endian11/DriveJudge

fctom1215

2020-02-14 806ed6836b84fbea87d19a0cb4414e120dd9c049

 app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java

@@ -209,9 +209,9 @@
        if (canvas2 == null || bmp == null) {
            return;
        }
        _mActivity.runOnUiThread(new Runnable() {
            @Override
            public void run() {
//        _mActivity.runOnUiThread(new Runnable() {
//            @Override
//            public void run() {
                double base_x = 100, base_y = 100;
                double max_x = 0, min_x = 0, max_y = 0, min_y = 0;

@@ -331,10 +331,13 @@

                // 提交画布
                Canvas canvas = holder.lockCanvas();
                canvas.drawBitmap(bmp, 0, 0, paint);
                holder.unlockCanvasAndPost(canvas);
            }
        });
                if (canvas != null){

                    canvas.drawBitmap(bmp, 0, 0, paint);
                    holder.unlockCanvasAndPost(canvas);
                }
//            }
//        });
    }

    public void CCL(final int c, final int who) {