From 966f82171a72fb78ce8185279940554ea55ed764 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 29 九月 2020 15:48:51 +0800
Subject: [PATCH] 加入收到产测数据命令

---
 app/src/main/java/safeluck/drive/evaluation/app.java                        |    1 +
 app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java |   19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index a454e27..10b1fe5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -528,6 +528,7 @@
                     CEventCenter.dispatchEvent(Constant.BIND_ROUTE_COLLECT_TOPIC,cmd,0,json);
                 break;
             case Constant. ID_SM_CAN_BRIEF:
+                CEventCenter.dispatchEvent(Constant.BIND_MCUINFO_TOPIC,cmd,0,json);
                 break;
         }
 
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 269f30d..aa70b4e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -90,14 +90,17 @@
     private ICEventListener icEventListener = new ICEventListener() {
         @Override
         public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
-            datas.clear();
+
             if (msgCode == Constant.MCU_SN){
                 String mcuinfoStr = (String)obj;
                 if (gson != null){
+                    datas.clear();
                     final MCUInfo mcuInfo=gson.fromJson(mcuinfoStr, MCUInfo.class);
                             Field [] fields = mcuInfo.getClass().getDeclaredFields();
-
-
+                            if (datas_ProductTest !=null && datas_ProductTest.size()>0){
+                                Log.i(TAG,"鏄剧ず浜ф祴鏁版嵁");
+                                datas.addAll(datas_ProductTest);
+                            }
                             for (int i = 0; i < fields.length; i++) {
                                 fields[i].setAccessible(true);
                                 try {
@@ -156,12 +159,13 @@
                 }
             }
             if (msgCode == Constant.ID_SM_CAN_BRIEF){
+                datas_ProductTest.clear();
                 ProductTestData productTestData = gson.fromJson((String) obj, ProductTestData.class);
 
-                datas.add(new BaseDataUIBean(str2SpannableString("杈撳叆鐘舵��"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getGpio()+""),"",1,null));
-                datas.add(new BaseDataUIBean(str2SpannableString("鍙戝姩鏈鸿浆閫�"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getRpm()+""),"",1,null));
-                datas.add(new BaseDataUIBean(str2SpannableString("杞﹂��"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getSpeed()+""),"",1,null));
-                datas.add(new BaseDataUIBean(str2SpannableString("鐢靛帇"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getVoltage()+""),"",1,null));
+                datas_ProductTest.add(new BaseDataUIBean(str2SpannableString("杈撳叆鐘舵��"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getGpio()+""),"",1,null));
+                datas_ProductTest.add(new BaseDataUIBean(str2SpannableString("鍙戝姩鏈鸿浆閫�"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getRpm()+""),"",1,null));
+                datas_ProductTest.add(new BaseDataUIBean(str2SpannableString("杞﹂��"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getSpeed()+""),"",1,null));
+                datas_ProductTest.add(new BaseDataUIBean(str2SpannableString("鐢靛帇"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getVoltage()+""),"",1,null));
             }
         }
     };
@@ -181,6 +185,7 @@
 
 
     private List<BaseDataUIBean> datas = new ArrayList<>();
+    private List<BaseDataUIBean> datas_ProductTest = new ArrayList<>();
     private ListView lv;
     private BaseDataInfoAdapter gpsInfoAdapter;
     @Nullable

--
Gitblit v1.8.0