lizhanwei
2020-03-02 2307694481c810b96a2a224bdcb383c93dd9cc26
平台协议增加speed编码器;修改基础数据UI;
2个文件已修改
27 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -83,10 +83,13 @@
                                    if (fields[i].getName().equalsIgnoreCase("version")){
                                        String version = (String) fields[i].get(mcuInfo);
                                        version = new String(BytesUtils.hexStringToBytes(version),"GBK");
                                        Log.i(TAG, "onCEvent: "+version);
                                        datas.add(fields[i].getName() + ":" + version);
                                    }else
                                        datas.add(fields[i].getName() + ":" + fields[i].get(mcuInfo));
                                        datas.add("版本号:" + version);
                                    }else if(fields[i].getName().equalsIgnoreCase("sn")){
                                        datas.add( "设备序列号:" + fields[i].get(mcuInfo));
                                    }else if(fields[i].getName().equalsIgnoreCase("selftest")){
                                        datas.add( "自检状态:" + fields[i].get(mcuInfo));
                                    }
                                } catch (IllegalAccessException e) {
                                    e.printStackTrace();
                                } catch (UnsupportedEncodingException e) {
@@ -101,17 +104,13 @@
                                        datas.add("省ID:"+mRtkConfig.getProvince());
                                        datas.add("市ID:"+mRtkConfig.getCity());
                                        datas.add("电话:"+mRtkConfig.getPhone());
                                        datas.add("RTK平台地址:"+mRtkConfig.getIp());
                                        datas.add("RTK平台端口:"+mRtkConfig.getPort());
                                        datas.add("RTK平台地址:"+mRtkConfig.getIp()+":"+mRtkConfig.getPort());
                                        datas.add("考试平台地址:"+ExamPlatformData.getInstance().getPlatformIP());
                                        datas.add("考试平台端口:"+ExamPlatformData.getInstance().getPlatformPort());
                                        datas.add("考试平台地址:"+ExamPlatformData.getInstance().getPlatformIP()+":"+ExamPlatformData.getInstance().getPlatformPort());
                                    }
                                    if (appStatus != null){
                                        datas.add("RTK平台连接状态:"+appStatus.getRtk_connect_status());
                                        datas.add("RTK平台登录状态:"+appStatus.getRtk_login_code());
                                        datas.add("考试平台连接状态:"+appStatus.getRtk_connect_status());
                                        datas.add("考试平台登录状态:"+appStatus.getRtk_login_code());
                                        datas.add("RTK平台状态:"+appStatus.getRtk_connect_status());
                                        datas.add("考试平台状态:"+appStatus.getRtk_connect_status());
                                    }
                                    gpsInfoAdapter.addAll(datas);
                                }
app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
@@ -18,11 +18,15 @@
import safeluck.drive.evaluation.platformMessage.decoder.JWDCoder;
import safeluck.drive.evaluation.platformMessage.decoder.Phone;
import safeluck.drive.evaluation.platformMessage.decoder.PhoneCoder;
import safeluck.drive.evaluation.platformMessage.decoder.SPEED;
import safeluck.drive.evaluation.platformMessage.decoder.SpeedCoder;
public class JK2019MessageBase extends BinMessageBase {
    static {
        AnnotationRegister.register(JWD.class, new JWDCoder());
        AnnotationRegister.register(Phone.class, new PhoneCoder());
        //增加speed 编码器
        AnnotationRegister.register(SPEED.class, new SpeedCoder());
    }
    static Int16Coder coder = new Int16Coder();