上传文件代码整理

app/src/main/java/com/jld/vod/view/PostFileActivity.kt

@@ -6,7 +6,9 @@ import android.os.Handler
 import android.os.Message
 import android.widget.Toast
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.observe
 import com.jld.vod.R
 import com.jld.vod.base.BaseActivity
 import com.jld.vod.config.Config
@@ -21,6 +23,7 @@ import com.jld.vod.utils.http.ProgressListener
 import com.jld.vod.utils.http.RetrofitCallback
 import com.jld.vod.viewmodel.MainViewModel
 import com.jld.vod.viewmodel.PostFileViewModel
+import com.jld.vod.viewmodel.SplashViewModel
 import okhttp3.Callback
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -122,38 +125,48 @@ class PostFileActivity : BaseActivity() {
 
         //接收U盘广播值
         EventBus.getDefault().register(this)
-        postFileViewModel = ViewModelProviders.of(this).get(PostFileViewModel::class.java)
+
+        //初始化viewmodel
+        postFileViewModel = ViewModelProvider.AndroidViewModelFactory(application).create(PostFileViewModel::class.java)
+
 
         //获取未上传电影列表
         postFileViewModel.findResByNotUploadedmovie()
-        //监听电影列表
-        val observer = Observer<BaseBean<List<MovieResByNotUploaded>>> { res ->
-            LogUtils.logD("movie"+res)
+
+        //初始化电影列表
+        initMovieList()
+        //初始化音乐列表
+        initMusicList()
+        //初始化游戏列表
+        initGameList()
+    }
+
+    /**
+     * 初始化游戏列表
+     */
+    private fun initGameList() {
+        //监听游戏列表
+        postFileViewModel.findResByNotUploadedgameliveData.observe(this){res->
+            LogUtils.logD("game"+res)
             when (res?.code) {
                 BaseBean.SUCCESS -> {
                     finishLoading()
+
                     if (res.data!!.size != 0)
                     {
                         for ((index,data) in res.data.withIndex())
                         {
-                            val file = File(strFilePath, data.movieId.toString()+".mp4")
+                            val file = File(strFilePath, data.gid.toString()+".apk")
                             val mid = data.mid
-                            val resId = data.movieId
+                            val resId = data.gid
                             if (file.exists())
                             {
-                                //上传电影
-                                postFileMovie(file,mid,resId)
-                            }else{
-                                if (flag)
-                                {
-                                    flag = false
-                                    postFileViewModel.findResByNotUploadedmusic()//继续获取未上传音乐列表
-                                }
-
+                                //上传游戏
+                                postFileGame(file,mid,resId)
                             }
                         }
                     }else{
-                        postFileViewModel.findResByNotUploadedmusic()//继续获取未上传音乐列表
+                        LogUtils.logD("上传数据为空")
                     }
                 }
                 BaseBean.ERROR -> {
@@ -163,12 +176,13 @@ class PostFileActivity : BaseActivity() {
                 BaseBean.LOADING -> showLoading()
             }
         }
-        postFileViewModel.findResByNotUploadedmovieliveData.observe(this, observer)
-
+    }
 
-        //监听音乐列表
-        val observer1 = Observer<BaseBean<List<MusicResByNotUploaded>>> { res ->
-            LogUtils.logD("music"+res)
+    /**
+     * 初始化音乐列表
+     */
+    private fun initMusicList() {
+        postFileViewModel.findResByNotUploadedmusicliveData.observe(this){res->
             when (res?.code) {
                 BaseBean.SUCCESS -> {
                     flag = true
@@ -203,31 +217,39 @@ class PostFileActivity : BaseActivity() {
                 BaseBean.LOADING -> showLoading()
             }
         }
-        postFileViewModel.findResByNotUploadedmusicliveData.observe(this, observer1)
-
+    }
 
-        //监听游戏列表
-        val observer2 = Observer<BaseBean<List<GameResByNotUploaded>>> { res ->
-            LogUtils.logD("game"+res)
+    /**
+     * 初始化电影列表
+     */
+    private fun initMovieList() {
+        postFileViewModel.findResByNotUploadedmovieliveData.observe(this){res->
+            LogUtils.logD("movie"+res)
             when (res?.code) {
                 BaseBean.SUCCESS -> {
                     finishLoading()
-
                     if (res.data!!.size != 0)
                     {
                         for ((index,data) in res.data.withIndex())
                         {
-                            val file = File(strFilePath, data.gid.toString()+".apk")
+                            val file = File(strFilePath, data.movieId.toString()+".mp4")
                             val mid = data.mid
-                            val resId = data.gid
+                            val resId = data.movieId
                             if (file.exists())
                             {
-                                //上传游戏
-                                postFileGame(file,mid,resId)
+                                //上传电影
+                                postFileMovie(file,mid,resId)
+                            }else{
+                                if (flag)
+                                {
+                                    flag = false
+                                    postFileViewModel.findResByNotUploadedmusic()//继续获取未上传音乐列表
+                                }
+
                             }
                         }
                     }else{
-                        LogUtils.logD("上传数据为空")
+                        postFileViewModel.findResByNotUploadedmusic()//继续获取未上传音乐列表
                     }
                 }
                 BaseBean.ERROR -> {
@@ -237,8 +259,8 @@ class PostFileActivity : BaseActivity() {
                 BaseBean.LOADING -> showLoading()
             }
         }
-        postFileViewModel.findResByNotUploadedgameliveData.observe(this, observer2)
     }
+
     /**
      * 上传游戏
      */