From 56dfd8464312226b25f14c090e5c13855fd73229 Mon Sep 17 00:00:00 2001 From: lizhanwei <Dana_Lee1016@126.com> Date: 星期五, 10 四月 2020 09:44:12 +0800 Subject: [PATCH] 删除无用代码 --- app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 3 - app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0201.java | 1 app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt | 2 app/src/main/java/safeluck/drive/evaluation/bean/DeviceWorkMCU.java | 12 ++++++ app/src/main/java/safeluck/drive/evaluation/bean/ExamMap.java | 63 ------------------------------- app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 4 +- 6 files changed, 16 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt index 96efc17..dd422ce 100644 --- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt +++ b/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() diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/DeviceWorkMCU.java b/app/src/main/java/safeluck/drive/evaluation/bean/DeviceWorkMCU.java index 930ce9d..d5a4d82 100644 --- a/app/src/main/java/safeluck/drive/evaluation/bean/DeviceWorkMCU.java +++ b/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; diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamMap.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamMap.java index fe99656..cee9c20 100644 --- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamMap.java +++ b/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) + -// '}'; -// } - } \ No newline at end of file diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java index cbae843..892e469 100644 --- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java +++ b/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(){ diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java index eb95882..03fc017 100644 --- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java +++ b/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; } diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0201.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0201.java index 0e483fd..7bc2df5 100644 --- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0201.java +++ b/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; -- Gitblit v1.8.0