diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7220d8b0af..f7bcf36553 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -378,11 +378,11 @@
             android:screenOrientation = "portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.video.VideoManagerActivity"
+            android:name="com.gh.gamecenter.video.videomanager.VideoManagerActivity"
             android:screenOrientation = "portrait"/>
 
         <activity
-            android:name="com.gh.gamecenter.video.upload.UploadVideoActivity"
+            android:name="com.gh.gamecenter.video.upload.view.UploadVideoActivity"
             android:screenOrientation = "portrait"/>
 
         <activity
diff --git a/app/src/main/java/com/gh/common/util/UploadImageUtils.kt b/app/src/main/java/com/gh/common/util/UploadImageUtils.kt
index e1182ac4d2..789443f83a 100644
--- a/app/src/main/java/com/gh/common/util/UploadImageUtils.kt
+++ b/app/src/main/java/com/gh/common/util/UploadImageUtils.kt
@@ -27,7 +27,8 @@ object UploadImageUtils {
         question,
         answer,
         suggestion,
-        icon
+        icon,
+        poster
     }
 
     // 不处理图片,只是单纯的上传
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
index f4bdd58902..a55f1c35c3 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
@@ -65,7 +65,7 @@ import com.gh.gamecenter.subject.SubjectActivity;
 import com.gh.gamecenter.user.ApiResponse;
 import com.gh.gamecenter.user.LoginTag;
 import com.gh.gamecenter.user.UserViewModel;
-import com.gh.gamecenter.video.VideoManagerActivity;
+import com.gh.gamecenter.video.videomanager.VideoManagerActivity;
 import com.halo.assistant.HaloApp;
 import com.jakewharton.rxbinding2.view.RxView;
 import com.lightgame.config.CommonDebug;
@@ -374,7 +374,9 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
                 MtaHelper.onEvent("我的光环", "浏览记录");
                 break;
             case R.id.personal_video_manager:
-                startActivity(VideoManagerActivity.getIntent(getContext(), "", "我的光环-视频投稿"));
+                CheckLoginUtils.checkLogin(getContext(), "我的光环-视频投稿", () -> {
+                    startActivity(VideoManagerActivity.getIntent(getContext(), "", "我的光环-视频投稿"));
+                });
                 break;
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
similarity index 98%
rename from app/src/main/java/com/gh/gamecenter/video/upload/UploadVideoActivity.kt
rename to app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
index 6f4c3e930b..1265d470b3 100644
--- a/app/src/main/java/com/gh/gamecenter/video/upload/UploadVideoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video.upload
+package com.gh.gamecenter.video.upload.view
 
 import android.app.Activity
 import android.content.Context
@@ -32,6 +32,8 @@ import com.gh.base.fragment.WaitingDialogFragment
 import com.gh.common.view.DrawableView
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.mvvm.Status
+import com.gh.gamecenter.video.upload.OnUploadListener
+import com.gh.gamecenter.video.upload.UploadManager
 import com.google.android.flexbox.FlexboxLayout
 import org.json.JSONArray
 import java.io.File
@@ -174,7 +176,8 @@ class UploadVideoActivity : BaseActivity() {
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
         if (item.itemId == R.id.menu_text) {
-            if (UploadManager.isUploading(mVideoFileEntity?.path ?: "")) {
+            if (UploadManager.isUploading(mVideoFileEntity?.path
+                            ?: "")) {
                 DialogUtils.showUploadDraftDialog(this@UploadVideoActivity, null, {
                     verifyData(true)
                 })
@@ -342,7 +345,7 @@ class UploadVideoActivity : BaseActivity() {
         val mimeTypeMap = MimeTypeMap.getSingleton()
         val format = mimeTypeMap.getExtensionFromMimeType(contentResolver.getType(fileUri))
 
-        mVideoFileEntity = VideoFileEntity(videoPath, null, timeInSecond, videoFile.length() / 1024, format
+        mVideoFileEntity = VideoFileEntity(videoPath, null, timeInSecond, videoFile.length(), format
                 ?: "")
 
         createUploadTask(videoPath)
@@ -389,7 +392,7 @@ class UploadVideoActivity : BaseActivity() {
     override fun handleBackPressed(): Boolean {
         DialogUtils.showAlertDialog(this, "提示",
                 "视频正在上传中，确定要返回吗？", "确定返回",
-                "暂时不了", DialogUtils.ConfirmListener {finish()}, null)
+                "暂时不了", DialogUtils.ConfirmListener { finish() }, null)
         return true
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/UploadVideoViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoViewModel.kt
similarity index 96%
rename from app/src/main/java/com/gh/gamecenter/video/upload/UploadVideoViewModel.kt
rename to app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoViewModel.kt
index dca98241e9..8005db8466 100644
--- a/app/src/main/java/com/gh/gamecenter/video/upload/UploadVideoViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoViewModel.kt
@@ -1,8 +1,7 @@
-package com.gh.gamecenter.video.upload
+package com.gh.gamecenter.video.upload.view
 
 import android.annotation.SuppressLint
 import android.app.Application
-import android.content.Context
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import com.gh.common.util.toJson
@@ -19,11 +18,8 @@ import android.media.ThumbnailUtils
 import android.provider.MediaStore
 import androidx.lifecycle.MediatorLiveData
 import com.gh.base.fragment.WaitingDialogFragment
-import com.gh.common.util.GzipUtils.compress
-import com.halo.assistant.HaloApp
 import java.io.File
 import java.io.FileOutputStream
-import com.gh.common.util.GzipUtils.compress
 import com.gh.common.util.UploadImageUtils
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.manager.UserManager
@@ -112,7 +108,7 @@ class UploadVideoViewModel(application: Application) : AndroidViewModel(applicat
             Utils.toast(application, "视频封面操作失败")
         }
 
-        UploadImageUtils.compressAndUploadImage(UploadImageUtils.UploadType.answer, imagePath, true,
+        UploadImageUtils.compressAndUploadImage(UploadImageUtils.UploadType.poster, imagePath, true,
                 object : UploadImageUtils.OnUploadImageListener {
                     override fun onSuccess(imageUrl: String) {
                         content.poster = imageUrl
diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/VideoFileEntity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/VideoFileEntity.kt
similarity index 79%
rename from app/src/main/java/com/gh/gamecenter/video/upload/VideoFileEntity.kt
rename to app/src/main/java/com/gh/gamecenter/video/upload/view/VideoFileEntity.kt
index 9b5ff9353f..83e0cd56b8 100644
--- a/app/src/main/java/com/gh/gamecenter/video/upload/VideoFileEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/VideoFileEntity.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video.upload
+package com.gh.gamecenter.video.upload.view
 
 data class VideoFileEntity(
         val path: String,
diff --git a/app/src/main/java/com/gh/gamecenter/video/MyDraftAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftAdapter.kt
similarity index 95%
rename from app/src/main/java/com/gh/gamecenter/video/MyDraftAdapter.kt
rename to app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftAdapter.kt
index 719d70e1fe..59cdd4acfd 100644
--- a/app/src/main/java/com/gh/gamecenter/video/MyDraftAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftAdapter.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video
+package com.gh.gamecenter.video.videomanager
 
 import android.app.Activity
 import android.content.Context
@@ -13,7 +13,8 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.baselist.ListAdapter
 import com.gh.gamecenter.databinding.VideoItemBinding
 import com.gh.gamecenter.entity.VideoDraftEntity
-import com.gh.gamecenter.video.upload.UploadVideoActivity
+import com.gh.gamecenter.video.VideoItemViewHolder
+import com.gh.gamecenter.video.upload.view.UploadVideoActivity
 
 class MyDraftAdapter(context: Context,
                      private val mViewModel: MyDraftViewModel,
diff --git a/app/src/main/java/com/gh/gamecenter/video/MyDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftFragment.kt
similarity index 93%
rename from app/src/main/java/com/gh/gamecenter/video/MyDraftFragment.kt
rename to app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftFragment.kt
index e73c9e3df5..ac08b809c3 100644
--- a/app/src/main/java/com/gh/gamecenter/video/MyDraftFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftFragment.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video
+package com.gh.gamecenter.video.videomanager
 
 import android.content.Intent
 import android.os.Bundle
@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.gamecenter.baselist.ListFragment
 import com.gh.gamecenter.entity.VideoDraftEntity
-import com.gh.gamecenter.video.upload.UploadVideoActivity
+import com.gh.gamecenter.video.upload.view.UploadVideoActivity
 
 class MyDraftFragment : ListFragment<VideoDraftEntity, MyDraftViewModel>() {
 
diff --git a/app/src/main/java/com/gh/gamecenter/video/MyDraftViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftViewModel.kt
similarity index 97%
rename from app/src/main/java/com/gh/gamecenter/video/MyDraftViewModel.kt
rename to app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftViewModel.kt
index 656e61969e..db5faa2e4e 100644
--- a/app/src/main/java/com/gh/gamecenter/video/MyDraftViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyDraftViewModel.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video
+package com.gh.gamecenter.video.videomanager
 
 import android.app.Application
 import com.gh.common.util.ErrorHelper
diff --git a/app/src/main/java/com/gh/gamecenter/video/MyVideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoAdapter.kt
similarity index 96%
rename from app/src/main/java/com/gh/gamecenter/video/MyVideoAdapter.kt
rename to app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoAdapter.kt
index 982b093ff7..83228305fb 100644
--- a/app/src/main/java/com/gh/gamecenter/video/MyVideoAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoAdapter.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video
+package com.gh.gamecenter.video.videomanager
 
 import android.content.Context
 import android.view.View
@@ -11,8 +11,8 @@ 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.entity.VideoEntity
 import com.gh.gamecenter.entity.VideoVerifyEntity
+import com.gh.gamecenter.video.VideoItemViewHolder
 import com.lightgame.utils.Utils
 
 class MyVideoAdapter(context: Context,
diff --git a/app/src/main/java/com/gh/gamecenter/video/MyVideoFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoFragment.kt
similarity index 93%
rename from app/src/main/java/com/gh/gamecenter/video/MyVideoFragment.kt
rename to app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoFragment.kt
index e7f387889f..fe484e51c9 100644
--- a/app/src/main/java/com/gh/gamecenter/video/MyVideoFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoFragment.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video
+package com.gh.gamecenter.video.videomanager
 
 import android.content.Intent
 import android.os.Bundle
@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.gamecenter.baselist.ListFragment
 import com.gh.gamecenter.entity.VideoVerifyEntity
-import com.gh.gamecenter.video.upload.UploadVideoActivity
+import com.gh.gamecenter.video.upload.view.UploadVideoActivity
 
 class MyVideoFragment : ListFragment<VideoVerifyEntity, MyVideoViewModel>() {
 
diff --git a/app/src/main/java/com/gh/gamecenter/video/MyVideoViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoViewModel.kt
similarity index 94%
rename from app/src/main/java/com/gh/gamecenter/video/MyVideoViewModel.kt
rename to app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoViewModel.kt
index ca8b5ea2f2..8b68e018a9 100644
--- a/app/src/main/java/com/gh/gamecenter/video/MyVideoViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/MyVideoViewModel.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video
+package com.gh.gamecenter.video.videomanager
 
 import android.app.Application
 import com.gh.gamecenter.baselist.ListViewModel
diff --git a/app/src/main/java/com/gh/gamecenter/video/VideoManagerActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt
similarity index 95%
rename from app/src/main/java/com/gh/gamecenter/video/VideoManagerActivity.kt
rename to app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt
index e7756cec51..7c832c86a0 100644
--- a/app/src/main/java/com/gh/gamecenter/video/VideoManagerActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt
@@ -1,4 +1,4 @@
-package com.gh.gamecenter.video
+package com.gh.gamecenter.video.videomanager
 
 import android.content.Context
 import android.content.Intent
@@ -10,11 +10,10 @@ import androidx.fragment.app.Fragment
 import com.gh.base.BaseActivity
 import com.gh.base.BaseActivity_TabLayout
 import com.gh.common.util.EntranceUtils
-import com.gh.common.util.GhMatisseFilter
 import com.gh.common.util.GhMatisseVideoApplyFilter
 import com.gh.common.util.GhMatisseVideoFilter
 import com.gh.gamecenter.R
-import com.gh.gamecenter.video.upload.UploadVideoActivity
+import com.gh.gamecenter.video.upload.view.UploadVideoActivity
 import com.zhihu.matisse.Matisse
 import com.zhihu.matisse.MimeType
 import com.zhihu.matisse.internal.utils.PathUtils
diff --git a/channel.txt b/channel.txt
index 04ad1bd125..f4b50f1e37 100644
--- a/channel.txt
+++ b/channel.txt
@@ -127,5 +127,6 @@ GH_689
 GH_690
 GH_666
 GH_777
+GH_787
 GH_888
 GH_999
\ No newline at end of file