diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 5ae98d9..3021fc7 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -89,7 +89,7 @@ public class Constant { public static LatLng markerLatlng; //marker 图标 - public static BitmapDescriptor POI_ICON = BitmapDescriptorFactory.fromResource(R.drawable.poi_icons); + public static final BitmapDescriptor POI_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg); public static BitmapDescriptor ROAD_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg); public static BitmapDescriptor STATION_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg); public static BitmapDescriptor PLANAR_TASK_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index 25fc468..cacd26e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -91,6 +91,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC private int pid; private String station; private LatLng latLng; + private LatLng poiLatLng; public static ChargingPileFragment newInstance(Bundle bundle) { ChargingPileFragment fragment = new ChargingPileFragment(); @@ -157,7 +158,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (isChecked){ Message obtain = Message.obtain(); obtain.what = Constant.MAIN_CHARGING_PILE; - obtain.obj = latLng; + obtain.obj = poiLatLng; EventBus.getDefault().post(obtain); }else { Message obtain = Message.obtain(); @@ -370,7 +371,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC editDescribe = findViewById(R.id.edit_describe); btnSaveLocal = findViewById(R.id.btn_save_local); btnSaveLocal.setOnClickListener(this::onClick); - //展示数据 initShowPileSharePre(); @@ -381,6 +381,14 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (station!=null){ PoiEntity poiEntity = new Gson().fromJson(station, PoiEntity.class); pid = poiEntity.getTaskId(); + String x = poiEntity.getX(); + String y = poiEntity.getY(); + if (x != null && y != null) { + poiLatLng = new LatLng(); + poiLatLng.setLatitude(Double.parseDouble(y)); + poiLatLng.setLongitude(Double.parseDouble(x)); + } + } // 添加信息: ChargingPileEntity chargingPileEntity = (ChargingPileEntity) getArguments().getSerializable("chargingPileEntity"); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java index 237203f..3648b5e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -263,14 +263,17 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi } else if (Constant.TASK_STASTUS == 3) { tvType.setText("未领取"); } + btnFilter = findViewById(R.id.btn_filter); btnFilter.setOnClickListener(this::onClick); recyclerFilter = findViewById(R.id.recycler_filter); + //设置下划线 recyclerFilter.setLayoutManager(new LinearLayoutManager(getActivity())); recyclerFilter.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL)); recyclerFilter.setRefreshProgressStyle(ProgressStyle.SemiCircleSpin); recyclerFilter.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); + //取消上啦加载下拉刷新 recyclerFilter.setPullRefreshEnabled(false); recyclerFilter.setLoadingMoreEnabled(false); @@ -281,10 +284,11 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi recyclerFilter.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { - } + } @Override public void onLoadMore() { + } }); filterAdapter.setItemCLick(new FilterAdapter.ItemCLick() { @@ -301,10 +305,8 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi obtain.obj = poiEntity; EventBus.getDefault().post(obtain); } - } }); - } @Override @@ -338,7 +340,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; EventBus.getDefault().post(obtain); - } }); break; @@ -366,13 +367,15 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi } }); break; + + /** - * 1 "POI" - * 2 "充电站" - * 3 "POI录像" - * 4 "道路录像" - * 5 "其他" - * 6 "面状任务" + 1 "POI" + 2 "充电站" + 3 "POI录像" + 4 "道路录像" + 5 "其他" + 6 "面状任务" */ case R.id.cl_exclusive: BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "poi", "充电站", "POI录像", "道路录像", "其他", "面状任务"}, new OnMenuItemClickListener() { 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 71847ba..bcf72a2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -41,11 +41,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe private TextView tvTitle, tvMoney, tvTime, tvDistance, tvDescribe; private PoiEntity poiEntity; private PoiDao poiDao; - private PoiEntity poiListEntity; - private int aSave; - private PoiEntity polygonEntity; private ChargingPileDao chargingPileDao; - public static GatherGetFragment newInstance(Bundle bundle) { GatherGetFragment fragment = new GatherGetFragment(); fragment.setArguments(bundle); @@ -161,11 +157,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe new Thread(new Runnable() { @Override public void run() { - if (poiListEntity != null) { - poiDao.deletePoiEntity(poiListEntity); - } else { - poiDao.deletePoiEntity(poiEntity); - } + } }).start(); } @@ -202,9 +194,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe initCompleteTask(HttpInterface.COMPLETE, poiEntity.getTaskId()); } - } else { - btnFinishGather.setVisibility(View.VISIBLE); - btnGather.setVisibility(View.GONE); + }else { if (poiEntity.getType() == 1) {//poi的领取类型 receivedTaskByNet(HttpInterface.RECEIVED_POI_TASK , poiEntity.getTaskId(), true); } else if (poiEntity.getType() == 5) {//其他的领取类型 @@ -212,6 +202,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe }else if (poiEntity.getType() == 2){//充电站的领取类型 chargingTaskByWork(HttpInterface.RECEIVED_CTASK, poiEntity.getTaskId(),true); } + btnFinishGather.setVisibility(View.VISIBLE); + btnGather.setVisibility(View.GONE); } } break; @@ -226,11 +218,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe new Thread(new Runnable() { @Override public void run() { - if (poiListEntity != null) { - poiDao.deletePoiEntity(poiListEntity); - } else { - poiDao.deletePoiEntity(poiEntity); - } + } }).start(); @@ -303,7 +291,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { btnFinishGather.setVisibility(View.VISIBLE); - if (isSaver && aSave == 1) { + if (isSaver) { Message obtain = Message.obtain(); obtain.what = Constant.GATHER_GET_MAP; obtain.obj = chargingListEntity; @@ -353,16 +341,16 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe Geometry geometry = GeometryTools.createGeometry(geo); if (geometry.getGeometryType().equals("Point")) {//点 LatLng latLng = GeometryTools.createLatLng(geo); - poiListEntity.setX(latLng.longitude + ""); - poiListEntity.setY(latLng.latitude + ""); + polygonEntity.setX(latLng.longitude + ""); + polygonEntity.setY(latLng.latitude + ""); } else if (geometry.getGeometryType().equals("LineString")) {//线 List latLineString = GeometryTools.getLatLngs(geo); - poiListEntity.setX(latLineString.get(0).longitude + ""); - poiListEntity.setY(latLineString.get(0).latitude + ""); + polygonEntity.setX(latLineString.get(0).longitude + ""); + polygonEntity.setY(latLineString.get(0).latitude + ""); } else if (geometry.getGeometryType().equals("Polygon")) {//面 List latPolygon = GeometryTools.getLatLngs(geo); - poiListEntity.setX(latPolygon.get(0).longitude + ""); - poiListEntity.setY(latPolygon.get(0).latitude + ""); + polygonEntity.setX(latPolygon.get(0).longitude + ""); + polygonEntity.setY(latPolygon.get(0).latitude + ""); } polygonEntity.setTaskStatus(1); new Thread(new Runnable() { @@ -549,7 +537,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { btnFinishGather.setVisibility(View.VISIBLE); - if (isSaver && aSave == 1) { + if (isSaver) { Message obtain = Message.obtain(); obtain.what = Constant.GATHER_GET_MAP; obtain.obj = poiListEntity; 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 e26711a..0f98de4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -368,7 +368,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } switch (Integer.valueOf(list.get(i).getType())) { case 1://poi - Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Constant.POI_ICON).alpha(0.5f) + BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg); + Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.7f) .flat(true) .clockwise(false)); poiMarker.setTag(listBean); @@ -376,7 +377,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen poiMarker.setClickable(true); break; case 2://充电站 - Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Constant.STATION_ICON).alpha(0.7f) + BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg); + Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.7f) .flat(true) .clockwise(false)); stationMarker.setTag(listBean); @@ -384,9 +386,17 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen stationMarker.setClickable(true); break; case 3://poi录像 + BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg); + Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.7f) + .flat(true) + .clockwise(false)); + poiVideoMarker.setTag(listBean); + removables.add(poiVideoMarker); + poiVideoMarker.setClickable(true); break; case 4://道路录像 - Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Constant.ROAD_ICON).alpha(0.7f) + BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg); + Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.7f) .flat(true) .clockwise(false)); roadMarker.setTag(listBean); @@ -394,9 +404,17 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen roadMarker.setClickable(true); break; case 5://其他 + BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg); + Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.7f) + .flat(true) + .clockwise(false)); + otherMarker.setTag(listBean); + removables.add(otherMarker); + otherMarker.setClickable(true); break; case 6://面状任务 - Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Constant.PLANAR_TASK_ICON).alpha(0.7f) + BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg); + Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.7f) .flat(true) .clockwise(false)); Log.d("面妆任务", "onSuccess: " + planarMarker); @@ -465,13 +483,69 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen showAllPoi.clear(); showAllPoi.addAll(allTaskStatus); for (int i = 0; i < allTaskStatus.size(); i++) { - if (allTaskStatus.get(i).getX() != null && allTaskStatus.get(i).getY() != null) { - LatLng position = new LatLng(Double.valueOf(allTaskStatus.get(i).getY()), Double.valueOf(allTaskStatus.get(i).getX())); - Marker marker = tencentMap.addMarker(new MarkerOptions(position)); - marker.setClickable(true); - marker.setTitle("本地");//1:本地 - marker.setTag(allTaskStatus.get(i)); - removablesLocality.add(marker); + PoiEntity poiEntity = allTaskStatus.get(i); + LatLng latLng = new LatLng(Double.valueOf(allTaskStatus.get(i).getY()), Double.valueOf(allTaskStatus.get(i).getX())); + switch (Integer.valueOf(poiEntity.getType())) { + case 1://poi + BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_have_bg); + Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.7f) + .flat(true) + .clockwise(false)); + poiMarker.setClickable(true); + poiMarker.setTitle("本地");//1:本地 + poiMarker.setTag(poiEntity); + removablesLocality.add(poiMarker); + break; + case 2://充电站 + BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_have_bg); + Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.7f) + .flat(true) + .clockwise(false)); + stationMarker.setClickable(true); + stationMarker.setTitle("本地");//1:本地 + stationMarker.setTag(poiEntity); + removablesLocality.add(stationMarker); + break; + case 3://poi录像 + BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_have_bg); + Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.7f) + .flat(true) + .clockwise(false)); + poiVideoMarker.setClickable(true); + poiVideoMarker.setTitle("本地");//1:本地 + poiVideoMarker.setTag(poiEntity); + removablesLocality.add(poiVideoMarker); + break; + case 4://道路录像 + BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_have_bg); + Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.7f) + .flat(true) + .clockwise(false)); + roadMarker.setClickable(true); + roadMarker.setTitle("本地");//1:本地 + roadMarker.setTag(poiEntity); + removablesLocality.add(roadMarker); + break; + case 5://其他 + BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bg); + Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.7f) + .flat(true) + .clockwise(false)); + otherMarker.setClickable(true); + otherMarker.setTitle("本地");//1:本地 + otherMarker.setTag(poiEntity); + removablesLocality.add(otherMarker); + break; + case 6://面状任务 + BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bg); + Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.7f) + .clockwise(false) + .flat(true)); + planarMarker.setClickable(true); + planarMarker.setTitle("本地");//1:本地 + planarMarker.setTag(poiEntity); + removablesLocality.add(planarMarker); + break; } } Message obtain = Message.obtain(); @@ -674,7 +748,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen initCheckedMarker(Constant.CHARGING_STATION_WORD); } } else if (data.what == Constant.MAIN_CHARGING_PILE) {//充电桩采集-移动位置 - initPoiMarker((LatLng) data.obj); + initPileMarker((LatLng) data.obj); } else if (data.what == Constant.MAIN_CHARGING_CHECKED_PILE) {//充电桩采集-确定位置 if((boolean)data.obj){ initCheckedMarker(Constant.CHARGING_PILE_WORD); @@ -790,6 +864,29 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } }); + + } + private void initPileMarker(LatLng latLng) { + CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( + latLng, //中心点坐标,地图目标经纬度 + tencentMap.getCameraPosition().zoom, //目标缩放级别 + tencentMap.getCameraPosition().tilt, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) + tencentMap.getCameraPosition().bearing)); //目标旋转角 0~360° (正北方为0) + tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() { + @Override + public void onFinish() { + screenPosition = tencentMap.getProjection().toScreenLocation(latLng); + sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); + //创建Marker对象之前,设置属性 + markerPoi = tencentMap.addMarker(new MarkerOptions(latLng)); + markerPoi.setFixingPoint(screenPosition.x, screenPosition.y); + } + + @Override + public void onCancel() { + + } + }); } private void initCheckedMarker(int poiWord) { @@ -807,6 +904,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } /** + * * 设置定位图标样式 */ private void setLocMarkerStyle() { @@ -1086,7 +1184,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen * * @return */ - public LatLng getMapCenter() { + public LatLng getMapCenterPoint() { // int left = treasureMap.getLeft(); // int top = treasureMap.getTop(); // int right = treasureMap.getRight(); @@ -1099,23 +1197,5 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen return tencentMap.getCameraPosition().target; } - /** - * 获取屏幕中心点位置 - * - * @return - */ - public LatLng getMapCenterPoint() { - int left = treasureMap.getLeft(); - int top = treasureMap.getTop(); - int right = treasureMap.getRight(); - int bottom = treasureMap.getBottom(); - // 获得屏幕点击的位置 - int x = (int) (treasureMap.getX() + (right - left) / 2); - int y = (int) (treasureMap.getY() + (bottom - top) / 2); - Projection projection = tencentMap.getProjection(); - LatLng pt = projection.fromScreenLocation(new Point(x, y)); - return pt; - } - } \ No newline at end of file diff --git a/app/src/main/res/drawable/marker_charge_centre_bg.png b/app/src/main/res/drawable/marker_charge_centre_bg.png new file mode 100644 index 0000000..9f69cb4 Binary files /dev/null and b/app/src/main/res/drawable/marker_charge_centre_bg.png differ diff --git a/app/src/main/res/drawable/marker_charge_have_bg.png b/app/src/main/res/drawable/marker_charge_have_bg.png new file mode 100644 index 0000000..07eb886 Binary files /dev/null and b/app/src/main/res/drawable/marker_charge_have_bg.png differ diff --git a/app/src/main/res/drawable/marker_other_have_bg.png b/app/src/main/res/drawable/marker_other_have_bg.png new file mode 100644 index 0000000..3f9d470 Binary files /dev/null and b/app/src/main/res/drawable/marker_other_have_bg.png differ diff --git a/app/src/main/res/drawable/marker_pile_bg.png b/app/src/main/res/drawable/marker_pile_bg.png new file mode 100644 index 0000000..abba110 Binary files /dev/null and b/app/src/main/res/drawable/marker_pile_bg.png differ diff --git a/app/src/main/res/drawable/marker_pile_centre_bg.png b/app/src/main/res/drawable/marker_pile_centre_bg.png new file mode 100644 index 0000000..043039e Binary files /dev/null and b/app/src/main/res/drawable/marker_pile_centre_bg.png differ diff --git a/app/src/main/res/drawable/marker_pile_have_bg.png b/app/src/main/res/drawable/marker_pile_have_bg.png new file mode 100644 index 0000000..f678b97 Binary files /dev/null and b/app/src/main/res/drawable/marker_pile_have_bg.png differ diff --git a/app/src/main/res/drawable/marker_poi_bg.png b/app/src/main/res/drawable/marker_poi_bg.png index 733e0e6..7502c02 100644 Binary files a/app/src/main/res/drawable/marker_poi_bg.png and b/app/src/main/res/drawable/marker_poi_bg.png differ diff --git a/app/src/main/res/drawable/marker_poi_have_bg.png b/app/src/main/res/drawable/marker_poi_have_bg.png new file mode 100644 index 0000000..cd90eb3 Binary files /dev/null and b/app/src/main/res/drawable/marker_poi_have_bg.png differ diff --git a/app/src/main/res/drawable/marker_road.png b/app/src/main/res/drawable/marker_road.png deleted file mode 100644 index 26e7ff1..0000000 Binary files a/app/src/main/res/drawable/marker_road.png and /dev/null differ diff --git a/app/src/main/res/drawable/marker_road_have_bg.png b/app/src/main/res/drawable/marker_road_have_bg.png new file mode 100644 index 0000000..fe556d9 Binary files /dev/null and b/app/src/main/res/drawable/marker_road_have_bg.png differ diff --git a/app/src/main/res/drawable/menpai_square.png b/app/src/main/res/drawable/menpai_square.png deleted file mode 100644 index c2708ca..0000000 Binary files a/app/src/main/res/drawable/menpai_square.png and /dev/null differ diff --git a/app/src/main/res/drawable/poi_icons.png b/app/src/main/res/drawable/poi_icons.png deleted file mode 100644 index 7502c02..0000000 Binary files a/app/src/main/res/drawable/poi_icons.png and /dev/null differ diff --git a/app/src/main/res/drawable/poi_square.png b/app/src/main/res/drawable/poi_square.png index c3caa71..29c8249 100644 Binary files a/app/src/main/res/drawable/poi_square.png and b/app/src/main/res/drawable/poi_square.png differ diff --git a/app/src/main/res/drawable/poi_video_bg.png b/app/src/main/res/drawable/poi_video_bg.png new file mode 100644 index 0000000..905d1c1 Binary files /dev/null and b/app/src/main/res/drawable/poi_video_bg.png differ diff --git a/app/src/main/res/drawable/poi_video_have_bg.png b/app/src/main/res/drawable/poi_video_have_bg.png new file mode 100644 index 0000000..f7f88ab Binary files /dev/null and b/app/src/main/res/drawable/poi_video_have_bg.png differ diff --git a/app/src/main/res/drawable/push_road.png b/app/src/main/res/drawable/push_road.png index b7840ee..ab5cb1e 100644 Binary files a/app/src/main/res/drawable/push_road.png and b/app/src/main/res/drawable/push_road.png differ diff --git a/app/src/main/res/layout/treasure_fragment.xml b/app/src/main/res/layout/treasure_fragment.xml index 231df10..0c22109 100644 --- a/app/src/main/res/layout/treasure_fragment.xml +++ b/app/src/main/res/layout/treasure_fragment.xml @@ -23,9 +23,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="?attr/actionBarSize" - android:focusable="false" android:focusableInTouchMode="false" android:gravity="center" + android:focusable="false" app:layout_constraintBottom_toTopOf="@+id/frame_layout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -42,16 +42,17 @@ android:background="@drawable/ic_baseline_add_alert" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - + + + + + + + + + + + app:layout_constraintStart_toStartOf="parent" + /> + app:layout_constraintTop_toTopOf="parent" + /> + app:layout_constraintTop_toBottomOf="@id/cb_map_type" + /> + app:layout_constraintTop_toTopOf="@id/iv_zoom_del" + /> + app:layout_constraintTop_toBottomOf="@id/iv_submit" + /> + app:layout_constraintTop_toBottomOf="@id/cb_foot_type" + /> + app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" + /> + app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" + /> + app:layout_constraintTop_toBottomOf="@id/iv_refrish" + />