把道路、场地、模型更新功能放到设置参数；修改基础数据，使之对齐

endian11

2020-09-10 9f4af8f45a67819d32f1c403025b7090c027c457

 app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java

@@ -104,11 +104,12 @@
                                        version = new String(BytesUtils.hexStringToBytes(version),"GBK");
                                        versionDes= "版本号                     ";
                                        version = version+"#"+ BuildConfig.VERSION_NAME;
                                        setitemInfo(versionDes,version,R.mipmap.version_pic);

                                        datas.add(new BaseDataUIBean(str2SpannableString(versionDes),R.mipmap.version_pic,str2FouregourdSpannableString(version),"",1,null));
                                    }else if(fields[i].getName().equalsIgnoreCase("sn")){
                                        setitemInfo("设备序列号            ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
                                        datas.add(new BaseDataUIBean(str2SpannableString("设备序列号"),R.mipmap.device_sn,str2FouregourdSpannableString(String.valueOf(fields[i].get(mcuInfo))),"",1,null));
                                    }else if(fields[i].getName().equalsIgnoreCase("selftest")){
                                        setitemInfo("自检状态                ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
                                        datas.add(new BaseDataUIBean(str2SpannableString("自检状态 "),R.mipmap.auto_check_status,str2FouregourdSpannableString(String.valueOf(fields[i].get(mcuInfo))),"",1,null));
                                    }

                                } catch (IllegalAccessException e) {
@@ -122,17 +123,16 @@
                                public void run() {

                                    if (mRtkConfig != null){
                                        setitemInfo("省ID                          ", String.valueOf(mRtkConfig.getProvince()),R.mipmap.province_id);
                                        setitemInfo("市ID                          ", String.valueOf(mRtkConfig.getCity()),R.mipmap.province_id);
                                        setitemInfo("RTK平台地址         ", mRtkConfig.getIp()+":"+mRtkConfig.getPort(),R.mipmap.platform_pic);
                                        setitemInfo("考试平台地址         ",ExamPlatformData.getInstance().getPlatformIP()
                                                +":"+ExamPlatformData.getInstance().getPlatformPort(),R.mipmap.platform_pic);

                                        datas.add(new BaseDataUIBean(str2SpannableString("省ID  "),R.mipmap.province_id,str2FouregourdSpannableString(String.valueOf(mRtkConfig.getProvince())),"",1,null));
                                        datas.add(new BaseDataUIBean(str2SpannableString("市ID  "),R.mipmap.province_id,str2FouregourdSpannableString(String.valueOf(mRtkConfig.getCity())),"",1,null));
                                        datas.add(new BaseDataUIBean(str2SpannableString("RTK平台地址  "),R.mipmap.platform_pic,str2FouregourdSpannableString(mRtkConfig.getIp()+":"+mRtkConfig.getPort()),"",1,null));
                                        datas.add(new BaseDataUIBean(str2SpannableString("考试平台地址  "),R.mipmap.platform_pic,str2FouregourdSpannableString(ExamPlatformData.getInstance().getPlatformIP()
                                                +":"+ExamPlatformData.getInstance().getPlatformPort()),"",1,null));

                                    }
                                    if (appStatus != null){
                                        setitemInfo("RTK平台状态         ", appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"已登录":"未登录"):"未连接",R.mipmap.conn_status);
                                        setitemInfo("考试平台状态         ", ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()),R.mipmap.conn_status);
                                          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));
                                    }
                                    HashMap<BaseDataUIBean.TYPE_, MapInfoHead> hashMaps = ExamPlatformData.getInstance().getMapInfoHeads();
                                    if (hashMaps != null){
@@ -163,16 +163,7 @@
        return spannableString;
    }

    private void setitemInfo(String des, String str, int id){
        versionDes=des;
        version= versionDes+str;
        spannableString = new SpannableString(version);
        spannableString.setSpan(new AbsoluteSizeSpan(22),0,versionDes.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#A8AAA7")),0,versionDes.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
        spannableString.setSpan(new AbsoluteSizeSpan(28),versionDes.length()-1,version.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#FFFFFF")),versionDes.length()-1,version.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
        datas.add(new BaseDataUIBean( spannableString,id));
    }


    public static SupportFragment newInstance() {
        return new BaseDatasFragment();
@@ -271,16 +262,13 @@
            BaseDataUIBean.TYPE_ type = datas.get((int)view.getTag()).getType_();
            switch (type){
                case car:
                    Toast.makeText(_mActivity, "更新车模型", Toast.LENGTH_SHORT).show();
                    DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"car");

                    break;
                case road:
                    Toast.makeText(_mActivity, "更新道路地图", Toast.LENGTH_SHORT).show();
                    DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"road");

                    break;
                case yard:
                    Toast.makeText(_mActivity, "更新场地地图", Toast.LENGTH_SHORT).show();
                    DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");

                    break;
            }
        }