From d12bcd5acd046d5021072587b4e95c020948e0be Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 10:57:20 +0800
Subject: [PATCH] 平台消息基类取电话号码，删除子类取电话号码的操作；训练模式只发送注册鉴权位置消息，其他不发送；Netty TCP增加重置TCP连接接口；收到单片机sn更新的时候重置tcp
---
app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
index b37cd0d..0a3bf27 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
@@ -75,7 +75,6 @@
String des = ((JKMessage8100) jk2019MessageBase).des;
SPUtils.put(app.getAppContext(),SPUtils.DES_HEX_PWD,des);
JKMessage0101 jkMessage0101 = new JKMessage0101();
-// jkMessage0101.des =((JKMessage8100) jk2019MessageBase).des;
long time =System.currentTimeMillis()/1000;
int unsignedInt = Utils.parseUnsignedInt(String.valueOf(time),10);
MyLog.i(String.format("鎬荤鏁�(long)=%d,瑁呮崲鎴恥nsigned int= %d",time,unsignedInt));
@@ -120,26 +119,34 @@
if ( ExamPlatformData.getInstance().getExamplatformStatus() == ExamPlatformData.DEV_LOGIN){
- if (IMSClientBootstrap.getInstance().isActive()){
- IMSClientBootstrap.getInstance().sendMessage(messageEscaper.escape(msg.toBytes()));
- }else{
- Log.e(TAG, "run: 鍙戦�佹秷鎭け璐ワ紝鏈垵濮嬪寲杩炴帴NettyTcp");
+ byte[] msgidbytes= ArrayUtils.subArray(msg.toBytes(),2,2);
+ String msgid = BytesUtils.bytesToHexString(msgidbytes);
+ if (canSend(msgid)){
+ if (IMSClientBootstrap.getInstance().isActive()){
+ IMSClientBootstrap.getInstance().sendMessage(messageEscaper.escape(msg.toBytes()));
+ }else{
+ Log.e(TAG, "run: 鍙戦�佹秷鎭け璐ワ紝鏈垵濮嬪寲杩炴帴NettyTcp");
+ }
}
+
}else{
// JK2019MessageBase jk2019MessageBase = MessageManager.get(msg.toString());
byte[] msgidbytes= ArrayUtils.subArray(msg.toBytes(),2,2);
String msgid = BytesUtils.bytesToHexString(msgidbytes);
Log.i(TAG, "run: msgid="+msgid);
- if ((msgid.equalsIgnoreCase("0100")) || (msgid.equalsIgnoreCase("0101"))){
- MyLog.i(PlatFormConstant.TAG,"娉ㄥ唽/閴存潈娑堟伅鐩存帴鍙戦�侊紝涓嶅彂閫佹槸鍚︾櫥褰曟垚鍔�");
- if (IMSClientBootstrap.getInstance().isActive()){
- IMSClientBootstrap.getInstance().sendMessage(messageEscaper.escape(msg.toBytes()));
+ if (canSend(msgid)){
+ if ((msgid.equalsIgnoreCase("0100")) || (msgid.equalsIgnoreCase("0101"))){
+ MyLog.i(PlatFormConstant.TAG,"娉ㄥ唽/閴存潈娑堟伅鐩存帴鍙戦��");
+ if (IMSClientBootstrap.getInstance().isActive()){
+ IMSClientBootstrap.getInstance().sendMessage(messageEscaper.escape(msg.toBytes()));
+ }else{
+ MyLog.i(PlatFormConstant.TAG, "鍙戦�佹秷鎭け璐ワ紝鏈垵濮嬪寲杩炴帴NettyTcp");
+ }
}else{
- MyLog.i(PlatFormConstant.TAG, "鍙戦�佹秷鎭け璐ワ紝鏈垵濮嬪寲杩炴帴NettyTcp");
+ MyLog.i(PlatFormConstant.TAG,"鐧诲綍鏈垚鍔燂紝涓嶈兘鍙戦�佹秷鎭�="+msgid);
}
- }else{
- MyLog.i(PlatFormConstant.TAG,"鐧诲綍鏈垚鍔燂紝涓嶈兘鍙戦�佹秷鎭�="+msgid);
}
+
}
@@ -153,4 +160,21 @@
IMSClientBootstrap.getInstance().addHeartbeat(seconds);
}
}
+
+ private boolean canSend(String msgId){
+ if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE){
+ //璁粌妯″紡涓� 鍙湁鍑犳潯鍙互鍙戦��
+ switch (msgId){
+ case "0206":
+ case "0100":
+ case "0101":
+ return true;
+ }
+
+ }else{
+ //鑰冭瘯妯″紡涓嬪叏閮ㄩ兘鍙互鍙戦��
+ return true;
+ }
+ return false;
+ }
}
--
Gitblit v1.8.0