0206增加附加消息0x41 和0x42

lizhanwei

2020-05-09 c9bc19d304412748ebee7f1413a78e3fd08f7bab

0206增加附加消息0x41 和0x42

 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()){

 app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java

@@ -291,11 +291,11 @@
                Log.i(TAG, "attachInfo.attach_message_id ="+attachInfo.attach_message_id );
                if (attachInfo.attach_message_id == 0x41){
                    Log.i(TAG, "onClick: 41");
                    attachInfo.attach_data="00000000";
//                    attachInfo.attach_data="00000000";
                }else{

                    //18个字节 ascii
                    attachInfo.attach_data="303030303030303030303030303030303030";
//                    attachInfo.attach_data="303030303030303030303030303030303030";
                }

                jkMessage0206.attachInfo = attachInfo;

 app/src/main/java/safeluck/drive/evaluation/platformMessage/AttachInfo.java

@@ -1,6 +1,7 @@
package safeluck.drive.evaluation.platformMessage;

import com.safeluck.aykj.annotation.Hex;
import com.safeluck.aykj.annotation.Int32;
import com.safeluck.aykj.annotation.Int8;
import com.safeluck.aykj.annotation.Length;
import com.safeluck.aykj.annotation.Order;
@@ -12,9 +13,9 @@
    public int attach_message_id;
    @Order(2)
    @Int8
    public int attach_message_length;
    public int attach_message_length = 4;
    @Order(3)
    @Length(lengthField = "attach_message_length")
    @Hex
    public String attach_data;
    @Int32
    public int attach_data;
}

 app/src/main/java/safeluck/drive/evaluation/platformMessage/AttachInfo2.java

New file
@@ -0,0 +1,20 @@
package safeluck.drive.evaluation.platformMessage;

import com.safeluck.aykj.annotation.Hex;
import com.safeluck.aykj.annotation.Int8;
import com.safeluck.aykj.annotation.Length;
import com.safeluck.aykj.annotation.Order;
import com.safeluck.aykj.message.BinMessageBase;

public class AttachInfo2 extends BinMessageBase {
    @Order(1)
    @Int8
    public int attach_message_id;
    @Order(2)
    @Int8
    public int attach_message_length = 1;
    @Order(3)
    @Length(lengthField = "attach_message_length")
    @Int8
    public int attach_data;
}

 app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0206.java

@@ -23,6 +23,10 @@
    @Message
    @Length(0)
    public AttachInfo attachInfo;
    @Order(6)
    @Message
    @Length(0)
    public AttachInfo2 attachInfo2;




 lib/src/main/cpp/native-lib.cpp

@@ -26,7 +26,7 @@
const int RTK_PLATFORM_PORT = 12125;
const uint8_t phone[] = {0x20,0x19,0x10,0x15,0x00,0x00,0x00,0x01};

const char *VIRTUAL_RTK_IP = "192.168.16.112";
const char *VIRTUAL_RTK_IP = "192.168.16.101";
const int VIRTUAL_RTK_PORT = 9001;

static pthread_mutex_t tts_mutex = PTHREAD_MUTEX_INITIALIZER;