diff --git a/app/src/main/java/com/gh/common/util/TimeUtils.kt b/app/src/main/java/com/gh/common/util/TimeUtils.kt
index 157aa21eeb..f77528ca86 100644
--- a/app/src/main/java/com/gh/common/util/TimeUtils.kt
+++ b/app/src/main/java/com/gh/common/util/TimeUtils.kt
@@ -60,7 +60,7 @@ object TimeUtils {
     /**
      * 判断时间戳是多少天前
      */
-    fun getBeforeDays(timestamp: Long):Int{
+    fun getBeforeDays(timestamp: Long): Int {
         var days: Long = 0
         val format = SimpleDateFormat("yyyyMMdd HH:mm", Locale.getDefault())
         try {
@@ -73,4 +73,15 @@ object TimeUtils {
 
         return days.toInt()
     }
+
+
+    /**
+     * 格式化视频时长
+     */
+    @JvmStatic
+    fun formatVideoDuration(length: Long): String {
+        val minute = length / 60
+        val second = length % 60
+        return String.format(Locale.CHINA, "%02d:%02d", minute, second)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt
index a19c73c7d5..75d5754a5e 100644
--- a/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt
@@ -9,14 +9,13 @@ import com.gh.common.util.*
 import com.gh.gamecenter.R
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.baselist.ListAdapter
-import com.gh.gamecenter.databinding.VideoItemBinding
 import com.gh.gamecenter.databinding.VideoNewItemBinding
 import com.gh.gamecenter.entity.MyVideoEntity
 import com.gh.gamecenter.video.VideoItemViewHolder
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
 
 class VideoAdapter(context: Context,
-                   val mViewModel: VideoViewModel, val mVideoStyle: String) : ListAdapter<MyVideoEntity>(context) {
+                   val mViewModel: VideoViewModel, val mVideoStyle: String, val mEntrance: String) : ListAdapter<MyVideoEntity>(context) {
     override fun getItemViewType(position: Int): Int {
         if (position == itemCount - 1) return ItemViewType.ITEM_FOOTER
         return ItemViewType.ITEM_BODY
@@ -44,8 +43,7 @@ class VideoAdapter(context: Context,
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is VideoItemViewHolder) {
             val entity = mEntityList[position]
-            ImageUtils.display(holder.binding.videoCover, entity.poster)
-            holder.binding.videoLikeCount.text = entity.vote.toSimpleCount()
+            holder.binding.video = entity
             holder.itemView.setOnClickListener {
                 if (mVideoStyle == VideoFragment.VideoStyle.COLLECT.value) {
                     DirectUtils.directToVideoDetail(mContext, entity.id, VideoDetailContainerViewModel.Location.USER_FAVORITE_VIDEO.value, false, path = getPath())
@@ -65,6 +63,10 @@ class VideoAdapter(context: Context,
                     })
                 }
             }
+            holder.binding.userIcon.setOnClickListener {
+                DirectUtils.directToHomeActivity(mContext, entity.user.id, mEntrance, getPath())
+            }
+            holder.binding.userName.setOnClickListener { holder.binding.userIcon.performClick() }
         } else if (holder is FooterViewHolder) {
             holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver)
         }
diff --git a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt
index fbc4b58057..50a6f2e946 100644
--- a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt
@@ -2,6 +2,7 @@ package com.gh.gamecenter.collection
 
 import android.os.Bundle
 import android.view.View
+import android.widget.RelativeLayout
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.util.dip2px
@@ -17,18 +18,19 @@ class VideoFragment : ListFragment<MyVideoEntity, VideoViewModel>() {
 
     override fun provideListAdapter(): VideoAdapter {
         if (mAdapter == null) {
-            mAdapter = VideoAdapter(requireContext(), mViewModel!!, mVideoStyle)
+            mAdapter = VideoAdapter(requireContext(), mViewModel!!, mVideoStyle,mEntrance)
         }
         return mAdapter!!
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration {
-        return GridSpacingItemDecoration(2, 1.5F.dip2px(), false, 8F.dip2px())
+        return GridSpacingItemDecoration(2, 8F.dip2px(), false, 8F.dip2px())
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         mVideoStyle = arguments?.getString("videoStyle") ?: ""
         super.onCreate(savedInstanceState)
+        mListRv.setPadding(8f.dip2px(), 0, 8f.dip2px(), 0)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt
index 8fb5ce3cf7..a35737bbe1 100644
--- a/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt
@@ -277,10 +277,6 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
             val slideItem = HomeItemData()
             slideItem.slides = mHomeSlides
             mSnapshotItemList.add(slideItem)
-
-            for (slide in mHomeSlides) {
-                if (slide.linkGame != null) addGamePositionAndPackage(slide.linkGame)
-            }
         }
 
         if (mHomeRecommends.isNotEmpty()) {
@@ -318,7 +314,6 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
                 attachGame.blockPosition = i + 1
                 attachGame.attachGame = homeContent
                 mSnapshotItemList.add(attachGame)
-                if (homeContent.linkGame != null) addGamePositionAndPackage(homeContent.linkGame)
             } else if (linkType == "top_game_comment") {
                 val head = HomeItemData()
                 head.columnHead = SubjectEntity(type = linkType, name = "安利墙")
@@ -365,8 +360,6 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
         itemDataList.postValue(mSnapshotItemList)
     }
 
-
-    // todo 部分游戏Item不需要显示下载按钮,去除相关监听
     private fun addGamePositionAndPackage(game: GameEntity) {
         var packages = ""
         for (apkEntity in game.getApk()) {
diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt
index 60a5d19085..87edd4897c 100644
--- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt
@@ -22,7 +22,8 @@ object LegacyHomeSubjectTransformer {
             val gameEntity = data[0]
             if (gameEntity.id.isEmpty()) gameEntity.id = gameEntity.link ?: ""
 
-            if (data[0].type == "column") {
+            //  图片专题样式(后台操作->只显示(滑动))
+            if (data[0].type == "column" && subjectEntity.type == "image_slide") {
                 itemDataImage.imageSlide = gameEntity
                 itemList.add(itemDataImage)
             } else {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt
index 70bd302033..fae8c1c4af 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt
@@ -6,12 +6,9 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.constant.ItemViewType
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.ImageUtils
-import com.gh.common.util.toSimpleCount
 import com.gh.gamecenter.R
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.baselist.ListAdapter
-import com.gh.gamecenter.databinding.VideoItemBinding
 import com.gh.gamecenter.databinding.VideoNewItemBinding
 import com.gh.gamecenter.entity.MyVideoEntity
 import com.gh.gamecenter.video.VideoItemViewHolder
@@ -51,8 +48,9 @@ class UserVideoHistoryAdapter(context: Context, val mViewModel: UserVideoHistory
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is VideoItemViewHolder) {
             val entity = mEntityList[position]
-            ImageUtils.display(holder.binding.videoCover, entity.poster)
-            holder.binding.videoLikeCount.text = entity.vote.toSimpleCount()
+            holder.binding.video = entity
+            holder.binding.userIcon.visibility = View.GONE
+            holder.binding.userName.visibility = View.GONE
             holder.itemView.setOnClickListener {
                 DirectUtils.directToVideoDetail(mContext, entity.id, VideoDetailContainerViewModel.Location.USER_VIDEO.value, false, path = "个人主页-视频")
             }
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt
index c856ae4eb2..7c62e1244d 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt
@@ -47,12 +47,12 @@ class UserVideoHistoryFragment : ListFragment<PersonalHistoryEntity, UserVideoHi
             }
         }
         mListRv.layoutManager = gridLayoutManager
-        mListRv.background = ColorDrawable(ContextCompat.getColor(requireContext(), R.color.white))
-        mListRv.setPadding(DisplayUtils.dip2px(20f), 0, DisplayUtils.dip2px(20f), 0)
+        mListRv.setPadding(8F.dip2px(), 0, 8F.dip2px(), 0)
+        filter.setPadding(8F.dip2px(), 0, 8F.dip2px(), 0)
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration? {
-        return GridSpacingItemDecoration(2, 1.5F.dip2px(), false)
+        return GridSpacingItemDecoration(2, 8F.dip2px(), false)
     }
 
     override fun provideListViewModel(): UserVideoHistoryViewModel {
diff --git a/app/src/main/java/com/gh/gamecenter/room/dao/VideoHistoryDao.kt b/app/src/main/java/com/gh/gamecenter/room/dao/VideoHistoryDao.kt
index cc4bd18c8c..195eb5c1f8 100644
--- a/app/src/main/java/com/gh/gamecenter/room/dao/VideoHistoryDao.kt
+++ b/app/src/main/java/com/gh/gamecenter/room/dao/VideoHistoryDao.kt
@@ -9,7 +9,7 @@ interface VideoHistoryDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun addVideo(video: MyVideoEntity)
 
-    @Query("select * from MyVideoEntity order by time desc limit :pageSize offset :offset ")
+    @Query("select * from MyVideoEntity where user!='' order by time desc limit :pageSize offset :offset ")
     fun getVideoWithOffset(pageSize: Int, offset: Int): Single<MutableList<MyVideoEntity>>
 
     @Query("select * from MyVideoEntity where videoStreamRecord=1 order by time desc limit :pageSize offset :offset ")
diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt
index 1becea7816..87c52f5635 100644
--- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt
@@ -22,7 +22,7 @@ class GameVideoAdapter(context: Context,
                        private val mViewModel: NormalListViewModel<MyVideoEntity>,
                        private val mEntrance: String,
                        private val mSortValue: String?,
-                       val gameId:String) : ListAdapter<MyVideoEntity>(context) {
+                       val gameId: String) : ListAdapter<MyVideoEntity>(context) {
 
     override fun getItemViewType(position: Int): Int {
         if (position == itemCount - 1) return ItemViewType.ITEM_FOOTER
@@ -51,8 +51,7 @@ class GameVideoAdapter(context: Context,
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is VideoItemViewHolder) {
             val entity = mEntityList[position]
-            ImageUtils.display(holder.binding.videoCover, entity.poster)
-            holder.binding.videoLikeCount.text = entity.vote.toSimpleCount()
+            holder.binding.video = entity
             holder.itemView.setOnClickListener {
                 var fromLocation = ""
                 var path = ""
@@ -65,6 +64,11 @@ class GameVideoAdapter(context: Context,
                     path = "视频合集-最新"
                 }
                 DirectUtils.directToVideoDetail(mContext, entity.id, fromLocation, false, gameId = gameId, entrance = mEntrance, path = path)
+
+                holder.binding.userIcon.setOnClickListener {
+                    DirectUtils.directToHomeActivity(mContext, entity.user.id, mEntrance, path)
+                }
+                holder.binding.userName.setOnClickListener { holder.binding.userIcon.performClick() }
             }
         } else if (holder is FooterViewHolder) {
             holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver)
diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt
index 2447e7489e..c9fa06d6ee 100644
--- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt
@@ -25,17 +25,18 @@ class GameVideoFragment : ListFragment<MyVideoEntity, NormalListViewModel<MyVide
                     mListViewModel,
                     mEntrance,
                     arguments?.getString(EntranceUtils.KEY_SORT),
-                    arguments?.getString(EntranceUtils.KEY_GAMEID)?:"")
+                    arguments?.getString(EntranceUtils.KEY_GAMEID) ?: "")
         }
         return mAdapter!!
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration {
-        return GridSpacingItemDecoration(2, 1.5F.dip2px(), false, 8F.dip2px())
+        return GridSpacingItemDecoration(2, 8F.dip2px(), false, 8F.dip2px())
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        mListRv.setPadding(8F.dip2px(), 0, 8F.dip2px(), 0)
         val gridLayoutManager = GridLayoutManager(requireContext(), 2)
         gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
diff --git a/app/src/main/res/drawable-xxhdpi/ic_video_comment_count.png b/app/src/main/res/drawable-xxhdpi/ic_video_comment_count.png
new file mode 100644
index 0000000000..608c86f9f9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_video_comment_count.png differ
diff --git a/app/src/main/res/drawable/background_shape_white_radius_6.xml b/app/src/main/res/drawable/background_shape_white_radius_6.xml
new file mode 100644
index 0000000000..2cb991c5eb
--- /dev/null
+++ b/app/src/main/res/drawable/background_shape_white_radius_6.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="6dp"/>
+    <solid android:color="@android:color/white" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/visit_history_video_bottom_bg.xml b/app/src/main/res/drawable/visit_history_video_bottom_bg.xml
new file mode 100644
index 0000000000..1cc116bec2
--- /dev/null
+++ b/app/src/main/res/drawable/visit_history_video_bottom_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:angle="270"
+        android:endColor="@color/black_alpha_80"
+        android:startColor="@color/transparent" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_user_history.xml b/app/src/main/res/layout/fragment_user_history.xml
index 12070bacd2..6a56edba05 100644
--- a/app/src/main/res/layout/fragment_user_history.xml
+++ b/app/src/main/res/layout/fragment_user_history.xml
@@ -8,8 +8,7 @@
         android:id="@+id/list_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/filter"
-        android:layout_marginTop="-16dp">
+        android:layout_below="@id/filter">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list_rv"
@@ -21,7 +20,6 @@
         android:id="@+id/filter"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white"
         android:orientation="vertical"
         android:paddingLeft="20dp"
         android:paddingRight="20dp"
diff --git a/app/src/main/res/layout/video_new_item.xml b/app/src/main/res/layout/video_new_item.xml
index 1ebd8a5e15..6f3f0e7989 100644
--- a/app/src/main/res/layout/video_new_item.xml
+++ b/app/src/main/res/layout/video_new_item.xml
@@ -1,49 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
+    <data>
+
+        <variable
+            name="video"
+            type="com.gh.gamecenter.entity.MyVideoEntity" />
+
+        <import type="com.gh.common.util.TimeUtils" />
+
+        <import type="com.gh.common.util.ExtensionsKt" />
+    </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:background="@drawable/background_shape_white_radius_6">
 
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/video_cover"
-            style="@style/frescoStyle"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@color/text_292929"
-            app:actualImageScaleType="centerCrop"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="h,16:9"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-        <ImageView
-            android:id="@+id/video_like"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/video_cover_info"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginBottom="8dp"
-            android:src="@drawable/video_like"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/video_cover"
+                style="@style/frescoStyle"
+                imageUrl="@{video.poster}"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:actualImageScaleType="centerCrop"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="h,16:9"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:roundedCornerRadius="6dp"
+                app:roundTopLeft="true"
+                app:roundTopRight="true"
+                app:roundBottomLeft="false"
+                app:roundBottomRight="false"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="24dp"
+                android:background="@drawable/visit_history_video_bottom_bg"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent">
+
+                <TextView
+                    android:id="@+id/video_like_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:drawableLeft="@drawable/ic_game_detail_video_vote"
+                    android:drawablePadding="4dp"
+                    android:gravity="center"
+                    android:text="@{ExtensionsKt.toSimpleCount(video.vote)}"
+                    android:textColor="@android:color/white"
+                    android:textSize="10sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/video_comment_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:drawableLeft="@drawable/ic_video_comment_count"
+                    android:drawablePadding="4dp"
+                    android:text="@{ExtensionsKt.toSimpleCount(video.commentCount)}"
+                    android:textColor="@android:color/white"
+                    android:textSize="10sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/video_like_count"
+                    app:layout_constraintStart_toEndOf="@+id/video_like_count"
+                    app:layout_constraintTop_toTopOf="@+id/video_like_count" />
+
+                <TextView
+                    android:id="@+id/video_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="8dp"
+                    android:text="@{TimeUtils.formatVideoDuration(video.length)}"
+                    android:textColor="@android:color/white"
+                    android:textSize="10sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/video_comment_count"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/video_comment_count" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
-            android:id="@+id/video_like_count"
-            android:layout_width="wrap_content"
+            android:id="@+id/video_title"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="4dp"
-            android:gravity="center"
-            android:text="继续上传"
-            android:textColor="@android:color/white"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/video_like"
-            app:layout_constraintLeft_toRightOf="@id/video_like"
-            app:layout_constraintTop_toTopOf="@id/video_like" />
+            android:layout_margin="8dp"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="7dp"
+            android:maxLines="2"
+            android:text="@{video.title}"
+            android:textColor="@color/text_333333"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toTopOf="@+id/user_icon"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/video_cover_info" />
 
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/user_icon"
+            style="@style/frescoCircleStyle"
+            imageUrl="@{video.user.icon}"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="8dp"
+            app:roundWithOverlayColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/video_title" />
+
+        <TextView
+            android:id="@+id/user_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@{video.user.name}"
+            android:textColor="@color/text_999999"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@+id/user_icon"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/user_icon"
+            app:layout_constraintTop_toTopOf="@+id/user_icon" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>