diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java index 56c5fdc..2d668e1 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -84,7 +84,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override protected void initData() { super.initData(); - SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); + SharedPreferences sharedPreferences = requireActivity().getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); @@ -116,7 +116,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe //主界面获取焦点 private void getFocus() { - Objects.requireNonNull(getView()).setFocusableInTouchMode(true); + requireView().setFocusableInTouchMode(true); getView().requestFocus(); getView().setOnKeyListener(new View.OnKeyListener() { @Override @@ -324,7 +324,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe if (geometry > 50) { //Voice.sprat("注意在附近50米范围内进行采集",0); DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "注意在任务附近50米范围内进行采集", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() { + MessageDialog.show((AppCompatActivity) requireActivity(), "提示", "注意在任务附近50米范围内进行采集", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { initGather(); @@ -349,7 +349,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); - Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { + requireActivity().runOnUiThread(new Runnable() { @Override public void run() { poiEntity.setTaskStatus(0); @@ -523,6 +523,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe ToastUtils.Message(getActivity(),"无此任务"); return; } + // 如果当前存在未关闭的面状任务,提示用户无法领取,先关闭已领取的面状任务 + List recivePolygonPoi = PoiDatabase.getInstance(requireContext()).getPoiDao().getPoiEntityByTaskStatus(1, 6); + if (recivePolygonPoi!=null&&!recivePolygonPoi.isEmpty()) { + ToastUtils.Message(requireActivity(),"您当前存在已领取的其他面状任务,请先关闭该任务后再领取!"); + return; + } + showLoadingDialog(); OkGoBuilder.getInstance() .time(30) 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 d2568c5..dd82fe8 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -1476,9 +1476,13 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (upload.contains(5)) { itemList.add(new ShareDialog.Item(requireActivity(), R.drawable.marker_other, "其他")); } - if (upload.contains(3)) { + if (upload.contains(11)) { itemList.add(new ShareDialog.Item(requireActivity(), R.drawable.icon_traffic_hub, "交通枢纽")); + } + if (upload.contains(12)) { itemList.add(new ShareDialog.Item(requireActivity(), R.drawable.icon_parking_hub, "区域设施")); + } + if (upload.contains(13)) { itemList.add(new ShareDialog.Item(requireActivity(), R.drawable.icon_building_inside, "建筑物内部")); } Bundle bundle = new Bundle(); diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index e9a998b..b98eed1 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -3,8 +3,8 @@ package com.navinfo.outdoor.http; public class HttpInterface { // public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP public static final String IP0 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 - public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 + public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String USER_PATH = "/user/";//我的 public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String USER_LOGIN_PATH = "/userlogin/";//登录