app/src/main/java/safeluck/drive/evaluation/app.java
@@ -319,7 +319,7 @@ Criteria ttsStr=WorkRoomDataBase.getWorkRoomDataBase(getAppContext()).getCriteriaDao().queryItemForCriteriaNoLive(emp_id); ExamPlatformData.getInstance().getTTS().speak(ttsStr.getDeducting_reason() + (ttsStr.getScore_deducting() == 100? "不合格 " : "扣" + ExamPlatformData.getInstance().getTTS().speak(ttsStr.getDeducting_reason().replace("s","秒") + (ttsStr.getScore_deducting() == 100? "不合格 " : "扣" + ttsStr.getScore_deducting() + "分 ")); jkMessage0203.fail_item_id =ttsStr.getItem_id(); jkMessage0203.fail_score = ttsStr.getScore_deducting(); app/src/main/java/safeluck/drive/evaluation/bean/GisCarModel.java
@@ -27,10 +27,10 @@ private List<Integer> right_rear_tire; private List<Integer> left_front_glass; private List<Integer> left_rear_glass; private List<Integer> left_center_glass; private List<Integer> right_front_glass; private List<Integer> right_rear_glass; private List<Integer> right_center_glass; private List<Integer> left_center_glass; public List<Integer> getAxial() { return axial; app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
@@ -25,6 +25,7 @@ import com.esri.arcgisruntime.geometry.Polyline; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISMapImageLayer; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.view.DefaultMapViewOnTouchListener; import com.esri.arcgisruntime.mapping.view.Graphic; @@ -312,7 +313,7 @@ } private void readGisCar() { String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/giscar.json"; String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/lianfang_giscar.json"; if (TextUtils.isEmpty(carFilePath)){ MyLog.i (TAG, "GISCar车辆模型文件不存在"); return ; app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -923,21 +923,22 @@ private void startArcGisMapFragment(String url) { MapFragment jiaXiaoFragment = findFragment(MapFragment.class); if (jiaXiaoFragment == null) { jiaXiaoFragment = (MapFragment) MapFragment.newInstance(); } start(jiaXiaoFragment); // url = "http://arcgis.aaej.cn/arcgis/rest/services/高庙村首飞驾校科二地图/MapServer"; if (!TextUtils.isEmpty(url)) { ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class); if (jiaXiaoFragment == null) { jiaXiaoFragment = (ArcGisMapFragment) ArcGisMapFragment.newInstance(url); } start(jiaXiaoFragment); }else{ Toast.makeText(_mActivity, "错误:ArcGIS URL 为空!", Toast.LENGTH_SHORT).show(); // if (!TextUtils.isEmpty(url)) { // ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class); // if (jiaXiaoFragment == null) { // jiaXiaoFragment = (ArcGisMapFragment) ArcGisMapFragment.newInstance(url); // } // start(jiaXiaoFragment); // }else{ // Toast.makeText(_mActivity, "错误:ArcGIS URL 为空!", Toast.LENGTH_SHORT).show(); // } MapFragment jiaXiaoFragment = findFragment(MapFragment.class); if (jiaXiaoFragment == null) { jiaXiaoFragment = (MapFragment) MapFragment.newInstance(); } start(jiaXiaoFragment); } } private String getArcGisUrl(int examType) { app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -326,7 +326,7 @@ else ->{ mapInfoHead.type = BaseDataUIBean.TYPE_.car val car = gson.fromJson<HttpCarRespBean>(str,HttpCarRespBean::class.java) car.isResult = false // car.isResult = false if (car.isResult){ if (car.data !=null){ mapInfoHead.version = car.data.version