代码优化

video/app/src/main/java/com/duben/roseplaylet/ui/activitys/CoinRecordActivity.kt

@@ -34,7 +34,7 @@ class CoinRecordActivity : BaseActivity(), CoinRecordView, OnRefreshListener, On
         iv_left_icon.setOnClickListener { finish() }
 
         coinRecordAdapter = CoinRecordAdapter()
-        val emptyView = LayoutInflater.from(this).inflate(R.layout.item_empty_history, null)
+        val emptyView = LayoutInflater.from(this).inflate(R.layout.item_empty_data, null)
         coinRecordAdapter.setEmptyView(emptyView)
         rv_coin_record.layoutManager = LinearLayoutManager(this)
         rv_coin_record.adapter = coinRecordAdapter

video/app/src/main/java/com/duben/roseplaylet/ui/activitys/ShareActivity.kt

@@ -149,6 +149,12 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
         val emptyView2 = LayoutInflater.from(this).inflate(R.layout.item_empty_data, null)
         mShareInviteAdapter.setEmptyView(emptyView2)
         rcy_my_invite.adapter = mShareInviteAdapter
+
+
+        if (UserManager.getInstance().userSex == 1) {
+            tv_tips.visibility = View.GONE
+            tv_tip2.visibility = View.GONE
+        }
     }
 
     override fun onClick(v: View?) {

video/app/src/main/java/com/duben/roseplaylet/ui/adapter/SquareAdapter.kt

@@ -4,6 +4,7 @@ import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewOutlineProvider
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
@@ -56,6 +57,7 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
                 blurViewHead.setupWith(holder.itemView as ViewGroup)
                     .setFrameClearDrawable(holder.itemView.background)
                     .setBlurRadius(10f)
+                blurViewHead.clipToOutline = true
             } else {
                 holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
                 blurViewHead.visibility = View.GONE
@@ -116,11 +118,15 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
                 blurViewHead.visibility = View.VISIBLE
                 blurViewHead.setupWith(holder.itemView as ViewGroup)
                     .setFrameClearDrawable(ColorDrawable(Color.RED))
-                    .setBlurRadius(30f)
+                    .setBlurRadius(10f)
                 blurViewImages.visibility = View.VISIBLE
                 blurViewImages.setupWith(holder.itemView as ViewGroup)
                     .setFrameClearDrawable(ColorDrawable(Color.RED))
-                    .setBlurRadius(30f)
+                    .setBlurRadius(10f)
+                blurViewHead.outlineProvider = ViewOutlineProvider.BACKGROUND
+                blurViewHead.clipToOutline = true
+                blurViewImages.outlineProvider = ViewOutlineProvider.BACKGROUND
+                blurViewImages.clipToOutline = true
             } else {
                 holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
                 blurViewHead.visibility = View.GONE

video/app/src/main/java/com/duben/roseplaylet/ui/fragment/SquareListFragment.kt

@@ -89,8 +89,8 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
             LayoutInflater.from(requireContext()).inflate(R.layout.item_empty_data, null)
         squareAdapter.setEmptyView(emptyView)
         squareAdapter.setOnItemClickListener { adapter, view, position ->
-            if (mType == 2 && !UserManager.getInstance().vipFlag) {
-                showUnlockWechatDialog(squareAdapter.data[position].headerUrl)
+            if (mType == 3 && !UserManager.getInstance().vipFlag) {
+                showSquareNewDialog(squareAdapter.data[position].headerUrl)
                 return@setOnItemClickListener
             }
             val bundle = Bundle()
@@ -100,7 +100,7 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
         squareAdapter.setOnClickLikeListener(object : SquareAdapter.OnClickLikeListener {
             override fun onClickLike(position: Int) {
                 if (mType == 2 && !UserManager.getInstance().vipFlag) {
-                    showUnlockWechatDialog(squareAdapter.data[position].headerUrl)
+                    showSquareNewDialog(squareAdapter.data[position].headerUrl)
                     return
                 }
                 val likeStatus = if (squareAdapter.data[position].likeStatus == 0) {
@@ -117,7 +117,7 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
         })
     }
 
-    private fun showUnlockWechatDialog(headUrl: String) {
+    private fun showSquareNewDialog(headUrl: String) {
         SquareNewDialog(
             requireContext(),
             headUrl,

video/app/src/main/res/drawable/shape_blur_round.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <corners android:radius="10dip" />
+</shape>
\ No newline at end of file

video/app/src/main/res/layout/activity_share.xml

@@ -289,6 +289,7 @@
                         android:textColor="@color/color_F1D6BA" />
 
                     <TextView
+                        android:id="@+id/tv_tips"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
@@ -296,6 +297,7 @@
                         android:textColor="@color/color_F1D6BA" />
 
                     <TextView
+                        android:id="@+id/tv_tip2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"

video/app/src/main/res/layout/dialog_square_new.xml

@@ -26,7 +26,8 @@
                 android:id="@+id/tv_unlock"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="80dp"
+                android:layout_marginTop="50dp"
+                android:layout_marginBottom="20dp"
                 android:textColor="@color/color_FCE8BA"
                 android:textSize="16sp" />
 
@@ -34,7 +35,7 @@
                 android:id="@+id/tv_vip_btn"
                 android:layout_width="260dp"
                 android:layout_height="40dp"
-                android:layout_marginTop="40dp"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/shape_bg_hall_btn2"
                 android:gravity="center"
                 android:text="分享得会员"

video/app/src/main/res/layout/item_square.xml

@@ -41,6 +41,7 @@
                 android:id="@+id/item_blurview_head"
                 android:layout_width="110dp"
                 android:layout_height="110dp"
+                android:background="@drawable/shape_blur_round"
                 android:visibility="gone" />
 
         </FrameLayout>