From 2fb664e451402172d6a53eea5ed7a541055ca7bb Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 10 三月 2020 11:35:24 +0800
Subject: [PATCH] 按照规则根据协处理器给的sn修改imei和phone；系统设置->基础数据用文字表述RTK平台状态和考试平台状态
---
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt | 11 +++++++++--
app/src/main/res/values/strings.xml | 4 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 6 +++---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 1 +
4 files changed, 17 insertions(+), 5 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)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
index b3e967a..8356a03 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -104,14 +104,14 @@
if (mRtkConfig != null){
datas.add("鐪両D锛�"+mRtkConfig.getProvince());
datas.add("甯侷D锛�"+mRtkConfig.getCity());
- datas.add("鐢佃瘽锛�"+mRtkConfig.getSn());
+ datas.add("鐢佃瘽锛�"+mRtkConfig.getPhone());
datas.add("RTK骞冲彴鍦板潃锛�"+mRtkConfig.getIp()+":"+mRtkConfig.getPort());
datas.add("鑰冭瘯骞冲彴鍦板潃锛�"+ExamPlatformData.getInstance().getPlatformIP()+":"+ExamPlatformData.getInstance().getPlatformPort());
}
if (appStatus != null){
- datas.add("RTK骞冲彴鐘舵�侊細"+appStatus.getRtk_connect_status());
- datas.add("鑰冭瘯骞冲彴鐘舵�侊細"+appStatus.getRtk_connect_status());
+ datas.add("RTK骞冲彴鐘舵�侊細"+(appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"宸茬櫥褰�":"鏈櫥褰�"):"鏈繛鎺�"));
+ datas.add("鑰冭瘯骞冲彴鐘舵�侊細"+ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()));
}
gpsInfoAdapter.addAll(datas);
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index c7fb43f..ce9a94a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -156,6 +156,7 @@
item_conents.add(f.getItem_content());
Collections.reverse(mArrayList);
mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
}
//TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
sendJKMessage0203(failedProj_selects);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf04d2f..58fb897 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,4 +51,8 @@
<string name="add_subtract">鍔犲噺妗�</string>
<string name="by_crossing">閫氳繃璺彛</string>
<string name="lane_change">鍙樻洿杞﹂亾</string>
+ <array name="simulate_light_tips">
+ <item>涓嬮潰灏嗚繘琛屾ā鎷熷闂磋椹跺満鏅伅鍏変娇鐢ㄧ殑鑰冭瘯锛岃鎸夎闊虫寚浠ゅ湪5绉掑唴鍋氬嚭鐩稿簲鐨勭伅鍏夋搷浣�</item>
+ <item>妯℃嫙澶滈棿鑰冭瘯瀹屾垚璇峰叧闂墍鏈夌伅鍏夛紝璇疯捣姝ョ户缁畬鎴愯�冭瘯</item>
+ </array>
</resources>
--
Gitblit v1.8.0