From 225473d256d26d4d8f9469038d02d28ac1c866be Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 03 二月 2021 14:24:57 +0800
Subject: [PATCH] 增加RTK全部信息展示页
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 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 92cacac..4efe7b2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -155,11 +155,7 @@
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();
@@ -183,20 +179,7 @@
}
};
- 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){
@@ -292,21 +275,22 @@
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
public void onDestroyView() {
super.onDestroyView();
- ((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
- ((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
+ Log.i(TAG,"onDestroyView");
+// ((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
+// ((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
}
@Override
--
Gitblit v1.8.0