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/action/ActionKuaishou.kt | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/shsening/autouploadvideos/ActionKuaishou.kt b/app/src/main/java/com/shsening/autouploadvideos/action/ActionKuaishou.kt
similarity index 79%
rename from app/src/main/java/com/shsening/autouploadvideos/ActionKuaishou.kt
rename to app/src/main/java/com/shsening/autouploadvideos/action/ActionKuaishou.kt
index 91e05c0..9fbf44d 100644
--- a/app/src/main/java/com/shsening/autouploadvideos/ActionKuaishou.kt
+++ b/app/src/main/java/com/shsening/autouploadvideos/action/ActionKuaishou.kt
@@ -1,15 +1,19 @@
-package com.shsening.autouploadvideos
+package com.shsening.autouploadvideos.action
import android.app.Instrumentation
import android.content.Context
import android.os.SystemClock
import android.os.Handler
+import com.shsening.autouploadvideos.UploadFragment
+import com.shsening.autouploadvideos.UploadSessionActivity
+import com.shsening.autouploadvideos.utils.Utils
+import com.shsening.autouploadvideos.WebviewUtils
-class ActionKuaishou (private var fragment:UploadFragment, private var context:Context, private var threadHandler: Handler, private var videoInfo:Utils.VideoUploadTaskInfo){
+class ActionKuaishou (private var activity: UploadSessionActivity, private var threadHandler: Handler, private var videoInfo: Utils.VideoUploadTaskInfo) :PlatformActionInterface{
- private var webView = fragment.webView
+ private var webView = activity.sessionProfileWebView
var jsCode_CheckContentLoaded = """
@@ -29,16 +33,25 @@
*/
private fun updatePostDescription(){
- WebviewUtils.addValueToDiv(webView,"#work-description-edit",videoInfo.description)
+ WebviewUtils.addValueToDiv(webView, "#work-description-edit", videoInfo.description)
// do not allow download
- WebviewUtils.simpleElementClick(webView,"#setting-tours > div:nth-child(2) > div > label:nth-child(2)")
+ WebviewUtils.simpleElementClick(
+ webView,
+ "#setting-tours > div:nth-child(2) > div > label:nth-child(2)"
+ )
// do not show same city
- WebviewUtils.simpleElementClick(webView,"#setting-tours > div:nth-child(2) > div > label:nth-child(3)")
+ WebviewUtils.simpleElementClick(
+ webView,
+ "#setting-tours > div:nth-child(2) > div > label:nth-child(3)"
+ )
//Scheduled publish
- WebviewUtils.simpleElementClick(webView,"#setting-tours > div:nth-child(4) > div > div > label:nth-child(2)")
+ WebviewUtils.simpleElementClick(
+ webView,
+ "#setting-tours > div:nth-child(4) > div > div > label:nth-child(2)"
+ )
addValueToDatePickerInput(true,"#setting-tours > div:nth-child(4) > div > div:nth-child(2) > div > div > input",videoInfo.datetime)
// 鍦ㄤ富绾跨▼涓缃欢杩熸墽琛�
@@ -48,7 +61,7 @@
}
- fun checkIfContentLoaded() {
+ override fun checkIfContentLoaded() {
webView.postDelayed({
webView.evaluateJavascript(jsCode_CheckContentLoaded) { result ->
if (result == "true") {
@@ -63,7 +76,7 @@
}
private fun startToPublishVideo(){
- WebviewUtils.simpleElementClick(webView,jsPath_PublishVideo)
+ WebviewUtils.simpleElementClick(webView, jsPath_PublishVideo)
checkVideoPublishFinished()
}
private fun checkVideoUploadFinished(){
@@ -87,7 +100,7 @@
webView.evaluateJavascript(jsCode_PublishVideo_Finished) { result ->
if (result == "true") {
// video published successfully!!!
- fragment.startUploadSingleTask()
+ activity.checkAndStartNextTask()
} else {
// 鍏冪礌涓嶅瓨鍦紝1绉掑悗鍐嶆妫�鏌�
webView.postDelayed({
@@ -103,9 +116,9 @@
var datetimes = Utils.validateAndReturnDateTime(targetValue) ?: return
- var dpPanelText = datetimes[0].toString()+"骞�"+Utils.getMonthAbbreviation(datetimes[1]);
+ var dpPanelText = datetimes[0].toString()+"骞�"+ Utils.getMonthAbbreviation(datetimes[1]);
- var dateRowColum = Utils.getDatePosition(datetimes[0],datetimes[1],datetimes[2])?:return;
+ var dateRowColum = Utils.getDatePosition(datetimes[0], datetimes[1], datetimes[2]) ?:return;
val jsCode = """
try {
@@ -149,7 +162,7 @@
private fun simulateSwipeAndUploadVideo() {
val instrumentation = Instrumentation()
- val displayMetrics = context.resources.displayMetrics
+ val displayMetrics = activity.resources.displayMetrics
val width = displayMetrics.widthPixels
val height = displayMetrics.heightPixels
@@ -160,7 +173,7 @@
Thread {
Utils.instrumentationSwipe(instrumentation, startX, y, endX, y)
SystemClock.sleep(500)
- Utils.instrumentationClick(instrumentation, width *4/5f, height *2/ 3f)
+ Utils.instrumentationClick(instrumentation, width * 4 / 5f, height * 2 / 3f)
// back to main thread
threadHandler.post {
checkVideoUploadFinished()
--
Gitblit v1.9.1