修改bug

app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java

@@ -167,8 +167,8 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                     poiEntity.setName(list.get(i).getName());
                     poiEntity.setAddress(list.get(i).getAddress());
                     poiEntity.setTelPhone(list.get(i).getTelephone() + "");
-                    poiEntity.setPrecision(list.get(i).getPrice());
+                    poiEntity.setPrecision(list.get(i).getPrice()+"");
-                    poiEntity.setDist(list.get(i).getDist());
+                    poiEntity.setDist(list.get(i).getDist()+"");
                     poiEntity.setType(Integer.valueOf(list.get(i).getType()));
                     String geo = list.get(i).getGeo();
                     Geometry geometry = GeometryTools.createGeometry(geo);

app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java

@@ -315,8 +315,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                 poiListEntity.setName(listBean.getName());
                                 poiListEntity.setAddress(listBean.getAddress());
                                 poiListEntity.setTelPhone(listBean.getTelephone() + "");
-                                poiListEntity.setPrecision(listBean.getPrice());
+                                poiListEntity.setPrecision(listBean.getPrice() + "");
-                                poiListEntity.setDist(listBean.getDist());
+                                poiListEntity.setDist(listBean.getDist() + "");
                                 poiListEntity.setDescribe(listBean.getMemo());
                                 poiListEntity.setCreateTime(listBean.getEndDate());
                                 poiListEntity.setType(Integer.valueOf(listBean.getType()));
@@ -395,6 +395,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                 Log.d("TAG", "onSuccess:  " + response.getCode() + response.getMessage() + "" + response.getBody());
                             }
                         }
+
                         @Override
                         public void onError(Throwable e, int id) {
                             dismissLoadingDialog();
@@ -423,14 +424,12 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
             centerEncode = Geohash.getInstance().encode(mapCenterPoint.latitude, mapCenterPoint.longitude);
         }
         userEncode = Geohash.getInstance().encode(tencentLocation.getLatitude(), tencentLocation.getLongitude());
-        long date = System.currentTimeMillis();
         OkGo.getInstance().cancelTag(this);
         showLoadingDialog();
         // 请求方式和请求url
         HttpParams httpParams = new HttpParams();
         httpParams.put("userGeo", userEncode);
         httpParams.put("centerGeo", centerEncode);
-        httpParams.put("date", date);
         httpParams.put("pageSize", Constant.NUMBER);
         httpParams.put("pageNum", "1");
         httpParams.put("type", task_type);
@@ -446,8 +445,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                     public void onSuccess(JobSearchBean response, int id) {
                         dismissLoadingDialog();
                         JobSearchBean.BodyBean body = response.getBody();
-                        upload =response.getUpload();
+                        upload = response.getBody().getUpload();
+
                         if (body != null) {
+                            if (upload != null) {
+                                ivSubmit.setEnabled(true);
+                            } else {
+                                ivSubmit.setEnabled(false);
+                            }
                             Log.d("TAG", "onSuccess: " + response.getBody().toString() + "sssssssssssss");
                             for (int i = 0; i < removables.size(); i++) {
                                 removables.get(i).remove();
@@ -591,6 +596,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                         obtain.obj = response;
                         EventBus.getDefault().post(obtain);
                     }
+
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
@@ -599,6 +605,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 });
         dismissDialog();
     }
+
     public void initMarker(PoiEntity poiEntity) {
         sliding_layout.setPanelHeight(0);
         sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
@@ -1310,6 +1317,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                     markerPile.setFixingPoint(screenPosition.x, screenPosition.y);
                 }
             }
+
             @Override
             public void onCancel() {
             }
@@ -1467,6 +1475,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 }
                 break;
             case R.id.iv_submit://弹窗
+
                 //分享
                 CharSequence title = "请选择上报类型";
                 // 如果当前fragment是筛选，则移除该fragment
@@ -1476,12 +1485,31 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 }
                 DialogSettings.style = DialogSettings.STYLE.STYLE_MIUI;
                 List<ShareDialog.Item> itemList = new ArrayList<>();
+                if (upload.contains(1)) {
                     itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_poi, "POI"));
-                itemList.add(new ShareDialog.Item(getContext(), R.drawable.poi_video, "POI录像"));
+                } else {
-                itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_road, "道路"));
-                itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_chongdianzhuang, "充电站"));
-                itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_qingbao, "其他"));
 
+                }
+                if (upload.contains(2)) {
+                    itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_chongdianzhuang, "充电站"));
+                }else {
+
+                }
+                if (upload.contains(3)) {
+                    itemList.add(new ShareDialog.Item(getContext(), R.drawable.poi_video, "POI录像"));
+                }else {
+
+                }
+                if (upload.contains(4)) {
+                    itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_road, "道路"));
+                }else {
+
+                }
+                if (upload.contains(5)) {
+                    itemList.add(new ShareDialog.Item(getContext(), R.drawable.push_qingbao, "其他"));
+                }else {
+
+                }
                 Bundle bundle = new Bundle();
                 PoiEntity poiEntity = new PoiEntity();
                 // 上报时以当前用户位置为准
@@ -1497,34 +1525,28 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 ShareDialog.show((AppCompatActivity) getActivity(), itemList, new ShareDialog.OnItemClickListener() {
                     @Override
                     public boolean onClick(ShareDialog shareDialog, int index, ShareDialog.Item item) {
-                        switch (index) {
+                        if (item.getText().equals("POI")) {
-                            case 0: // POI
                             showPoiMarkerByType(1, newPoiLatLng);
                             PoiFragment poiFragment = PoiFragment.newInstance(bundle);
                             showSlidingFragment(poiFragment);
-                                break;
+                        } else if (item.getText().equals("充电站")) {
-                            case 1: // POI录像
+                            showPoiMarkerByType(4, newPoiLatLng);
+                            ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
+                            showSlidingFragment(chargingStationFragment);
+                        } else if (item.getText().equals("POI录像")) {
                             showPoiMarkerByType(2, newPoiLatLng);
                             poiEntity.setWork_type(1);
                             bundle.putSerializable("poiEntity", poiEntity);
                             PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
                             showSlidingFragment(poiVideoFragment);
-                                break;
+                        } else if (item.getText().equals("道路")) {
-                            case 2://道路录像
                             showPoiMarkerByType(3, newPoiLatLng);
                             RoadFragment roadFragment = RoadFragment.newInstance(bundle);
                             showSlidingFragment(roadFragment);
-                                break;
+                        } else if (item.getText().equals("其他")) {
-                            case 3://充电站
-                                showPoiMarkerByType(4, newPoiLatLng);
-                                ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
-                                showSlidingFragment(chargingStationFragment);
-                                break;
-                            case 4://其他
                             showPoiMarkerByType(5, newPoiLatLng);
                             OtherFragment otherFragment = OtherFragment.newInstance(bundle);
                             showSlidingFragment(otherFragment);
-                                break;
                         }
                         return false;
                     }