From e381baaeebc5b34b8c21f0f6d509b37e195af183 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 29 十一月 2024 11:10:46 +0800
Subject: [PATCH] v2
---
app/src/main/java/com/shsening/autouploadvideos/UploadFragment.kt | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/shsening/autouploadvideos/UploadFragment.kt b/app/src/main/java/com/shsening/autouploadvideos/UploadFragment.kt
index a4a9525..2f30566 100644
--- a/app/src/main/java/com/shsening/autouploadvideos/UploadFragment.kt
+++ b/app/src/main/java/com/shsening/autouploadvideos/UploadFragment.kt
@@ -19,6 +19,10 @@
import androidx.core.content.FileProvider
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
+import com.shsening.autouploadvideos.action.ActionDouyin
+import com.shsening.autouploadvideos.action.ActionKuaishou
+import com.shsening.autouploadvideos.action.ActionShipinhao
+import com.shsening.autouploadvideos.utils.Utils
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import okhttp3.Call
@@ -49,7 +53,7 @@
var uploadTaskList: MutableList<Utils.VideoUploadTaskInfo> =mutableListOf()
- private lateinit var currentUploadVideoInfo:Utils.VideoUploadTaskInfo
+ private lateinit var currentUploadVideoInfo: Utils.VideoUploadTaskInfo
private lateinit var currentUploadServerUrl:String
private val threadHandler = Handler(Looper.getMainLooper())
@@ -68,11 +72,8 @@
override fun onPageFinished(view: WebView?, url: String?) {
super.onPageFinished(view, url)
-
view?.requestFocus()
-
injectPageLoadFinishedActions()
-
}
}
@@ -146,6 +147,8 @@
try {
+ /*
+
when (currentUploadServerType) {
AppConfig.UPLOADSERVERTYPE_DOUYIN -> {
val actionDouyin =
@@ -177,6 +180,8 @@
}
}
+
+ */
}catch (e:Exception){
e.printStackTrace()
}
@@ -309,10 +314,9 @@
currentUploadServerIndex++
}else{
lifecycleScope.launch {
- Utils.sendVideoUploadedMessage(
- requireContext(),
- currentUploadVideoInfo.taskId
- )
+ Utils.sendVideoUploadedMessage(currentUploadVideoInfo.taskId) { result, error ->
+ Toast.makeText(context,error.toString(),Toast.LENGTH_SHORT)
+ }
}
startUploadTask()
}
@@ -325,7 +329,7 @@
}
- private fun uploadVideoUrlAndWait(taskInfo:Utils.VideoUploadTaskInfo){
+ private fun uploadVideoUrlAndWait(taskInfo: Utils.VideoUploadTaskInfo){
try{
currentUploadVideoInfo = taskInfo
@@ -370,7 +374,7 @@
- private suspend fun executeDownloadAndUploadTask(taskInfo:Utils.VideoUploadTaskInfo){
+ private suspend fun executeDownloadAndUploadTask(taskInfo: Utils.VideoUploadTaskInfo){
Utils.downloadCommonFileToExternalFilesDir(requireContext(),taskInfo.videoUrl,taskInfo.filename+".mp4",false)
Utils.downloadCommonFileToExternalFilesDir(requireContext(),taskInfo.coverUrl,taskInfo.filename+".png",false)
}
--
Gitblit v1.9.1