From c9bc19d304412748ebee7f1413a78e3fd08f7bab Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期六, 09 五月 2020 09:36:21 +0800
Subject: [PATCH] 0206增加附加消息0x41 和0x42

---
 app/src/main/java/safeluck/drive/evaluation/app.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 4ca59a5..6761109 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -47,6 +47,7 @@
 import safeluck.drive.evaluation.cEventCenter.CEventCenter;
 import safeluck.drive.evaluation.im.MessageProcessor;
 import safeluck.drive.evaluation.platformMessage.AttachInfo;
+import safeluck.drive.evaluation.platformMessage.AttachInfo2;
 import safeluck.drive.evaluation.platformMessage.JKMessage0203;
 import safeluck.drive.evaluation.platformMessage.JKMessage0206;
 import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
@@ -408,17 +409,21 @@
                         jkMessage0206.json =json;
                         jkMessage0206.length = jkMessage0206.json.length();
                         AttachInfo attachInfo = new AttachInfo();
-                        attachInfo.attach_message_id = Integer.parseInt(String.valueOf(0x40));
-                        attachInfo.attach_message_length = 4;
-                        if (attachInfo.attach_message_id == 0x41){
-                            attachInfo.attach_data="00000000";
-                        }else{
+                        AttachInfo2 attachInfo2 = new AttachInfo2();
+                        attachInfo.attach_message_id = 0x41;
 
-                            //18涓瓧鑺� ascii
-                            attachInfo.attach_data="303030303030303030303030303030303030";
-                        }
 
                         jkMessage0206.attachInfo = attachInfo;
+
+
+                        attachInfo2.attach_message_id = 0x42;
+                        if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+                            attachInfo2.attach_data =1;
+                        }else{
+
+                            attachInfo2.attach_data = 0;
+                        }
+                        jkMessage0206.attachInfo2 = attachInfo2;
                     if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.MODE_NONE){
                         //鍒ゆ柇10s鏃堕棿鏄惁鍒�
                         if (ExamPlatformData.getInstance().isTimeArrive_10s()){

--
Gitblit v1.8.0