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/ActionShipinhao.kt | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/shsening/autouploadvideos/ActionShipinhao.kt b/app/src/main/java/com/shsening/autouploadvideos/action/ActionShipinhao.kt
similarity index 78%
rename from app/src/main/java/com/shsening/autouploadvideos/ActionShipinhao.kt
rename to app/src/main/java/com/shsening/autouploadvideos/action/ActionShipinhao.kt
index b7e2c05..34c6430 100644
--- a/app/src/main/java/com/shsening/autouploadvideos/ActionShipinhao.kt
+++ b/app/src/main/java/com/shsening/autouploadvideos/action/ActionShipinhao.kt
@@ -1,15 +1,18 @@
-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 ActionShipinhao (private var fragment:UploadFragment, private var context:Context, private var threadHandler: Handler, private var videoInfo:Utils.VideoUploadTaskInfo){
+class ActionShipinhao (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 = """
@@ -28,11 +31,18 @@
* Title,description(including # and @ ) publish datetime etc
*/
private fun updatePostDescription(){
- WebviewUtils.addValueToDiv(webView,"#container-wrap > div.container-center > div > div > div.main-body-wrap.post-create > div.main-body > div > div.post-edit-wrap.material-edit-wrap > div.form > div:nth-child(2) > div.form-item-body > div > div.input-editor",videoInfo.description)
+ WebviewUtils.addValueToDiv(
+ webView,
+ "#container-wrap > div.container-center > div > div > div.main-body-wrap.post-create > div.main-body > div > div.post-edit-wrap.material-edit-wrap > div.form > div:nth-child(2) > div.form-item-body > div > div.input-editor",
+ videoInfo.description
+ )
// publish later radiobox
- WebviewUtils.simpleElementClick(webView,"#container-wrap > div.container-center > div > div > div.main-body-wrap.post-create > div.main-body > div > div.post-edit-wrap.material-edit-wrap > div.form > div.post-time-wrap > div:nth-child(1) > div.form-item-body > div > label:nth-child(2)")
+ WebviewUtils.simpleElementClick(
+ webView,
+ "#container-wrap > div.container-center > div > div > div.main-body-wrap.post-create > div.main-body > div > div.post-edit-wrap.material-edit-wrap > div.form > div.post-time-wrap > div:nth-child(1) > div.form-item-body > div > label:nth-child(2)"
+ )
addValueToDatePickerInput(true,"#container-wrap > div.container-center > div > div > div.main-body-wrap.post-create > div.main-body > div > div.post-edit-wrap.material-edit-wrap > div.form > div.post-time-wrap > div:nth-child(2) > div.form-item-body > dl > dd",videoInfo.datetime)
@@ -44,7 +54,7 @@
}
- fun checkIfContentLoaded() {
+ override fun checkIfContentLoaded() {
webView.postDelayed({
webView.evaluateJavascript(jsCode_CheckContentLoaded) { result ->
if (result == "true") {
@@ -59,7 +69,7 @@
}
private fun startToPublishVideo(){
- WebviewUtils.simpleElementClick(webView,jsPath_PublishVideo)
+ WebviewUtils.simpleElementClick(webView, jsPath_PublishVideo)
checkVideoPublishFinished()
}
private fun checkVideoUploadFinished(){
@@ -83,7 +93,7 @@
webView.evaluateJavascript(jsCode_PublishVideo_Finished) { result ->
if (result == "true") {
// video published successfully!!!
- fragment.startUploadSingleTask()
+ activity.checkAndStartNextTask()
} else {
// 鍏冪礌涓嶅瓨鍦紝1绉掑悗鍐嶆妫�鏌�
webView.postDelayed({
@@ -101,7 +111,7 @@
var dpPanelText = datetimes[0].toString()+"骞� "+datetimes[1].toString()+"鏈�";
- 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 {
@@ -136,7 +146,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
@@ -147,7 +157,7 @@
Thread {
Utils.instrumentationSwipe(instrumentation, startX, y, endX, y)
SystemClock.sleep(500)
- Utils.instrumentationClick(instrumentation, width *4/5f, height / 2f)
+ Utils.instrumentationClick(instrumentation, width * 4 / 5f, height / 2f)
// back to main thread
threadHandler.post {
checkVideoUploadFinished()
--
Gitblit v1.9.1