From 5fdd4458a3c9f99a3c951683d503f73a47ff976d Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 13 三月 2020 15:43:07 +0800
Subject: [PATCH] 解决RTK配置，传感器配置收到NDK_Start的时候发两次的问题；在ExamStatusOutWork里面发送rtf配置 传感器配置、考试状态；RTK配置增加数据库访问；电话使用sn，sn更新发送给服务在RTKConfigUpdateWorker；基本设置里删除电话显示；修改鉴权消息，使用服务器注册给的密码，用des加密时间，发鉴权消息给服务；Utils增加des加密和解密算法
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 3eca6b0..b0dc214 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -56,10 +56,12 @@
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.JKMessage0100;
import safeluck.drive.evaluation.platformMessage.JKMessage0101;
+import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.PermissionManager;
import safeluck.drive.evaluation.util.SPUtils;
+import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.viewmodels.ExamPlatformModel;
import safeluck.drive.evaluation.viewmodels.MainViewModel;
import safeluck.drive.evaluation.viewmodels.RTKConnAndLogin;
@@ -82,7 +84,7 @@
@Override
public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
if (msgCode == Constant.FETCH_RTK_PLATFORM_INFO) {
- sendRtkConfigInfo();
+// sendRtkConfigInfo();
}
if (msgCode == Constant.RTK_PLATFORM_REGISTER_STATUS) {
try {
@@ -102,8 +104,8 @@
}
}
if (msgCode == Constant.NDK_START){
- MyLog.i(TAG,"NDK_start,鍙戦�丷TK閰嶇疆");
- sendRtkConfigInfo();
+ MyLog.i(TAG,"NDK_start");
+// sendRtkConfigInfo();
sendMcuUprgrade();
}
}
@@ -134,27 +136,27 @@
}
- private void sendRtkConfigInfo() {
- if (mRTKConfig != null) {
- String rtkjson = gson.toJson(mRTKConfig);
-
- //鍘婚櫎id瀛楁
- JSONObject jsonObject = null;
- try {
- jsonObject = new JSONObject(rtkjson);
- } catch (JSONException e) {
- e.printStackTrace();
- }
- jsonObject.remove("_id");
- rtkjson = null;
- rtkjson = jsonObject.toString();
- MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�" + rtkjson);
- AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, rtkjson);
- } else {
- MyLog.d(TAG, "RTKConfig鏈彇鍒版暟鎹�");
- onlySendOnceRTKConfig = true;
- }
- }
+// private void sendRtkConfigInfo() {
+// if (mRTKConfig != null) {
+// String rtkjson = gson.toJson(mRTKConfig);
+//
+// //鍘婚櫎id瀛楁
+// JSONObject jsonObject = null;
+// try {
+// jsonObject = new JSONObject(rtkjson);
+// } catch (JSONException e) {
+// e.printStackTrace();
+// }
+// jsonObject.remove("_id");
+// rtkjson = null;
+// rtkjson = jsonObject.toString();
+// MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�" + rtkjson);
+// AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, rtkjson);
+// } else {
+// MyLog.d(TAG, "RTKConfig鏈彇鍒版暟鎹�");
+// onlySendOnceRTKConfig = true;
+// }
+// }
public ExamPlatformModel examPlatformModel;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -200,13 +202,13 @@
MyLog.i(TAG, "RTKConfig Changed: " + (rtkConfig != null ? rtkConfig.toString() : "null"));
mRTKConfig = rtkConfig;
if (rtkConfig != null)
- ExamPlatformData.getInstance().setPhone(rtkConfig.getPhone());
+ ExamPlatformData.getInstance().setPhone(rtkConfig.getSn());
synchronized (MainActivity.this){
- if (onlySendOnceRTKConfig){
- MyLog.i(TAG,"杩涘叆 synchronized (MainActivity.this)");
- onlySendOnceRTKConfig = false;
- sendRtkConfigInfo();
- }
+// if (onlySendOnceRTKConfig){
+// MyLog.i(TAG,"杩涘叆 synchronized (MainActivity.this)");
+// onlySendOnceRTKConfig = false;
+// sendRtkConfigInfo();
+// }
}
}
@@ -365,8 +367,15 @@
}else{
JKMessage0101 jkMessage0101 = new JKMessage0101();
jkMessage0101.phone = ExamPlatformData.getInstance().getPhone();
- jkMessage0101.des =hexPwd;
- jkMessage0101.timestamp = (int) System.currentTimeMillis();
+ String des = hexPwd;
+ int time = (int) System.currentTimeMillis();
+ jkMessage0101.timestamp = time;
+
+
+ byte[] miwen = Utils.encrypt(com.anyun.im_lib.util.ByteUtil.intGetBytes(time),des);
+ MyLog.i(PlatFormConstant.TAG,"閴存潈瀵嗘枃="+BytesUtils.bytesToHexString(miwen)+" time="+time);
+ jkMessage0101.des = BytesUtils.bytesToHexString(miwen);
+
MessageProcessor.getInstance().sendMessage(jkMessage0101);
}
}
--
Gitblit v1.8.0