修改启动页面和marker

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 29
     buildToolsVersion '29.0.2'
-    ndkVersion '21.1.6352462'
+    ndkVersion '23.0.7123448'
 
     defaultConfig {
         applicationId "com.navinfo.outdoor"

app/src/main/java/com/navinfo/outdoor/bean/ReceivedBean.java

@@ -0,0 +1,157 @@
+package com.navinfo.outdoor.bean;
+
+import java.util.List;
+
+public class ReceivedBean {
+
+    private Integer code;
+    private String message;
+    private BodyBean body;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public BodyBean getBody() {
+        return body;
+    }
+
+    public void setBody(BodyBean body) {
+        this.body = body;
+    }
+
+    public static class BodyBean {
+        private Integer sptype;
+        private List<CsTaskListBean> csTaskList;
+        private String address;
+        private String telephone;
+        private String geo;
+        private Double price;
+        private Integer type;
+        private String name;
+        private Integer isExclusive;
+
+        public Integer getSptype() {
+            return sptype;
+        }
+
+        public void setSptype(Integer sptype) {
+            this.sptype = sptype;
+        }
+
+        public List<CsTaskListBean> getCsTaskList() {
+            return csTaskList;
+        }
+
+        public void setCsTaskList(List<CsTaskListBean> csTaskList) {
+            this.csTaskList = csTaskList;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        public void setAddress(String address) {
+            this.address = address;
+        }
+
+        public String getTelephone() {
+            return telephone;
+        }
+
+        public void setTelephone(String telephone) {
+            this.telephone = telephone;
+        }
+
+        public String getGeo() {
+            return geo;
+        }
+
+        public void setGeo(String geo) {
+            this.geo = geo;
+        }
+
+        public Double getPrice() {
+            return price;
+        }
+
+        public void setPrice(Double price) {
+            this.price = price;
+        }
+
+        public Integer getType() {
+            return type;
+        }
+
+        public void setType(Integer type) {
+            this.type = type;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getIsExclusive() {
+            return isExclusive;
+        }
+
+        public void setIsExclusive(Integer isExclusive) {
+            this.isExclusive = isExclusive;
+        }
+
+        public static class CsTaskListBean {
+            private String address;
+            private String geo;
+            private Double price;
+            private String name;
+
+            public String getAddress() {
+                return address;
+            }
+
+            public void setAddress(String address) {
+                this.address = address;
+            }
+
+            public String getGeo() {
+                return geo;
+            }
+
+            public void setGeo(String geo) {
+                this.geo = geo;
+            }
+
+            public Double getPrice() {
+                return price;
+            }
+
+            public void setPrice(Double price) {
+                this.price = price;
+            }
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+        }
+    }
+}

app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java

@@ -214,8 +214,6 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                     if (poiEntity != null) {
                         if (poiEntity.getType() == 1) {//poi的领取类型
                             receivedTaskByNet(HttpInterface.RECEIVED_POI_TASK+"/"+poiEntity.getTaskId() + "", true);
-                        } else if (poiEntity.getType() == 5) {
-                            receivedTaskByNet(HttpInterface.RECEIVED_OTHER_TASK+"/"+poiEntity.getTaskId() + "", true);
                         }
                 }
                 break;

app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java

@@ -60,6 +60,9 @@ public class HttpInterface {
     //172.23.139.4:8003/poitask/1/receivedPoitask/1
     public static final String RECEIVED_POI_TASK = IPm7+"receivedPoitask/1";//poi-领取任务
 
+    public static final String IPm10 = "http://172.23.139.4:8003/ctask/1/receivedCtask/8608";
+
+
 
     public static final String IPm8 = "http://172.23.139.4:8003/poitask/1/";
     //172.23.139.4:8003/poitask/1/submitPoitask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注
@@ -67,7 +70,11 @@ public class HttpInterface {
     public static final String SUBMIT_POI_TASK = IPm8+"submitPoitask";//poi-保存本地
 
     public static final String IPm9 = "http://172.23.139.4:8003/othertask/1/";
-    //172.23.139.4:8003/othertask/1/submitOhtertask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注
 
+    //172.23.139.4:8003/othertask/1/submitOhtertask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注
     public static final String SUBMIT_OTHER_TASK = IPm9+"submitOthertask";//其他-保存本地
+
+    //172.23.139.4:8003/ctask/1/receivedCtask/8608
+    public static final String RECEIVED_CTASK = IPm10+"receivedCtask/8608";//充电站-领取任务
+
 }

app/src/main/res/layout/activity_main.xml

@@ -4,14 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ic_launcher_background"
+    android:background="@drawable/start_bg"
     tools:context="activity.MainActivity">
 
     <TextView
         android:id="@+id/tv_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="启动页"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"