Merge branch 'dev_aiduanju_250210_girl_B' of...

Merge branch 'dev_aiduanju_250210_girl_B' of http://gitlab.mints-id.com/android/android_vediosocial into dev_aiduanju_250210_girl_B

video/app/src/main/java/com/duben/loveplayletd/ui/fragment/FirstFragment.kt

@@ -13,6 +13,7 @@ import com.duben.loveplayletd.manager.TrackManager
 import com.duben.loveplayletd.manager.UserManager
 import com.duben.loveplayletd.mvp.presenters.FirstPresenter
 import com.duben.loveplayletd.mvp.views.FirstView
+import com.duben.loveplayletd.ui.activitys.EditProfileActivity
 import com.duben.loveplayletd.ui.activitys.ShareActivity
 import com.duben.loveplayletd.ui.adapter.RecommendPageAdapter
 import com.duben.loveplayletd.ui.fragment.base.LazyLoadBaseFragment
@@ -57,6 +58,13 @@ class FirstFragment : LazyLoadBaseFragment(), FirstView {
             } else {
                 TrackManager.getInstance().getBaseMsg()
             }
+
+            if(UserManager.getInstance().newFlag){
+                iv_share.visibility=View.VISIBLE
+            }else{
+                iv_share.visibility=View.GONE
+
+            }
         }
     }
 

video/app/src/main/java/com/duben/loveplayletd/ui/fragment/MyFragment.kt

@@ -183,8 +183,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
 
             tv_edit_profile.visibility=View.VISIBLE
             ll_my_likeroot.visibility=View.VISIBLE
-            ll_my_wallet.visibility=View.VISIBLE
-            ll_my_invite.visibility=View.VISIBLE
+            ll_my_friends_root.visibility=View.VISIBLE
             ll_my_album.visibility=View.VISIBLE
             ll_my_auth.visibility=View.VISIBLE
 
@@ -192,8 +191,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         }else{
             tv_edit_profile.visibility=View.GONE
             ll_my_likeroot.visibility=View.GONE
-            ll_my_wallet.visibility=View.GONE
-            ll_my_invite.visibility=View.GONE
+            ll_my_friends_root.visibility=View.GONE
             ll_my_album.visibility=View.GONE
             ll_my_auth.visibility=View.GONE
         }

video/app/src/main/java/com/duben/loveplayletd/video/tx/adapter/TxVideoAdapter.kt

@@ -72,16 +72,16 @@ class TxVideoAdapter : BaseMultiItemQuickAdapter<VideoMultiItemEntity, BaseViewH
         Glide.with(context).load(vedioBean?.coverImage)
             .into(holder.getView(R.id.iv_bg))
         val vipBtn = holder.getView<View>(R.id.vip)
-        if (UserManager.getInstance().newFlag) {
+//        if (UserManager.getInstance().newFlag) {
             // 匹配
             vipBtn.visibility = View.VISIBLE
             vipBtn.setOnClickListener {
                 mOnCustomChildClickListener?.onCustomChildClick(it, holder.adapterPosition)
             }
-        } else {
-            // 未匹配
-            vipBtn.visibility = View.GONE
-        }
+//        } else {
+//            // 未匹配
+//            vipBtn.visibility = View.GONE
+//        }
 
 
         val adBtn = holder.getView<View>(R.id.unlock)

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

@@ -237,6 +237,7 @@
                 </RelativeLayout>
 
                 <LinearLayout
+                    android:id="@+id/ll_my_friends_root"
                     android:layout_width="match_parent"
                     android:layout_height="65dp"
                     android:layout_marginTop="10dp">