From 65f303d74eef06b3ceccac11c9fca1fe569506a9 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 29 九月 2020 16:31:27 +0800
Subject: [PATCH] 修改产测数据发送不是用CEvent
---
app/src/main/java/safeluck/drive/evaluation/app.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 13 +++++++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 30 ++++++++++++++----------------
3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 46776d2..8dbc95b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -526,7 +526,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);
+ ExamPlatformData.getInstance().setSM_CAN_BRIEF(json);
break;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index ba47c06..570b425 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -534,4 +534,17 @@
public void setCurrRouteItem(int roadItemChangeLane) {
this.routeItem = roadItemChangeLane;
}
+
+ private String smCanBriefString;
+ public void setSM_CAN_BRIEF(String json) {
+ if (smCanBriefString != null && smCanBriefString.equalsIgnoreCase(json)){
+
+ }else{
+ smCanBriefString = json;
+ }
+ }
+
+ public String getSMCanBrief(){
+ return smCanBriefString;
+ }
}
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 aa70b4e..dcecebf 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -17,6 +17,7 @@
import android.text.SpannableString;
import android.text.Spanned;
+import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
@@ -31,7 +32,7 @@
import com.anyun.exam.lib.AYSdk;
import com.anyun.basecommonlib.MyLog;
-import com.anyun.exam.lib.util.ByteUtil;
+import com.anyun.im_lib.util.ByteUtil;
import com.google.gson.Gson;
import com.safeluck.aykj.utils.BytesUtils;
@@ -97,11 +98,17 @@
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++) {
+ String canBrief = ExamPlatformData.getInstance().getSMCanBrief();
+ if (!TextUtils.isEmpty(canBrief)){
+ ProductTestData productTestData = gson.fromJson(canBrief, ProductTestData.class);
+
+ datas.add(new BaseDataUIBean(str2SpannableString("杈撳叆鐘舵��"),R.mipmap.version_pic,str2FouregourdSpannableString(ByteUtil.byte2HexStr(ByteUtil.intGetBytes(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));
+ }
+
+ for (int i = 0; i < fields.length; i++) {
fields[i].setAccessible(true);
try {
if (fields[i].getName().equalsIgnoreCase("version")){
@@ -151,22 +158,14 @@
}
}
-
gpsInfoAdapter.addAll(datas);
}
});
}
}
- if (msgCode == Constant.ID_SM_CAN_BRIEF){
- datas_ProductTest.clear();
- ProductTestData productTestData = gson.fromJson((String) obj, ProductTestData.class);
- 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));
- }
+
}
};
@@ -185,7 +184,6 @@
private List<BaseDataUIBean> datas = new ArrayList<>();
- private List<BaseDataUIBean> datas_ProductTest = new ArrayList<>();
private ListView lv;
private BaseDataInfoAdapter gpsInfoAdapter;
@Nullable
--
Gitblit v1.8.0