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

fix: 增加面状任务完成控制

Browse Source
This commit is contained in:
xiaoyan 2023-04-18 18:28:37 +08:00
parent 26f6627be0
commit 6fcb464311
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
View File

@ -84,7 +84,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
@Override @Override
protected void initData() { protected void initData() {
super.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(); SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
@SuppressLint("SimpleDateFormat") @SuppressLint("SimpleDateFormat")
DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
@ -116,7 +116,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
//主界面获取焦点 //主界面获取焦点
private void getFocus() { private void getFocus() {
Objects.requireNonNull(getView()).setFocusableInTouchMode(true); requireView().setFocusableInTouchMode(true);
getView().requestFocus(); getView().requestFocus();
getView().setOnKeyListener(new View.OnKeyListener() { getView().setOnKeyListener(new View.OnKeyListener() {
@Override @Override
@ -324,7 +324,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
if (geometry > 50) { if (geometry > 50) {
//Voice.sprat("注意在附近50米范围内进行采集",0); //Voice.sprat("注意在附近50米范围内进行采集",0);
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; 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 @Override
public boolean onClick(BaseDialog baseDialog, View v) { public boolean onClick(BaseDialog baseDialog, View v) {
initGather(); initGather();
@ -349,7 +349,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
@Override @Override
public void run() { public void run() {
PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity);
Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { requireActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
poiEntity.setTaskStatus(0); poiEntity.setTaskStatus(0);
@ -523,6 +523,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
ToastUtils.Message(getActivity(),"无此任务"); ToastUtils.Message(getActivity(),"无此任务");
return; return;
} }
// 如果当前存在未关闭的面状任务，提示用户无法领取，先关闭已领取的面状任务
List<PoiEntity> recivePolygonPoi = PoiDatabase.getInstance(requireContext()).getPoiDao().getPoiEntityByTaskStatus(1, 6);
if (recivePolygonPoi!=null&&!recivePolygonPoi.isEmpty()) {
ToastUtils.Message(requireActivity(),"您当前存在已领取的其他面状任务，请先关闭该任务后再领取！");
return;
}
showLoadingDialog(); showLoadingDialog();
OkGoBuilder.getInstance() OkGoBuilder.getInstance()
.time(30) .time(30)

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

@ -1476,9 +1476,13 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if (upload.contains(5)) { if (upload.contains(5)) {
itemList.add(new ShareDialog.Item(requireActivity(), R.drawable.marker_other, "其他")); 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, "交通枢纽")); 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, "区域设施")); 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, "建筑物内部")); itemList.add(new ShareDialog.Item(requireActivity(), R.drawable.icon_building_inside, "建筑物内部"));
} }
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();

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

@ -3,8 +3,8 @@ package com.navinfo.outdoor.http;
public class HttpInterface { public class HttpInterface {
// public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP // 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 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/test/m4";//测试接口-外网
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String USER_PATH = "/user/";//我的 public static final String USER_PATH = "/user/";//我的
public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String MSG_LIST_PATH = "/msgList/";//发现
public static final String USER_LOGIN_PATH = "/userlogin/";//登录 public static final String USER_LOGIN_PATH = "/userlogin/";//登录