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/rtktb/RTKConfigUpdateWorker.kt | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
index ded84a7..1c921d3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
@@ -5,6 +5,10 @@
import android.util.Log
import androidx.work.Worker
import androidx.work.WorkerParameters
+import com.anyun.exam.lib.AYSdk
+import com.anyun.exam.lib.MyLog
+import com.google.gson.Gson
+import org.json.JSONException
import org.json.JSONObject
import safeluck.drive.evaluation.DB.Constant
import safeluck.drive.evaluation.DB.WorkRoomDataBase
@@ -12,6 +16,7 @@
class RTKConfigUpdateWorker(context:Context, workerParams: WorkerParameters) :Worker(context, workerParams){
val TAG:String = "RTKConfigUpdateWorker"
+ private val gson = Gson()
override fun doWork(): Result {
@@ -32,14 +37,37 @@
0311200200000011锛屽墠4浣嶆槸璁惧缂栫爜锛屾帴涓嬫潵4浣嶆槸骞存湀锛屽悗闈�8浣嶆槸娴佹按鍙凤紱
鐢佃瘽鍙风爜鍓�2浣嶅浐瀹�13锛岀涓変綅鍙朣N鐨勭4浣嶏紝绗�4-7浣嶅彇SN鐨勫勾鏈堬紝绗�8-11浣嶅彇SN娴佹按鍙风殑鍚�4浣嶏紱鍗�13120020011
*/
- phone = "13"+sn.subSequence(3,8)+sn.substring(sn.length-4,sn.length)
+ phone = sn
Log.i(TAG,"phone="+phone)
}
var rtkConfigDao = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao.also {
it.update(sn, imei, phone)
+
+
}
+
+ sendRtkConfigInfo(WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao._getRtkConfig())
return Result.success()
}
+ 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