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/MainActivity.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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);
--
Gitblit v1.8.0