Merge remote-tracking branch 'origin/master'

yy1717

2020-03-12 c125fc0a5ee47ef32db587899d972491231167ee

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

@@ -104,7 +104,6 @@
            if (msgCode == Constant.NDK_START){
                MyLog.i(TAG,"NDK_start,发送RTK配置");
                sendRtkConfigInfo();
                sendSignalConfigsToRemote();
                sendMcuUprgrade();
            }
        }
@@ -165,7 +164,7 @@
        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
        setContentView(R.layout.activity_main);
        //初始化tts
        ExamPlatformData.getInstance().initTTS(this);
        ExamPlatformData.getInstance().initTTS(getApplicationContext());
        // TODO
        //  进行tcp连接
        final String userId = "100002";
@@ -214,23 +213,23 @@
        });


        signalConfigViewModel = ViewModelProviders.of(this).get(SignalConfigViewModel.class);
        signalConfigViewModel.getSignalConfigs().observe(this, new Observer<List<SingalConfig>>() {
            @Override
            public void onChanged(List<SingalConfig> singalConfigs) {
                signalConfiglist.clear();
                MyLog.i(TAG, "信号配置发生变化");

                for (int i = 0; i < singalConfigs.size(); i++) {
                    SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
                    signalConfigRemote.setFunc_id(i);
                    signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
                    signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
                    signalConfiglist.add(signalConfigRemote);
                }
                sendSignalConfigsToRemote();
            }
        });
//        signalConfigViewModel = ViewModelProviders.of(this).get(SignalConfigViewModel.class);
//        signalConfigViewModel.getSignalConfigs().observe(this, new Observer<List<SingalConfig>>() {
//            @Override
//            public void onChanged(List<SingalConfig> singalConfigs) {
//                signalConfiglist.clear();
//                MyLog.i(TAG, "信号配置发生变化");
//
//                for (int i = 0; i < singalConfigs.size(); i++) {
//                    SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
//                    signalConfigRemote.setFunc_id(i);
//                    signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
//                    signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
//                    signalConfiglist.add(signalConfigRemote);
//                }
//                sendSignalConfigsToRemote();
//            }
//        });

        mPermissionsManager = new PermissionManager(this) {
            @Override