xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
wds 2021-08-04 16:12:29 +08:00
parent 4f157306ad
commit c278f9b57a
5 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java
View File

@ -471,8 +471,6 @@ public class FragmentManagement extends BaseActivity {
fragmentTransaction.show(messageFragment); fragmentTransaction.show(messageFragment);
} }
break; break;
} }
fragmentTransaction.commit(); fragmentTransaction.commit();
} }

2
app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java
View File

@ -104,7 +104,7 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl
private void initTimer() { private void initTimer() {
Timer timer = new Timer(true); Timer timer = new Timer(true);
TimerTask timerTask = new TimerTask() { TimerTask timerTask = new TimerTask() {
int countTime = 10; int countTime = 20;
@Override @Override
public void run() { public void run() {

10
app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
View File

@ -247,11 +247,11 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
public void run() { public void run() {
roadEntities.clear(); roadEntities.clear();
roadEntities.addAll(roadAll); roadEntities.addAll(roadAll);
// for (int i = 0; i < roadAll.size(); i++) { // for (int i = 0; i < roadAll.size(); i++) {
// if (roadAll.get(i).getType()!=6){ // if (roadAll.get(i).getType()!=6){
// roadEntities.add(roadAll.get(i)); // roadEntities.add(roadAll.get(i));
// } // }
// } // }
Log.d("TAG", "run: " + roadEntities.toString()); Log.d("TAG", "run: " + roadEntities.toString());
staySubmitAdapter.setAllRoad(roadEntities); staySubmitAdapter.setAllRoad(roadEntities);
staySubmitAdapter.notifyDataSetChanged(); staySubmitAdapter.notifyDataSetChanged();

22
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@ -274,7 +274,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
case 2: case 2:
ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle); ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
showSlidingFragment(chargingStationFragment); showSlidingFragment(chargingStationFragment);
break; break;
case 3: case 3:
PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
@ -323,6 +322,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
poiListEntity.setY(latPolygon.get(0).latitude + ""); poiListEntity.setY(latPolygon.get(0).latitude + "");
} }
initMarker(poiListEntity); 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); 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) { if (bigMarker == null) {
BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bag); bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(descriptor).alpha(0.9f)
bigMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
.flat(true) .flat(true)
.clockwise(false)); .clockwise(false));
} else { } else {
bigMarker.setPosition(latLng); bigMarker.setPosition(latLng);
bigMarker.setIcon(descriptor);
} }
bigMarker.setVisible(true); bigMarker.setVisible(true);
bigMarker.setClickable(false); bigMarker.setClickable(false);

4
app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java
View File

@ -2,6 +2,10 @@ package com.navinfo.outdoor.http;
import android.app.Activity; 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.OkGo;
import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.HttpParams;
import com.lzy.okgo.model.Response; import com.lzy.okgo.model.Response;