Merge branch 'google' into qiye

baseswago/src/main/java/com/swago/baseswago/PersonDataDFragment.kt

@@ -139,6 +139,7 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
             isBlock = it.is_black
             nickName = it.user_name
             account = it.user_account
+            binding.ivVip.visibility = if (it.is_benefit==1) View.VISIBLE else View.GONE
             Glide.with(this).load(it.user_head_img_url)
                 .placeholder(R.mipmap.default_avatar)
                 .error(R.mipmap.default_avatar).into(binding.ivAvatar)

baseswago/src/main/res/layout/dialog_person_data.xml

@@ -89,7 +89,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
                 android:src="@mipmap/vip"
-                android:visibility="visible"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/tvLevelView"
                 app:layout_constraintTop_toTopOf="@+id/tvLevelView"