Merge branch 'master' of https://gitee.com/endian11/DriveJudge

yy1717

2020-12-04 5719515b70fd7405e34198f15dfbc78c07975323

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

@@ -54,6 +54,7 @@
import safeluck.drive.evaluation.adapter.WrapContentLinearLayoutManager;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.bean.UserOpStatus;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.customview.MyArgEditText;
@@ -269,14 +270,17 @@
            case R.id.btn_car_upgrade:
                Toast.makeText(_mActivity, "更新车模型", Toast.LENGTH_SHORT).show();
                DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"car");
                UserOpStatus.getInstance().resetCarFileSelectState();
                break;
            case R.id.btn_yard_update:
                Toast.makeText(_mActivity, "更新场地地图", Toast.LENGTH_SHORT).show();
                DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");
                UserOpStatus.getInstance().resetItemsFileSelectState();
                break;
            case R.id.btn_road_update:
                Toast.makeText(_mActivity, "更新道路地图", Toast.LENGTH_SHORT).show();
                DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"road");
                UserOpStatus.getInstance().resetRoadFileSelectState();
                break;
            default:
                break;
@@ -302,6 +306,7 @@
            if (data != null){
                final Uri uri= data.getData();
                Log.i(TAG, "onActivityResult: "+uri.getPath());
                UserOpStatus.getInstance().setItemsFileSelectState(UserOpStatus.State.SELECT_ITEMS_MAP_STATE);
                ExamPlatformData.getInstance().setNewMapPath(uri.getPath());
                CThreadPoolExecutor.runInBackground(()-> {

@@ -321,6 +326,7 @@
                final Uri uri= data.getData();
                Log.i(TAG, "onActivityResult: "+uri.getPath());
                ExamPlatformData.getInstance().setCarModelPath(uri.getPath());
                UserOpStatus.getInstance().setCarFileSelectState(UserOpStatus.State.SELECT_CAR_FILE_STATE);
                CThreadPoolExecutor.runInBackground(()-> {

                        byte[] fileContent = FileUtil.readFile(uri.getPath());
@@ -339,6 +345,7 @@
                final Uri uri= data.getData();
                Log.i(TAG, "onActivityResult: "+uri.getPath());
                ExamPlatformData.getInstance().setNewRoadMapPath(uri.getPath());
                UserOpStatus.getInstance().setRoadFileSelectState(UserOpStatus.State.SELECT_ROAD_MAP_STATE);
                CThreadPoolExecutor.runInBackground(() -> {
                    byte[] fileContent = FileUtil.readFile(uri.getPath());
                    if (fileContent != null){