From 7e0731118e81cf2425fc88a57835e3176e54425e Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期六, 21 三月 2020 09:59:46 +0800
Subject: [PATCH] app启动发灯光

---
 app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt |   23 +++++++++++
 app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java    |   51 +++++++++++++------------
 2 files changed, 49 insertions(+), 25 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 e2ea10d..485910a 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
@@ -16,7 +16,11 @@
 import safeluck.drive.evaluation.DB.WorkRoomDataBase
 import safeluck.drive.evaluation.DB.rtktb.RTKConfig
 import safeluck.drive.evaluation.DB.signalConfigdb.SingalConfig
+import safeluck.drive.evaluation.bean.ExamPlatformData
 import safeluck.drive.evaluation.bean.SignalConfigRemote
+import safeluck.drive.evaluation.bean.SimulateNightBean
+import safeluck.drive.evaluation.bean.SimulateNightBean.QuestionBean
+import safeluck.drive.evaluation.util.Utils
 import java.io.IOException
 import java.io.InputStreamReader
 
@@ -24,10 +28,29 @@
     val TAG:String = "ExamStatusOutWorker"
     private var signalConfiglist: MutableList<SignalConfigRemote> = ArrayList()
     private val gson = Gson()
+    lateinit var  simulateNightBean:SimulateNightBean
     private var singalConfigs :List<SingalConfig> = ArrayList()
+    private val tempQs: MutableList<QuestionBean> = java.util.ArrayList()
     override fun doWork(): Result {
         val examType =WorkRoomDataBase.getWorkRoomDataBase(applicationContext).examStatusDao.startExamInt;
 
+            simulateNightBean = SimulateNightBean()
+        simulateNightBean.setExam(0)
+
+        val list = ExamPlatformData.getInstance().simulate_light_tips
+        simulateNightBean.setQuestion(list.subList(list.size - 2, list.size - 1))
+
+
+
+
+        tempQs.add(list[0])
+        val a = Utils.getRandomInts(4, 12)
+        for (i in a.indices) {
+            tempQs.add(list[a[i]])
+        }
+
+        simulateNightBean.setQuestion(tempQs)
+        AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean))
 
 
         MyLog.i(TAG,"鏌ュ埌鐨勮�冭瘯type="+examType)
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 99bb189..b4d6560 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -531,33 +531,34 @@
                         exam_type = 3;
                         examStatusViewModel.updateStartExam(exam_type);
                         sendExamJson(1,exam_type);
-                        if (simulateNightBean == null){
-                            simulateNightBean = new SimulateNightBean();
-                        }
-                        simulateNightBean.setExam(0);
-
-                        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);
-
                         iv_head.getDrawable().setLevel(1);
-                        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);
+                        MessageProcessor.getInstance().sendMessage(jkMessage0202);
+//                        if (simulateNightBean == null){
+//                            simulateNightBean = new SimulateNightBean();
+//                        }
+//                        simulateNightBean.setExam(0);
+//
+//                        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));
+//
+//
+//
+//                        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);
 
                     }
                 });

--
Gitblit v1.8.0