lizhanwei
2020-04-10 56dfd8464312226b25f14c090e5c13855fd73229
删除无用代码
6个文件已修改
85 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/DeviceWorkMCU.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamMap.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0201.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
@@ -59,7 +59,7 @@
        }
        MyLog.i(TAG,"查到的考试type="+examType)
        MyLog.i(TAG, "查到的考试type=$examType")
        ExamPlatformData.getInstance().examType = examType
        var rtk =  WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao._getRtkConfig()
app/src/main/java/safeluck/drive/evaluation/bean/DeviceWorkMCU.java
@@ -1,5 +1,17 @@
package safeluck.drive.evaluation.bean;
/**
 * @ProjectName: DriveJudge
 * @Package: safeluck.drive.evaluation.bean
 * @ClassName: faf
 * @Description: java类作用描述
 * @Author: 李占伟
 * @CreateDate: 2020-04-10 09:37
 * @UpdateUser: 更新者
 * @UpdateDate: 2020-04-10 09:37
 * @UpdateRemark: 更新说明
 * @Version: 1.0
 */
public class DeviceWorkMCU {
    public int event;
    public int timeout;
app/src/main/java/safeluck/drive/evaluation/bean/ExamMap.java
@@ -94,67 +94,4 @@
        }
    }
//    /**
//     * id : 863
//     * item : 1
//     * point : [{"x-y":[-11.9669,28.013,-11.5114,27.137,-10.8069,27.5039,-10.2969,26.4212,-9.2102,26.8894,-9.6513,28.0027,-8.9758,28.3797,-9.5057,29.3232]},{"x-y":[-11.9669,28.013,-11.5114,27.137,-10.8069,27.5039,-10.2969,26.4212,-9.2102,26.8894,-9.6513,28.0027,-8.9758,28.3797,-9.5057,29.3232]}]
//     */
//
//    private int id;
//    private int item;
//    private List<PointBean> point;
//
//    public int getId() {
//        return id;
//    }
//
//    public void setId(int id) {
//        this.id = id;
//    }
//
//    public int getItem() {
//        return item;
//    }
//
//    public void setItem(int item) {
//        this.item = item;
//    }
//
//    public List<PointBean> getPoint() {
//        return point;
//    }
//
//    public void setPoint(List<PointBean> point) {
//        this.point = point;
//    }
//
//    public static class PointBean {
//        @SerializedName("x-y")
//        private List<Double> xy;
//
//        public List<Double> getXy() {
//            return xy;
//        }
//
//        public void setXy(List<Double> xy) {
//            this.xy = xy;
//        }
//
//        @Override
//        public String toString() {
//            return "PointBean{" +
//                    "xy=" + FileUtil.ListToString(xy) +
//                    '}';
//        }
//    }
//
//    @Override
//    public String toString() {
//        return "ExamMap{" +
//                "id=" + id +
//                ", item=" + item +
//                ", point=" + FileUtil.ListToString(point) +
//                '}';
//    }
}
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -130,7 +130,6 @@
    private String mapPath;//绝对路径包含文件名的path
    private String roadmapPath;//绝对路径包含文件名的path
    private String carPath;//绝对路径包含文件名的path
    private StringBuffer stringBuffer;
    private int rtkPort = 12125;
    private String rtkIP = "47.93.80.84";
    public final int MAX_SCORE_DUCT = 20;
@@ -141,7 +140,7 @@
    private ExamPlatformData() {
        stringBuffer = new StringBuffer();
    }
    public String getPlatformIP(){
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -149,9 +149,9 @@
        scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
            @Override
            public void run() {
                Log.i(TAG,"1s到");
//                Log.i(TAG,"1s到");
                if (lastcount==count){
                    Log.i(TAG,"已经没在发消息了");
//                    Log.i(TAG,"已经没在发消息了");
                    leftDistance = 0.0;
                    rightDistance = 0.0;
                }
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0201.java
@@ -1,6 +1,5 @@
package safeluck.drive.evaluation.platformMessage;
import androidx.annotation.IntegerRes;
import com.safeluck.aykj.annotation.Ascii;
import com.safeluck.aykj.annotation.Int8;