Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

app/src/main/java/com/gh/base/BaseActivity.java

@@ -225,7 +225,6 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
 
 
     /**
-     *
      * @param entrance 上一个页面的链式入口名称
      * @param path 当前页面名称
      * @return 完整的链式入口名称

app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt

@@ -26,7 +26,7 @@ class VideoFragment : ListFragment<MyVideoEntity, NormalListViewModel<MyVideoEnt
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration {
-        return GridSpacingItemDecoration(3, 2F.dip2px(), false)
+        return GridSpacingItemDecoration(3, 1.5F.dip2px(), false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/personalhome/video/MyVideoActivity.kt

@@ -28,7 +28,7 @@ class MyVideoActivity : ListActivity<MyVideoEntity, NormalListViewModel<MyVideoE
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration? {
-        return GridSpacingItemDecoration(3, 2F.dip2px(), false)
+        return GridSpacingItemDecoration(3, 1.5F.dip2px(), false)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt

@@ -52,7 +52,7 @@ class VideoActivity : ListActivity<MyVideoEntity, NormalListViewModel<MyVideoEnt
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration? {
-        return GridSpacingItemDecoration(3, 2F.dip2px(), false)
+        return GridSpacingItemDecoration(3, 1.5F.dip2px(), false)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt

@@ -26,7 +26,7 @@ class GameVideoFragment : ListFragment<MyVideoEntity, NormalListViewModel<MyVide
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration {
-        return GridSpacingItemDecoration(3, 2F.dip2px(), false)
+        return GridSpacingItemDecoration(3, 1.5F.dip2px(), false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.constant.ItemViewType
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.ImageUtils
+import com.gh.common.util.toColor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.baselist.ListAdapter
@@ -57,6 +58,7 @@ class VideoDraftAdapter(context: Context,
         if (holder is VideoDraftItemViewHolder) {
             val draftEntity = mEntityList[position]
             ImageUtils.display(holder.binding.videoCover, draftEntity.poster)
+            holder.binding.videoStatus.setTextColor(R.color.text_2496FF.toColor())
             holder.itemView.setOnClickListener {
                 val intent = UploadVideoActivity.getIntent(mContext, draftEntity, mEntrance, mPath)
                 (mContext as Activity).startActivityForResult(intent, VideoManagerActivity.REQUEST_CODE_DRAFT)

app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt

@@ -23,7 +23,7 @@ class VideoDraftFragment : ListFragment<VideoDraftEntity, VideoDraftViewModel>()
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration {
-        return GridSpacingItemDecoration(3, 2F.dip2px(), false)
+        return GridSpacingItemDecoration(3, 1.5F.dip2px(), false)
     }
 
     override fun provideListAdapter(): VideoDraftAdapter {

app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt

@@ -53,7 +53,7 @@ class VideoVerifyAdapter(context: Context,
                     "未通过"
                 }
                 "pending" -> {
-                    holder.binding.videoStatus.setTextColor(R.color.text_F10000.toColor())
+                    holder.binding.videoStatus.setTextColor(R.color.text_FF700F.toColor())
                     "审核中"
                 }
                 else -> ""

app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt

@@ -23,7 +23,7 @@ class VideoVerifyFragment : ListFragment<VideoVerifyEntity, VideoVerifyViewModel
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration? {
-        return GridSpacingItemDecoration(3, 2F.dip2px(), false)
+        return GridSpacingItemDecoration(3, 1.5F.dip2px(), false)
     }
 
     override fun provideListAdapter(): VideoVerifyAdapter {