From 29cd07271e0e37ce1e4b5c0d7c56f98da208190f Mon Sep 17 00:00:00 2001 From: fctom1215 <fctom1215@outlook.com> Date: 星期二, 10 三月 2020 15:08:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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 dc043ef..ded84a7 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 @@ -25,8 +25,15 @@ jsonObject = JSONObject(data) sn = jsonObject.getString(Constant.RTK_CONFIG_SN) Log.i(TAG,"sn="+sn) - imei = sn - phone = sn + imei = sn.substring(1) + Log.i(TAG,"imei="+imei) + /** + * SN涓庣數璇濆彿鐮佺殑鍏崇郴锛堜互AYKJ-4涓轰緥锛夛細 + 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) + Log.i(TAG,"phone="+phone) } var rtkConfigDao = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao.also { it.update(sn, imei, phone) -- Gitblit v1.8.0