From cfd058531ac72f728028f141102ddb9743a8568f Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期六, 14 三月 2020 21:31:03 +0800
Subject: [PATCH] 如果设备未登录则不发送心跳消息和位置消息等其他一切消息(不包括注册和鉴权消息);鉴权时间戳修改为秒,然后des加密进行发送;0206位置消息,再收到rtk_info的时候进行控制发送,如果移到MessageProcesser app崩溃,MessageManager.get()抛异常动态长度字段和依赖字段只能有一个,暂时先不改,后边有时间再改

---
 app/src/main/java/safeluck/drive/evaluation/app.java |   84 ++++++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 5929334..84e4574 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -306,49 +306,53 @@
                 CEventCenter.dispatchEvent(Constant.BIND_SPEED_TOPIC,cmd,0,json);
                 break;
             case Constant.RTK_INFO:
-                try {
-                    JSONObject jsSpeed = new JSONObject(json);
-                    double latitude = jsSpeed.getDouble("latitude");
-                    double longitude = jsSpeed.getDouble("longitude");
-                    double altitude = jsSpeed.getDouble("altitude");
-                    double speed = jsSpeed.getDouble("speed");
-                    int  qf = jsSpeed.getInt("qf");
-                    double track_ture = jsSpeed.getDouble("track_ture");
-                    String utc = jsSpeed.getString("utc");
-                    CEventCenter.dispatchEvent(Constant.BIND_RTK_SPEED_TOPIC,cmd,0,speed);
-                    utc = utc.replace(".","");
-                    JKMessage0206 jkMessage0206 = new JKMessage0206();
-                    jkMessage0206.phone = ExamPlatformData.getInstance().getPhone();
-                    jkMessage0206.alert = 0;
-                    jkMessage0206.status = 0;
-                    jkMessage0206.jd = longitude;
-                    jkMessage0206.wd = latitude;
-                    jkMessage0206.gaoCheng = (int)altitude;
-                    jkMessage0206.speed = speed;
-                    jkMessage0206.fangXiang = (int)track_ture;
-                    jkMessage0206.rf = qf;
-                    if (utc.length()>16){
-                        utc = utc.substring(0,16);
-                    }
-                    jkMessage0206.timeBCD = utc;
-                    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{
+                if (ExamPlatformData.getInstance().getExamplatformStatus()==ExamPlatformData.DEV_LOGIN){
+                    try {
+                        JSONObject jsSpeed = new JSONObject(json);
+                        double latitude = jsSpeed.getDouble("latitude");
+                        double longitude = jsSpeed.getDouble("longitude");
+                        double altitude = jsSpeed.getDouble("altitude");
+                        double speed = jsSpeed.getDouble("speed");
+                        int  qf = jsSpeed.getInt("qf");
+                        double track_ture = jsSpeed.getDouble("track_ture");
+                        String utc = jsSpeed.getString("utc");
+                        CEventCenter.dispatchEvent(Constant.BIND_RTK_SPEED_TOPIC,cmd,0,speed);
+                        utc = utc.replace(".","");
+                        JKMessage0206 jkMessage0206 = new JKMessage0206();
+                        jkMessage0206.phone = ExamPlatformData.getInstance().getPhone();
+                        jkMessage0206.alert = 0;
+                        jkMessage0206.status = 0;
+                        jkMessage0206.jd = longitude;
+                        jkMessage0206.wd = latitude;
+                        jkMessage0206.gaoCheng = (int)altitude;
+                        jkMessage0206.speed = speed;
+                        jkMessage0206.fangXiang = (int)track_ture;
+                        jkMessage0206.rf = qf;
+                        if (utc.length()>16){
+                            utc = utc.substring(0,16);
+                        }
+                        jkMessage0206.timeBCD = utc;
+                        jkMessage0206.json =json;
+                        jkMessage0206.length = jkMessage0206.json.length();
+//                    MyLog.i("鍦扮悊鍧愭爣闀垮害="+jkMessage0206.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{
 
-                        //18涓瓧鑺� ascii
-                        attachInfo.attach_data="303030303030303030303030303030303030";
+                            //18涓瓧鑺� ascii
+                            attachInfo.attach_data="303030303030303030303030303030303030";
+                        }
+
+                        jkMessage0206.attachInfo = attachInfo;
+                        MessageProcessor.getInstance().sendMessage(jkMessage0206);
+
+                    } catch (JSONException e) {
+                        e.printStackTrace();
                     }
 
-                    jkMessage0206.attachInfo = attachInfo;
-                    MessageProcessor.getInstance().sendMessage(jkMessage0206);
-
-                } catch (JSONException e) {
-                    e.printStackTrace();
                 }
 
                 break;

--
Gitblit v1.8.0