app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
@@ -87,7 +87,7 @@ "yard" -> fileName = safeluck.drive.evaluation.Constant.MAP else -> fileName = safeluck.drive.evaluation.Constant.VEHICLE } if (!FileUtil.isMapExist(applicationContext,fileName)) { // if (!FileUtil.isMapExist(applicationContext,fileName)) { getRestService().getMapsAndVehicleModel(HttpRequetBean(sn, type)).enqueue(object : Callback<ResponseBody> { override fun onFailure(call: Call<ResponseBody>, t: Throwable) { MyLog.i(PlatFormConstant.HTTPTAG,t.localizedMessage) @@ -189,15 +189,15 @@ } }) }else{ MyLog.i(PlatFormConstant.HTTPTAG,"已存在直接发送车辆和地图"+fileName) when(type){ "road" -> sendRoadMapInfo() "yard" -> sendMapInfo() else -> sendVehicleInfo() } } // }else{ // MyLog.i(PlatFormConstant.HTTPTAG,"已存在直接发送车辆和地图"+fileName) // when(type){ // "road" -> sendRoadMapInfo() // "yard" -> sendMapInfo() // else -> sendVehicleInfo() // } // // } } private fun sendRoadMapInfo(){ app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -44,8 +44,10 @@ import me.yokeyword.fragmentation.SupportFragment; import safeluck.drive.evaluation.Constant; import safeluck.drive.evaluation.R; import safeluck.drive.evaluation.bean.BaseDataUIBean; import safeluck.drive.evaluation.bean.ExamMap; import safeluck.drive.evaluation.bean.ExamPlatformData; import safeluck.drive.evaluation.bean.MapInfoHead; import safeluck.drive.evaluation.bean.RealTimeCarPos; import safeluck.drive.evaluation.cEventCenter.CEventCenter; import safeluck.drive.evaluation.cEventCenter.ICEventListener; @@ -169,6 +171,7 @@ mSurfaceView = view.findViewById(R.id.surfaceview); view.findViewById(R.id.btn_reduce).setOnClickListener(this); view.findViewById(R.id.btn_amplify).setOnClickListener(this); view.findViewById(R.id.btn_change_map).setOnClickListener(this); holder = mSurfaceView.getHolder(); holder.addCallback(new SurfaceHolder.Callback() { @@ -447,6 +450,17 @@ pixels+=5; } break; case R.id.btn_change_map: MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard); String url = mapInfoHead.getGps_moinitor_url(); Log.i(TAG,"map head lulao gps url="+url); VPFragment jiaXiaoFragment = findFragment(VPFragment.class); if (jiaXiaoFragment == null) { jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url); } start(jiaXiaoFragment); break; } }
@@ -46,7 +46,9 @@ import me.yokeyword.fragmentation.SupportFragment; import safeluck.drive.evaluation.Constant; import safeluck.drive.evaluation.R; import safeluck.drive.evaluation.bean.BaseDataUIBean; import safeluck.drive.evaluation.bean.ExamPlatformData; import safeluck.drive.evaluation.bean.MapInfoHead; import safeluck.drive.evaluation.bean.RealTimeCarPos; import safeluck.drive.evaluation.bean.RoadExamMap; import safeluck.drive.evaluation.bean.RoadExamMap2; @@ -156,6 +158,7 @@ mSurfaceView = view.findViewById(R.id.surfaceview); view.findViewById(R.id.btn_reduce).setOnClickListener(this); view.findViewById(R.id.btn_amplify).setOnClickListener(this); view.findViewById(R.id.btn_change_map).setOnClickListener(this); holder = mSurfaceView.getHolder(); holder.addCallback(new SurfaceHolder.Callback() { @@ -1492,6 +1495,16 @@ pixels+=5; } break; case R.id.btn_change_map: MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road); String url = mapInfoHead.getGps_moinitor_url(); Log.i(TAG,"map head lulao gps url="+url); VPFragment jiaXiaoFragment = findFragment(VPFragment.class); if (jiaXiaoFragment == null) { jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url); } start(jiaXiaoFragment); break; } }
@@ -596,37 +596,37 @@ case R.id.view_map: if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){ // RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class); RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class); MyLog.i(TAG,"查看路考地图"); // if (mapFragment == null) { // mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance(); // } // start(mapFragment); MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road); String url = mapInfoHead.getGps_moinitor_url(); Log.i(TAG,"map head lulao gps url="+url); VPFragment jiaXiaoFragment = findFragment(VPFragment.class); if (jiaXiaoFragment == null) { jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url); if (mapFragment == null) { mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance(); } start(jiaXiaoFragment); start(mapFragment); // MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road); // String url = mapInfoHead.getGps_moinitor_url(); // Log.i(TAG,"map head lulao gps url="+url); // VPFragment jiaXiaoFragment = findFragment(VPFragment.class); // if (jiaXiaoFragment == null) { // jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url); // } // start(jiaXiaoFragment); }else{ // MapFragment mapFragment = findFragment(MapFragment.class); MapFragment mapFragment = findFragment(MapFragment.class); MyLog.i(TAG,"查看场考地图"); // if (mapFragment == null) { // mapFragment = (MapFragment) MapFragment.newInstance(); // } // start(mapFragment); VPFragment jiaXiaoFragment = findFragment(VPFragment.class); if (jiaXiaoFragment == null) { MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard); String url = mapInfoHead.getGps_moinitor_url(); Log.i(TAG,"map head gps url="+url); jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url); if (mapFragment == null) { mapFragment = (MapFragment) MapFragment.newInstance(); } start(jiaXiaoFragment); start(mapFragment); // VPFragment jiaXiaoFragment = findFragment(VPFragment.class); // if (jiaXiaoFragment == null) { // MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard); // String url = mapInfoHead.getGps_moinitor_url(); // Log.i(TAG,"map head gps url="+url); // jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url); // } // start(jiaXiaoFragment); } break; case R.id.iv_head: app/src/main/res/layout/layout_mapfragment.xml
@@ -22,4 +22,12 @@ android:background="@drawable/btn_state_save" android:layout_marginLeft="120dp" android:text="缩小"/> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|left" android:id="@+id/btn_change_map" android:background="@drawable/btn_state_save" android:layout_marginLeft="240dp" android:text="切换地图"/> </FrameLayout>
