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/DB/exam_status/ExamStatusOutWorker.kt | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
index 9e20043..31824e3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
@@ -2,7 +2,6 @@
import android.content.Context
import android.util.Log
-import android.widget.Toast
import androidx.work.Data
import androidx.work.Worker
import androidx.work.WorkerParameters
@@ -13,6 +12,7 @@
import org.json.JSONObject
import safeluck.drive.evaluation.DB.Constant
import safeluck.drive.evaluation.DB.WorkRoomDataBase
+import safeluck.drive.evaluation.DB.rtktb.RTKConfig
import safeluck.drive.evaluation.DB.signalConfigdb.SingalConfig
import safeluck.drive.evaluation.bean.SignalConfigRemote
@@ -24,6 +24,8 @@
override fun doWork(): Result {
val examType =WorkRoomDataBase.getWorkRoomDataBase(applicationContext).examStatusDao.startExamInt;
singalConfigs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).signalConfigDao._getSignalConfigs()
+
+ sendRtkConfigInfo(WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao._getRtkConfig())
for (i in singalConfigs.indices) {
val signalConfigRemote = SignalConfigRemote()
signalConfigRemote.func_id = i
@@ -73,4 +75,25 @@
return false
}
+
+ private fun sendRtkConfigInfo(mRTKConfig: RTKConfig) {
+ if (mRTKConfig != null) {
+ var rtkjson = gson.toJson(mRTKConfig)
+ //鍘婚櫎id瀛楁
+ var jsonObject: JSONObject? = null
+ try {
+ jsonObject = JSONObject(rtkjson)
+ } catch (e: JSONException) {
+ e.printStackTrace()
+ }
+ jsonObject!!.remove("_id")
+ rtkjson = null
+ rtkjson = jsonObject.toString()
+ MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�$rtkjson")
+ AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.PUSH_RTK_PLATFORM_INFO, rtkjson)
+ } else {
+ MyLog.d(TAG, "RTKConfig鏈彇鍒版暟鎹�")
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0