diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index ccd6d6e398..f0e652d28c 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -1819,6 +1819,25 @@ public class DialogUtils {
         dialog.show();
     }
 
+    public static void showPassRegulationDialog(Context context, String icon) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_pass_regulation, null);
+        SimpleDraweeView userIcon = contentView.findViewById(R.id.dialog_icon);
+
+        ImageUtils.display(userIcon, icon);
+
+        contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+    }
+
     /**
      * @param context may be is application context
      * @return activity context
diff --git a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt
index fac1daafbb..c5dd6d5cd4 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt
@@ -21,8 +21,9 @@ data class PersonalEntity(
         var iconBorder: AvatarBorderEntity? = null,
         var background: BackgroundImageEntity? = null,
         @SerializedName("last_visitor")
-        val lastVisitor: LastVisitor? = null
-
+        val lastVisitor: LastVisitor? = null,
+        @SerializedName("etiquette_exam")
+        val regulationTest: RegulationTest? = null
 ) : Parcelable {
     @Parcelize
     data class Count(
@@ -44,6 +45,13 @@ data class PersonalEntity(
     }
 }
 
+// 礼仪测试
+@Parcelize
+data class RegulationTest(
+        var status: String = "",
+        var rank: Int = 0) : Parcelable
+
+// 最近访客
 @Parcelize
 data class LastVisitor(
         var id: String = "",
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
index 6e47747bb1..1ba67bc564 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
@@ -365,6 +365,16 @@ class UserHomeFragment : NormalFragment() {
                 }
             }
 
+            // 礼仪测试标签
+            regulationTestContainer.setOnClickListener {
+                DialogUtils.showPassRegulationDialog(requireContext(), mPersonalEntity.icon)
+            }
+
+            // 徽章标签
+            badgeContainer.setOnClickListener {
+                directToBadgeWall(requireContext(), mPersonalEntity.id, mPersonalEntity.name, mPersonalEntity.icon)
+            }
+
             userIcon.setOnClickListener {
                 if (mUserHomeViewModel.userId == UserManager.getInstance().userId) {
                     MtaHelper.onEvent("个人主页详情", "个人主页详情", "头像")
@@ -409,7 +419,7 @@ class UserHomeFragment : NormalFragment() {
                 MtaHelper.onEvent("进入徽章墙_用户记录", if (mUserHomeViewModel.userId == UserManager.getInstance().userId) "个人主页-我的徽章" else "个人主页-Ta的徽章",
                         "${mUserHomeViewModel.userInfo.value?.name}（${mUserHomeViewModel.userId}）")
                 MtaHelper.onEvent("徽章中心", "进入徽章中心", if (mUserHomeViewModel.userId == UserManager.getInstance().userId) "个人主页-我的徽章" else "个人主页-Ta的徽章")
-                DirectUtils.directToBadgeWall(requireContext(),
+                directToBadgeWall(requireContext(),
                         mUserHomeViewModel.userId, mUserHomeViewModel.userInfo.value?.name
                         ?: "", mUserHomeViewModel.userInfo.value?.icon ?: "")
             }
diff --git a/app/src/main/res/drawable-xxhdpi/bg_pass_regulation_btn.png b/app/src/main/res/drawable-xxhdpi/bg_pass_regulation_btn.png
new file mode 100644
index 0000000000..6e800f3bed
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_pass_regulation_btn.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_pass_regulation_btn.png b/app/src/main/res/drawable-xxxhdpi/bg_pass_regulation_btn.png
new file mode 100644
index 0000000000..b28464a8b1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_pass_regulation_btn.png differ
diff --git a/app/src/main/res/drawable/bg_share_dialog.xml b/app/src/main/res/drawable/bg_share_dialog.xml
new file mode 100644
index 0000000000..566daeb45d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_share_dialog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/text_F5F5F5" />
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pass_regulation.xml b/app/src/main/res/layout/dialog_pass_regulation.xml
new file mode 100644
index 0000000000..bcb7da61eb
--- /dev/null
+++ b/app/src/main/res/layout/dialog_pass_regulation.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="300dp"
+        android:layout_height="297dp"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"
+        android:background="@drawable/background_shape_white_radius_5"
+        android:orientation="vertical">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/dialog_icon"
+            android:layout_marginTop="43dp"
+            style="@style/frescoCircleStyle"
+            android:layout_width="52dp"
+            android:layout_height="52dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="31dp"
+            android:lineSpacingExtra="16dp"
+            android:gravity="center_horizontal"
+            android:textColor="@color/text_333333"
+            android:textSize="16sp"
+            android:text="@string/pass_regulation" />
+        
+        <TextView
+            android:id="@+id/dialog_ok"
+            android:layout_width="252dp"
+            android:layout_height="49dp"
+            android:layout_marginTop="32dp"
+            android:gravity="center"
+            android:paddingBottom="5dp"
+            android:background="@drawable/bg_pass_regulation_btn"
+            android:text="@string/dialog_ok"/>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 9be6e81ae4..b5924b00a9 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -97,7 +97,7 @@
                             app:layout_constraintTop_toBottomOf="@+id/user_name">
 
                             <RelativeLayout
-                                android:visibility="gone"
+                                visibleGone="@{entity.regulationTest != null}"
                                 android:id="@+id/regulation_test_container"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ac543ef691..8a8f2e6f24 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -743,6 +743,8 @@
     <string name="share_weibo">微博</string>
     <string name="excellent_comment">优秀评论</string>
     <string name="excellent_more">查看更多</string>
+    <string name="pass_regulation">祝贺！童鞋\n你已通过礼仪测试～</string>
+    <string name="dialog_ok">好的</string>
 
     <item name="tag_show_gif" type="id" />
     <item name="download_item_type" type="id" />