From e8537942fc76efbc4d5cc466c925b6a81cdb79fc Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Mon, 26 Jul 2021 21:12:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../navinfo/outdoor/activity/WebActivity.java |  24 ++++-----
 .../outdoor/adapter/MessageAdapter.java       |  18 +++++++
 .../outdoor/adapter/StaySubmitAdapter.java    |  35 ++++++++++---
 .../com/navinfo/outdoor/api/Constant.java     |   2 +
 .../outdoor/bean/UserPriceExchangeBean.java   |   9 ++++
 .../outdoor/fragment/AboutFragment.java       |   8 +++
 .../fragment/ChargingStationFragment.java     |  11 ++--
 .../outdoor/fragment/FilterFragment.java      |   1 -
 .../outdoor/fragment/GatherGetFragment.java   |  32 +++++-------
 .../outdoor/fragment/MessageFragment.java     |  11 ++++
 .../navinfo/outdoor/fragment/PoiFragment.java |  29 ++++++++---
 .../outdoor/fragment/RoadFragment.java        |   4 +-
 .../outdoor/fragment/StaySubmitFragment.java  |  46 +++++++++--------
 .../outdoor/fragment/TreasureFragment.java    |  44 +++++++++++++---
 .../outdoor/fragment/WithdrawFragment.java    |   3 +-
 .../navinfo/outdoor/http/HttpInterface.java   |  10 +++-
 .../main/res/color/test_color_selector.xml    |   4 +-
 app/src/main/res/drawable-hdpi/graycharge.png | Bin 0 -> 1916 bytes
 app/src/main/res/drawable-hdpi/grayother.png  | Bin 0 -> 1764 bytes
 app/src/main/res/drawable-hdpi/graypoi.png    | Bin 0 -> 2026 bytes
 app/src/main/res/drawable-hdpi/grayroad.png   | Bin 0 -> 1791 bytes
 .../drawable-hdpi/ic_launcher_foreground.xml  |  30 +++++++++++
 .../icon_add_bg.png                           | Bin
 .../icon_del_bg.png                           | Bin
 .../marker_charge_bg1.png                     | Bin
 .../marker_other_bg1.png                      | Bin
 .../marker_poi_bg1.png                        | Bin
 .../marker_poi_video_bg1.png                  | Bin
 app/src/main/res/drawable/selector_hui_bg.xml |   8 +++
 app/src/main/res/drawable/selector_red_bg.xml |   8 +++
 app/src/main/res/drawable/shap_red_bg.xml     |   4 ++
 app/src/main/res/drawable/shape_hui_bg.xml    |   5 ++
 app/src/main/res/drawable/shape_radius_bg.xml |   5 ++
 .../res/layout/charging_pile_fragment.xml     |  36 +++++++++----
 .../res/layout/charging_station_fragment.xml  |  26 ++++++----
 .../main/res/layout/fragment_gather_get.xml   |   3 +-
 app/src/main/res/layout/fragment_message.xml  |  18 ++++---
 app/src/main/res/layout/fragment_other.xml    |  48 +++++++++---------
 app/src/main/res/layout/fragment_road.xml     |  44 ++++++++++++----
 .../main/res/layout/fragment_stay_submit.xml  |  10 ++--
 app/src/main/res/layout/item_filter.xml       |  33 ++++++------
 app/src/main/res/layout/poi_fragment.xml      |  24 ++++++---
 .../main/res/layout/poi_video_fragment.xml    |  43 ++++++++++++----
 app/src/main/res/values/styles.xml            |   4 +-
 44 files changed, 455 insertions(+), 185 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/graycharge.png
 create mode 100644 app/src/main/res/drawable-hdpi/grayother.png
 create mode 100644 app/src/main/res/drawable-hdpi/graypoi.png
 create mode 100644 app/src/main/res/drawable-hdpi/grayroad.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_launcher_foreground.xml
 rename app/src/main/res/{drawable => drawable-hdpi}/icon_add_bg.png (100%)
 rename app/src/main/res/{drawable => drawable-hdpi}/icon_del_bg.png (100%)
 rename app/src/main/res/{drawable => drawable-hdpi}/marker_charge_bg1.png (100%)
 rename app/src/main/res/{drawable => drawable-hdpi}/marker_other_bg1.png (100%)
 rename app/src/main/res/{drawable => drawable-hdpi}/marker_poi_bg1.png (100%)
 rename app/src/main/res/{drawable => drawable-hdpi}/marker_poi_video_bg1.png (100%)
 create mode 100644 app/src/main/res/drawable/selector_hui_bg.xml
 create mode 100644 app/src/main/res/drawable/selector_red_bg.xml
 create mode 100644 app/src/main/res/drawable/shap_red_bg.xml
 create mode 100644 app/src/main/res/drawable/shape_hui_bg.xml
 create mode 100644 app/src/main/res/drawable/shape_radius_bg.xml

diff --git a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java
index 89b1650..7378357 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java
@@ -27,18 +27,18 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
     private WebView nWebView;
     private String content = "<div>\n" +
             "<a>测试</a>\n" +
-//            "\n" +
-//            "<p>\n" +
-//            "\t<img  src=\"https://exp-picture.cdn.bcebos.com/560be432939c2cf72dff4caa452c5b1b1fde12e1.jpg?x-bce-process=image%2Fresize%2Cm_lfit%2Cw_500%2Climit_1%2Fformat%2Cf_jpg%2Fquality%2Cq_80\">\n" +
-//            "</p>\n" +
-//            "\n" +
-//            "<p style=\"color: red; margin-left: 20px\">&lt;style&gt; 标签用于为 HTML 文档定义样式信息。</p>\n" +
-//            "\n" +
-//            "<p style=\"background-color: lightblue; margin-left: 20px\">在 style 中，您可以规定在浏览器中如何呈现 HTML 文档。</p>\n" +
-//            "\n" +
-//            "<p style=\"font-family: verdana; margin-left: 20px\">type 属性是必需的，定义 style 元素的内容。唯一可能的值是 \"text/css\"。</p>\n" +
-//            "\n" +
-//            "<p style=\"font-size: 20px; margin-left: 20px\">style 元素位于 head 部分中。</p>\n" +
+            "\n" +
+            "<p>\n" +
+            "\t<img  src=\"https://exp-picture.cdn.bcebos.com/560be432939c2cf72dff4caa452c5b1b1fde12e1.jpg?x-bce-process=image%2Fresize%2Cm_lfit%2Cw_500%2Climit_1%2Fformat%2Cf_jpg%2Fquality%2Cq_80\">\n" +
+            "</p>\n" +
+            "\n" +
+            "<p style=\"color: red; margin-left: 20px\">&lt;style&gt; 标签用于为 HTML 文档定义样式信息。</p>\n" +
+            "\n" +
+            "<p style=\"background-color: lightblue; margin-left: 20px\">在 style 中，您可以规定在浏览器中如何呈现 HTML 文档。</p>\n" +
+            "\n" +
+            "<p style=\"font-family: verdana; margin-left: 20px\">type 属性是必需的，定义 style 元素的内容。唯一可能的值是 \"text/css\"。</p>\n" +
+            "\n" +
+            "<p style=\"font-size: 20px; margin-left: 20px\">style 元素位于 head 部分中。</p>\n" +
             "</div>";
     @Override
     protected int getLayout() {
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/MessageAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/MessageAdapter.java
index d87a7e6..4fb7e07 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/MessageAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/MessageAdapter.java
@@ -43,6 +43,15 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.ViewHold
         holder.tvMessageTitle.setText(messageList.get(position).getTitle());
         holder.tvMessageDest.setText(messageList.get(position).getSubtitle());
         holder.tvMessageTime.setText(messageList.get(position).getCreatetime());
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (messageClickItem!=null){
+                    messageClickItem.item(messageList.get(position).getId());
+                }
+
+            }
+        });
     }
 
     @Override
@@ -63,4 +72,13 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.ViewHold
             tvMessageTime = itemView.findViewById(R.id.tv_message_time);
         }
     }
+    public messageClickItem messageClickItem;
+
+    public void setMessageClickItem(MessageAdapter.messageClickItem messageClickItem) {
+        this.messageClickItem = messageClickItem;
+    }
+
+    public interface messageClickItem{
+        void item(int aInt);
+    }
 }
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
index 70e8c43..fb73d94 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
@@ -8,26 +8,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.navinfo.outdoor.R;
-import com.navinfo.outdoor.bean.CapacityMeasureBean;
 import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-
-import static com.tencent.mapsdk.internal.aaa.getContext;
 
 public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.ViewHolder> {
     private List<PoiEntity> allRoad = new ArrayList<>();
@@ -91,6 +85,25 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
                 allRoad.get(position).setChecked(isChecked);
             }
         });
+        if (poiEntity.getIsLocalData() == 1){
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onClickItem!=null){
+                        onClickItem.item(position,poiEntity);
+                    }
+                }
+            });
+        }else {
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onClickItem!=null){
+                        onClickItem.item(position,poiEntity);
+                    }
+                }
+            });
+        }
 
 
     }
@@ -124,4 +137,14 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
             }
         }
     };
+
+   public onClickItem onClickItem ;
+
+    public void setOnClickItem(StaySubmitAdapter.onClickItem onClickItem) {
+        this.onClickItem = onClickItem;
+    }
+
+    public interface onClickItem {
+        void item(int position, PoiEntity allRoad);
+    }
 }
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 df56833..c383390 100644
--- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java
+++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java
@@ -82,6 +82,8 @@ public class Constant {
     public static final int CHARGING_PILE_BODY = 36;//充电装的body
     public static final int CHARGING_PILE_PHONE = 37;//充电桩的照片
     public static final int EVENT_WHAT_CURRENT_MARKER = 41; // 显示当前正在编辑的POI类型数据的Event的What值
+    //CompleteTask
+    public static final int EVENT_WHAT_COMPLETE_TASK = 42; // 点击记录跳转开始采集
 
 
     public static String USER_ATTESTATION_NAME; //实名认证姓名  银行卡
diff --git a/app/src/main/java/com/navinfo/outdoor/bean/UserPriceExchangeBean.java b/app/src/main/java/com/navinfo/outdoor/bean/UserPriceExchangeBean.java
index cc37223..ab60f55 100644
--- a/app/src/main/java/com/navinfo/outdoor/bean/UserPriceExchangeBean.java
+++ b/app/src/main/java/com/navinfo/outdoor/bean/UserPriceExchangeBean.java
@@ -4,6 +4,7 @@ public class UserPriceExchangeBean {
 
     private Integer code;
     private String message;
+    private Integer body;
 
     public Integer getCode() {
         return code;
@@ -20,4 +21,12 @@ public class UserPriceExchangeBean {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public Integer getBody() {
+        return body;
+    }
+
+    public void setBody(Integer body) {
+        this.body = body;
+    }
 }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
index c4afd30..8e70cf3 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
@@ -1,5 +1,6 @@
 package com.navinfo.outdoor.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
@@ -8,6 +9,7 @@ import android.widget.RelativeLayout;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.WebActivity;
 import com.navinfo.outdoor.base.BaseFragment;
 
 /**
@@ -54,10 +56,16 @@ public class AboutFragment extends BaseFragment implements View.OnClickListener
                 getActivity().finish();
                 break;
             case R.id.rl_about:
+                Intent intent = new Intent(getContext(), WebActivity.class);
+                startActivity(intent);
                 break;
             case R.id.rl_serve:
+                Intent serveIntent = new Intent(getContext(), WebActivity.class);
+                startActivity(serveIntent);
                 break;
             case R.id.rl_privilege:
+                Intent privilegeIntent = new Intent(getContext(), WebActivity.class);
+                startActivity(privilegeIntent);
                 break;
         }
     }
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 d81adfb..e70fd67 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
@@ -83,7 +83,7 @@ import static android.app.Activity.RESULT_OK;
 public class ChargingStationFragment extends BaseDrawerFragment implements View.OnClickListener {
 
     private EditText editDescribe;
-    private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlElse, rlScutcheon;
+    private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlElse, rlScutcheon,rlNull;
     private ImageView ivPanorama, ivName, ivInternal, ivElse, ivScutcheon;
     private TextView tvExamine;
     private EditText editNameContent, editSiteContent;
@@ -235,6 +235,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         rlName.setOnClickListener(this::onClick);
         rlInternalPhotos = findViewById(R.id.rl_internal_photos);
         rlInternalPhotos.setOnClickListener(this::onClick);
+        rlNull = findViewById(R.id.rl_null);
+
         rlElse = findViewById(R.id.rl_else);
         rlElse.setOnClickListener(this::onClick);
         rlScutcheon = findViewById(R.id.rl_scutcheon);
@@ -322,6 +324,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         rlInternalPhotos.setVisibility(View.VISIBLE);
                         rlElse.setVisibility(View.VISIBLE);
                         rlScutcheon.setVisibility(View.VISIBLE);
+                        rlNull.setVisibility(View.VISIBLE);
                         existence = 0;
                         break;
                     case 1:
@@ -329,6 +332,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         rlInternalPhotos.setVisibility(View.GONE);
                         rlElse.setVisibility(View.GONE);
                         rlScutcheon.setVisibility(View.GONE);
+                        rlNull.setVisibility(View.GONE);
                         existence = 1;
                         break;
                     case 2:
@@ -336,6 +340,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                         rlInternalPhotos.setVisibility(View.GONE);
                         rlElse.setVisibility(View.GONE);
                         rlScutcheon.setVisibility(View.GONE);
+                        rlNull.setVisibility(View.GONE);
                         existence = 2;
                         break;
                 }
@@ -422,9 +427,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
             }
         } else {
             if (Constant.CODE == null || Constant.CODE.equals("")) {
-                poiBeans.add(new PhoneBean("电话*", "", "", R.drawable.icon_add_bg));
+                poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
             } else {
-                poiBeans.add(new PhoneBean("电话*", "", Constant.CODE, R.drawable.icon_add_bg));
+                poiBeans.add(new PhoneBean("电话", "", Constant.CODE, R.drawable.icon_add_bg));
             }
         }
         body = showPoiEntity.getBodyId();
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 59612c5..158f94d 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
@@ -308,7 +308,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                     obtain.what = Constant.FILTER_LIST_ITEM;
                     obtain.obj = poiEntity;
                     EventBus.getDefault().post(obtain);
-
                 }
             }
         });
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 e35a986..9283736 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
@@ -223,7 +223,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     getActivity().runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-                                            initCompleteTask(HttpInterface.COMPLETE, poiEntity.getTaskId(), taskIdPoiEntity);
+                                            initCompleteTask(HttpInterface.COMPLETE, poiEntity.getTaskId(),true, taskIdPoiEntity);
                                         }
                                     });
                                 }
@@ -258,10 +258,6 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     public void run() {
                                         poiEntity.setTaskStatus(0);
                                         initViewByTaskStatus(0);
-//                                        btnGetTask.setVisibility(View.VISIBLE);
-//                                        btnCancelGet.setVisibility(View.GONE);
-//                                        btnGather.setVisibility(View.VISIBLE);
-//                                        btnFinishGather.setVisibility(View.GONE);
                                     }
                                 });
                             }
@@ -345,12 +341,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     getActivity().runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-//                                        poiEntity.setTaskStatus(1);
-//                                        initViewByTaskStatus(1);
-                                            btnGetTask.setVisibility(View.GONE);
-                                            btnCancelGet.setVisibility(View.VISIBLE);
-                                            btnFinishGather.setVisibility(View.VISIBLE);
-                                            btnGather.setVisibility(View.GONE);
+                                        poiEntity.setTaskStatus(1);
+                                        initViewByTaskStatus(1);
                                             if (isSaver) {
                                                 Message obtain = Message.obtain();
                                                 obtain.what = Constant.GATHER_GET_MAP;
@@ -430,10 +422,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                         public void run() {
 //                                            poiEntity.setTaskStatus(1);
 //                                            initViewByTaskStatus(1);
+
                                             btnGetTask.setVisibility(View.GONE);
                                             btnCancelGet.setVisibility(View.VISIBLE);
+
                                             if (aBoolean) {
-                                                initCompleteTask(HttpInterface.COMPLETE, GatherGetFragment.this.poiEntity.getTaskId(), polygonEntity);
+                                                initCompleteTask(HttpInterface.COMPLETE, GatherGetFragment.this.poiEntity.getTaskId(), true, polygonEntity);
                                             }
                                         }
                                     });
@@ -501,8 +495,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
 
     /**
      * @param url 面妆任务立即采集
+     * @param b
+     *
      */
-    private void initCompleteTask(String url, int taskId, PoiEntity poiEntity) {
+    private void initCompleteTask(String url, int taskId, boolean b, PoiEntity poiEntity) {
         if (taskId == 0) {
             Toast.makeText(getContext(), "无此任务", Toast.LENGTH_SHORT).show();
             return;
@@ -526,9 +522,9 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                     getActivity().runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-//                                            onBackPressed();
-//                                            poiEntity.setTaskStatus(3);
-//                                            initViewByTaskStatus(3);
+
+//                                            poiEntity.setTaskStatus(1);
+//                                            initViewByTaskStatus(1);
                                             btnGather.setVisibility(View.GONE);
                                             btnFinishGather.setVisibility(View.VISIBLE);
 
@@ -745,10 +741,6 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
                                         public void run() {
                                             poiEntity.setTaskStatus(1);
                                             initViewByTaskStatus(1);
-//                                            btnGetTask.setVisibility(View.GONE);
-//                                            btnCancelGet.setVisibility(View.VISIBLE);
-//                                            btnFinishGather.setVisibility(View.VISIBLE);
-//                                            btnGather.setVisibility(View.GONE);
                                             if (isSaver) {
                                                 Message obtain = Message.obtain();
                                                 obtain.what = Constant.GATHER_GET_MAP;
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java
index b682a72..15f5ddb 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java
@@ -1,5 +1,6 @@
 package com.navinfo.outdoor.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -12,6 +13,7 @@ import com.jcodecraeer.xrecyclerview.ProgressStyle;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.lzy.okgo.model.HttpParams;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.WebActivity;
 import com.navinfo.outdoor.adapter.MessageAdapter;
 import com.navinfo.outdoor.adapter.TaskPrefectureAdapter;
 import com.navinfo.outdoor.base.BaseFragment;
@@ -56,7 +58,16 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
         messageRecycler.setLoadingMoreEnabled(false);
         messageAdapter = new MessageAdapter(getContext());
         messageRecycler.setAdapter(messageAdapter);
+        messageAdapter.setMessageClickItem(new MessageAdapter.messageClickItem() {
+            @Override
+            public void item(int id) {
+                Intent intent = new Intent(getContext(), WebActivity.class);
+                intent.putExtra("id", id);
+                startActivity(intent);
+            }
+        });
         messageRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕");
+
         messageRecycler.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
             public void onRefresh() {
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 f4feea6..e8e5434 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -107,6 +107,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
     private LinearLayout linearContact;
     private ContactView contactView;
     private ArrayList<File> poiPicList;
+    private String tagPanorama;
 
     public static PoiFragment newInstance(Bundle bundle) {
         PoiFragment fragment = new PoiFragment();
@@ -252,7 +253,20 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
         initShowPoi();
         //禁用所有可操作控件
         //disables();
-
+//        ivPanorama.setOnLongClickListener(new View.OnLongClickListener() {
+//            @Override
+//            public boolean onLongClick(View v) {
+//                DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+//                MessageDialog.show((AppCompatActivity) getContext(), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+//                    @Override
+//                    public boolean onClick(BaseDialog baseDialog, View v) {
+//                        tagPanorama.isEmpty();
+//                        return false;
+//                    }
+//                });
+//                return true;
+//            }
+//        });
 
     }
 
@@ -288,13 +302,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                     if (!StringUtils.isEmpty(phones[i])) {
                         if (phones[i].contains("-")) { // 包含区号数据的电话
                             String[] split = phones[i].split("-");
-                            if (split!=null&&split.length>1) {
+                            if (split != null && split.length > 1) {
                                 poiBeans.add(new PhoneBean("电话", split[1] + "", split[0] + "", R.drawable.icon_add_bg));
                             } else {
                                 poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg));
                             }
                         } else {
-                            if (phones[i]!=null) {
+                            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));
@@ -305,13 +319,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                     if (!StringUtils.isEmpty(phones[i])) {
                         if (phones[i].contains("-")) { // 包含区号数据的电话
                             String[] split = phones[i].split("-");
-                            if (split!=null&&split.length>1) {
+                            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) {
+                            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));
@@ -357,10 +371,11 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 }
             }
         }
-        if (showPoiEntity.getTaskStatus() == 3){
+        if (showPoiEntity.getTaskStatus() == 3) {
             disables();
         }
 
+
     }
 
     /**
@@ -548,7 +563,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                                 String list = contactView.getList();
                                 poiEntity.setTelPhone(list);
                             }
-                            String tagPanorama = (String) ivPanorama.getTag();
+                            tagPanorama = (String) ivPanorama.getTag();
                             if (tagPanorama == null) {
                                 Toast.makeText(getActivity(), "请拍照 全景图", Toast.LENGTH_SHORT).show();
                                 return;
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 52b7194..e85f497 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
@@ -312,7 +312,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                                 String formats = formatters.format(calendars.getTime());
                                 String city = Constant.currentLocation.getCity();//返回当前位置的城市.
                                 String district = Constant.currentLocation.getDistrict();//返回当前位置的区县.
-                                StringBuffer sb = new StringBuffer("poi录像上报");
+                                StringBuffer sb = new StringBuffer("道路录像上报");
                                 if (city != null && !"".equals(city)) {
                                     sb.append("-");
                                     sb.append(city);
@@ -420,7 +420,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         }
         OkGo
                 // 请求方式和请求url
-                .<OtherUploadPicBean>post(HttpInterface.POI_VIDEO_UPLOAD_PIC)
+                .<OtherUploadPicBean>post(HttpInterface.ROAD_TASK_UPLOAD_PIC)
                 // 请求的 tag, 主要用于取消对应的请求
                 .params("auditId", body)
                 .params("file", fileZip)
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
index 32f465e..f54dfd6 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
@@ -2,7 +2,6 @@ package com.navinfo.outdoor.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 import android.view.View;
@@ -12,18 +11,12 @@ import android.widget.CompoundButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.text.SimpleDateFormat;
-
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.gson.Gson;
-import com.jcodecraeer.xrecyclerview.ProgressStyle;
-import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialog.interfaces.OnMenuItemClickListener;
 import com.kongzue.dialog.util.BaseDialog;
@@ -31,19 +24,17 @@ import com.kongzue.dialog.util.DialogSettings;
 import com.kongzue.dialog.v3.BottomMenu;
 import com.kongzue.dialog.v3.MessageDialog;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.FragmentManagement;
 import com.navinfo.outdoor.adapter.StaySubmitAdapter;
-import com.navinfo.outdoor.api.UserApplication;
+import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseFragment;
 import com.navinfo.outdoor.room.PoiDao;
 import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 
-import org.jetbrains.annotations.NotNull;
+import org.greenrobot.eventbus.EventBus;
 
-import java.sql.Date;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -90,6 +81,20 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
         stayXrv.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
         staySubmitAdapter = new StaySubmitAdapter(getContext());
         stayXrv.setAdapter(staySubmitAdapter);
+        staySubmitAdapter.setOnClickItem(new StaySubmitAdapter.onClickItem() {
+            @Override
+            public void item(int position, PoiEntity poiEntity) {
+//                Intent subIntent = new Intent(getActivity(), FragmentManagement.class);
+//                subIntent.putExtra("poiEntity", poiEntity);
+//                subIntent.putExtra("tag", 4);
+//                startActivity(subIntent);
+
+//                Message obtain = Message.obtain();
+//                obtain.what = Constant.EVENT_WHAT_COMPLETE_TASK;
+//                obtain.obj = poiEntity;
+//                EventBus.getDefault().post(obtain);
+            }
+        });
         cbSelect.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -105,14 +110,15 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
 //        super.initData();
 //    }
 
-    public List<PoiEntity> initRoadWord(int type){
+
+    public List<PoiEntity> initRoadWord(int type) {
         newEntities.clear();
         for (int i = 0; i < roadEntities.size(); i++) {
             PoiEntity poiEntity = roadEntities.get(i);
-            if (type==0){
+            if (type == 0) {
                 newEntities.add(poiEntity);
-            }else {
-                if (poiEntity.getType()==type){
+            } else {
+                if (poiEntity.getType() == type) {
                     newEntities.add(poiEntity);
                 }
             }
@@ -125,10 +131,10 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.cl_stay_type://1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
-                BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部","poi", "充电站", "poi录像", "道路录像","其他","面状任务"}, new OnMenuItemClickListener() {
+                BottomMenu.show((AppCompatActivity) getContext(), new String[]{"全部", "poi", "充电站", "poi录像", "道路录像", "其他", "面状任务"}, new OnMenuItemClickListener() {
                     @Override
                     public void onClick(String text, int index) {
-                        switch (index){
+                        switch (index) {
                             case 0:
                                 List<PoiEntity> entities = initRoadWord(0);
                                 staySubmitAdapter.setAllRoad(entities);
@@ -138,7 +144,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
                                 staySubmitAdapter.setAllRoad(poiEntities);
                                 break;
                             case 2:
-                                List<PoiEntity> stationEntities= initRoadWord(2);
+                                List<PoiEntity> stationEntities = initRoadWord(2);
                                 staySubmitAdapter.setAllRoad(stationEntities);
                                 break;
                             case 3:
@@ -179,7 +185,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
     public void refreshData() {
         roadDatabase = PoiDatabase.getInstance(getContext());
         roadDao = roadDatabase.getPoiDao();
-        if (roadEntities ==null) {
+        if (roadEntities == null) {
             roadEntities = new ArrayList<>();
         }
         if (newEntities == 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 971cb6e..a7d2190 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -444,7 +444,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                 });
 
     }
-
     public void initMarker(PoiEntity poiEntity) {
         sliding_layout.setPanelHeight(0);
         sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
@@ -528,7 +527,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                             switch (Integer.valueOf(poiEntity.getType())) {
                                 case 1://poi
 
-                                    BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_have_bg);
+                                    BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.graypoi);
                                     Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
@@ -540,7 +539,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
 
                                     break;
                                 case 2://充电站
-                                    BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_have_bg);
+                                    BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.graycharge);
                                     Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
@@ -560,7 +559,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     removablesLocality.add(poiVideoMarker);
                                     break;
                                 case 4://道路录像
-                                    BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_have_bg);
+                                    BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayroad);
                                     Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.9f)
                                             .flat(true)
                                             .clockwise(false));
@@ -841,7 +840,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
             }
         } else if (data.what == Constant.GATHER_GET_RETURN) {//item 点击页面的返回事件的处理
             if ((boolean) data.obj) {
-
                 frameLayout.setVisibility(View.GONE);
                 sliding_layout.setPanelHeight(1000);
                 sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
@@ -893,6 +891,40 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
             int type = data.arg1;
             showPoiMarkerByType(type, latLng);
         }
+//        else if (data.what == Constant.EVENT_WHAT_COMPLETE_TASK){
+//            // 如果当前fragment是筛选，则移除该fragment
+//            FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName());
+//            if (filterFragment != null) {
+//                fragmentTransaction.remove(filterFragment);
+//                //fragmentTransaction.commit();
+//            }
+//            PoiEntity poiEntity = (PoiEntity) data.obj;
+//            Bundle bundle = new Bundle();
+//            bundle.putSerializable("poiEntity", poiEntity);
+//            switch (poiEntity.getType()) {
+//                case 1:
+//                    PoiFragment poiFragment = PoiFragment.newInstance(bundle);
+//                    showSlidingFragment(poiFragment);
+//                    break;
+//                case 2:
+//                    ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
+//                    showSlidingFragment(chargingStationFragment);
+//                    break;
+//                case 3:
+//                    PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
+//                    showSlidingFragment(poiVideoFragment);
+//                    break;
+//                case 4:
+//                    RoadFragment roadFragment = RoadFragment.newInstance(bundle);
+//                    showSlidingFragment(roadFragment);
+//                    break;
+//                case 5:
+//                    OtherFragment otherFragment = OtherFragment.newInstance(bundle);
+//                    showSlidingFragment(otherFragment);
+//                    break;
+//            }
+//            frameLayout.setVisibility(View.VISIBLE);
+//        }
     }
 
 
@@ -912,7 +944,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
 
     private void initFilterMarker(List<PoiEntity> poiEntities) {
         sliding_layout.setPanelHeight(1000);
-        sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+        sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
         for (int i = 0; i < poiEntities.size(); i++) {
             LatLng position = new LatLng(Double.valueOf(poiEntities.get(i).getY()), Double.valueOf(poiEntities.get(i).getX()));
             tencentMap.addMarker(new MarkerOptions(position));
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
index 8cd071d..b87dd4d 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
@@ -163,8 +163,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                     @Override
                     public void onSuccess(UserPriceExchangeBean response, int id) {
                         dismissLoadingDialog();
-                        //  Toast.makeText(getContext(), "获取成功", Toast.LENGTH_SHORT).show();
-
+                          Toast.makeText(getContext(), "提现成功", Toast.LENGTH_SHORT).show();
                         Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt");
                     }
 
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 a65eb98..cebaf4d 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
@@ -64,10 +64,16 @@ public class HttpInterface {
     public static final String RECEIVED_POI_VIDEO_TASK = IPm6 + "poivideotask/1/receivedPoivideotask";//poi录像任务获取
     // 172.23.139.4:8003/poivideotask/1/submitPoivideotask
     public static final String INSIDE_API_LIST = IPm6 + "poivideotask/1/submitPoivideotask";//poi录像 保存
-    //172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2
-    public static final String ROAD_TASK_SUBMIT = IPm6+"roadtask/1/submitRoadtask";
+
     //172.23.139.4:8003/poivideotask/1/uploadpic
     public static final String POI_VIDEO_UPLOAD_PIC = IPm6 + "poivideotask/1/uploadpic";//poi录像-上传
+
+    //172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2
+    public static final String ROAD_TASK_SUBMIT = IPm6+"roadtask/1/submitRoadtask";//道路录像-保存本地
+
+    //172.23.139.4:8003/roadtask/1/uploadpic
+    public static final String ROAD_TASK_UPLOAD_PIC=IPm6+"roadtask/1/uploadpic";//道路录像—上传
+
     //http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy
     public static final String GET_PHONE = IPm6 + "m4/task/1/getPhone"; //任务搜索
     //http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy
diff --git a/app/src/main/res/color/test_color_selector.xml b/app/src/main/res/color/test_color_selector.xml
index e9fd0ec..cbc14d2 100644
--- a/app/src/main/res/color/test_color_selector.xml
+++ b/app/src/main/res/color/test_color_selector.xml
@@ -3,6 +3,8 @@
     <item android:state_pressed="true"
         android:color="#ff0000ff"/> <!-- pressed 看下的颜色-->
     <item android:state_focused="true"
-        android:color="#D8D7D7"/> <!-- focused -->
+        android:color="#ff000000"/> <!-- focused -->
+    <item android:state_enabled="false"
+        android:color="@color/colorGray"/> <!-- focused -->
     <item android:color="#ff000000"/> <!-- default 默认颜色 -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/graycharge.png b/app/src/main/res/drawable-hdpi/graycharge.png
new file mode 100644
index 0000000000000000000000000000000000000000..1da65b3ba10733dffb17a77376599da46abebd10
GIT binary patch
literal 1916
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
Cd1(az

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/grayother.png b/app/src/main/res/drawable-hdpi/grayother.png
new file mode 100644
index 0000000000000000000000000000000000000000..02409e38b4842d964ce05a6fc1242346bf72c7f8
GIT binary patch
literal 1764
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
GLSTYaD?``-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/graypoi.png b/app/src/main/res/drawable-hdpi/graypoi.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1752de2e6b172c983c07452f1cbe786b089b81b
GIT binary patch
literal 2026
zcmV<G2Nn2<P)<h;3K|Lk000e1NJLTq001BW001cn1^@s6RCOyn00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91AfN*P1ONa40RR91DF6Tf0HKxuf&c&qR7pfZR9FeESXoS!M-)Eni!4Dl
zK?Ff97^7(eg4PlYpcE91fj+fOeC$J`ZCbl()Apq%eQaNvCMInY+B5}~njj&HHW6e|
z;tmgNvdAi%?A%MgZ}{hW@8$k*p*_iA{yB4I&Y82$#Y5bL#l=NWuzDD%zwLJ~Vqyhy
zT=ekp;P<M)15E)!wLmX0`2hV4^u_26q#^_gTL8`hXAPXkXaQ0gD&-PP6)<j0!4w(<
z3<ZV&gMooS(z#BcAPSxWP5{RZe1UNWXfd<MG6jrV^Jcsy1%?BoW@ct$A3b`M`s~@W
zS0^SWlIG^-LKYSlsF-+rd%y7U@fi;Z32EQ7Y16%(J9jp2*s!4&O9Q|mAQhr@tj^YO
zP{0t*TLl0qICgk=_?5c4y5hdRzHA62eO2)C@|uZ_jjc{gOZzJ_GO`65dVs^gX&|j(
zbBVJ86i)L-1LJSpxbaqNYwJmi#o~|on!(f4b9Tp$9VJ;=StZ!q3G4?>LIJu=flUF!
z=SukO?CkdP^76AIBO`BU#{V*ghle*DJ$m#TKR-WOqYpT(l~4*8re{z^z|7lAOH0p>
zjg4hcDE!+J7#LU$TpSn}IBB(7-Esr>+Cyk)Xj4&9(I-3)^g-Y(U7;1A=^5pTWo2dG
z4h;<zU~wiaEbRN@;^N;xXE4TK?Htz9@x3lUJX||*;>2gz+y)$@6}*kxGsi>k+_{s5
zpv&h%TwL6#{QUguphtIfbfh&mH|IZp{`@t}*A0V%gE^3qlbV{!fSiJCt1c!qe;Cs2
zG!=@Dj=lilHK0XRRaLzQ1>Oc-7oBx0z>SdcJ`||J=Lm3Km(&1gmVsQ4C)2)t`|2?y
zJb3URx4pgn-TzBC&xVY+#>U3i@yX2cuvwt9v-3?d5E>d9-r2f!>peix62<XvKtO;X
zs3bTzSP+zgG!+D`AZr{MO=gglhZ^xWmOZHe1JQeOaxz8p_xAQ?5%pY;NF&+5f4@LE
z>F(|p@TeuyVOH_=^_AM%TIuNM&|6%Nkd=%DC7XW;9!S5)rBBy?d22+lAQh#gq(l%W
zf~XdhTp1l5mCDLWK`EB(>}*AYuU#JmDl8U(L1my;U=a$i$+!emG&y|uu)5j(`}gJ0
zp+mBH^JWL$y?gfxd@GkPUzWncLgfx^AqPfG3|XoiGYI)H4<QrIjC!7wl%&jy*pR%u
zJS7~>NRXOx_wHRmgJQvA@XD4gTLisBee3<sqalm!TBR0y`791ta;P&m=ICyMjF8>C
zcMHm@OifJ*s---B{8&&oq@toi3FTH=qN}S*Xf+0@D==iSeOt8!rr~4ey-SFSijtn5
z9zk(Z>-F{ZLK<U&?l^w@xX?8yRKkEnCzSsFeqr3W0)K!1+o1EE@X`V}u*?-RX=ty4
zH-K#1xKXj7qDf+6qM%}`IjzF9B%Q!uWLlajfZ#0!8x^p6;t<Bb!oh<FZ$o=(whWl-
zOfmYMKw<U)M&-uG#}%FHC^jk+G(Tw?aQixBN-gFKl&#Av<6s&A^d*RV+c^LlkTNTM
zOJL5ow6w_8t5>C_rbaGZx}*XVuOU^KSR-ha>1n<{UINdC8@~XB3zWI^s5GoF56$Xe
zz8|?@4=Bef5SaxiBI@vzloWaT^r<|2_)rNtaNvO2^5n@Ab$eQgR<Q@rexMA{<_(#)
zS1tXivf;>)Bj4eD$DVBiW&r&fA0IDhPC|v~0tO}c6(21^WvC>TL2psk(1+m6=7NHP
z^O*A;pl;7K?E=kb2?`1tgDXyh$@Xkw3{+QFOGZY9L_|a=C0O^<)6<pd6A}`nsi{c`
zg%DMQsE{2jK>1TV8#LRwTz62wFw1;yZtgAQ@XvM!s1i(H$Hc^_qO)z=Hl+-CnEM14
zp|-X*xq0)Zpo1zJ|G;`b<>cfr@NA~ni%WT=XU2%l-Uz%%ybEukY$iG_t0}sfPzeGp
zbmhvGWkJU^n7$RIITMx}#08fHxS0Z^`=P<)A<!;DA(wm<uoBSM=$wTpR@cBcXIR)_
zi-QaFigpF+{xx*FUo?HKBYb`V!vDd(Wv16>xm3VdWTeg@@V-JN?A9CH9Z~N)GBY#3
z<{7kv**;SR3@cdR=RpMCN3P6gb|`s~q8|eJ_;iSR=RKwhkkJr2kJPHb?}9&_H=E62
z`d{&Wpx;eRulKH~fWf3(fvEo+uHa9r6@l(TeK-duTe)3n!>S5sS0pDV_o0h@y3%3f
zrMu`h@HzYlHQTqU0^Ep$X@$9C$BtcuE6U9d!`dHo7uHuby*|S&1q@~?F%4IofteXx
z4uGidLl0o5Q+?iHafON73TRiL3wFU3XPwW)EBOqHP9NxQnO^UATLEscbH(p?SXAmm
zVER&YMY@KjH_ds?Z$GX{0b?TtOzqmW>jOMIM}hr&_Ut(Wnp;tCFPz`{cY!nAbWT?Q
zEO-^Q;Z^)G6c~d7{1?ocOs@s3tI2S)(V+DH75^2dg}EC41*Y!}|5@kxJpcdz07*qo
IM6N<$g4f%i$p8QV

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/grayroad.png b/app/src/main/res/drawable-hdpi/grayroad.png
new file mode 100644
index 0000000000000000000000000000000000000000..efe3c21912b5839cc78e14d432a4654af4defcab
GIT binary patch
literal 1791
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_foreground.xml b/app/src/main/res/drawable-hdpi/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_add_bg.png b/app/src/main/res/drawable-hdpi/icon_add_bg.png
similarity index 100%
rename from app/src/main/res/drawable/icon_add_bg.png
rename to app/src/main/res/drawable-hdpi/icon_add_bg.png
diff --git a/app/src/main/res/drawable/icon_del_bg.png b/app/src/main/res/drawable-hdpi/icon_del_bg.png
similarity index 100%
rename from app/src/main/res/drawable/icon_del_bg.png
rename to app/src/main/res/drawable-hdpi/icon_del_bg.png
diff --git a/app/src/main/res/drawable/marker_charge_bg1.png b/app/src/main/res/drawable-hdpi/marker_charge_bg1.png
similarity index 100%
rename from app/src/main/res/drawable/marker_charge_bg1.png
rename to app/src/main/res/drawable-hdpi/marker_charge_bg1.png
diff --git a/app/src/main/res/drawable/marker_other_bg1.png b/app/src/main/res/drawable-hdpi/marker_other_bg1.png
similarity index 100%
rename from app/src/main/res/drawable/marker_other_bg1.png
rename to app/src/main/res/drawable-hdpi/marker_other_bg1.png
diff --git a/app/src/main/res/drawable/marker_poi_bg1.png b/app/src/main/res/drawable-hdpi/marker_poi_bg1.png
similarity index 100%
rename from app/src/main/res/drawable/marker_poi_bg1.png
rename to app/src/main/res/drawable-hdpi/marker_poi_bg1.png
diff --git a/app/src/main/res/drawable/marker_poi_video_bg1.png b/app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png
similarity index 100%
rename from app/src/main/res/drawable/marker_poi_video_bg1.png
rename to app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png
diff --git a/app/src/main/res/drawable/selector_hui_bg.xml b/app/src/main/res/drawable/selector_hui_bg.xml
new file mode 100644
index 0000000..1bfa71d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_hui_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_red_radius_bg_disable"  android:state_enabled="false"/>
+    <item android:drawable="@drawable/shape_hui_bg" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_red_bg.xml b/app/src/main/res/drawable/selector_red_bg.xml
new file mode 100644
index 0000000..a50aafe
--- /dev/null
+++ b/app/src/main/res/drawable/selector_red_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_red_radius_bg_disable"  android:state_enabled="false"/>
+    <item android:drawable="@drawable/shape_radius_bg" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shap_red_bg.xml b/app/src/main/res/drawable/shap_red_bg.xml
new file mode 100644
index 0000000..b8094ba
--- /dev/null
+++ b/app/src/main/res/drawable/shap_red_bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorPrimaryBlue" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_hui_bg.xml b/app/src/main/res/drawable/shape_hui_bg.xml
new file mode 100644
index 0000000..94d94f0
--- /dev/null
+++ b/app/src/main/res/drawable/shape_hui_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color=" #EFEDED" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_radius_bg.xml b/app/src/main/res/drawable/shape_radius_bg.xml
new file mode 100644
index 0000000..04f8c6d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_radius_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorPrimaryBlue" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/charging_pile_fragment.xml b/app/src/main/res/layout/charging_pile_fragment.xml
index bcc2401..bb24654 100644
--- a/app/src/main/res/layout/charging_pile_fragment.xml
+++ b/app/src/main/res/layout/charging_pile_fragment.xml
@@ -144,12 +144,14 @@
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
                     android:text="对所有车辆开放"
+                    android:textColor="@color/test_color_selector"
                     />
                 <CheckBox
                     android:id="@+id/check_button2"
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
                     android:text="对环卫车开放"
+                    android:textColor="@color/test_color_selector"
                     />
             </LinearLayout>
 
@@ -163,12 +165,14 @@
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
                     android:text="对公交车开放"
+                    android:textColor="@color/test_color_selector"
                     />
                 <CheckBox
                     android:id="@+id/check_button4"
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
                     android:text="对出租车开放"
+                    android:textColor="@color/test_color_selector"
                     />
 
             </LinearLayout>
@@ -182,6 +186,7 @@
                     android:id="@+id/check_button5"
                     android:layout_width="250dp"
                     android:layout_height="40dp"
+                    android:textColor="@color/test_color_selector"
                     android:text="对除环卫,公交,出租,品牌,之外的其他 特种车辆开放"
                     />
             </LinearLayout>
@@ -313,7 +318,7 @@
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_alignParentLeft="true"
                     android:layout_marginRight="5dp"
                     android:layout_marginBottom="10dp">
@@ -338,6 +343,7 @@
                     <ImageView
                         android:id="@+id/iv_panorama"
                         android:layout_centerInParent="true"
+                        android:scaleType="fitXY"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         />
@@ -348,7 +354,7 @@
                     android:layout_height="100dp"
                     android:layout_marginTop="10dp"
                     android:layout_centerHorizontal="true"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="5dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -372,6 +378,7 @@
                     <ImageView
                         android:id="@+id/iv_coding"
                         android:layout_centerInParent="true"
+                        android:scaleType="fitXY"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         />
@@ -428,7 +435,7 @@
                     android:layout_height="100dp"
                     android:layout_alignParentLeft="true"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="5dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -453,6 +460,7 @@
                         android:id="@+id/iv_equipment"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
+                        android:scaleType="fitXY"
                         android:layout_height="match_parent"
                         />
                 </RelativeLayout>
@@ -461,7 +469,7 @@
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:layout_marginTop="10dp"
-                    android:background="#EFEDED"
+                    android:background="@drawable/selector_hui_bg"
                     android:layout_centerHorizontal="true"
                     android:layout_marginRight="5dp"
                     android:layout_marginBottom="10dp">
@@ -487,6 +495,7 @@
                         android:id="@+id/iv_facility"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
+                        android:scaleType="fitXY"
                         android:layout_height="match_parent"
                         />
                 </RelativeLayout>
@@ -495,7 +504,7 @@
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:visibility="gone"
                     android:layout_alignParentRight="true"
                     android:layout_centerHorizontal="true"
@@ -520,6 +529,7 @@
                         android:layout_below="@id/image_scutcheon"
                         />
                     <ImageView
+                        android:scaleType="fitXY"
                         android:id="@+id/iv_scutcheon"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
@@ -532,7 +542,7 @@
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:layout_marginTop="10dp"
-                android:background="#03A9F4"
+                android:background="@drawable/selector_red_bg"
                 android:visibility="gone"
                 android:layout_centerHorizontal="true"
                 android:layout_marginRight="5dp"
@@ -560,6 +570,7 @@
                     android:layout_centerInParent="true"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:scaleType="fitXY"
                     />
             </RelativeLayout>
             <RelativeLayout
@@ -612,7 +623,7 @@
                     android:id="@+id/rl_usable"
                     android:layout_width="100dp"
                     android:layout_height="match_parent"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_alignParentLeft="true"
                     >
                     <ImageView
@@ -637,6 +648,7 @@
                     <ImageView
                         android:id="@+id/iv_usable"
                         android:layout_width="match_parent"
+                        android:scaleType="fitXY"
                         android:layout_height="match_parent" />
                 </RelativeLayout>
                 <RelativeLayout
@@ -644,7 +656,7 @@
                     android:layout_width="100dp"
                     android:layout_centerHorizontal="true"
                     android:layout_height="match_parent"
-                    android:background="#EFEDED">
+                    android:background="@drawable/selector_hui_bg">
                     <ImageView
                         android:id="@+id/image_available"
                         android:layout_centerHorizontal="true"
@@ -668,6 +680,7 @@
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:scaleType="fitXY"
                         />
                 </RelativeLayout>
                 <RelativeLayout
@@ -675,7 +688,7 @@
                     android:layout_width="100dp"
                     android:layout_height="match_parent"
                     android:layout_alignParentRight="true"
-                    android:background="#03A9F4">
+                    android:background="@drawable/selector_red_bg">
                     <ImageView
                         android:id="@+id/image_parking"
                         android:layout_centerHorizontal="true"
@@ -699,6 +712,7 @@
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:scaleType="fitXY"
                         />
                 </RelativeLayout>
 
@@ -707,7 +721,7 @@
                 android:id="@+id/rl_number"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:background="#EFEDED"
+                android:background="@drawable/selector_hui_bg"
                 android:layout_marginTop="10dp"
                 android:layout_alignParentLeft="true"
                 >
@@ -731,6 +745,7 @@
                     />
 
                 <ImageView
+                    android:scaleType="fitXY"
                     android:id="@+id/iv_number"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
@@ -771,6 +786,7 @@
                 android:background="@color/white"
                 android:hint="任务描述"
                 android:textSize="15sp"
+                android:textColor="@color/test_color_selector"
 
                 />
         </LinearLayout>
diff --git a/app/src/main/res/layout/charging_station_fragment.xml b/app/src/main/res/layout/charging_station_fragment.xml
index fa31c80..f51ab1a 100644
--- a/app/src/main/res/layout/charging_station_fragment.xml
+++ b/app/src/main/res/layout/charging_station_fragment.xml
@@ -111,7 +111,7 @@
                 android:layout_toEndOf="@id/tv_name"
                 android:layout_toStartOf="@id/tv_examine"
                 android:textSize="15sp"
-                android:textColor="#333" />
+                android:textColor="@color/test_color_selector" />
             <TextView
                 android:id="@+id/tv_examine"
                 android:layout_width="wrap_content"
@@ -137,7 +137,7 @@
                 android:id="@+id/tv_site"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
-                android:text="地址*"
+                android:text="地址"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
                 android:textColor="#333"
@@ -157,7 +157,7 @@
                 android:background="@color/white"
                 android:hint="地址"
                 android:textSize="15sp"
-                android:textColor="#333" />
+                android:textColor="@color/test_color_selector" />
         </RelativeLayout>
         <RelativeLayout
             android:id="@+id/linear_phone"
@@ -302,7 +302,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -326,6 +326,7 @@
                     <ImageView
                         android:id="@+id/iv_panorama"
                         android:layout_centerInParent="true"
+                        android:scaleType="fitXY"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         />
@@ -336,7 +337,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -360,6 +361,7 @@
                     <ImageView
                         android:id="@+id/iv_name"
                         android:layout_centerInParent="true"
+                        android:scaleType="fitXY"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         />
@@ -370,7 +372,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -394,6 +396,7 @@
                     <ImageView
                         android:id="@+id/iv_internal"
                         android:layout_centerInParent="true"
+                        android:scaleType="fitXY"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         />
@@ -410,7 +413,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -436,6 +439,7 @@
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:scaleType="fitXY"
                         />
                 </RelativeLayout>
                 <RelativeLayout
@@ -444,7 +448,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -470,9 +474,11 @@
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:scaleType="fitXY"
                         />
                 </RelativeLayout>
                 <RelativeLayout
+                    android:id="@+id/rl_null"
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="match_parent"
@@ -510,7 +516,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
             android:padding="3dp"
-            android:background="@drawable/shape_red_radius_bg"
+            android:background="@drawable/selector_red_radius_bg"
             android:orientation="horizontal"
            app:layout_constraintTop_toTopOf="@+id/tv_03"
             app:layout_constraintBottom_toBottomOf="@+id/tv_03"
@@ -590,7 +596,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="1"
-                android:background="@drawable/shape_red_radius_bg"
+                android:background="@drawable/selector_red_radius_bg"
                 android:text="保存本地"
                 android:textColor="@color/white" />
 
diff --git a/app/src/main/res/layout/fragment_gather_get.xml b/app/src/main/res/layout/fragment_gather_get.xml
index c52bcac..7c2bd64 100644
--- a/app/src/main/res/layout/fragment_gather_get.xml
+++ b/app/src/main/res/layout/fragment_gather_get.xml
@@ -8,13 +8,14 @@
 
     <TextView
         android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
+        android:layout_width="280dp"
         android:layout_height="wrap_content"
         android:text="众包录像 测试3"
         android:textColor="#333"
         android:layout_margin="20dp"
         android:textSize="18sp"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 17f34ab..28ba3bf 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -13,6 +13,7 @@
         android:background="#fff"
         android:paddingTop="@dimen/top_pind_sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
@@ -21,24 +22,27 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
+            android:padding="10dp"
             android:src="@drawable/ic_arrow_left" />
-
+<!-- style="@style/text_style_toolbar_title"-->
         <TextView
             android:id="@+id/tv_message"
-            style="@style/text_style_toolbar_title"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginLeft="50dp"
             android:text="消息"
-
             android:textColor="#000" />
+
         <TextView
             android:id="@+id/tv_read"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="全部已读"
-            android:layout_marginTop="10dp"
-            android:textColor="@color/black"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"/>
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="10dp"
+            android:text="全部已读"
+            android:textColor="@color/black" />
     </RelativeLayout>
     <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:id="@+id/message_recycler"
diff --git a/app/src/main/res/layout/fragment_other.xml b/app/src/main/res/layout/fragment_other.xml
index 03ad688..1af56bf 100644
--- a/app/src/main/res/layout/fragment_other.xml
+++ b/app/src/main/res/layout/fragment_other.xml
@@ -150,6 +150,7 @@
                     android:layout_marginLeft="15dp"
                     android:background="@null"
                     android:hint="任务名称"
+                    android:textColor="@color/test_color_selector"
                     android:textSize="12sp" />
             </LinearLayout>
 
@@ -184,7 +185,7 @@
                 android:layout_width="150dp"
                 android:layout_height="100dp"
                 android:layout_margin="10dp"
-                android:background="#03A9F4"
+                android:background="@drawable/selector_red_bg"
                 android:gravity="center">
 
                 <ImageView
@@ -217,7 +218,7 @@
                 android:layout_width="150dp"
                 android:layout_height="100dp"
                 android:layout_margin="10dp"
-                android:background="#03A9F4"
+                android:background="@drawable/selector_red_bg"
                 android:gravity="center">
 
                 <ImageView
@@ -256,37 +257,38 @@
             app:layout_constraintLeft_toLeftOf="@+id/tv_other_picture"
             app:layout_constraintTop_toBottomOf="@id/ll_image_picture" />
 
-<!--        <LinearLayout-->
-<!--            android:id="@+id/linear_describe"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            -->
-<!--            -->
-<!--            android:layout_marginEnd="10dp"-->
-<!--           -->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tv_03">-->
+        <LinearLayout
+            android:id="@+id/linear_describe"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:background="@drawable/underline"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_03">
 
             <EditText
                 android:id="@+id/edit_other_describe"
-                android:layout_width="320dp"
-                android:layout_height="100dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/underline"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="2dp"
+                android:background="@color/white"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:gravity="top"
                 android:hint="任务描述"
-                android:paddingTop="10dp"
                 android:paddingLeft="10dp"
+                android:paddingTop="10dp"
                 android:paddingBottom="30dp"
-                app:layout_constraintLeft_toLeftOf="@+id/tv_03"
-                app:layout_constraintTop_toBottomOf="@+id/tv_03"
+                android:textColor="@color/test_color_selector"
                 android:textSize="15sp"
 
+
                 />
-<!--        </LinearLayout>-->
+        </LinearLayout>
+
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -299,7 +301,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/edit_other_describe">
+            app:layout_constraintTop_toBottomOf="@id/linear_describe">
 
             <Button
                 android:id="@+id/btn_other_local"
@@ -307,7 +309,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="1"
-                android:background="@drawable/shape_red_radius_bg"
+                android:background="@drawable/selector_red_radius_bg"
                 android:text="保存本地"
                 android:textColor="@color/white" />
 
diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml
index 11590c4..a69a3c7 100644
--- a/app/src/main/res/layout/fragment_road.xml
+++ b/app/src/main/res/layout/fragment_road.xml
@@ -56,6 +56,7 @@
                 android:layout_width="200dp"
                 android:gravity="center_vertical"
                 android:layout_height="match_parent"
+                android:textSize="14sp"
                 android:background="@null" />
         </LinearLayout>
 
@@ -91,11 +92,13 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:textColor="@color/test_color_selector"
                     android:text="车行" />
 
                 <RadioButton
                     android:id="@+id/rb_bicycle"
                     android:layout_width="0dp"
+                    android:textColor="@color/test_color_selector"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="自行车" />
@@ -103,6 +106,7 @@
                 <RadioButton
                     android:id="@+id/rb_walking"
                     android:layout_width="0dp"
+                    android:textColor="@color/test_color_selector"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="步行" />
@@ -110,6 +114,7 @@
                 <RadioButton
                     android:id="@+id/rb_manual"
                     android:layout_width="0dp"
+                    android:textColor="@color/test_color_selector"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="手动" />
@@ -170,17 +175,36 @@
                 android:text="03.描述"
                 android:textColor="@color/black"
                 android:textSize="16sp" />
+            <LinearLayout
+                android:id="@+id/linear_describe"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:background="@drawable/underline"
+                app:layout_constraintTop_toBottomOf="@id/tv_03"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent">
+                <EditText
+                    android:id="@+id/et_desc"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="30dp"
+                    android:layout_margin="2dp"
+                    android:gravity="top"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="10dp"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:background="@color/white"
+                    android:hint="任务描述"
+                    android:textSize="15sp"
+                    android:textColor="@color/test_color_selector"
 
-            <EditText
-                android:id="@+id/et_desc"
-                android:layout_width="320dp"
-                android:layout_height="100dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/road_shape"
-                android:hint="任务描述"
-                android:paddingLeft="10dp"
-                android:paddingBottom="50dp" />
+
+                    />
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_stay_submit.xml b/app/src/main/res/layout/fragment_stay_submit.xml
index 3e8b6ce..e7f4202 100644
--- a/app/src/main/res/layout/fragment_stay_submit.xml
+++ b/app/src/main/res/layout/fragment_stay_submit.xml
@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_stay_type"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="70dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -63,14 +63,14 @@
             android:id="@+id/tv_stay_result"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="15dp"
+            android:layout_margin="10dp"
             android:text="筛选结果"
             android:textSize="25sp"
             android:textStyle="bold" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="300dp">
+            android:layout_height="280dp">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/stay_xrv"
@@ -97,7 +97,7 @@
             style="@style/CheckBoxTheme"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="15dp"
+            android:layout_margin="10dp"
             android:text="全选"
             android:textSize="17sp" />
 
@@ -105,7 +105,7 @@
             android:id="@+id/tv_delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="15dp"
+            android:layout_margin="10dp"
             android:text="删除"
             android:textColor="@color/colorPrimaryBlue"
             android:textSize="18sp" />
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
index 61e98b9..fa5abc8 100644
--- a/app/src/main/res/layout/item_filter.xml
+++ b/app/src/main/res/layout/item_filter.xml
@@ -1,44 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-
+<!-- android:lines="1"-->
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="300dp"
+        android:layout_width="260dp"
         android:layout_height="wrap_content"
         android:layout_margin="20dp"
         android:text="测试彼此"
         android:textColor="#333"
         android:textSize="15sp"
-        android:lines="1"
-        app:layout_constraintRight_toLeftOf="@+id/tv_money"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
         android:id="@+id/tv_form"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="道路"
-        android:padding="5dp"
-        android:textColor="#00BCD4"
-        android:background="@drawable/underline"
-        android:textSize="12sp"
-        android:layout_marginTop="5dp"
         android:layout_marginLeft="20dp"
+        android:layout_marginTop="5dp"
+        android:background="@drawable/underline"
+        android:padding="5dp"
+        android:text="道路"
+        android:textColor="#00BCD4"
+        android:textSize="12sp"
         app:layout_constraintStart_toStartOf="parent"
-       app:layout_constraintTop_toBottomOf="@+id/tv_name"/>
+        app:layout_constraintTop_toBottomOf="@+id/tv_name" />
+
     <TextView
         android:id="@+id/tv_task_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
-        android:padding="5dp"
         android:background="@drawable/underline"
+        android:padding="5dp"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_form"
         app:layout_constraintStart_toEndOf="@+id/tv_form"
@@ -63,9 +61,10 @@
         android:layout_marginRight="10dp"
         android:text="￥3.5"
         android:textColor="#000"
-        android:textSize="20sp"
+        android:textSize="18sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
diff --git a/app/src/main/res/layout/poi_fragment.xml b/app/src/main/res/layout/poi_fragment.xml
index d06fc83..0465f0d 100644
--- a/app/src/main/res/layout/poi_fragment.xml
+++ b/app/src/main/res/layout/poi_fragment.xml
@@ -139,7 +139,7 @@
                 android:id="@+id/tv_site"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
-                android:text="地址*"
+                android:text="地址"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
                 android:textColor="#333"
@@ -156,10 +156,11 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="18dp"
                 android:layout_toRightOf="@id/tv_site"
+                android:textColor="@color/test_color_selector"
                 android:background="@color/white"
                 android:hint="poi地址"
                 android:textSize="15sp"
-                android:textColor="#333" />
+              />
         </RelativeLayout>
         <RelativeLayout
             android:id="@+id/linear_phone"
@@ -261,7 +262,8 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
+
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -284,6 +286,7 @@
                         />
                     <ImageView
                         android:id="@+id/iv_panorama"
+                        android:scaleType="fitXY"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -295,7 +298,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#03A9F4"
+                    android:background="@drawable/selector_red_bg"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -318,6 +321,7 @@
                         />
                     <ImageView
                         android:id="@+id/iv_name"
+                        android:scaleType="fitXY"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -329,7 +333,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#EFEDED"
+                    android:background="@drawable/selector_hui_bg"
                     android:layout_marginRight="5dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -352,6 +356,7 @@
                         />
                     <ImageView
                         android:id="@+id/iv_internal"
+                        android:scaleType="fitXY"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -369,7 +374,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#EFEDED"
+                    android:background="@drawable/selector_hui_bg"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -392,6 +397,7 @@
                         />
                     <ImageView
                         android:id="@+id/iv_card"
+                        android:scaleType="fitXY"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -403,7 +409,7 @@
                     android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:background="#EFEDED"
+                    android:background="@drawable/selector_hui_bg"
                     android:layout_marginRight="5dp"
                     android:layout_marginBottom="10dp">
                     <ImageView
@@ -426,6 +432,7 @@
                         />
                     <ImageView
                         android:id="@+id/iv_else"
+                        android:scaleType="fitXY"
                         android:layout_centerInParent="true"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -475,6 +482,7 @@
                 android:background="@color/white"
                 android:hint="任务描述"
                 android:textSize="15sp"
+                android:textColor="@color/test_color_selector"
 
 
                 />
@@ -499,7 +507,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="1"
-                android:background="@drawable/shape_red_radius_bg"
+                android:background="@drawable/selector_red_radius_bg"
                 android:text="保存本地"
                 android:textColor="@color/white" />
 
diff --git a/app/src/main/res/layout/poi_video_fragment.xml b/app/src/main/res/layout/poi_video_fragment.xml
index fb992c2..4cf479f 100644
--- a/app/src/main/res/layout/poi_video_fragment.xml
+++ b/app/src/main/res/layout/poi_video_fragment.xml
@@ -84,11 +84,13 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:textColor="@color/test_color_selector"
                     android:text="车行"/>
                 <RadioButton
                     android:id="@+id/rb_bicycle"
                     android:layout_width="0dp"
                     android:layout_weight="1"
+                    android:textColor="@color/test_color_selector"
                     android:layout_height="wrap_content"
                     android:text="自行车"/>
                 <RadioButton
@@ -96,11 +98,13 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:textColor="@color/test_color_selector"
                     android:text="步行"/>
                 <RadioButton
                     android:id="@+id/rb_manual"
                     android:layout_width="0dp"
                     android:layout_weight="1"
+                    android:textColor="@color/test_color_selector"
                     android:layout_height="wrap_content"
                     android:text="手动"/>
             </RadioGroup>
@@ -205,17 +209,36 @@
                 android:text="04.描述"
                 android:textColor="@color/black"
                 android:textSize="16sp" />
+            <LinearLayout
+                android:id="@+id/linear_describe"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:background="@drawable/underline"
+                app:layout_constraintTop_toBottomOf="@id/tv_03"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent">
+                <EditText
+                    android:id="@+id/et_desc"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="30dp"
+                    android:layout_margin="2dp"
+                    android:gravity="top"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="10dp"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:background="@color/white"
+                    android:hint="任务描述"
+                    android:textSize="15sp"
+                    android:textColor="@color/test_color_selector"
 
-            <EditText
-                android:id="@+id/et_desc"
-                android:layout_width="320dp"
-                android:layout_height="100dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/road_shape"
-                android:hint="任务描述"
-                android:paddingLeft="10dp"
-                android:layout_marginLeft="10dp"
-                android:paddingBottom="50dp" />
+
+                    />
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 89faab1..44c93c5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -81,7 +81,7 @@
 
 <!--    ‘我的-用户资料’方框设置-->
 <style name="user_style">
-    <item name="android:background">@drawable/user_rz</item>
+    <item name="android:background">@drawable/selector_red_bg</item>
 </style>
 <!--    ‘我的-用户资料’字体设置-->
     <style name="user_text_style">
@@ -122,7 +122,7 @@
         <item name="android:textStyle">bold</item>
     </style>
     <style name="user_data_style">
-        <item name="android:background">@drawable/user_style</item>
+        <item name="android:background">@drawable/selector_red_radius_bg</item>
         <item name="android:textColor">@color/white</item>
     </style>