From 80dd77772dbce0c7144c2e91fd78b237cf459e00 Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Fri, 23 Jul 2021 16:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/ChargingStationFragment.java     | 156 +++++++++---------
 .../outdoor/fragment/OtherFragment.java       |  11 +-
 .../outdoor/fragment/PoiVideoFragment.java    |  46 +++---
 .../outdoor/fragment/RoadFragment.java        |  50 +++---
 .../outdoor/fragment/TreasureFragment.java    |   4 +-
 .../com/navinfo/outdoor/room/PoiEntity.java   |   4 +-
 .../res/drawable/marker_other_have_bag.png    | Bin 2852 -> 894 bytes
 .../res/drawable/marker_other_have_bg.png     | Bin 894 -> 0 bytes
 .../drawable/marker_poi_video_have_bag.png    | Bin 18389 -> 0 bytes
 app/src/main/res/layout/fragment_road.xml     |   6 +-
 app/src/main/res/layout/withdraw_fragment.xml |   2 +-
 11 files changed, 146 insertions(+), 133 deletions(-)
 delete mode 100644 app/src/main/res/drawable/marker_other_have_bg.png
 delete mode 100644 app/src/main/res/drawable/marker_poi_video_have_bag.png

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 bfd1f7d..d81adfb 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
@@ -211,6 +211,54 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         chargingPileDao = poiDatabase.getChargingPileDao();
         checkBoxLife = findViewById(R.id.check_pot_life);
         checkBoxRight = findViewById(R.id.check_pot_right);
+        //添加桩
+        linearChargingPile = findViewById(R.id.linear_charging_pile);
+        linearChargingPile.setOnClickListener(this::onClick);
+        btnSaveLocal = findViewById(R.id.btn_save_local);
+        btnSaveLocal.setOnClickListener(this::onClick);
+        btnUploading = findViewById(R.id.btn_uploading);
+        btnUploading.setOnClickListener(this::onClick);
+        editNameContent = findViewById(R.id.tv_name_content);
+        editSiteContent = findViewById(R.id.tv_site_content);
+        tvExamine = findViewById(R.id.tv_examine);
+        tvExamine.setOnClickListener(this::onClick);
+        editDescribe = findViewById(R.id.edit_describe);
+        ivPanorama = findViewById(R.id.iv_panorama);
+        ivName = findViewById(R.id.iv_name);
+        linearContact = findViewById(R.id.linear_contact);
+        ivInternal = findViewById(R.id.iv_internal);
+        ivElse = findViewById(R.id.iv_else);
+        ivScutcheon = findViewById(R.id.iv_scutcheon);
+        rlPanorama = findViewById(R.id.rl_panorama);
+        rlPanorama.setOnClickListener(this::onClick);
+        rlName = findViewById(R.id.rl_name);
+        rlName.setOnClickListener(this::onClick);
+        rlInternalPhotos = findViewById(R.id.rl_internal_photos);
+        rlInternalPhotos.setOnClickListener(this::onClick);
+        rlElse = findViewById(R.id.rl_else);
+        rlElse.setOnClickListener(this::onClick);
+        rlScutcheon = findViewById(R.id.rl_scutcheon);
+        rlScutcheon.setOnClickListener(this::onClick);
+
+       /* recyclerPhone = findViewById(R.id.recycler_phone);
+        recyclerPhone.setLayoutManager(new LinearLayoutManager(getContext()));
+        recyclerPhone.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
+        poiRecycleAdapter = new PoiRecycleAdapter(getContext());
+        recyclerPhone.setAdapter(poiRecycleAdapter);*/
+        recyclerStation = findViewById(R.id.recycler_station);
+        recyclerStation.setLayoutManager(new GridLayoutManager(getContext(), 3));
+        chargingPileAdapter = new ChargingPileAdapter(getContext());
+        recyclerStation.setAdapter(chargingPileAdapter);
+        chargingPileAdapter.setOnLickItem(new ChargingPileAdapter.onLickItem() {
+            @Override
+            public void item(ChargingPileEntity chargingPileEntity) {
+                Message obtains = Message.obtain();
+                obtains.what = Constant.CHARGING_STATION_ITEM;
+                obtains.obj = chargingPileEntity;
+                EventBus.getDefault().post(obtains);
+            }
+        });
+
         checkBoxLife.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -271,12 +319,23 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 switch (position) {
                     case 0:
+                        rlInternalPhotos.setVisibility(View.VISIBLE);
+                        rlElse.setVisibility(View.VISIBLE);
+                        rlScutcheon.setVisibility(View.VISIBLE);
                         existence = 0;
                         break;
                     case 1:
+
+                        rlInternalPhotos.setVisibility(View.GONE);
+                        rlElse.setVisibility(View.GONE);
+                        rlScutcheon.setVisibility(View.GONE);
                         existence = 1;
                         break;
                     case 2:
+
+                        rlInternalPhotos.setVisibility(View.GONE);
+                        rlElse.setVisibility(View.GONE);
+                        rlScutcheon.setVisibility(View.GONE);
                         existence = 2;
                         break;
                 }
@@ -286,53 +345,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
-        //添加桩
-        linearChargingPile = findViewById(R.id.linear_charging_pile);
-        linearChargingPile.setOnClickListener(this::onClick);
-        btnSaveLocal = findViewById(R.id.btn_save_local);
-        btnSaveLocal.setOnClickListener(this::onClick);
-        btnUploading = findViewById(R.id.btn_uploading);
-        btnUploading.setOnClickListener(this::onClick);
-        editNameContent = findViewById(R.id.tv_name_content);
-        editSiteContent = findViewById(R.id.tv_site_content);
-        tvExamine = findViewById(R.id.tv_examine);
-        tvExamine.setOnClickListener(this::onClick);
-        editDescribe = findViewById(R.id.edit_describe);
-        ivPanorama = findViewById(R.id.iv_panorama);
-        ivName = findViewById(R.id.iv_name);
-        linearContact = findViewById(R.id.linear_contact);
-        ivInternal = findViewById(R.id.iv_internal);
-        ivElse = findViewById(R.id.iv_else);
-        ivScutcheon = findViewById(R.id.iv_scutcheon);
-        rlPanorama = findViewById(R.id.rl_panorama);
-        rlPanorama.setOnClickListener(this::onClick);
-        rlName = findViewById(R.id.rl_name);
-        rlName.setOnClickListener(this::onClick);
-        rlInternalPhotos = findViewById(R.id.rl_internal_photos);
-        rlInternalPhotos.setOnClickListener(this::onClick);
-        rlElse = findViewById(R.id.rl_else);
-        rlElse.setOnClickListener(this::onClick);
-        rlScutcheon = findViewById(R.id.rl_scutcheon);
-        rlScutcheon.setOnClickListener(this::onClick);
 
-       /* recyclerPhone = findViewById(R.id.recycler_phone);
-        recyclerPhone.setLayoutManager(new LinearLayoutManager(getContext()));
-        recyclerPhone.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
-        poiRecycleAdapter = new PoiRecycleAdapter(getContext());
-        recyclerPhone.setAdapter(poiRecycleAdapter);*/
-        recyclerStation = findViewById(R.id.recycler_station);
-        recyclerStation.setLayoutManager(new GridLayoutManager(getContext(), 3));
-        chargingPileAdapter = new ChargingPileAdapter(getContext());
-        recyclerStation.setAdapter(chargingPileAdapter);
-        chargingPileAdapter.setOnLickItem(new ChargingPileAdapter.onLickItem() {
-            @Override
-            public void item(ChargingPileEntity chargingPileEntity) {
-                Message obtains = Message.obtain();
-                obtains.what = Constant.CHARGING_STATION_ITEM;
-                obtains.obj = chargingPileEntity;
-                EventBus.getDefault().post(obtains);
-            }
-        });
         //数据展示
         initShowPoi();
         //禁用所有可操作控件
@@ -380,31 +393,28 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                                 poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
                             }
                         } else {
-                            if (!StringUtils.isEmpty(phones[i])) {
-                                if (phones[i].contains("-")) { // 包含区号数据的电话
-                                    String[] split = phones[i].split("-");
-                                    if (split!=null&&split.length>1) {
-                                        poiBeans.add(new PhoneBean("", split[1] + "", split[0] + "", R.drawable.icon_del_bg));
-                                    } else {
-                                        poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
-                                    }
-                                } else {
-                                    if (phones[i]!=null) {
-                                        poiBeans.add(new PhoneBean("", phones[i] + "", "", R.drawable.icon_del_bg));
-                                    } else {
-                                        poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
-                                    }
-                                }
+                            if (phones[i]!=null) {
+                                poiBeans.add(new PhoneBean("电话", phones[i] + "", "", R.drawable.icon_add_bg));
+                            } else {
+                                poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
                             }
                         }
                     }
                 } else {
                     if (!StringUtils.isEmpty(phones[i])) {
-                        String[] split = phones[i].split("-");
-                        if (split[0] == phones[i]) {
-                            poiBeans.add(new PhoneBean("", phones[i], "", R.drawable.icon_del_bg));
+                        if (phones[i].contains("-")) { // 包含区号数据的电话
+                            String[] split = phones[i].split("-");
+                            if (split!=null&&split.length>1) {
+                                poiBeans.add(new PhoneBean("", split[1] + "", split[0] + "", R.drawable.icon_del_bg));
+                            } else {
+                                poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
+                            }
                         } else {
-                            poiBeans.add(new PhoneBean("", split[1], split[0], R.drawable.icon_del_bg));
+                            if (phones[i]!=null) {
+                                poiBeans.add(new PhoneBean("", phones[i] + "", "", R.drawable.icon_del_bg));
+                            } else {
+                                poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg));
+                            }
                         }
                     }
                 }
@@ -416,7 +426,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             } else {
                 poiBeans.add(new PhoneBean("电话*", "", Constant.CODE, R.drawable.icon_add_bg));
             }
-
         }
         body = showPoiEntity.getBodyId();
         contactView = new ContactView(getActivity(), linearContact, poiBeans);
@@ -768,24 +777,15 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                                 infoPhoto.add(new Info(tagName));
                             }
                             String tagInternal = (String) ivInternal.getTag();
-                            if (tagInternal == null) {
-                                Toast.makeText(getActivity(), "请拍照 服务说明", Toast.LENGTH_SHORT).show();
-                                return;
-                            } else {
+                            if (tagInternal != null) {
                                 infoPhoto.add(new Info(tagInternal));
                             }
                             String tagElse = (String) ivElse.getTag();
-                            if (tagElse == null) {
-                                Toast.makeText(getActivity(), "请拍照 充电站指引牌", Toast.LENGTH_SHORT).show();
-                                return;
-                            } else {
+                            if (tagElse != null) {
                                 infoPhoto.add(new Info(tagElse));
                             }
                             String tagScutcheon = (String) ivScutcheon.getTag();
-                            if (tagScutcheon == null) {
-                                Toast.makeText(getActivity(), "请拍照 停车收费标牌", Toast.LENGTH_SHORT).show();
-                                return;
-                            } else {
+                            if (tagScutcheon != null) {
                                 infoPhoto.add(new Info(tagScutcheon));
                             }
                             poiEntity.setExistence(existence);
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 83be4fe..926da09 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
@@ -73,7 +73,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
 
 
     private Spinner spinnerOther;
-    String[] others = new String[]{"门牌", "公交", "情报"};//  //门牌:6 公交:7 情报:8 现在其他任务类型里就这三种
+    String[] others = new String[]{"门牌", "公交", "情报"};//  //门牌:5 公交:6 情报:7 现在其他任务类型里就这三种
     private EditText editTaskName, editOtherDescribe;
     private RelativeLayout rlPicture;
     private ImageView ivPicture;
@@ -85,7 +85,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
     private PoiDao poiDao;
     private PoiEntity showPoiEntity;
     private LatLng latLng;
-    private int station_type = 6;
+    private int station_type = 5;
 
 
     private String takePhotoPath;
@@ -160,13 +160,13 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 switch (position) {
                     case 0:
-                        station_type = 6;
+                        station_type = 5;
                         break;
                     case 1:
-                        station_type = 7;
+                        station_type = 6;
                         break;
                     case 2:
-                        station_type = 8;
+                        station_type = 7;
                         break;
                 }
             }
@@ -276,6 +276,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
                 }
             }
         }
+        //判断是否是已完成作业并保存成功
         if (showPoiEntity.getTaskStatus()==3){
             disables();
         }
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 e0ef386..940af5b 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
@@ -225,8 +225,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                 }
             }
         }
+        //判断是否是已做完任务并保存成功
         if (showPoiEntity.getTaskStatus() == 3){
-         disables();
+         disables();//禁用所有可操作的控件
         }
     }
 
@@ -499,26 +500,31 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
                     public void onSuccess(PoiVideoBean poiVideoBean, int id) {
                         dismissLoadingDialog();
                         Integer poiVideoBody = poiVideoBean.getBody();
-                        poiEntity.setBodyId(poiVideoBody);
-                        poiEntity.setTaskStatus(3);
-                        new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity);
-                                getActivity().runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (isLocal){
-                                            poiVideoUpload(poiVideoBody,fileZip);
-                                        }else {
-                                            Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
-                                            onBackPressed();
+                        if (poiVideoBody!=null&&poiVideoBody!=0){
+                            poiEntity.setBodyId(poiVideoBody);
+                            poiEntity.setTaskStatus(3);
+                            new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity);
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            if (isLocal){
+                                                poiVideoUpload(poiVideoBody,fileZip);
+                                            }else {
+                                                Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
+                                                onBackPressed();
+                                            }
                                         }
-                                    }
-                                });
-                            }
-                        }).start();
-                        Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
+                                    });
+                                }
+                            }).start();
+                            Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
+                        }else {
+                            Toast.makeText(getActivity(), "没有获取到具体位置", Toast.LENGTH_SHORT).show();
+                        }
+
                     }
 
                     @Override
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 0437a2f..52b7194 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
@@ -71,7 +71,7 @@ import java.util.List;
 
 public class RoadFragment extends BaseDrawerFragment implements View.OnClickListener {
     private TextView tvPictures;
-    private TextView etRoadName;
+    private EditText etRoadName;
     private ImageView ivRoadPicture;
     private RadioButton rbCar;
     private RadioButton rbBicycle;
@@ -140,7 +140,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         poiDao = poiDatabase.getPoiDao();
         tvPictures = (TextView) findViewById(R.id.tv_pictures);
         tvPictures.setOnClickListener(this::onClick);
-        etRoadName = (TextView) findViewById(R.id.et_road_name);
+        etRoadName = (EditText) findViewById(R.id.et_road_name);
         ivRoadPicture = (ImageView) findViewById(R.id.iv_road_picture);
         // Glide.with(getContext()).load(getLocalVideoBitmap(String.valueOf(R.drawable.bg_01))).into(ivRoadPicture);
         rbCar = (RadioButton) findViewById(R.id.rb_car);
@@ -480,26 +480,32 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                     public void onSuccess(RoadSaveBean roadSaveBean, int id) {
                         dismissLoadingDialog();
                         Integer poiVideoBody = roadSaveBean.getBody();
-                        poiEntity.setBodyId(poiVideoBody);
-                        poiEntity.setTaskStatus(3);
-                        new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity);
-                                getActivity().runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (isLocal) {
-                                            poiVideoUpload(poiVideoBody, fileZip);
-                                        } else {
-                                            Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
-                                        }
-                                    }
-                                });
-                            }
-                        }).start();
-                        Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
-                        onBackPressed();
+                       if (poiVideoBody!=null&&poiVideoBody!=0){
+                           poiEntity.setBodyId(poiVideoBody);
+                           poiEntity.setTaskStatus(3);
+                           new Thread(new Runnable() {
+                               @Override
+                               public void run() {
+                                   InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity);
+                                   getActivity().runOnUiThread(new Runnable() {
+                                       @Override
+                                       public void run() {
+                                           if (isLocal) {
+                                               poiVideoUpload(poiVideoBody, fileZip);
+                                           } else {
+                                               Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
+                                           }
+                                       }
+                                   });
+                               }
+                           }).start();
+                           Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show();
+                           onBackPressed();
+                       }else {
+                           Toast.makeText(getActivity(), "没获取到具体的位置", Toast.LENGTH_SHORT).show();
+                       }
+
+
                     }
 
                     @Override
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 68911d0..ac05a08 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -570,7 +570,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     removablesLocality.add(roadMarker);
                                     break;
                                 case 5://其他
-                                    BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bg);
+                                    BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bag);
                                     Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
@@ -580,7 +580,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     removablesLocality.add(otherMarker);
                                     break;
                                 case 6://面状任务
-                                    BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bg);
+                                    BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_have_bag);
                                     Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f)
                                             .clockwise(false)
                                             .flat(true));
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 6477897..3f3dce0 100644
--- a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java
+++ b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java
@@ -34,14 +34,14 @@ public class PoiEntity implements Serializable {
     //ROOM不支持直接存储集合
     @TypeConverters(PhotoInfoConverter.class)
     private List<Info> photoInfo;//照片信息
-    private int existence;//是否存在 不存在对应  0 存在对应  1
+    private int existence;//是否存在 不存在对应  0 存在对应  1  无法验证对应 2
     private String x;//经度
     private String y;//纬度
     private String detail;//深度信息
     private String dist;//距离用户位置
     private int taskStatus;//任务状态 0.未领取 1.已领取，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）,
     private int type;//1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
-    private int station_type;//1."全部"2 "POI"3 "充电站"4 "POI录像"5 "道路录像", "门牌:6 公交:7 情报:8
+    private int station_type;//1."充电站"2 "充换电站"3 "充电桩组"4 "换电站"5 "门牌", "公交:6 情报:7
     private int isLocalData;//是否是本地数据  0,服务 1,本地
     private int isExclusive;//任务类型 0.普通任务，1.专属任务
     private int bodyId;//保存本地的bodyId
diff --git a/app/src/main/res/drawable/marker_other_have_bag.png b/app/src/main/res/drawable/marker_other_have_bag.png
index 72ffdad01b925b86a7cb4a7a98a21f08ef7b7c37..3f9d470cf16574bb41f588cf61386fd5af37b9f8 100644
GIT binary patch
delta 878
zcmV-!1Cjis7XAhyiBL{Q4GJ0x0000DNk~Le0000F0000O2nGNE03`*dX^|lxe*-8<
zL_t(IPkoe2OjAJ=hEH2sUM&Ts4^S5>NFbnufK(wEbU};{NYEG-Y&1ql+?u#^<w`cV
zaAD*Ti5e2bh=BwRMq&s75iJ6hQlOLqg_gGW_I2BPZ*^uI3ZdYaOnT0L=A4-`ccv29
zL-vtlC1vL-n~&$@Rx4F1Js0A<e|DR7Y;t_G&HQ_IfKDUCk`odV5-(q`Z!I;PzblbQ
zq*RXa2Vt2r4ZeNT)ffy0Tv#K?GL+bOyQ%*~?x{=I{~wzh>oaZ7TB}0Apj(E8E4B4c
z3yVu`kthXM-5$G1RjRa^8g1URak5*c%gR1occbA2+G=dxg^F@er=@{Tf2$#*(ohN}
zvxP<haI$s5@<m!^sBDr*rLi7S@8EQ~!R2;CgpYu6#srB91t=79Is@$nQF7LBM^<yK
zt|c{9nMrlX*6YB-FeD+wg+U>g0~f}>3h=TloduAXl%$fX)#*p6PdJpJ2Dirxtj`br
zKmf9IS}@I7AU!>e&iIE?f2q<-1wjZ?pRnCJ!}>@8xjX@QK_J?0B9TZyijSW91a0PF
zC@w6B4W&{EMFn}F)5JO>IM!FEWXUNh8990RHCRYZNd`d>VHTaNW77#+X!|M2Nic0P
zBV7P|t{gfC%*gQ26Y2Ny(e{Af@5F*AMq$~$MuHgJz`~M^*!DFCe}uykVl!T^{pZB^
zOPPpzW*N^)LD89dQ4}T7Xp~IAh{zU1k=W>VlHO5V?0MDM;N09WksG$@Sf7rHQ64>p
zi@Pt&Uhw_?*#G{4aq?Ri_DM2kd1>J*swx~mnOl8O0kqZ5PXm1qsk@Vm!38v0eZEeg
zRY;{6F6YMF>yGEOe`o=oN)Y$-KJ<1s`+cl~x&*x4zMk%TJkJNIM2Jh~LLtxR!GTBA
zC77nC-dPtd!_<utmyG!_G1kE{-c@YlRfmTLACtfy_Dx2gj7J4Jv2C|4kFBrTCrMxr
z`zB*%e;Ir6s`$}UDUJh^w_MJ7e6lv{;s}-E*!O$ZT&-&<M6am2kN*_$jar;H4|R97
z-wcPjod=EBcV!>Ttg&9tN|@tV{Mi`BV-p0PqhSibUrCvFc}*+s#{d8T07*qoM6N<$
Ef)&G)FaQ7m

delta 2851
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
BQ49b8

diff --git a/app/src/main/res/drawable/marker_other_have_bg.png b/app/src/main/res/drawable/marker_other_have_bg.png
deleted file mode 100644
index 3f9d470cf16574bb41f588cf61386fd5af37b9f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 894
zcmV-^1A+XBP)<h;3K|Lk000e1NJLTq000jF000;W1^@s6B?YHx00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj8C`m*?R5(w4luJxgK@^5hTUuT%1*H#A7b-{~poD-_
zAsBQ)j1NfA7#3_aMo8S6xO3%7Hn?zM<PnJ)62yps1Pw-F2mui-0+mvrlmdm8w)ggR
z+k0<yW*iEk;FnB#&VS~dnKO5$64*obkz*xg=PH|z=j2u^RVqCf;=Fd7b!>8cw9Wi`
zc7RSJ#F7&d5)v<8uWv0ioWCoPNTgJb@dsg<GY!6d)72OZ23%Mp$ugAKc)O|pMDD3e
z*#94!8|yP|&swWO!Ju1)g)6o7PYa7nZjmSjSKS`FNmZ(}nHp{0v~jXqrpwAcU3a75
z1=?zC-i3;CP^YDVPOBlK(ohN}vxP<haI$s5@<m!^sBDr*rLi7S@8EQ~!R2;CgpYu6
z#srB91t=79Is@$nQF7LBM^<yKt|c{9nMrlX*6YB-FeD+wg+U>g0~f}>3h=TloduAX
zl%$fX)#*p6PdJpJ2Dirxtj`brKmf9IS}@I7AU!>e&iIE?snSaYK?qZyu-!Vt`bYt}
zJOOw?Alhyskw`#_kDmGjZRTMpE-Z)*rBVq+1$m&;#5yB5)>o%w$tfurIeGatSV&Dt
z20;*E7M-kP(+OK>`zgsuFl{m;T>yNp96ATg$nek;>G$!`_JH5-#DXYBVcEV$f*9Pu
z!jg^H_B98D!x3ULUa$S<#P~~@h<auj&q_hjnR-zaCDCY<Ou&f97DSQQ=ysCcQC#eK
z)!E?O+%S<Fw&_@(j*3wpJ%)?BFUwx={r=eh{(*7wTNn08GG=*c;VY^t96y;`eNX|k
z)y_`?eGjR-lZ?RyG+KSWPM=jsr5G;f#@y?U=e1}7o=On+^gi@<H~W38gSrH~-M*gg
zdpyqvsYHlN=0YLQ=fQzT)Fqgvr`}l?EyL7}5toelF)`M`GTv2e<5h=;1|O5a9`;Q}
zpNvNZI<alHEsw3Q+9ye15Bnx#W`7xb@v8XIQz?!Eleb*Xd3>@q>*5HN;@J0l)?BS?
zDX*xykN*_$jar;H4|R97-wcPjod=EBcV!>Ttg&9tN|@tV{Mi`BV-p0PqhSibUrCvF
Uc}*+s#{d8T07*qoM6N<$g7~VG`2YX_

diff --git a/app/src/main/res/drawable/marker_poi_video_have_bag.png b/app/src/main/res/drawable/marker_poi_video_have_bag.png
deleted file mode 100644
index 03fee1d05234c47e487fa646f74c1aa22d8f17c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18389
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
GLSTY)uE0A0

diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml
index 137de58..11590c4 100644
--- a/app/src/main/res/layout/fragment_road.xml
+++ b/app/src/main/res/layout/fragment_road.xml
@@ -51,11 +51,11 @@
                 android:textColor="@color/black"
                 android:textSize="15sp" />
 
-            <TextView
+            <EditText
                 android:id="@+id/et_road_name"
                 android:layout_width="200dp"
+                android:gravity="center_vertical"
                 android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
                 android:background="@null" />
         </LinearLayout>
 
@@ -130,7 +130,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="02.拍照  "
+                android:text="03.拍照  "
                 android:textColor="@color/black"
                 android:textSize="16sp" />
 
diff --git a/app/src/main/res/layout/withdraw_fragment.xml b/app/src/main/res/layout/withdraw_fragment.xml
index cd4d403..d3a9907 100644
--- a/app/src/main/res/layout/withdraw_fragment.xml
+++ b/app/src/main/res/layout/withdraw_fragment.xml
@@ -84,7 +84,7 @@
             android:id="@+id/tv_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableRight="@drawable/ic_baseline_arrow_forward"
+            android:drawableRight="@drawable/ic_baseline_navigate"
             android:text="提现纪录"
             app:layout_constraintBottom_toBottomOf="@+id/tv_unit"
             app:layout_constraintEnd_toEndOf="parent"