lizhanwei
2020-04-13 c5d0c045e9feb4cddc396842638f89f50b2d1319
lambda表达式
2个文件已修改
83 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -559,21 +559,18 @@
        view.findViewById(R.id.btn_return).setOnClickListener(this);
        mListView = view.findViewById(R.id.lv);
        mListView.setFocusable(false);
        mListView.setOnTouchListener(new View.OnTouchListener() {
            @Override
            public boolean onTouch(View v, MotionEvent ev) {
                switch (ev.getAction()) {
                    case MotionEvent.ACTION_DOWN:
                    case MotionEvent.ACTION_MOVE:
                        mListView.getParent().requestDisallowInterceptTouchEvent(true);
                        break;
                    case MotionEvent.ACTION_UP:
                    case MotionEvent.ACTION_CANCEL:
                        mListView.getParent().requestDisallowInterceptTouchEvent(false);
                        break;
                }
                return false;
        mListView.setOnTouchListener((v, ev) -> {
            switch (ev.getAction()) {
                case MotionEvent.ACTION_DOWN:
                case MotionEvent.ACTION_MOVE:
                    mListView.getParent().requestDisallowInterceptTouchEvent(true);
                    break;
                case MotionEvent.ACTION_UP:
                case MotionEvent.ACTION_CANCEL:
                    mListView.getParent().requestDisallowInterceptTouchEvent(false);
                    break;
            }
            return false;
        });
        view.findViewById(R.id.view_map).setOnClickListener(this);
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -97,24 +97,21 @@
        View view = inflater.inflate(R.layout.layout_base_datas, container, false);
        initView(view);
        rtkConfigViewModel= ViewModelProviders.of(this).get(RTKConfigViewModel.class);
        rtkConfigViewModel.getRTKConfig().observe(this, new Observer<RTKConfig>() {
            @Override
            public void onChanged(RTKConfig rtkConfig) {
                if (rtkConfig != null){
                    Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
                    mRtkConfig = rtkConfig;
                    et_ip_rtk.setText(rtkConfig.getIp());
                    et_city_id.setText(String.valueOf(rtkConfig.getCity()));
                    et_city_province.setText(String.valueOf(rtkConfig.getProvince()));
                    et_port_rtk.setText(String.valueOf(rtkConfig.getPort()));
                    et_phone.setText(rtkConfig.getPhone());
                    ExamPlatformData.getInstance().setRTKPort(rtkConfig.getPort());
                    ExamPlatformData.getInstance().setRTKIP(rtkConfig.getIp());
                }
        rtkConfigViewModel.getRTKConfig().observe(this, rtkConfig -> {
            if (rtkConfig != null){
                Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
                mRtkConfig = rtkConfig;
                et_ip_rtk.setText(rtkConfig.getIp());
                et_city_id.setText(String.valueOf(rtkConfig.getCity()));
                et_city_province.setText(String.valueOf(rtkConfig.getProvince()));
                et_port_rtk.setText(String.valueOf(rtkConfig.getPort()));
                et_phone.setText(rtkConfig.getPhone());
                ExamPlatformData.getInstance().setRTKPort(rtkConfig.getPort());
                ExamPlatformData.getInstance().setRTKIP(rtkConfig.getIp());
            }
        });
@@ -279,16 +276,15 @@
                final Uri uri= data.getData();
                Log.i(TAG, "onActivityResult: "+uri.getPath());
                ExamPlatformData.getInstance().setNewMapPath(uri.getPath());
                CThreadPoolExecutor.runInBackground(new Runnable() {
                    @Override
                    public void run() {
                CThreadPoolExecutor.runInBackground(()-> {
                        byte[] fileContent = FileUtil.readFile(uri.getPath());
                        if (fileContent != null){
                            String str = new String(fileContent);
                            Log.i(TAG, "文件内容:"+str);
                            AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,str);
                        }
                    }
                });
            }
@@ -298,16 +294,15 @@
                final Uri uri= data.getData();
                Log.i(TAG, "onActivityResult: "+uri.getPath());
                ExamPlatformData.getInstance().setCarModelPath(uri.getPath());
                CThreadPoolExecutor.runInBackground(new Runnable() {
                    @Override
                    public void run() {
                CThreadPoolExecutor.runInBackground(()-> {
                        byte[] fileContent = FileUtil.readFile(uri.getPath());
                        if (fileContent != null){
                            String str = new String(fileContent);
                            Log.i(TAG, "文件内容:"+str);
                            AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,str);
                        }
                    }
                });
            }
@@ -317,15 +312,12 @@
                final Uri uri= data.getData();
                Log.i(TAG, "onActivityResult: "+uri.getPath());
                ExamPlatformData.getInstance().setNewRoadMapPath(uri.getPath());
                CThreadPoolExecutor.runInBackground(new Runnable() {
                    @Override
                    public void run() {
                        byte[] fileContent = FileUtil.readFile(uri.getPath());
                        if (fileContent != null){
                            String str = new String(fileContent);
                            Log.i(TAG, "文件内容:"+str);
                            AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_MAP_INFO,str);
                        }
                CThreadPoolExecutor.runInBackground(() -> {
                    byte[] fileContent = FileUtil.readFile(uri.getPath());
                    if (fileContent != null){
                        String str = new String(fileContent);
                        Log.i(TAG, "文件内容:"+str);
                        AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_MAP_INFO,str);
                    }
                });
            }