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/app.java | 1 +
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt | 11 +++++++++--
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 18 ++++++++++++------
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 9 +++++++++
app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java | 3 +++
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 | 8 +++++---
8 files changed, 46 insertions(+), 14 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/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 06d7c64..8eac5e6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -198,6 +198,7 @@
MyLog.i(TAG, "RTKConfig Changed: " + (rtkConfig != null ? rtkConfig.toString() : "null"));
mRTKConfig = rtkConfig;
+ ExamPlatformData.getInstance().setPhone(rtkConfig.getPhone());
synchronized (MainActivity.this){
if (onlySendOnceRTKConfig){
MyLog.i(TAG,"杩涘叆 synchronized (MainActivity.this)");
@@ -337,18 +338,22 @@
@Override
public void onConnected() {
ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.TCP_CONNECTED);
- MyLog.i(TAG,"TCP杩炴帴鎴愬姛");
+ MyLog.i("TCP杩炴帴鎴愬姛");
//TODO 鍒ゆ柇SPUtils 鏄惁淇濆瓨鏈塪es瀵嗙爜锛涘鏋滄病鏈夊垯杩涜娉ㄥ唽JKMessage0100锛屽鏋滄湁瀵嗙爜鍒欒繘琛岄壌鏉僇KMessage0101
String hexPwd = (String) SPUtils.get(this,SPUtils.DES_HEX_PWD,"");
MessageProcessor.getInstance().addBeatHeart(10);
if (TextUtils.isEmpty(hexPwd)){
JKMessage0100 jkRegisterMessage = new JKMessage0100();
- jkRegisterMessage.proviceid = 23;
- jkRegisterMessage.cityid = 1;
- jkRegisterMessage.imei = "460123874561";
- jkRegisterMessage.model = "123";
- jkRegisterMessage.sn = "0314200100000004";
+ if (mRTKConfig!=null){
+ jkRegisterMessage.phone = ExamPlatformData.getInstance().getPhone();
+ jkRegisterMessage.proviceid = mRTKConfig.getProvince();
+ jkRegisterMessage.cityid = mRTKConfig.getCity();
+ jkRegisterMessage.imei = mRTKConfig.getImei();
+ jkRegisterMessage.model = mRTKConfig.getModel();
+ jkRegisterMessage.sn = mRTKConfig.getSn();
+ }
+
Log.i(TAG, "onClick: msg len "+jkRegisterMessage.getMessageLen()+" "+ jkRegisterMessage.props.value);
byte[] str = jkRegisterMessage.toBytes();
@@ -356,6 +361,7 @@
Log.i(TAG, "onClick: "+ BytesUtils.bytesToHexString(str)+" ============");
}else{
JKMessage0101 jkMessage0101 = new JKMessage0101();
+ jkMessage0101.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0101.des =hexPwd;
jkMessage0101.timestamp = (int) System.currentTimeMillis();
MessageProcessor.getInstance().sendMessage(jkMessage0101);
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index ba745ad..e66e144 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -313,6 +313,7 @@
CEventCenter.dispatchEvent(Constant.BIND_RTK_SPEED_TOPIC,cmd,0,speed);
utc = utc.replace(".","");
JKMessage0206 jkMessage0206 = new JKMessage0206();
+ jkMessage0206.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0206.alert = 0;
jkMessage0206.status = 0;
jkMessage0206.jd = longitude;
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index 836677a..d0b8154 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -27,6 +27,8 @@
private int exam_id =12345;//鑰冭瘯鍞竴ID
+ private String mPhone = "";//鑰冭瘯骞冲彴娑堟伅鐢ㄥ埌鐨刾hone
+
public static final int TCP_DISCONNECT = 1;
public static final int TCP_CONNECTED = 2;///2-鏈繛鎺ワ紙tcp杩炴帴涓嶄笂锛�
public static final int DEV_NOT_REGISTERED = 3;
@@ -210,4 +212,11 @@
}
+ public void setPhone(String phone) {
+ this.mPhone = phone;
+ }
+
+ public String getPhone() {
+ return mPhone;
+ }
}
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..01c396d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -119,6 +119,7 @@
String icStr = jsSpeed.getString("serialno");
if (result == 0) {
JKMessage0201 jkMessage0201 = new JKMessage0201();
+ jkMessage0201.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0201.currentExam = 0;
jkMessage0201.id = icStr;
MessageProcessor.getInstance().sendMessage(jkMessage0201);
@@ -156,6 +157,7 @@
item_conents.add(f.getItem_content());
Collections.reverse(mArrayList);
mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
}
//TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
sendJKMessage0203(failedProj_selects);
@@ -242,7 +244,7 @@
private List<Integer> sns =new ArrayList<>();
private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
JKMessage0203 jkMessage0203 = new JKMessage0203();
- jkMessage0203.phone = "0314200100000004";
+ jkMessage0203.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0203.ID = ExamPlatformData.getInstance().getID();
jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
@@ -401,7 +403,7 @@
sns.clear();
//TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
JKMessage0202 jkMessage0202 = new JKMessage0202();
- jkMessage0202.phone = "0314200100000004";
+ jkMessage0202.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0202.timeBCD = new Date();
jkMessage0202.curr_exam = 0;
jkMessage0202.ID = ExamPlatformData.getInstance().getID();
@@ -460,7 +462,7 @@
sendExamJson(0);
//TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
JKMessage0204 jkMessage0204 = new JKMessage0204();
- jkMessage0204.phone = "0314200100000004";
+ jkMessage0204.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0204.timeBCD = new Date();
jkMessage0204.score = 10;
jkMessage0204.stop = JKMessage0204.SUCC_STOP;
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java b/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java
index d754273..807de79 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java
@@ -8,6 +8,7 @@
import com.anyun.im_lib.listener.OnEventListener;
import safeluck.drive.evaluation.app;
+import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.platformMessage.JKMessage0002;
import safeluck.drive.evaluation.platformMessage.utils.MessageEscaper;
@@ -93,6 +94,8 @@
@Override
public byte[] getHearbeatMsg() {
JKMessage0002 jkMessage0002 = new JKMessage0002();
+ jkMessage0002.phone = ExamPlatformData.getInstance().getPhone();
+
return messageEscaper.escape(jkMessage0002.toBytes());
}
}
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