Merge remote-tracking branch 'origin/master' into lowprecision

endian11

2020-09-18 74ecba68332f19f3df72698a3d412348ebf9379e

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

@@ -295,8 +295,13 @@
            return ;
        }
        byte[] fileContentBytes= FileUtil.readFile(carFilePath);
        String buffer= new String(fileContentBytes);
        gisCarModel = new Gson().fromJson(buffer, GisCarModel.class);
        if (fileContentBytes !=null&&fileContentBytes.length>0){
            String buffer= new String(fileContentBytes);
            gisCarModel = new Gson().fromJson(buffer, GisCarModel.class);
        }else{
            return;
        }


    }