diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d7d7c57..e5e430e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -193,6 +193,11 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="false"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.my.SettingActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="portrait" />
 
 
         <activity
diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java
index 52e462b..7a187f3 100644
--- a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java
+++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java
@@ -2,6 +2,10 @@ package com.tairui.industrial_operation.ui.my;
 
 import com.tairui.industrial_operation.base.BaseFragment;
 import com.tairui.industrial_operation.databinding.FragmentMyBinding;
+import com.tairui.industrial_operation.util.IntentUtil;
+import com.tairui.industrial_operation.util.SingleClickListener;
+
+import android.view.View;
 
 public class MyFragment extends BaseFragment<FragmentMyBinding> {
 
@@ -9,4 +13,14 @@ public class MyFragment extends BaseFragment<FragmentMyBinding> {
     protected Class<FragmentMyBinding> getBindingClass() {
         return FragmentMyBinding.class;
     }
+
+    @Override
+    protected void onBindListener() {
+        binding.btnSetting.setOnClickListener(new SingleClickListener() {
+            @Override
+            protected void onSingleClick(View v) {
+                IntentUtil.startActivity(mContext, SettingActivity.class);
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/SettingActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/SettingActivity.java
new file mode 100644
index 0000000..72f92fc
--- /dev/null
+++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/SettingActivity.java
@@ -0,0 +1,32 @@
+package com.tairui.industrial_operation.ui.my;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.tairui.industrial_operation.base.BaseActivity;
+import com.tairui.industrial_operation.databinding.ActivitySettingBinding;
+import com.tairui.industrial_operation.util.SingleClickListener;
+
+import android.view.View;
+
+public class SettingActivity extends BaseActivity<ActivitySettingBinding> {
+
+    @Override
+    protected Class<ActivitySettingBinding> getBindingClass() {
+        return ActivitySettingBinding.class;
+    }
+
+    @Override
+    protected void initStatusBar() {
+        ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar()
+                .statusBarDarkFont(true).init();
+    }
+
+    @Override
+    protected void onBindListener() {
+        binding.btnBack.setOnClickListener(new SingleClickListener() {
+            @Override
+            protected void onSingleClick(View v) {
+                finish();
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
new file mode 100644
index 0000000..b52ac25
--- /dev/null
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -0,0 +1,218 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/color_f5f5f5">
+
+    <com.tairui.industrial_operation.widget.statusbar.StatusBarHeightView
+        android:id="@+id/statusbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_constraintTop_toBottomOf="@id/statusbar">
+
+
+        <ImageView
+            android:id="@+id/btnBack"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="16dp"
+            android:padding="4dp"
+            android:src="@mipmap/ic_back_black"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:text="设置"
+            android:textColor="@color/color_txt_black"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginRight="16dp"
+            android:background="@drawable/bg_container_white_raduis_10"
+            android:drawableLeft="@mipmap/ic_setting_1"
+            android:drawableRight="@mipmap/ic_arrow_right_gray"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:text="编辑资料"
+            android:textColor="@color/color_txt_black"
+            android:textSize="14sp" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginRight="16dp"
+            android:background="@drawable/bg_container_white_raduis_10"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@mipmap/ic_setting_2"
+                android:drawableRight="@mipmap/ic_arrow_right_gray"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="账户与安全"
+                android:textColor="@color/color_txt_black"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@mipmap/ic_setting_3"
+                android:drawableRight="@mipmap/ic_arrow_right_gray"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="隐私设置"
+                android:textColor="@color/color_txt_black"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginRight="16dp"
+            android:background="@drawable/bg_container_white_raduis_10"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@mipmap/ic_setting_4"
+                android:drawableRight="@mipmap/ic_arrow_right_gray"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="通知设置"
+                android:textColor="@color/color_txt_black"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@mipmap/ic_setting_5"
+                android:drawableRight="@mipmap/ic_arrow_right_gray"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="通用设置"
+                android:textColor="@color/color_txt_black"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginRight="16dp"
+            android:background="@drawable/bg_container_white_raduis_10"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@mipmap/ic_setting_6"
+                android:drawableRight="@mipmap/ic_arrow_right_gray"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="个人信息收集清单"
+                android:textColor="@color/color_txt_black"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@mipmap/ic_setting_7"
+                android:drawableRight="@mipmap/ic_arrow_right_gray"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="服务协议"
+                android:textColor="@color/color_txt_black"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@mipmap/ic_setting_8"
+                android:drawableRight="@mipmap/ic_arrow_right_gray"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="关于我们"
+                android:textColor="@color/color_txt_black"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/btnLogout"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="28dp"
+        android:background="@drawable/bg_container_white_raduis_30"
+        android:gravity="center"
+        android:text="退出登录"
+        android:textColor="@color/color_txt_black"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_1.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_1.png
new file mode 100644
index 0000000..80f99e1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_2.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_2.png
new file mode 100644
index 0000000..9792c98
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_2.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_3.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_3.png
new file mode 100644
index 0000000..4b2f409
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_3.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_4.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_4.png
new file mode 100644
index 0000000..e8844d8
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_4.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_5.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_5.png
new file mode 100644
index 0000000..cce171e
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_5.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_6.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_6.png
new file mode 100644
index 0000000..8241231
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_6.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_7.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_7.png
new file mode 100644
index 0000000..e682057
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_7.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting_8.png b/app/src/main/res/mipmap-xxhdpi/ic_setting_8.png
new file mode 100644
index 0000000..ddd8e10
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting_8.png differ