From 7101d0e35c03656e92f3ad3366e573482176afd9 Mon Sep 17 00:00:00 2001
From: wds <wds811@126.com>
Date: Wed, 2 Jun 2021 09:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=98=E6=88=91=E7=9A=84=E2=80=99=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../outdoor/activity/FragmentManagement.java  |  16 +
 .../outdoor/fragment/AboutFragment.java       |   2 -
 .../outdoor/fragment/ContactFragment.java     |  50 ++-
 .../outdoor/fragment/GatheringFragment.java   |  31 +-
 .../outdoor/fragment/MapDownloadFragment.java |  18 +-
 .../outdoor/fragment/MineFragment.java        |  11 +-
 .../navinfo/outdoor/fragment/SetFragment.java |  19 +-
 .../fragment/UserAttestationFragment.java     |  76 +++++
 .../outdoor/fragment/UserDataFragment.java    |  29 +-
 .../outdoor/fragment/WithdrawFragment.java    |  18 +-
 .../res/drawable/switch_custom_thumb_off.xml  |   8 +
 .../res/drawable/switch_custom_thumb_on.xml   |   8 +
 .../drawable/switch_custom_thumb_selector.xml |   5 +
 .../res/drawable/switch_custom_track_off.xml  |   9 +
 .../res/drawable/switch_custom_track_on.xml   |  10 +
 .../drawable/switch_custom_track_selector.xml |   5 +
 app/src/main/res/layout/about_fragment.xml    |   4 +-
 app/src/main/res/layout/contact_fragment.xml  |  42 ++-
 .../res/layout/fragment_capacity_eva_web.xml  |  80 +++--
 .../main/res/layout/gathering_fragment.xml    | 146 ++++++++-
 .../main/res/layout/map_download_fragment.xml |  69 +++-
 app/src/main/res/layout/mine_fragment.xml     |   7 +-
 app/src/main/res/layout/set_fragment.xml      | 213 ++++++++++++-
 .../res/layout/user_attestation_fragment.xml  | 139 +++++++++
 .../main/res/layout/user_data_fragment.xml    |   8 +-
 app/src/main/res/layout/withdraw_fragment.xml | 294 +++++++++++++++++-
 app/src/main/res/values/strings.xml           |   2 +-
 30 files changed, 1234 insertions(+), 90 deletions(-)
 create mode 100644 app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
 create mode 100644 app/src/main/res/drawable/switch_custom_thumb_off.xml
 create mode 100644 app/src/main/res/drawable/switch_custom_thumb_on.xml
 create mode 100644 app/src/main/res/drawable/switch_custom_thumb_selector.xml
 create mode 100644 app/src/main/res/drawable/switch_custom_track_off.xml
 create mode 100644 app/src/main/res/drawable/switch_custom_track_on.xml
 create mode 100644 app/src/main/res/drawable/switch_custom_track_selector.xml
 create mode 100644 app/src/main/res/layout/user_attestation_fragment.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b6ea2b1..7bfef59 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index e88d242..c2c1f0c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
-    ndkVersion '23.0.7123448'
+    //ndkVersion '23.0.7123448'
 
     defaultConfig {
         applicationId "com.example.myapplication"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1c62a75..f6bf5f0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java
index eca5cca..c13b0c0 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java
@@ -27,6 +27,7 @@ import com.navinfo.outdoor.fragment.TaskPrefectureFragment;
 
 import com.navinfo.outdoor.fragment.RegisterFragment;
 import com.navinfo.outdoor.fragment.TreasureFragment;
+import com.navinfo.outdoor.fragment.UserAttestationFragment;
 import com.navinfo.outdoor.fragment.UserDataFragment;
 import com.navinfo.outdoor.fragment.WithdrawFragment;
 import com.gyf.immersionbar.ImmersionBar;
@@ -67,6 +68,7 @@ public class FragmentManagement extends BaseActivity {
     private SetFragment setFragment;//我的-设置的fragment  -22
     private AboutFragment aboutFragment;//我的-关于的fragment  -23
     private GatheringFragment gatheringFragment;//我的-用户资料-收款信息的fragment  -24
+    private UserAttestationFragment userAttestationFragment;//我的-用户资料-实名认证的fragment  -25
 
 
     @Override
@@ -135,6 +137,9 @@ public class FragmentManagement extends BaseActivity {
             fragmentTransaction.hide(aboutFragment);
         if (gatheringFragment != null)//我的-用户资料-收款信息的fragment  -24
             fragmentTransaction.hide(gatheringFragment);
+        if (userAttestationFragment!=null){//我的-用户资料-实名认证的fragment-25
+            fragmentTransaction.hide(userAttestationFragment);
+        }
 
 
     }
@@ -338,6 +343,14 @@ public class FragmentManagement extends BaseActivity {
                     fragmentTransaction.show(gatheringFragment);
                 }
                 break;
+                case 25://我的-用户资料-实名认证的fragment
+                if (userAttestationFragment == null) {
+                    userAttestationFragment = new UserAttestationFragment();
+                    fragmentTransaction.add(R.id.frame_layout, userAttestationFragment);
+                } else {
+                    fragmentTransaction.show(userAttestationFragment);
+                }
+                break;
         }
         fragmentTransaction.commit();
     }
@@ -418,6 +431,9 @@ public class FragmentManagement extends BaseActivity {
             case 24:
                 gatheringFragment.onActivityResult(requestCode, resultCode, data);
                 break;
+            case 25:
+                userAttestationFragment.onActivityResult(requestCode,resultCode,data);
+                break;
 
         }
     }
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 a8bfd90..f4c2c7f 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
@@ -13,7 +13,6 @@ import com.navinfo.outdoor.base.BaseFragment;
  */
 public class AboutFragment extends BaseFragment implements View.OnClickListener {
     private ImageView ivAboutFinish;
-    private ImageView imageAbout;
 
     @Override
     protected int getLayout() {
@@ -30,7 +29,6 @@ public class AboutFragment extends BaseFragment implements View.OnClickListener
         super.initView();
         ivAboutFinish = (ImageView) findViewById(R.id.iv_about_finish);
         ivAboutFinish.setOnClickListener(this::onClick);
-        imageAbout = (ImageView) findViewById(R.id.image_about);
     }
 
     @Override
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java
index 6208ca3..c9f1d22 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java
@@ -1,12 +1,39 @@
 package com.navinfo.outdoor.fragment;
 
+import android.os.Build;
+import android.view.View;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.widget.ImageView;
+
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.WebActivity;
+import com.navinfo.outdoor.api.UserApplication;
 import com.navinfo.outdoor.base.BaseFragment;
 
 /**
  * 联系我们的Fragment
  */
-public class ContactFragment extends BaseFragment {
+public class ContactFragment extends BaseFragment implements View.OnClickListener{
+
+    private ImageView ivContact;
+    private String content = "<div>\n" +
+            "<h2>定义和用法</h2>\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>";
+    private WebView nWebView;
+
     @Override
     protected int getLayout() {
         return R.layout.contact_fragment;
@@ -20,5 +47,26 @@ public class ContactFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        ivContact = findViewById(R.id.iv_contact);
+        ivContact.setOnClickListener(this);
+        nWebView = findViewById(R.id.news_webView);
+        nWebView.getSettings().setBlockNetworkImage(false);
+        WebSettings settings = nWebView.getSettings();
+        settings.setJavaScriptEnabled(true);
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+            nWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+        settings.setBuiltInZoomControls(false);
+        content = content.replace("<img", "<img style='max-width: 100%'");
+        nWebView.loadDataWithBaseURL(null, content, "text/html", "utf-8", null);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_contact:
+                getActivity().finish();
+                break;
+        }
     }
 }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
index 1f64d8f..f15cf8e 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
@@ -1,12 +1,23 @@
 package com.navinfo.outdoor.fragment;
 
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.base.BaseFragment;
 
 /**
  * 收款信息
  */
-public class GatheringFragment extends BaseFragment {
+public class GatheringFragment extends BaseFragment implements View.OnClickListener {
+
+    private ImageView ivGathering;
+    private ImageView imageBank;
+    private Button btnBank;
+    private TextView tvBank;
+
     @Override
     protected int getLayout() {
         return R.layout.gathering_fragment;
@@ -15,10 +26,28 @@ public class GatheringFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        ivGathering = findViewById(R.id.iv_gathering);
+        ivGathering.setOnClickListener(this::onClick);
+        imageBank = findViewById(R.id.iv_bank);
+        tvBank = findViewById(R.id.tv_bank);
+        btnBank = findViewById(R.id.btn_bank);
     }
 
     @Override
     protected void initData() {
         super.initData();
     }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_gathering:
+                getActivity().finish();
+                break;
+            case R.id.iv_bank:
+                break;
+            case R.id.btn_bank:
+                break;
+        }
+    }
 }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java
index 62df613..7168a14 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java
@@ -1,12 +1,18 @@
 package com.navinfo.outdoor.fragment;
 
+import android.view.View;
+import android.widget.ImageView;
+
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.base.BaseFragment;
 
 /**
  * 地图下载的Fragment
  */
-public class MapDownloadFragment extends BaseFragment {
+public class MapDownloadFragment extends BaseFragment implements View.OnClickListener{
+
+    private ImageView ivDownLoad;
+
     @Override
     protected int getLayout() {
         return R.layout.map_download_fragment;
@@ -15,6 +21,8 @@ public class MapDownloadFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        ivDownLoad = findViewById(R.id.iv_download);
+        ivDownLoad.setOnClickListener(this);
     }
 
     @Override
@@ -22,5 +30,13 @@ public class MapDownloadFragment extends BaseFragment {
         super.initData();
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_download:
+                getActivity().finish();
+                break;
+        }
+    }
 }
 
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
index 5cc424b..7c7da71 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
@@ -86,15 +86,15 @@ public class MineFragment extends BaseFragment implements View.OnClickListener{
                 break;
             case R.id.rl_grade:
                 //我的等级
-                Intent intentGrade = new Intent(getActivity(), FragmentManagement.class);
+               /* Intent intentGrade = new Intent(getActivity(), FragmentManagement.class);
                 intentGrade.putExtra("tag",17);
-                startActivity(intentGrade);
+                startActivity(intentGrade);*/
                 break;
             case R.id.rl_privilege:
                 //我的特权
-                Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class);
+                /*Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class);
                 intentPrivilege.putExtra("tag",18);
-                startActivity(intentPrivilege);
+                startActivity(intentPrivilege);*/
                 break;
             case R.id.rl_map:
                 //地图下载
@@ -130,9 +130,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener{
                 //退出登录
                 getActivity().finish();
                 break;
-
-
-
         }
     }
 }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java
index 310e209..6218314 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java
@@ -1,12 +1,18 @@
 package com.navinfo.outdoor.fragment;
 
+import android.view.View;
+import android.widget.ImageView;
+
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.base.BaseFragment;
 
 /**
  * 设置页面的fragment
  */
-public class SetFragment extends BaseFragment {
+public class SetFragment extends BaseFragment implements View.OnClickListener{
+
+    private ImageView ivSet;
+
     @Override
     protected int getLayout() {
         return R.layout.set_fragment;
@@ -20,5 +26,16 @@ public class SetFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        ivSet = findViewById(R.id.iv_set);
+        ivSet.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_set:
+                getActivity().finish();
+                break;
+        }
     }
 }
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
new file mode 100644
index 0000000..7fd5872
--- /dev/null
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
@@ -0,0 +1,76 @@
+package com.navinfo.outdoor.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.Nullable;
+
+import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.base.BaseFragment;
+
+import static android.app.Activity.RESULT_OK;
+
+/**
+ * 实名认证
+ */
+public class UserAttestationFragment extends BaseFragment implements View.OnClickListener{
+
+    private ImageView ivAttestation2;
+    private ImageView ivAttestation1;
+    private ImageView ivAttestation;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.user_attestation_fragment;
+    }
+
+    @Override
+    protected void initData() {
+        super.initData();
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        ivAttestation = findViewById(R.id.iv_attestation);
+        ivAttestation.setOnClickListener(this);
+        ivAttestation1 = findViewById(R.id.iv_attestation1);
+        ivAttestation1.setOnClickListener(this);
+        ivAttestation2 = findViewById(R.id.iv_attestation2);
+        ivAttestation2.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_attestation:
+                getActivity().finish();
+                break;
+            case R.id.iv_attestation1:
+                Intent ivAttestation1 = new Intent("android.media.action.IMAGE_CAPTURE");
+                startActivityForResult(ivAttestation1,100);
+                break;
+            case R.id.iv_attestation2:
+                Intent ivAttestation2 = new Intent("android.media.action.IMAGE_CAPTURE");
+                startActivityForResult(ivAttestation2,200);
+                break;
+        }
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode==100&&resultCode==RESULT_OK){
+            Bundle extras=data.getExtras();//从Intent中获取附加值
+            Bitmap bitmap=(Bitmap) extras.get("data");//从附加值中获取返回的图像
+            ivAttestation1.setImageBitmap(bitmap);//显示图像
+        }else if (requestCode==200&&resultCode==RESULT_OK){
+            Bundle extras=data.getExtras();//从Intent中获取附加值
+            Bitmap bitmap=(Bitmap) extras.get("data");//从附加值中获取返回的图像
+            ivAttestation2.setImageBitmap(bitmap);//显示图像
+        }
+    }
+}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java
index 8081e32..efc2949 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java
@@ -18,11 +18,11 @@ import static android.app.Activity.RESULT_OK;
 /**
  * 用户资料的fragment
  */
-public class UserDataFragment extends BaseFragment implements View.OnClickListener{
+public class UserDataFragment extends BaseFragment implements View.OnClickListener {
 
     private Button btnGathering;
     private Button btnAttestation;
-    private ImageView imageView;
+    private ImageView ivUser;
 
     @Override
     protected int getLayout() {
@@ -37,6 +37,8 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen
     @Override
     protected void initView() {
         super.initView();
+        ivUser = findViewById(R.id.iv_user);
+        ivUser.setOnClickListener(this::onClick);
         btnAttestation = findViewById(R.id.btn_attestation);
         btnAttestation.setOnClickListener(this::onClick);
         btnGathering = findViewById(R.id.btn_gathering);
@@ -45,23 +47,22 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
+        switch (v.getId()) {
+            case R.id.iv_user:
+                getActivity().finish();
+                break;
             case R.id.btn_gathering:
-
                 Intent gatheringIntent = new Intent(getActivity(), FragmentManagement.class);
-                gatheringIntent.putExtra("tag",24);
+                gatheringIntent.putExtra("tag", 24);
                 startActivity(gatheringIntent);
                 break;
+            case R.id.btn_attestation:
+                Intent attestationIntent = new Intent(getActivity(), FragmentManagement.class);
+                attestationIntent.putExtra("tag", 25);
+                startActivity(attestationIntent);
+                break;
         }
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode==RESULT_OK){
-            Bundle extras=data.getExtras();//从Intent中获取附加值
-            Bitmap bitmap=(Bitmap) extras.get("data");//从附加值中获取返回的图像
-            imageView.setImageBitmap(bitmap);//显示图像
-        }
-    }
+
 }
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 9ab8bc4..b6cb914 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
@@ -1,12 +1,18 @@
 package com.navinfo.outdoor.fragment;
 
+import android.view.View;
+import android.widget.ImageView;
+
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.base.BaseFragment;
 
 /**
  * 提现页面的fragment
  */
-public class WithdrawFragment extends BaseFragment {
+public class WithdrawFragment extends BaseFragment implements View.OnClickListener{
+
+    private ImageView ivWithDraw;
+
     @Override
     protected int getLayout() {
         return R.layout.withdraw_fragment;
@@ -20,6 +26,16 @@ public class WithdrawFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        ivWithDraw = findViewById(R.id.iv_withdraw);
+        ivWithDraw.setOnClickListener(this);
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_withdraw:
+                getActivity().finish();
+                break;
+        }
+    }
 }
diff --git a/app/src/main/res/drawable/switch_custom_thumb_off.xml b/app/src/main/res/drawable/switch_custom_thumb_off.xml
new file mode 100644
index 0000000..bcb7134
--- /dev/null
+++ b/app/src/main/res/drawable/switch_custom_thumb_off.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#AAA" />
+    <size
+        android:width="20dp"
+        android:height="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/switch_custom_thumb_on.xml b/app/src/main/res/drawable/switch_custom_thumb_on.xml
new file mode 100644
index 0000000..179020a
--- /dev/null
+++ b/app/src/main/res/drawable/switch_custom_thumb_on.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#94C5FF" />
+    <size
+        android:width="20dp"
+        android:height="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/switch_custom_thumb_selector.xml b/app/src/main/res/drawable/switch_custom_thumb_selector.xml
new file mode 100644
index 0000000..8b59519
--- /dev/null
+++ b/app/src/main/res/drawable/switch_custom_thumb_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/switch_custom_thumb_on" android:state_checked="true" />
+    <item android:drawable="@drawable/switch_custom_thumb_off" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_custom_track_off.xml b/app/src/main/res/drawable/switch_custom_track_off.xml
new file mode 100644
index 0000000..bc7bbf1
--- /dev/null
+++ b/app/src/main/res/drawable/switch_custom_track_off.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E3E3E3" />
+    <stroke
+        android:width="1dp"
+        android:color="#00000000" />
+    <corners android:radius="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/switch_custom_track_on.xml b/app/src/main/res/drawable/switch_custom_track_on.xml
new file mode 100644
index 0000000..4cb0058
--- /dev/null
+++ b/app/src/main/res/drawable/switch_custom_track_on.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#B6D6FE" />
+
+    <stroke
+        android:width="1dp"
+        android:color="#00000000" />
+    <corners android:radius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_custom_track_selector.xml b/app/src/main/res/drawable/switch_custom_track_selector.xml
new file mode 100644
index 0000000..4129576
--- /dev/null
+++ b/app/src/main/res/drawable/switch_custom_track_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/switch_custom_track_on" android:state_checked="true" />
+    <item android:drawable="@drawable/switch_custom_track_off" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
index 6b7642c..db8b67d 100644
--- a/app/src/main/res/layout/about_fragment.xml
+++ b/app/src/main/res/layout/about_fragment.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:id="@+id/ll_about"
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 61a4490..b372aec 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -1,6 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:id="@+id/rl_contact"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#1BA5F1"
+        android:paddingTop="@dimen/top_pind_sp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
+        <ImageView
+            android:id="@+id/iv_contact"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/icon_arrow"
+            />
+
+        <TextView
+            android:id="@+id/tv_contact"
+            android:layout_width="wrap_content"
+            style="@style/text_style_toolbar_title"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:text="联系我们" />
+    </LinearLayout>
+
+    <WebView
+        android:id="@+id/news_webView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_contact" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_capacity_eva_web.xml b/app/src/main/res/layout/fragment_capacity_eva_web.xml
index a2f53c3..dba1359 100644
--- a/app/src/main/res/layout/fragment_capacity_eva_web.xml
+++ b/app/src/main/res/layout/fragment_capacity_eva_web.xml
@@ -25,39 +25,55 @@
             android:src="@drawable/ic_baseline_arrow" />
     </LinearLayout>
 
-
-
-        <TextView
-            android:id="@+id/tv_capacity_measurement"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:text="POI任务测试"
-            android:textColor="@color/colorGray"
-            android:textSize="30sp"
-            app:layout_constraintLeft_toLeftOf="@id/rl_capacity_measurement"
-            app:layout_constraintRight_toRightOf="@id/rl_capacity_measurement"
-            app:layout_constraintTop_toBottomOf="@+id/rl_capacity_measurement" />
-
-        <Button
-            android:id="@+id/btn"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_login"
-            android:text="提交"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/capacity_measurementRel"
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_capacity_measurement">
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="10dp"
-            app:layout_constraintBottom_toTopOf="@id/btn"
-            app:layout_constraintTop_toBottomOf="@id/tv_capacity_measurement" />
+            android:layout_height="match_parent"
+            >
 
+            <TextView
+                android:id="@+id/tv_capacity_measurement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="POI任务测试"
+                android:textColor="@color/colorGray"
+                android:textSize="30sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <Button
+                android:id="@+id/btn"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="20dp"
+                android:background="@drawable/shape_login"
+                android:text="提交"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/capacity_measurementRel"
+                app:layout_constraintRight_toRightOf="parent" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/capacity_measurementRel"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:nestedScrollingEnabled="false"
+                app:layout_constraintBottom_toTopOf="@id/btn"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_capacity_measurement" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gathering_fragment.xml b/app/src/main/res/layout/gathering_fragment.xml
index 7e4c40a..24e47f2 100644
--- a/app/src/main/res/layout/gathering_fragment.xml
+++ b/app/src/main/res/layout/gathering_fragment.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
+
     <LinearLayout
         android:id="@+id/rl_gathering"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorPrimaryBlue"
-        android:paddingTop="@dimen/top_pind_sp"
         android:orientation="horizontal"
+        android:paddingTop="@dimen/top_pind_sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -20,8 +21,7 @@
             android:layout_height="45dp"
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="15dp"
-            android:src="@drawable/ic_baseline_arrow"
-            />
+            android:src="@drawable/ic_baseline_arrow" />
 
         <TextView
             android:id="@+id/tv_gathering"
@@ -37,18 +37,148 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/linear_hint"
         android:layout_width="match_parent"
         android:layout_height="100dp"
         android:layout_margin="20dp"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rl_gathering" >
+        app:layout_constraintTop_toBottomOf="@+id/rl_gathering">
 
+        <TextView
+            android:id="@+id/tv_hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="提示："
+            android:textColor="#FF9800"
+            android:textSize="15sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:text="1.必须先实名认证才能绑定银行卡"
+            android:textColor="#FF9800" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="5dp"
+            android:text="2.银行卡户主姓名必须与实名认证姓名一致"
+            android:textColor="#FF9800" />
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="@+id/linear_hint"
+        app:layout_constraintStart_toStartOf="@+id/linear_hint"
+        app:layout_constraintTop_toBottomOf="@+id/linear_hint">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:gravity="center"
+                android:textColor="#333"
+                android:text="持卡人" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:background="@null"
+                android:textSize="16sp"
+                android:layout_height="match_parent"
+                android:hint="持卡人姓名" />
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#2196F3"
+            />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:gravity="center"
+                android:textColor="#333"
+                android:text="银行卡号" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:background="@null"
+                android:textSize="16sp"
+                android:layout_height="match_parent"
+                android:hint="持卡人姓名" />
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#2196F3"
+            />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bank"
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:gravity="center"
+                android:textColor="#333"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="所属银行" />
+
+            <TextView
+                android:id="@+id/tv_bank"
+                android:layout_width="wrap_content"
+                android:textSize="16sp"
+                android:layout_toRightOf="@id/bank"
+                android:layout_toLeftOf="@id/iv_bank"
+                android:layout_centerVertical="true"
+                android:layout_height="wrap_content"
+                android:hint="请选择所属银行" />
+            <ImageView
+                android:id="@+id/iv_bank"
+                android:layout_width="50dp"
+                android:layout_height="30dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:src="@drawable/ic_baseline_arrow"
+                />
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#2196F3"
+            />
+        <Button
+            android:id="@+id/btn_bank"
+            android:layout_marginTop="40dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="绑定银行卡"
+            android:textColor="#fff"
+            />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/map_download_fragment.xml b/app/src/main/res/layout/map_download_fragment.xml
index 61a4490..775101c 100644
--- a/app/src/main/res/layout/map_download_fragment.xml
+++ b/app/src/main/res/layout/map_download_fragment.xml
@@ -1,6 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:id="@+id/rl_map_download"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#1BA5F1"
+        android:paddingTop="@dimen/top_pind_sp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
+        <ImageView
+            android:id="@+id/iv_download"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/icon_arrow"
+            />
+
+        <TextView
+            android:id="@+id/tv_download"
+            android:layout_width="wrap_content"
+            style="@style/text_style_toolbar_title"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:text="下载离线地图" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="#F3E7C5"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_map_download">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:background="#fff" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:background="#FF5722"
+            android:text="搜索"
+            android:textColor="#fff" />
+    </LinearLayout>
+
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mine_fragment.xml b/app/src/main/res/layout/mine_fragment.xml
index c1c7ca9..f900a94 100644
--- a/app/src/main/res/layout/mine_fragment.xml
+++ b/app/src/main/res/layout/mine_fragment.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <RelativeLayout
         android:id="@+id/rl_mine"
         android:layout_width="match_parent"
@@ -58,8 +57,8 @@
             android:id="@+id/image_share"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:layout_marginTop="10dp"
             android:layout_marginRight="15dp"
+            android:layout_marginTop="10dp"
             android:background="@drawable/icon_event_prefecture"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/set_fragment.xml b/app/src/main/res/layout/set_fragment.xml
index 61a4490..3d93e2f 100644
--- a/app/src/main/res/layout/set_fragment.xml
+++ b/app/src/main/res/layout/set_fragment.xml
@@ -1,6 +1,213 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:id="@+id/rl_set"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#1BA5F1"
+        android:paddingTop="@dimen/top_pind_sp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
+        <ImageView
+            android:id="@+id/iv_set"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/icon_arrow"
+            />
+
+        <TextView
+            android:id="@+id/tv_set"
+            android:layout_width="wrap_content"
+            style="@style/text_style_toolbar_title"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:text="设置" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_title"
+        style="@style/text_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="基本资料"
+        android:layout_margin="20dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/linearLayout"
+        app:layout_constraintTop_toBottomOf="@+id/rl_set" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="#fff"
+        android:orientation="vertical"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_title">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="实时上传"
+                android:layout_marginLeft="20dp"
+                android:layout_centerVertical="true"
+                android:textColor="#333"
+                android:textSize="15sp" />
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="20dp"
+                android:thumb="@drawable/switch_custom_thumb_selector"
+                android:track="@drawable/switch_custom_track_selector" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#F1F0F0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="自动保存"
+                android:layout_marginLeft="20dp"
+                android:layout_centerVertical="true"
+                android:textColor="#333"
+                android:textSize="15sp"/>
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="20dp"
+                android:thumb="@drawable/switch_custom_thumb_selector"
+                android:track="@drawable/switch_custom_track_selector" />
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="#fff"
+        android:orientation="vertical"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/linearLayout">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="任务通知"
+                android:layout_marginLeft="20dp"
+                android:layout_centerVertical="true"
+                android:textColor="#333"
+                android:textSize="15sp" />
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="20dp"
+                android:thumb="@drawable/switch_custom_thumb_selector"
+                android:track="@drawable/switch_custom_track_selector" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#F1F0F0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="流量提醒"
+                android:layout_marginLeft="20dp"
+                android:layout_centerVertical="true"
+                android:textColor="#333"
+                android:textSize="15sp"/>
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="20dp"
+                android:thumb="@drawable/switch_custom_thumb_selector"
+                android:track="@drawable/switch_custom_track_selector" />
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/relativeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="20dp"
+        android:background="#fff"
+        android:gravity="center_vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout1">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:text="清除缓存"
+            android:textColor="#333"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginRight="20dp"
+        android:text="退出登录"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/relativeLayout" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_attestation_fragment.xml b/app/src/main/res/layout/user_attestation_fragment.xml
new file mode 100644
index 0000000..8b71a0b
--- /dev/null
+++ b/app/src/main/res/layout/user_attestation_fragment.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/rl_attestation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryBlue"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/top_pind_sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_attestation"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/ic_baseline_arrow" />
+
+        <TextView
+            android:id="@+id/tv_attestation"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:gravity="center"
+            android:text="实名认证"
+            android:textColor="#fff"
+            android:textSize="17sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="@+id/linear_hint"
+        app:layout_constraintStart_toStartOf="@+id/linear_hint"
+        app:layout_constraintTop_toBottomOf="@+id/rl_attestation">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="姓名："
+                android:textColor="#333"
+                android:textSize="18sp" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:hint="请输入姓名"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#2196F3" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="身份证号："
+                android:textColor="#333"
+                android:textSize="18sp" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:hint="请输入身份证号"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#2196F3" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/iv_attestation1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_centerVertical="true"
+                android:layout_margin="10dp"
+                android:background="@mipmap/checkbox"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:id="@+id/iv_attestation2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_margin="10dp"
+                android:background="@mipmap/checkbox"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#2196F3" />
+
+        <Button
+            android:id="@+id/btn_attestation"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="40dp"
+            android:text="认证" />
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_data_fragment.xml b/app/src/main/res/layout/user_data_fragment.xml
index de53789..d9596e9 100644
--- a/app/src/main/res/layout/user_data_fragment.xml
+++ b/app/src/main/res/layout/user_data_fragment.xml
@@ -45,7 +45,7 @@
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
-        android:layout_height="400dp"
+        android:layout_height="480dp"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:background="#fff"
@@ -268,5 +268,11 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="#F1F0F0" />
+        <Button
+            android:layout_marginTop="50dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="保存"
+            />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/withdraw_fragment.xml b/app/src/main/res/layout/withdraw_fragment.xml
index 61a4490..490aac1 100644
--- a/app/src/main/res/layout/withdraw_fragment.xml
+++ b/app/src/main/res/layout/withdraw_fragment.xml
@@ -1,6 +1,294 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <LinearLayout
+        android:id="@+id/rl_withdraw"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryBlue"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/top_pind_sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_withdraw"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/ic_baseline_arrow" />
+
+        <TextView
+            android:id="@+id/tv_withdraw"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:gravity="center"
+            android:text="财务信息"
+            android:textColor="#fff"
+            android:textSize="17sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:background="@mipmap/bg"
+        app:layout_constraintTop_toBottomOf="@+id/rl_withdraw" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/linear_layout"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_margin="20dp"
+        android:background="#fff"
+        app:layout_constraintEnd_toEndOf="@+id/linear_hint"
+        app:layout_constraintStart_toStartOf="@+id/linear_hint"
+        app:layout_constraintTop_toBottomOf="@+id/rl_withdraw">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="可提现（元）"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_unit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="0.0"
+            android:textColor="#333"
+            android:textSize="45sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@+id/tv_title"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+
+        <TextView
+            android:id="@+id/tv_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableRight="@drawable/ic_baseline_arrow_forward"
+            android:text="提现纪录"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_unit"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_unit" />
+
+        <TextView
+            android:id="@+id/tv_already_withdraw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="已提现（元）"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tv_total_assets"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_text" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0.0"
+            android:textColor="#333"
+            android:textSize="30sp"
+            android:textStyle="normal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/tv_already_withdraw"
+            app:layout_constraintStart_toStartOf="@+id/tv_already_withdraw"
+            app:layout_constraintTop_toBottomOf="@+id/tv_already_withdraw" />
+        <TextView
+            android:id="@+id/tv_total_assets"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="总资产（元）"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/tv_already_withdraw"
+            app:layout_constraintTop_toBottomOf="@+id/tv_text" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0.0"
+            android:textColor="#333"
+            android:textSize="30sp"
+            android:textStyle="normal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/tv_total_assets"
+            app:layout_constraintStart_toStartOf="@+id/tv_total_assets"
+            app:layout_constraintTop_toBottomOf="@+id/tv_total_assets" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <RelativeLayout
+        android:id="@+id/relativeLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_margin="20dp"
+        android:gravity="center_vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linear_layout">
+
+        <TextView
+            android:id="@+id/tv_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:text="￥"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@id/tv_view"
+            android:background="@null"
+            android:hint="请输入提现金额"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/tv_all"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:text="全部"
+            android:textColor="#2196F3"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:background="#F1F0F0" />
+    </RelativeLayout>
+
+    <CheckBox
+        android:id="@+id/checkBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="银行卡"
+        app:layout_constraintStart_toStartOf="@+id/relativeLayout2"
+        app:layout_constraintTop_toBottomOf="@+id/relativeLayout2" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_margin="20dp"
+        android:text="立即提现"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox" />
+
+    <TextView
+        android:id="@+id/tv_infuse"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:text="注：达到10元方可兑换，只能兑换整数部分，10个工作日内发放,如遇到特殊情况"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="#fff"
+        android:orientation="vertical"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_infuse">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center_vertical">
+            <ImageView
+                android:id="@+id/image_poi"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_margin="2dp"
+                android:layout_centerVertical="true"
+                android:background="@drawable/icon_task_specification"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="POI"
+                android:layout_marginLeft="20dp"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/image_poi"
+                android:textColor="#333"
+                android:textSize="18sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:gravity="center_vertical"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_height="wrap_content"
+                android:text="+￥0.0"
+                android:textColor="#333"
+                android:textSize="18sp"
+                />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#F1F0F0" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center_vertical">
+            <ImageView
+                android:id="@+id/image_way"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_margin="2dp"
+                android:layout_centerVertical="true"
+                android:background="@drawable/icon_task_specification"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="道路"
+                android:layout_marginLeft="20dp"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/image_way"
+                android:textColor="#333"
+                android:textSize="18sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:gravity="center_vertical"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_height="wrap_content"
+                android:text="+￥0.0"
+                android:textColor="#333"
+                android:textSize="18sp"
+                />
+        </RelativeLayout>
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db64cac..0fec131 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">mapp</string>
+    <string name="app_name">navinfo</string>
     <string name="title_activity_home">HomeActivity</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>