坐标

yy1717

2020-11-24 215ea57c59e1b6b803acef2fa0d66b22c6f3b55f

坐标

 app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatus.java

@@ -1,5 +1,6 @@
package safeluck.drive.evaluation.DB.appstatusdb;

import androidx.annotation.NonNull;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
@Entity(tableName = "app_status")
@@ -94,6 +95,8 @@
                ", rtk_connect_status=" + rtk_connect_status +
                ", id=" + id +
                ", work_platform=" + work_platform +
                ", sat_num=" + sat_num +
                ", qf=" + qf +
                ", default_observe1=" + default_observe1 +
                ", default_boserve2=" + default_boserve2 +
                '}';

 app/src/main/java/safeluck/drive/evaluation/MainActivity.java

@@ -73,7 +73,7 @@
    private RTKConfig mRTKConfig;//RTK配置信息
    private ImageView iv_rtk_status;
    private Gson gson = new Gson();
    String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
    String[] PERMISSIONS = new String[]{ Manifest.permission.ACCESS_FINE_LOCATION};
    RTKConfigViewModel rtkConfigViewModel;
    public ExamPlatformModel examPlatformModel;

@@ -224,7 +224,7 @@
        mPermissionsManager = new PermissionManager(this) {
            @Override
            public void authorized(int requestCode) {

                Log.d(TAG, "requestCode = " + requestCode);
            }

            @Override
@@ -243,7 +243,7 @@

            @Override
            public void ignore() {

                Log.d(TAG, "requestCode ignore");
            }
        };

@@ -272,6 +272,7 @@
    @Override
    protected void onResume() {
        super.onResume();
        Log.i(TAG,"mPermissionManager check");
        mPermissionsManager.checkPermissions(PERMISSIONS_REQUEST_CODE, PERMISSIONS);
    }

@@ -280,6 +281,7 @@
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        mPermissionsManager.recheckPermissions(PERMISSIONS_REQUEST_CODE, permissions, grantResults);
    }

    private boolean listContainsSameValue(List<Integer> indexs) {
        for (int i = 0; i < indexs.size(); i++) {
            //可以默认是0  0不判断是否有相同的index

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

@@ -126,7 +126,7 @@
            sendMapInfo();
            sendVechileInfo();
            sendRouteExam();
            DataInitKt.MCUUpgrade(getApplicationContext());
//            DataInitKt.MCUUpgrade(getApplicationContext());
            DataInitKt.sendExamLights(getApplicationContext());
            DataInitKt.sendRtkConfig(getApplicationContext());
//            DataInitKt.sendSignalConfigToRemote(getApplicationContext());
@@ -657,8 +657,8 @@
    }

    private String last0206Str="";
    private int lastSatNum= 0;
    private int lastQf = 0;
    private int lastSatNum= -1;
    private int lastQf = -1;

    private boolean lastSatEqualNow(int satNum) {
        if (lastSatNum == satNum){

 app/src/main/java/safeluck/drive/evaluation/bean/REM4.java

New file
@@ -0,0 +1,4 @@
package safeluck.drive.evaluation.bean;

public class REM4 {
}

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

@@ -1184,8 +1184,24 @@
                    }

                    canvas2.drawCircle((float) (base_x + (map[points.get(y)][0] - min_x) * scale_x), (float) (base_y + (map[points.get(y)][1] - min_x) * scale_y), 2.5f, paint);


                }
            }

            paint.setColor(Color.WHITE);

            PointF tp = ConvertScreen(428909.046, 3291970.692, yaw, mainPoint);
            canvas2.drawCircle((float) (base_x + (tp.getX() - min_x) * scale_x), (float) (base_y + (tp.getY() - min_y) * scale_y), 5.0f, paint);
            tp = ConvertScreen(428864.169, 3292181.902, yaw, mainPoint);
            canvas2.drawCircle((float) (base_x + (tp.getX() - min_x) * scale_x), (float) (base_y + (tp.getY() - min_y) * scale_y), 5.0f, paint);
            tp = ConvertScreen(428507.796, 3292262.818, yaw, mainPoint);
            canvas2.drawCircle((float) (base_x + (tp.getX() - min_x) * scale_x), (float) (base_y + (tp.getY() - min_y) * scale_y), 5.0f, paint);
            tp = ConvertScreen(428041.147, 3292240.051, yaw, mainPoint);
            canvas2.drawCircle((float) (base_x + (tp.getX() - min_x) * scale_x), (float) (base_y + (tp.getY() - min_y) * scale_y), 5.0f, paint);
            tp = ConvertScreen(427961.753, 3292170.694, yaw, mainPoint);
            canvas2.drawCircle((float) (base_x + (tp.getX() - min_x) * scale_x), (float) (base_y + (tp.getY() - min_y) * scale_y), 5.0f, paint);

        }


@@ -1213,6 +1229,20 @@
    }


    public PointF ConvertScreen(double x, double y, double yaw, PointF mainPoint) {
        PointF oldPoint = new PointF(x, y);
        PointF newPoint = rotatePoint(oldPoint, mainPoint, yaw );
        x = newPoint.getX();
        y = newPoint.getY();

        x = x - mainPoint.getX();
        y = y - mainPoint.getY();
        y = -y;

        newPoint = new PointF(x, y);
        return newPoint;
    }

    /**
     * 缩放图片
     * @param bm 要缩放图片

 app/src/main/java/safeluck/drive/evaluation/receiver/ReBootBroadcastReceiver.java

@@ -26,7 +26,7 @@
            deviceWorkMCU.event = 0;
            deviceWorkMCU.timeout = Constant.SHUTDOWN_TIME;
            MyLog.i(TAG,"重启广播");
            AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
//            AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
        }
    }
}

 app/src/main/java/safeluck/drive/evaluation/receiver/ShutdownBroadcastReceiver.java

@@ -23,7 +23,7 @@
            deviceWorkMCU.event = 1;
            deviceWorkMCU.timeout = Constant.SHUTDOWN_TIME;
            MyLog.i(TAG,"关机广播");
            AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
//            AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
        }
    }
}

 app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt

@@ -60,7 +60,7 @@
            val strs = String(datas, Charset.forName("ISO-8859-1"))
            AYSdk.getInstance().sendCmd(Constant.UPGRADE_MCU_CONTENT_FILE, strs)

            FileUtil.deleteFile("", Constant.MCU_FILE_NAME);
//            FileUtil.deleteFile("", Constant.MCU_FILE_NAME);
        } else {

            MyLog.i( "mcu升级文件不存在")