From 594b8f929d9374838d99b831320ea4da96e4d3b5 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 03 二月 2021 09:54:16 +0800
Subject: [PATCH] 基础数据增加坐标 经纬度
---
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 9 +++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 24 ++++++++++++++++++++++++
2 files changed, 33 insertions(+), 0 deletions(-)
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 3c7a54d..3edf64d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -628,4 +628,13 @@
public int getServceBindStatus(){
return bindServiceStats;
}
+
+ private RTKInfoBean rtkInfoBean;
+ public void setRTKinfoBean(RTKInfoBean rtkInfoBean) {
+ this.rtkInfoBean =rtkInfoBean;
+ }
+
+ public RTKInfoBean getRtkInfoBean() {
+ return rtkInfoBean;
+ }
}
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 82e00cf..92cacac 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -64,6 +64,7 @@
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.bean.MapInfoHead;
import safeluck.drive.evaluation.bean.ProductTestData;
+import safeluck.drive.evaluation.bean.RTKInfoBean;
import safeluck.drive.evaluation.bean.RTKModuleInfo;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
@@ -154,6 +155,11 @@
datas.add(new BaseDataUIBean(str2SpannableString("RTK骞冲彴鐘舵��"),R.mipmap.conn_status,str2FouregourdSpannableString(appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"宸茬櫥褰�":"鏈櫥褰�"):"鏈繛鎺�"),"",1,null));
datas.add(new BaseDataUIBean(str2SpannableString("鑰冭瘯骞冲彴鐘舵��"),R.mipmap.conn_status,str2FouregourdSpannableString(ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus())),"",1,null));
}
+ RTKInfoBean rtkinfo = ExamPlatformData.getInstance().getRtkInfoBean();
+ if (rtkinfo != null){
+ datas.add(new BaseDataUIBean(str2SpannableString("鍧愭爣"),R.mipmap.conn_status,str2FouregourdSpannableString(rtkinfo.getCoord_y()+","+rtkinfo.getCoord_x()),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("缁忕含搴�"),R.mipmap.conn_status,str2FouregourdSpannableString(rtkinfo.getLongitude()+","+rtkinfo.getLatitude()),"",1,null));
+ }
HashMap<BaseDataUIBean.TYPE_, MapInfoHead> hashMaps = ExamPlatformData.getInstance().getMapInfoHeads();
if (hashMaps != null){
Iterator<Map .Entry<BaseDataUIBean.TYPE_,MapInfoHead>> iterator = hashMaps.entrySet().iterator();
@@ -176,6 +182,22 @@
}
};
+
+ private String lastRtkinfoStr = "";
+ private ICEventListener icEventListener1 = new ICEventListener() {
+ @Override
+ public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
+ if (msgCode == Constant.RTK_INFO){
+ String str = (String)obj;
+ if (!str.equalsIgnoreCase(lastRtkinfoStr)){
+ RTKInfoBean rtkInfoBean = gson.fromJson(str, RTKInfoBean.class);
+ ExamPlatformData.getInstance().setRTKinfoBean(rtkInfoBean);
+ }
+
+ }
+ }
+ };
+
private String left(String s,int pos){
StringBuffer sb = new StringBuffer();
@@ -270,12 +292,14 @@
public void onAttach(Context context) {
super.onAttach(context);
CEventCenter.onBindEvent(true,icEventListener,Constant.BIND_MCUINFO_TOPIC);
+ CEventCenter.onBindEvent(true,icEventListener1,Constant.BIND_RTK_INFO_MAP);
}
@Override
public void onDetach() {
super.onDetach();
CEventCenter.onBindEvent(false,icEventListener,Constant.BIND_MCUINFO_TOPIC);
+ CEventCenter.onBindEvent(false,icEventListener1,Constant.BIND_RTK_INFO_MAP);
}
@Override
--
Gitblit v1.8.0