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/fragment/BaseDatasFragment.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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);
}
--
Gitblit v1.8.0