From 1ab10fb7a24ba4aff2b099a488b41b7377cd88d7 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 30 十一月 2020 16:24:12 +0800
Subject: [PATCH] RTKUpdate Worker SN不再通过json传的行驶传入,而是直接通过getMcuSn

---
 app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 fa17849..d911339 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
@@ -41,15 +41,17 @@
 
     override fun doWork(): Result {
 
-        var data = inputData.getString(Constant.RTK_CONFIG_UPDATE_JSON)
-        MyLog.i(PlatFormConstant.RTK,"鏇存柊RTK_config imei phone sn="+data)
+//        var data = inputData.getString(Constant.RTK_CONFIG_UPDATE_JSON)
+//        MyLog.i(PlatFormConstant.RTK,"鏇存柊RTK_config imei phone sn="+data)
+
         var imei:String=""
         var phone:String=""
         var sn:String=""
-        if (!TextUtils.isEmpty(data)){
-            var jsonObject: JSONObject? = null
-            jsonObject = JSONObject(data)
-            sn = jsonObject.getString(Constant.RTK_CONFIG_SN)
+//        if (!TextUtils.isEmpty(data)){
+//            var jsonObject: JSONObject? = null
+//            jsonObject = JSONObject(data)
+//            sn = jsonObject.getString(Constant.RTK_CONFIG_SN)
+            sn = ExamPlatformData.getInstance().mcuSN
             ExamPlatformData.getInstance().setPhone(sn);
             Log.i(TAG,"sn="+sn)
             imei = sn.substring(1)
@@ -68,7 +70,7 @@
 
             MyLog.i(PlatFormConstant.TAG,"閲嶇疆TCP杩炴帴")
             IMSClientBootstrap.getInstance().resetConnect();
-        }
+//        }
         var rtkConfigDao = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao.also {
             it.update(sn, imei, phone)
 

--
Gitblit v1.8.0