From 1b49aaa6fce4b095f8f0c7ba7a917124ae9f3c36 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Tue, 8 Oct 2019 15:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=A7=86=E9=A2=91=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3UI/=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/base/BaseActivity.java   |   1 -
 .../com/gh/gamecenter/collection/VideoFragment.kt |   2 +-
 .../personalhome/video/MyVideoActivity.kt         |   2 +-
 .../com/gh/gamecenter/qa/editor/VideoActivity.kt  |   2 +-
 .../gh/gamecenter/video/game/GameVideoFragment.kt |   2 +-
 .../video/videomanager/VideoDraftAdapter.kt       |   2 ++
 .../video/videomanager/VideoDraftFragment.kt      |   2 +-
 .../video/videomanager/VideoVerifyAdapter.kt      |   2 +-
 .../video/videomanager/VideoVerifyFragment.kt     |   2 +-
 .../personal_video_manager_icon.png               | Bin 0 -> 995 bytes
 .../res/layout/community_select_opened_item.xml   |   1 -
 app/src/main/res/layout/fragment_personal.xml     |   4 ++--
 12 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/personal_video_manager_icon.png

diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java
index 969799b148..fcfb7485c8 100644
--- a/app/src/main/java/com/gh/base/BaseActivity.java
+++ b/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 完整的链式入口名称
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 b700ba661b..73c54109cf 100644
--- a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt
+++ b/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?) {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/video/MyVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/video/MyVideoActivity.kt
index 97cc9f95df..6396e76d05 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/video/MyVideoActivity.kt
+++ b/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?) {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt
index 424f49b18d..b447c9ebf5 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt
+++ b/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?) {
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 17b4cbc7a5..c9cf7a119f 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
@@ -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?) {
diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt
index 8ce5763eda..d14c50d3c9 100644
--- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt
+++ b/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)
diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt
index 4b1a10a094..af91f28bf5 100644
--- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt
+++ b/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 {
diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt
index 11d32d79e0..41ca6ad6e3 100644
--- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt
+++ b/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 -> ""
diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt
index b55851e22c..071aa3ec7f 100644
--- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt
+++ b/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 {
diff --git a/app/src/main/res/drawable-xxhdpi/personal_video_manager_icon.png b/app/src/main/res/drawable-xxhdpi/personal_video_manager_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d273ce8aea21d56a5e02f34d5d603938ab39ccf0
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq001xm001fo1^@s6^-tJ(00001b5ch_0Itp)
z=>Px&ok>JNR9Fe^SxsmYQ4pSa`O#W`5h^u}|5cKJE$T%)89j*LNfZ%8J?K%a;K3Sn
zwQ0S0Q4|loRPdtW&4Yp-6a}Rx1(VWNp_-sH_}kX1yZgp@(OqKN+BUnJwzLc3y`6nK
z^L;aK-kY}pn7L*=Fugs1!_i-*y<Yai(6=GU5F+`98{<?aL689WM1E?|oQ*t3HdKnv
ze+aC(+%@Y*&PYn46F^FTnJ$DUet+QLTW#%|@mjPADDdBV^`{Jc<9L<0G9IDdhyM7x
zrgiP((Pw*ku=m&52?MVX6U;TG(WV^vKLVka^y1}-j+NG!{QM4U9ZOBaJZT9hu#NH*
zKEn2|6k<@IVUP~6gZI+_ZPJnYh-jh8n>+z&%I)j{Pm;9|$XNO$X@^B1q;=MVVH}46
z+DAZtBg45)FhAVfxs=Cc|A3ZMGZy7#8G}?4N_4~l<SEki?IYPlgQ{%;h!CWb7O|1k
zmo8@<bpYnW(KMixi_{o9iAQ^3vOPDYSTLmta6(tQLI43@VgNTIh(p}}Shh$BS>X-=
zfmgFy^jWq!avcJJdO&<!4iZS1UzHr^fCTzx0nTc*nJw!hae;7-iAYQCMa#;AO0Q!A
z#o%u5MKhC(X#z3MQz~2h+^u^Cp2zMw0SjQJDe?#^v5t4kyOzw&mUm*G(&rfgr99gh
z`It>ccX2e11A?Js?p^3@1PXy>lF>_if2~mFv`<h*0tzhWgD16?CrS&wt7#-!^>ibb
z2uBO$PWxPlno5VK1XP*cs;6#nnYGm^;NtgrAIKB%EQxCpshy@FUw8ptk&#|SAf{39
zi<!D0B{Xp1ZXa2TJ?Qk_ih$!OBnanOV8V&6)t`;@O+Ik&x!T+MoY$aV%C2Jq5@bU-
zk?!G;Mop=oXW%v=i<l=Z!B1BRu%ja;$on2Ue5elyzbm0<Nj%h|yAt%7{gaXaXT8qb
z-lz#gQhc=u@FtT_2zPx{qBew70R1s0(#B`?k#YI)lT82wW=b^Y{%eGpp5)qewmEj#
zUx6#Qnr-4b<U_Hc*+JiXn}G0%2kuvk#U{sgj{@&mBYRFq-*Yv4raBy5CQ$6=sNCV{
z)yKbFcVlf%jk7nJP~ue!Po-1V%M;Y5<}3+r=ss4PUm}OYu;&)}QmI_UE3GP@#5RE`
z|8ZBbo>LXrB80f;^?7!PXa9U&uN&`|X{E=GK%vs9^an>F?wS6K2d1M3egnvzLHW}@
RcXt2)002ovPDHLkV1oF;*=GO%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/community_select_opened_item.xml b/app/src/main/res/layout/community_select_opened_item.xml
index a073296d41..667c6d4aa0 100644
--- a/app/src/main/res/layout/community_select_opened_item.xml
+++ b/app/src/main/res/layout/community_select_opened_item.xml
@@ -63,7 +63,6 @@
                 app:layout_constraintTop_toTopOf="@id/game_icon_left"
                 tools:text="UC浏览器（无广告版" />
 
-
             <TextView
                 android:id="@+id/community_status_left"
                 visibleGone="@{isSelectLeft}"
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index dc3b806e51..51b294a4fa 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -354,7 +354,7 @@
                     android:layout_height="18dp"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="18dp"
-                    android:src="@drawable/personal_draft_icon" />
+                    android:src="@drawable/personal_video_manager_icon" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -499,7 +499,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="12sp"
                     android:visibility="gone" />
-                
+
             </RelativeLayout>
 
             <View