From c278f9b57a1d20990c775c1fa92feb31a18d5f42 Mon Sep 17 00:00:00 2001 From: wds Date: Wed, 4 Aug 2021 16:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/activity/FragmentManagement.java | 2 -- .../navinfo/outdoor/base/BaseFragment.java | 2 +- .../outdoor/fragment/StaySubmitFragment.java | 10 ++++----- .../outdoor/fragment/TreasureFragment.java | 22 ++++++++++++++++--- .../com/navinfo/outdoor/http/OkGoBuilder.java | 4 ++++ 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java index 837fb43..204f96b 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java @@ -471,8 +471,6 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(messageFragment); } break; - - } fragmentTransaction.commit(); } diff --git a/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java index 7e1e171..0586038 100644 --- a/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java @@ -104,7 +104,7 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl private void initTimer() { Timer timer = new Timer(true); TimerTask timerTask = new TimerTask() { - int countTime = 10; + int countTime = 20; @Override public void run() { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index c9ab4a5..39facc4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -247,11 +247,11 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList public void run() { roadEntities.clear(); roadEntities.addAll(roadAll); -// for (int i = 0; i < roadAll.size(); i++) { -// if (roadAll.get(i).getType()!=6){ -// roadEntities.add(roadAll.get(i)); -// } -// } +// for (int i = 0; i < roadAll.size(); i++) { +// if (roadAll.get(i).getType()!=6){ +// roadEntities.add(roadAll.get(i)); +// } +// } Log.d("TAG", "run: " + roadEntities.toString()); staySubmitAdapter.setAllRoad(roadEntities); staySubmitAdapter.notifyDataSetChanged(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index 1b3113c..6784070 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -274,7 +274,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen case 2: ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle); showSlidingFragment(chargingStationFragment); - break; case 3: PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); @@ -323,6 +322,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen poiListEntity.setY(latPolygon.get(0).latitude + ""); } initMarker(poiListEntity); + }else { + Toast.makeText(getActivity(), "数据为空", Toast.LENGTH_SHORT).show(); } } @@ -576,13 +577,28 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen latLng = latPolygon.get(0); }*/ } + BitmapDescriptor descriptor = null; + if (poiEntity.getType()==1){ + descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bags); + }else if (poiEntity.getType()==2){ + descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bags); + }else if (poiEntity.getType()==3){ + descriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bag); + }else if (poiEntity.getType()==4){ + descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bag); + }else if (poiEntity.getType()==5){ + descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bag); + }else if (poiEntity.getType()==6){ + descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bag); + } + if (bigMarker == null) { - BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bag); - bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f) + bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(descriptor).alpha(0.9f) .flat(true) .clockwise(false)); } else { bigMarker.setPosition(latLng); + bigMarker.setIcon(descriptor); } bigMarker.setVisible(true); bigMarker.setClickable(false); diff --git a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java index 4d55c0a..fed6b6e 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java +++ b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java @@ -2,6 +2,10 @@ package com.navinfo.outdoor.http; import android.app.Activity; +import com.github.lazylibrary.util.DES; +import com.github.lazylibrary.util.MD5; +import com.google.gson.Gson; +import com.google.gson.JsonObject; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response;