加入产测数据展示，隐藏考试系统设置为GNSS信息，为合并到主分支做准备

endian11

2020-09-29 cf55dd98225897f49fbdc82b697adebb74c8c708

加入产测数据展示，隐藏考试系统设置为GNSS信息，为合并到主分支做准备

 app/src/main/java/safeluck/drive/evaluation/Constant.java

@@ -98,6 +98,8 @@
    public static final String BIND_ROUTE_COLLECT_TOPIC = "BIND_ROUTE_COLLECT_TOPIC";
    public static final int ENTER_OR_EXIT_ROAD_ID = 0x0015;
    public static final int ENTER_OR_EXIT_ROADCROSS_ID = 0x0016;
    //用于接受产测数据
    public static final int ID_SM_CAN_BRIEF = 0x0021;
    public static String exam_enter_exitdata="exam_enter_exitdata";
    public static int Chang_di = 2;
    public static int DaoLu_night = 3;

 app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java

@@ -20,7 +20,8 @@
 * All Rights Saved! Chongqing AnYun Tech co. LTD
 */
public class SimpleFragmentAdapter  extends FragmentPagerAdapter {
    private String[] mTitles = new String[]{"基础数据","考试系统设置"};
    private String[] mTitles = new String[]{"基础数据","GNSS信息"};
//    private String[] mTitles = new String[]{"基础数据","GNSS信息","考试系统设置"};
    public SimpleFragmentAdapter(FragmentManager fm) {
        super(fm);
    }
@@ -38,11 +39,10 @@
//                //ftp
//                break;
//            case 2:
//                supportFragment = JiaXiaoFragment.newInstance();
//                //驾校信息
//                supportFragment = SysExamSettingFragment.newInstance();
//                break;
            case 1:
                supportFragment = SysExamSettingFragment.newInstance();
                        case 1:
                supportFragment = GpsInfoFragment.newInstance();
                break;
                default:break;
        }

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

@@ -527,6 +527,8 @@
                case Constant.ENTER_OR_EXIT_ROADCROSS_ID:
                    CEventCenter.dispatchEvent(Constant.BIND_ROUTE_COLLECT_TOPIC,cmd,0,json);
                break;
            case Constant. ID_SM_CAN_BRIEF:
                break;
        }

    }

 app/src/main/java/safeluck/drive/evaluation/bean/ProductTestData.java

New file
@@ -0,0 +1,62 @@
package safeluck.drive.evaluation.bean;

/**
 * DriveJudge
 * Created by lzw on 2020/9/29. 14:40:19
 * 邮箱：632393724@qq.com
 * All Rights Saved! Chongqing AnYun Tech co. LTD
 */
public class ProductTestData {

    /**
     * gpio : 32
     * rpm : 1200
     * speed : 55.6
     * voltage : 6.3
     *
     *
     * {
     * "gpio": int             取低16位，具体定义不晓得是啥
     * "rpm": int              转/分
     * "speed": double    公里/时
     * "voltage": double  伏特
     * }
     */

    private int gpio;
    private int rpm;
    private double speed;
    private double voltage;

    public int getGpio() {
        return gpio;
    }

    public void setGpio(int gpio) {
        this.gpio = gpio;
    }

    public int getRpm() {
        return rpm;
    }

    public void setRpm(int rpm) {
        this.rpm = rpm;
    }

    public double getSpeed() {
        return speed;
    }

    public void setSpeed(double speed) {
        this.speed = speed;
    }

    public double getVoltage() {
        return voltage;
    }

    public void setVoltage(double voltage) {
        this.voltage = voltage;
    }
}

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

@@ -62,6 +62,7 @@
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.bean.MapInfoHead;
import safeluck.drive.evaluation.bean.ProductTestData;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
@@ -89,12 +90,13 @@
    private ICEventListener icEventListener = new ICEventListener() {
        @Override
        public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
            datas.clear();
            if (msgCode == Constant.MCU_SN){
                String mcuinfoStr = (String)obj;
                if (gson != null){
                    final MCUInfo mcuInfo=gson.fromJson(mcuinfoStr, MCUInfo.class);
                            Field [] fields = mcuInfo.getClass().getDeclaredFields();
                            datas.clear();


                            for (int i = 0; i < fields.length; i++) {
                                fields[i].setAccessible(true);
@@ -153,6 +155,14 @@

                }
            }
            if (msgCode == Constant.ID_SM_CAN_BRIEF){
                ProductTestData productTestData = gson.fromJson((String) obj, ProductTestData.class);

                datas.add(new BaseDataUIBean(str2SpannableString("输入状态"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getGpio()+""),"",1,null));
                datas.add(new BaseDataUIBean(str2SpannableString("发动机转速"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getRpm()+""),"",1,null));
                datas.add(new BaseDataUIBean(str2SpannableString("车速"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getSpeed()+""),"",1,null));
                datas.add(new BaseDataUIBean(str2SpannableString("电压"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getVoltage()+""),"",1,null));
            }
        }
    };