From f16cc04f5be09aa4e1521462e6c66836428cec9e Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 10 三月 2020 15:03:22 +0800
Subject: [PATCH] 修改平台协议phone字段的值
---
app/src/main/java/safeluck/drive/evaluation/app.java | 1 +
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/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 7 ++++---
5 files changed, 29 insertions(+), 9 deletions(-)
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/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index ce9a94a..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);
@@ -243,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();
@@ -402,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();
@@ -461,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());
}
}
--
Gitblit v1.8.0