From d12bcd5acd046d5021072587b4e95c020948e0be Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 10:57:20 +0800
Subject: [PATCH] 平台消息基类取电话号码，删除子类取电话号码的操作；训练模式只发送注册鉴权位置消息，其他不发送；Netty TCP增加重置TCP连接接口；收到单片机sn更新的时候重置tcp
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 71fbd34..6da2ff2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -139,9 +139,10 @@
public void onChanged(RTKConfig rtkConfig) {
MyLog.i(TAG, "RTKConfig Changed: " + (rtkConfig != null ? rtkConfig.toString() : "null"));
- mRTKConfig = rtkConfig;
+
if (rtkConfig != null)
- ExamPlatformData.getInstance().setPhone(rtkConfig.getSn());
+ mRTKConfig = rtkConfig;
+
synchronized (MainActivity.this){
// if (onlySendOnceRTKConfig){
// MyLog.i(TAG,"杩涘叆 synchronized (MainActivity.this)");
@@ -291,7 +292,6 @@
JKMessage0100 jkRegisterMessage = new JKMessage0100();
if (mRTKConfig!=null){
- jkRegisterMessage.phone = ExamPlatformData.getInstance().getPhone();
jkRegisterMessage.proviceid = mRTKConfig.getProvince();
jkRegisterMessage.cityid = mRTKConfig.getCity();
jkRegisterMessage.imei = mRTKConfig.getImei();
@@ -307,7 +307,6 @@
}else{
MyLog.i(PlatFormConstant.TAG,"瀵嗙爜瀛樺湪锛屽凡娉ㄥ唽杩囷紝鐩存帴鍙戦壌鏉冩秷鎭�");
JKMessage0101 jkMessage0101 = new JKMessage0101();
- jkMessage0101.phone = ExamPlatformData.getInstance().getPhone();
String des = hexPwd;
long time = System.currentTimeMillis()/1000;
int unsignedInt = Utils.parseUnsignedInt(String.valueOf(time),10);
--
Gitblit v1.8.0