endian11
2021-02-03 594b8f929d9374838d99b831320ea4da96e4d3b5
基础数据增加坐标 经纬度
2个文件已修改
33 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    }
}
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