From 7a621d952fb83005ce7b6db82f9b2206746562be Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 02 三月 2020 15:47:12 +0800
Subject: [PATCH] 提交根据协处理器给的gpio信号来查看车载信号情况

---
 app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 fa69236..731f010 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -35,6 +35,7 @@
 import java.util.List;
 
 import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.BuildConfig;
 import safeluck.drive.evaluation.Constant;
 import safeluck.drive.evaluation.DB.appstatusdb.AppStatus;
 import safeluck.drive.evaluation.DB.appstatusdb.AppStatusViewModel;
@@ -83,7 +84,7 @@
                                     if (fields[i].getName().equalsIgnoreCase("version")){
                                         String version = (String) fields[i].get(mcuInfo);
                                         version = new String(BytesUtils.hexStringToBytes(version),"GBK");
-                                        datas.add("鐗堟湰鍙凤細" + version);
+                                        datas.add("鐗堟湰鍙凤細" + version+"#"+ BuildConfig.VERSION_NAME);
                                     }else if(fields[i].getName().equalsIgnoreCase("sn")){
                                         datas.add( "璁惧搴忓垪鍙凤細" + fields[i].get(mcuInfo));
                                     }else if(fields[i].getName().equalsIgnoreCase("selftest")){
@@ -103,7 +104,7 @@
                                     if (mRtkConfig != null){
                                         datas.add("鐪両D锛�"+mRtkConfig.getProvince());
                                         datas.add("甯侷D锛�"+mRtkConfig.getCity());
-                                        datas.add("鐢佃瘽锛�"+mRtkConfig.getPhone());
+                                        datas.add("鐢佃瘽锛�"+mRtkConfig.getSn());
                                         datas.add("RTK骞冲彴鍦板潃锛�"+mRtkConfig.getIp()+":"+mRtkConfig.getPort());
 
                                         datas.add("鑰冭瘯骞冲彴鍦板潃锛�"+ExamPlatformData.getInstance().getPlatformIP()+":"+ExamPlatformData.getInstance().getPlatformPort());

--
Gitblit v1.8.0