diff --git a/app/build.gradle b/app/build.gradle index aa5f03b..c0f3bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 118 - versionName "8.231110-通用测试版" + versionCode 119 + versionName "8.231201-测试版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiActivity.java index a84c2d2..b79eb06 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiActivity.java @@ -1365,7 +1365,7 @@ public class AutoTakePicture4PoiActivity extends BaseActivity implements View.On Gson gson = new Gson(); UnPolygonTaskBean response = gson.fromJson(bodyString, UnPolygonTaskBean.class); if (response.getCode() == 200) { - PoiDatabase.getInstance(AutoTakePicture4PoiActivity.this).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(AutoTakePicture4PoiActivity.this).getPoiDao().deletePoiEntityById(poiEntity.getId()); // 不需要删除照片，自动采集时照片是临时保存在tmp目录下 } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(AutoTakePicture4PoiActivity.this); diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java index 55aba34..75f1dc1 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java @@ -1224,7 +1224,7 @@ public class AutoTakePicture4PoiVideoActivity extends BaseActivity implements Vi Gson gson = new Gson(); UnPolygonTaskBean response = gson.fromJson(bodyString, UnPolygonTaskBean.class); if (response.getCode() == 200) { - PoiDatabase.getInstance(AutoTakePicture4PoiVideoActivity.this).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(AutoTakePicture4PoiVideoActivity.this).getPoiDao().deletePoiEntityById(poiEntity.getId()); // 不需要删除照片，自动采集时照片是临时保存在tmp目录下 } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(AutoTakePicture4PoiVideoActivity.this); diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java index b257152..2c17702 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -1416,7 +1416,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic Gson gson = new Gson(); UnPolygonTaskBean response = gson.fromJson(bodyString, UnPolygonTaskBean.class); if (response.getCode() == 200) { - PoiDatabase.getInstance(AutoTakePictureActivity.this).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(AutoTakePictureActivity.this).getPoiDao().deletePoiEntityById(poiEntity.getId()); // 不需要删除照片，自动采集时照片是临时保存在tmp目录下 } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(AutoTakePictureActivity.this); diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/HasReceiveAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/HasReceiveAdapter.java index 732056d..4ceaa22 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/HasReceiveAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/HasReceiveAdapter.java @@ -117,7 +117,7 @@ public class HasReceiveAdapter extends RecyclerView.Adapter " + Constant.DEVICE_TOKEN); -// } -// -// @Override -// public void onFailure(String s, String s1) { -// Log.e("TAGEE", "Failure 注册失败：--> " + "code:" + s + ", desc:" + s1); -// } -// }); -// instance.onAppStart(); -// UmengMessageHandler msgHandler = new UmengMessageHandler() { -// //处理通知栏消息 -// @Override -// public void dealWithNotificationMessage(Context context, UMessage msg) { -// super.dealWithNotificationMessage(context, msg); -// Log.i("TAGEE", "dealWithNotificationMessage:" + msg.getRaw().toString()); -// Constant.NOTIFICATION=msg.getRaw().toString(); -// } -// -// //自定义通知样式，此方法可以修改通知样式等 -// @Override -// public Notification getNotification(Context context, UMessage msg) { -// Log.i("TAGEE", "getNotification: "+msg.getRaw().toString()); -// return super.getNotification(context, msg); -// } -// -// //处理透传消息 -// @Override -// public void dealWithCustomMessage(Context context, UMessage msg) { -// super.dealWithCustomMessage(context, msg); -// Log.i("TAGEE", "dealWithCustomMessage:" + msg.getRaw().toString()); -// } -// }; -// instance.setMessageHandler(msgHandler); + instance = PushAgent.getInstance(this); + instance.register(new IUmengRegisterCallback() { + @Override + public void onSuccess(String s) { + //注册成功会返回deviceToken deviceToken是推送消息的唯一标志 + Constant.DEVICE_TOKEN = s; + Log.i("TAGEE", "Success 注册成功：deviceToken：--> " + Constant.DEVICE_TOKEN); + } + + @Override + public void onFailure(String s, String s1) { + Log.e("TAGEE", "Failure 注册失败：--> " + "code:" + s + ", desc:" + s1); + } + }); + instance.onAppStart(); + UmengMessageHandler msgHandler = new UmengMessageHandler() { + //处理通知栏消息 + @Override + public void dealWithNotificationMessage(Context context, UMessage msg) { + super.dealWithNotificationMessage(context, msg); + Log.i("TAGEE", "dealWithNotificationMessage:" + msg.getRaw().toString()); + Constant.NOTIFICATION=msg.getRaw().toString(); + } + + //自定义通知样式，此方法可以修改通知样式等 + @Override + public Notification getNotification(Context context, UMessage msg) { + Log.i("TAGEE", "getNotification: "+msg.getRaw().toString()); + return super.getNotification(context, msg); + } + + //处理透传消息 + @Override + public void dealWithCustomMessage(Context context, UMessage msg) { + super.dealWithCustomMessage(context, msg); + Log.i("TAGEE", "dealWithCustomMessage:" + msg.getRaw().toString()); + } + }; + instance.setMessageHandler(msgHandler); //App处于前台时不显示通知 //instance.setNotificationOnForeground(false); //设置显示通知的数量 diff --git a/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java b/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java index 9a74b48..15bfa3c 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java @@ -115,7 +115,7 @@ public class JobSearchBean implements Serializable { private String memo; private String telephone; - private int publish; // 是否已发布，如果是未发布的数据，则用半透明形式展示 + private int publish; // 是否已发布，如果是未发布的数据，则用半透明形式展示，0-未发布，1-已发布 public int getCanReceived() { return canReceived; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java index dd74bd1..26fa8df 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java @@ -816,7 +816,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntityById(poiEntity.getId()); } }).start(); if (poiEntity.getId() != null) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java index f096591..a063235 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java @@ -917,7 +917,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntityById(poiEntity.getId()); } }).start(); if (poiEntity.getId() != null) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 18815d8..a6a657d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -1767,7 +1767,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntityById(poiEntity.getId()); if (showPoiEntity != null) { List chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId()); if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { 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 3c238ca..cc83ade 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -75,6 +75,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe private StringBuilder gatherGetBuilder; private TextView tvStartNav; private TextView tvMatchTrack; // 手动匹配轨迹照片 + private DateFormat receiverDateFormate; // 接收任务时间的格式化对象 public static GatherGetFragment newInstance(Bundle bundle) { GatherGetFragment fragment = new GatherGetFragment(); @@ -89,6 +90,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); + receiverDateFormate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String newFormat = formatter.format(new Date(System.currentTimeMillis())); String pictures_time = sharedPreferences.getString("pictures_time", null); if (pictures_time == null) { @@ -280,32 +282,39 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe * 根据当前数据状态重新构建领取对话框按钮的显隐 * */ private void initViewByTaskStatus(int taskStatus) { - switch (taskStatus) { - case 0://未领取 - btnCancelGet.setVisibility(View.GONE);//取消领取 - btnGetTask.setVisibility(View.VISIBLE);//领取任务 - btnGather.setVisibility(View.VISIBLE);//立即采集 - btnFinishGather.setVisibility(View.GONE);//结束采集 - break; - case 1://已领取 - btnCancelGet.setVisibility(View.VISIBLE); - btnGetTask.setVisibility(View.GONE); - btnGather.setVisibility(View.VISIBLE); - btnFinishGather.setVisibility(View.GONE); - break; - case 2://已保存 - case 3://已提交 - btnCancelGet.setVisibility(View.VISIBLE); - btnGetTask.setVisibility(View.GONE); - btnGather.setVisibility(View.GONE); - btnFinishGather.setVisibility(View.VISIBLE); - break; - case 4://结束采集 - btnCancelGet.setVisibility(View.GONE); - btnGetTask.setVisibility(View.GONE); - btnGather.setVisibility(View.GONE); - btnFinishGather.setVisibility(View.GONE); - break; + if (poiEntity.getPublish() == 1) { // 如果是已发布的数据 + switch (taskStatus) { + case 0://未领取 + btnCancelGet.setVisibility(View.GONE);//取消领取 + btnGetTask.setVisibility(View.VISIBLE);//领取任务 + btnGather.setVisibility(View.VISIBLE);//立即采集 + btnFinishGather.setVisibility(View.GONE);//结束采集 + break; + case 1://已领取 + btnCancelGet.setVisibility(View.VISIBLE); + btnGetTask.setVisibility(View.GONE); + btnGather.setVisibility(View.VISIBLE); + btnFinishGather.setVisibility(View.GONE); + break; + case 2://已保存 + case 3://已提交 + btnCancelGet.setVisibility(View.VISIBLE); + btnGetTask.setVisibility(View.GONE); + btnGather.setVisibility(View.GONE); + btnFinishGather.setVisibility(View.VISIBLE); + break; + case 4://结束采集 + btnCancelGet.setVisibility(View.GONE); + btnGetTask.setVisibility(View.GONE); + btnGather.setVisibility(View.GONE); + btnFinishGather.setVisibility(View.GONE); + break; + } + } else { // 未发布数据，所有按钮都隐藏 + btnCancelGet.setVisibility(View.GONE); + btnGetTask.setVisibility(View.GONE); + btnGather.setVisibility(View.GONE); + btnFinishGather.setVisibility(View.GONE); } } @@ -391,7 +400,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntityById(poiEntity.getId()); requireActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -466,6 +475,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe chargingStationEntity.setUnReceivedTime(stationBean.getUnReceivedTime()); chargingStationEntity.setPrecision(stationBean.getPrice() + ""); chargingStationEntity.setAddress(stationBean.getAddress()); + chargingStationEntity.setCreateTime(receiverDateFormate.format(new Date())); if (stationBean.getTelephone() == null || stationBean.getTelephone().equals("") || stationBean.getTelephone().equals("null")) { chargingStationEntity.setTelPhone(null); } else { @@ -605,6 +615,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe PoiEntity polygonEntity = new PoiEntity(); polygonEntity.setRecord_way(poiEntity.getRecord_way()); polygonEntity.setWork_type(poiEntity.getWork_type()); + polygonEntity.setCreateTime(receiverDateFormate.format(new Date())); if (listBean != null) { polygonEntity.setTaskId(listBean.getId()); polygonEntity.setName(listBean.getName()); @@ -694,7 +705,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntityById(poiEntity.getId()); if (poiEntity.getType() == 2) { PoiDatabase.getInstance(getContext()).getChargingPileDao().deleteChargingFidPileEntity(poiEntity.getId()); } @@ -846,7 +857,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntityById(poiEntity.getId()); getActivity().runOnUiThread(new Runnable() { @Override @@ -921,6 +932,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe poiListEntity.setIsExclusive(listBean.getIsExclusive()); poiListEntity.setRecord_way(poiEntity.getRecord_way()); poiListEntity.setWork_type(poiEntity.getWork_type()); + poiEntity.setCreateTime(receiverDateFormate.format(new Date())); if (listBean.getType() == 1) { if (listBean.getTelephone() == null || listBean.getTelephone().equals("") || listBean.getTelephone().equals("null")) { poiListEntity.setTelPhone(null); @@ -1052,6 +1064,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe poiListEntity.setGeoWkt(listBean.getGeo()); String encodeStr = listBean.getGeo(); String geo = Geohash.getInstance().decode(encodeStr); + poiListEntity.setCreateTime(receiverDateFormate.format(new Date())); // 生成对应的x和y poiEntity.setX GeometryTools.obitainPoiEntityXY(geo, poiListEntity); if (statusId == 1 || statusId == 5) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasReceiveFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasReceiveFragment.java index f814ceb..cffe9fd 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/HasReceiveFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasReceiveFragment.java @@ -474,7 +474,7 @@ public class HasReceiveFragment extends BaseFragment implements View.OnClickList PoiEntity poiEntity = (PoiEntity) iterator.next(); if (poiEntity.getUnReceivedTimeStamp()<=new Date().getTime()) { // 删除该条数据，并且将此数据移除出当前列表 - roadDao.deletePoiEntity(poiEntity); + roadDao.deletePoiEntityById(poiEntity.getId()); iterator.remove(); } } @@ -498,7 +498,7 @@ public class HasReceiveFragment extends BaseFragment implements View.OnClickList } } // 数据库中移除该数据 - roadDao.deletePoiEntity(poiEntity); + roadDao.deletePoiEntityById(poiEntity.getId()); iteratorAgain.remove(); } } else { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 51dbfd6..23d0f83 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -901,7 +901,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntityById(poiEntity.getId()); } }).start(); initList(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index a47867f..a68d1ee 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -1268,7 +1268,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntityById(poiEntity.getId()); } }).start(); initList(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index d630b47..473de0e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -819,7 +819,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntityById(poiEntity.getId()); } }).start(); if (poiEntity.getId() != null) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index aba1661..d9c0bdc 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -927,7 +927,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getContext()).getPoiDao().deletePoiEntityById(poiEntity.getId()); } }).start(); if (poiEntity.getId() != null) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java index 315cb15..de64dd4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java @@ -816,7 +816,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli new Thread(new Runnable() { @Override public void run() { - PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntity(poiEntity); + PoiDatabase.getInstance(getActivity()).getPoiDao().deletePoiEntityById(poiEntity.getId()); } }).start(); if (poiEntity.getId() != null) { 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 77c7469..aaeb0fe 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -44,6 +44,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; import com.elvishew.xlog.XLog; import com.github.lazylibrary.util.DensityUtil; import com.github.lazylibrary.util.FileUtils; @@ -1951,6 +1952,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen poiListEntity.setType(listBean.getType()); poiListEntity.setRecord_way(listBean.getCanReceived()); poiListEntity.setIsExclusive(listBean.getIsExclusive()); + poiListEntity.setPublish(listBean.getPublish()); String beanGeo = listBean.getGeo(); String geo = Geohash.getInstance().decode(beanGeo); // 生成对应的x和y poiEntity.setX @@ -2131,7 +2133,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen @Override public void onSuccess(LatestPushMessageResponse response, int id) { tvLatestPush.setVisibility(View.GONE); // 默认先隐藏推荐任务按钮 - if (response != null) { + if (response != null&&response.getBody()!=null) { Map responseBody = response.getBody(); // 解析response // 获取当前json的id，如果id大于等于0，则根据Content内容尝试展示提示信息 @@ -2160,6 +2162,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen public void onBind(com.kongzue.dialogx.dialogs.CustomDialog dialog, View v) { ImageView photo = v.findViewById(R.id.img_photo); TextView tvConfirm = v.findViewById(R.id.tv_confirm); +// // Glide增加加载中图片显示 +// RequestOptions options = new RequestOptions() +// .placeholder(R.mipmap.ic_launcher); // 显示照片 Glide.with(requireContext()).load(imgUrl).into(photo); View.OnClickListener clickListener = new View.OnClickListener() { 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 7dd6c3e..993e2e1 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,13 +1,13 @@ package com.navinfo.outdoor.http; public class HttpInterface { - // 开发 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发地址 - public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-数据上传 +// // 开发 +// public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发地址 +// public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-数据上传 // 测试 -// public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试环境接口 -// public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试环境接口-数据上传 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试环境接口 + public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试环境接口-数据上传 // 生产 // public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//生产地址 diff --git a/app/src/main/java/com/navinfo/outdoor/room/PoiDao.java b/app/src/main/java/com/navinfo/outdoor/room/PoiDao.java index b624194..59ceb46 100644 --- a/app/src/main/java/com/navinfo/outdoor/room/PoiDao.java +++ b/app/src/main/java/com/navinfo/outdoor/room/PoiDao.java @@ -61,8 +61,10 @@ public interface PoiDao { /** * 删除 */ - @Delete - void deletePoiEntity(PoiEntity... poiEntities); +// @Delete +// void deletePoiEntity(PoiEntity... poiEntities); + @Query("DELETE FROM poi where id=:id") + void deletePoiEntityById(String id); /** * 删除 diff --git a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java index 949067e..a6f44d1 100644 --- a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java +++ b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java @@ -61,6 +61,8 @@ public class PoiEntity implements Serializable { private String drawLine; // 用户绘制的线型 private String uploadResult; //上传结果 private String unReceivedTime; // 任务领取后自动释放的时间 + @Ignore + private int publish = 1; // 是否已发布，0-未发布，1-已发布（默认） public int getRecord_way() { return record_way; @@ -331,6 +333,14 @@ public class PoiEntity implements Serializable { this.uploadResult = uploadResult; } + public int getPublish() { + return publish; + } + + public void setPublish(int publish) { + this.publish = publish; + } + /** * 获取经过处理后的接受任务失效时间的时间戳 * */ diff --git a/app/src/main/java/com/navinfo/outdoor/util/TencentMarkerUtils.java b/app/src/main/java/com/navinfo/outdoor/util/TencentMarkerUtils.java index 7601d26..6645a24 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/TencentMarkerUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/TencentMarkerUtils.java @@ -188,7 +188,8 @@ public class TencentMarkerUtils { } // publish字段标识了当前数据是否已发布，如果未发布，则半透明显示，且不可点击，否则正常显示 float alpha = listBean.getPublish() == 0? 0.3f: 1.0f; - boolean clickable = listBean.getPublish() == 0? false: true; +// boolean clickable = listBean.getPublish() == 0? false: true; + boolean clickable = true; switch (listBean.getType()) { case 1://poi BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi); diff --git a/app/src/main/res/layout/has_receive_item.xml b/app/src/main/res/layout/has_receive_item.xml index 4ca4022..721d7a7 100644 --- a/app/src/main/res/layout/has_receive_item.xml +++ b/app/src/main/res/layout/has_receive_item.xml @@ -34,10 +34,18 @@ android:textSize="15sp" /> + diff --git a/app/src/main/res/layout/stay_item.xml b/app/src/main/res/layout/stay_item.xml index a9d67bd..19307cc 100644 --- a/app/src/main/res/layout/stay_item.xml +++ b/app/src/main/res/layout/stay_item.xml @@ -37,8 +37,8 @@ android:id="@+id/tv_road_day" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="10dp" - android:text="2021-05-08 13:24:36" + android:layout_marginHorizontal="10dp" + android:text="2021-05-08 13:24:36" android:textColor="#333" app:layout_constraintTop_toBottomOf="@id/tv_road_name" />