From 98508eb8eb40e2e995045a7b9fb5b69bbd0e7c8c Mon Sep 17 00:00:00 2001 From: fctom1215 <fctom1215@outlook.com> Date: 星期四, 27 八月 2020 17:31:03 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge --- app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java index 57dd56f..447aa4d 100644 --- a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java +++ b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java @@ -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; } } -- Gitblit v1.8.0