From 69b7a12b0cdc7b6d8a5f3aa27d88b0ee962d9900 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 14 四月 2020 15:50:17 +0800
Subject: [PATCH] 平台考试考试协议增加教练员身份证和学员身份证字段；优化场考和路考发送开始考试部分代码
---
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 21 ++++++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 47 +++++++++------
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java | 16 ++++-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 63 +++++++++------------
4 files changed, 86 insertions(+), 61 deletions(-)
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 b586d21..5940779 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -140,6 +140,7 @@
private int rtkPort = 12125;
private String rtkIP = "47.93.80.84";
public final int MAX_SCORE_DUCT = 20;
+ private String coachID;//鏁欑粌鍛樿韩浠借瘉鍙风爜
public static ExamPlatformData getInstance() {
return ourInstance;
@@ -207,7 +208,10 @@
}
-
+ /**
+ * 鑾峰彇瀛﹀憳ID锛堣韩浠借瘉锛�
+ * @return
+ */
public String getID() {
return id;
}
@@ -388,4 +392,19 @@
return roadmapPath;
}
+ /**
+ * 璁剧疆淇濆瓨鏁欑粌鍛樿韩浠借瘉鍙�
+ * @param id
+ */
+ public void setCoachID(String id) {
+ this.coachID = id;
+ }
+
+ /**
+ * 鑾峰彇
+ * @return 鏁欑粌鍛樿韩浠借瘉
+ */
+ public String getCoachID() {
+ return coachID;
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 6574525..e4ee2f4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -484,6 +484,8 @@
ExamPlatformData.getInstance().setId(student.getID());
tv_sex.setText(getString(R.string.sex)+(student.getSex()==2?"濂�":"鐢�"));
tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
+ }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
+ ExamPlatformData.getInstance().setCoachID(student.getID());
}
}
}
@@ -594,8 +596,6 @@
clearArrayListResetTotalScore();
- //TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
- final JKMessage0202 jkMessage0202 = new JKMessage0202();
if (myDialogFragment == null){
myDialogFragment = new MyDialogFragment();
@@ -604,44 +604,12 @@
myDialogFragment.setCallback(new MyDialogFragment.Callback() {
@Override
public void changKao() {
- exam_type = 2;
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.EXAMING_MODE);
- ExamPlatformData.getInstance().setExamType(exam_type);
- examStatusViewModel.updateStartExam(exam_type);
- sendExamJson(1,exam_type);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
-
- Date date = new Date();
- wokViewModel.updateBeginTime(date.getTime());
- jkMessage0202.timeBCD = date;
- ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
-
- jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
-
- jkMessage0202.curr_exam = 0;
- jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
- MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ sendJK0202(2);
}
@Override
public void luKao() {
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.EXAMING_MODE);
- exam_type = 3;
- ExamPlatformData.getInstance().setExamType(exam_type);
- examStatusViewModel.updateStartExam(exam_type);
- sendExamJson(1,exam_type);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
-
- Date date = new Date();
- wokViewModel.updateBeginTime(date.getTime());
- jkMessage0202.timeBCD = date;
- ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
-
- jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
-
- jkMessage0202.curr_exam = 1;
- jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
- MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ sendJK0202(3);
}
});
@@ -685,6 +653,29 @@
}
}
+ private void sendJK0202(int type) {
+
+ final JKMessage0202 jkMessage0202 = new JKMessage0202();
+ exam_type = type;
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.EXAMING_MODE);
+ ExamPlatformData.getInstance().setExamType(exam_type);
+ examStatusViewModel.updateStartExam(exam_type);
+ sendExamJson(1,exam_type);
+ ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
+
+ Date date = new Date();
+ wokViewModel.updateBeginTime(date.getTime());
+ jkMessage0202.timeBCD = date;
+ ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
+ jkMessage0202.stu_id = ExamPlatformData.getInstance().getID();
+ jkMessage0202.coach_id = ExamPlatformData.getInstance().getCoachID();
+ jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
+
+ jkMessage0202.curr_exam = (type-2);// 璺熺Щ鍔ㄧ珯鏈嶅姟瀹氫箟鐨勫満鑰冩槸2 锛屽钩鍙版槸0 锛� 绉诲姩绔欒矾鑰冩槸3 锛屽钩鍙版槸1
+ jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
+ MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ }
+
private void sendExamJson(int i,int type) {
try {
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 9f6846a..a5cef99 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -474,6 +474,8 @@
tv_sex.setText(getString(R.string.sex)+(student.getSex()==2?"濂�":"鐢�"));
tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
+ }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
+ ExamPlatformData.getInstance().setCoachID(student.getID());
}
}
}
@@ -606,30 +608,12 @@
@Override
public void changKao() {
- exam_type = 2;
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//璁剧疆涓鸿缁冩ā寮�
- ExamPlatformData.getInstance().setExamType(exam_type);
- examStatusViewModel.updateStartExam(exam_type);
- sendExamJson(1,exam_type);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
- jkMessage0202.curr_exam = 0;
-
- jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
-
- MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ sendJK0202(2);
}
@Override
public void luKao() {
- exam_type = 3;
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
- ExamPlatformData.getInstance().setExamType(exam_type);
- examStatusViewModel.updateStartExam(exam_type);
- sendExamJson(1,exam_type);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
- jkMessage0202.curr_exam = 1;
- jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
- MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ sendJK0202(3);
@@ -676,6 +660,29 @@
}
}
+ private void sendJK0202(int type) {
+
+ final JKMessage0202 jkMessage0202 = new JKMessage0202();
+ exam_type = type;
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
+ ExamPlatformData.getInstance().setExamType(exam_type);
+ examStatusViewModel.updateStartExam(exam_type);
+ sendExamJson(1,exam_type);
+ ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
+
+ Date date = new Date();
+ wokViewModel.updateBeginTime(date.getTime());
+ jkMessage0202.timeBCD = date;
+ ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
+ jkMessage0202.stu_id = ExamPlatformData.getInstance().getID();
+ jkMessage0202.coach_id = ExamPlatformData.getInstance().getCoachID();
+ jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
+
+ jkMessage0202.curr_exam = (type-2);// 璺熺Щ鍔ㄧ珯鏈嶅姟瀹氫箟鐨勫満鑰冩槸2 锛屽钩鍙版槸0 锛� 绉诲姩绔欒矾鑰冩槸3 锛屽钩鍙版槸1
+ jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
+ MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ }
+
private void sendExamJson(int i,int type) {
try {
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java
index 70ccedf..e03fb5c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java
@@ -6,17 +6,25 @@
public class JKMessage0202 extends JK2019MessageBase {
-
@Order(1)
+ @Length(18)
+ @Ascii
+ public String coach_id;
+ @Order(2)
+ @Length(18)
+ @Ascii
+ public String stu_id;
+
+ @Order(3)
@BcdDateTime
public Date timeBCD;
- @Order(2)
+ @Order(4)
@Int32
public int exam_id;
- @Order(3)
+ @Order(5)
@Int8
public int curr_exam;
- @Order(3)
+ @Order(6)
@Int8
public int mode;
--
Gitblit v1.8.0