From c257c28cb70c9f204262f67e817a1793260e4bea Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 11 三月 2020 00:42:54 +0800
Subject: [PATCH] 考试type保存，收到ndk_start的时候进行发送；随机生成五个模拟灯光测试项(第一个永远是开启前照灯）；Random随机生成5个不重复的整数算法
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
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 00235ce..edbca12 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -36,6 +36,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Random;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
@@ -63,6 +64,7 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0202;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
+import safeluck.drive.evaluation.util.Utils;
/**
* 鑱旂綉璁粌UI
@@ -98,6 +100,8 @@
private static final int SPEED_DATA = 2;
private FailedProjViewModel failedProjViewModel;
String icson;//杩斿洖鐨刬c鍗′俊鎭� json
+ private Random random = new Random();
+ private List<SimulateNightBean.QuestionBean> tempQs= new ArrayList<>();
public static SupportFragment newInstance() {
return new NetWorkTrainFragment();
@@ -202,14 +206,14 @@
examStatusList.clear();
examStatusList.addAll(examStatus);
mHandler.obtainMessage(ADD_DATA).sendToTarget();
- if (examStatus.get(0).getStartExam() == Constant.HAS_BEEN_START_EXAM){
+ if (examStatus.get(0).getStartExam() != Constant.NONE_BEEN_START_EXAM){
btn_start_exam.setEnabled(false);
tv_stop.setEnabled(true);
- sendExamJson(Constant.HAS_BEEN_START_EXAM,exam_type);
}else{
btn_start_exam.setEnabled(true);
tv_stop.setEnabled(false);
}
+ exam_type = examStatus.get(0).getStartExam();
}
@@ -402,7 +406,13 @@
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_start:
- examStatusViewModel.updateStartExam(Constant.HAS_BEEN_START_EXAM);
+ //TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
+ final JKMessage0202 jkMessage0202 = new JKMessage0202();
+ jkMessage0202.phone = ExamPlatformData.getInstance().getPhone();
+ jkMessage0202.timeBCD = new Date();
+ jkMessage0202.ID = ExamPlatformData.getInstance().getID();
+
+ jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
failedProjViewModel.deleteAll();
if (myDialogFragment == null){
@@ -415,6 +425,9 @@
exam_type = 2;
sendExamJson(1,exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
+ jkMessage0202.curr_exam = 0;
+
+ MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
@Override
@@ -425,9 +438,28 @@
simulateNightBean = new SimulateNightBean();
}
simulateNightBean.setExam(0);
- List<SimulateNightBean.QuestionBean> list = ExamPlatformData.getInstance().getSimulate_light_tips();
+
+ final List<SimulateNightBean.QuestionBean> list = ExamPlatformData.getInstance().getSimulate_light_tips();
simulateNightBean.setQuestion(list.subList(list.size()-2,list.size()-1));
AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
+ jkMessage0202.curr_exam = 1;
+
+ MessageProcessor.getInstance().sendMessage(jkMessage0202);
+
+ tempQs.add(list.get(0));
+ int [] a =Utils.getRandomInts(4,12);
+ for (int i = 0; i < a.length; i++) {
+ tempQs.add(list.get(a[i]));
+ }
+
+ simulateNightBean.setQuestion(tempQs);
+ mHandler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
+ tempQs.clear();
+ }
+ },10*1000);
}
});
@@ -435,14 +467,8 @@
iv_head.getDrawable().setLevel(1);
//娓呯┖sns
sns.clear();
- //TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
-// JKMessage0202 jkMessage0202 = new JKMessage0202();
-// jkMessage0202.phone = ExamPlatformData.getInstance().getPhone();
-// jkMessage0202.timeBCD = new Date();
-// jkMessage0202.curr_exam = 0;
-// jkMessage0202.ID = ExamPlatformData.getInstance().getID();
-// jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
-// MessageProcessor.getInstance().sendMessage(jkMessage0202);
+
+
break;
case R.id.tv_stop:
@@ -472,6 +498,7 @@
private void sendExamJson(int i,int type) {
try {
+ examStatusViewModel.updateStartExam(type);
JSONObject jsonObject = new JSONObject();
jsonObject.put("exam", i);
jsonObject.put("type", type);
--
Gitblit v1.8.0