From 80fa039de88829e38be193819ffea3f4144297ad Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期二, 10 十二月 2024 16:44:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/shsening/autouploadvideos/UploadSessionActivity.kt | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/shsening/autouploadvideos/UploadSessionActivity.kt b/app/src/main/java/com/shsening/autouploadvideos/UploadSessionActivity.kt
index b06cd33..3ff8236 100644
--- a/app/src/main/java/com/shsening/autouploadvideos/UploadSessionActivity.kt
+++ b/app/src/main/java/com/shsening/autouploadvideos/UploadSessionActivity.kt
@@ -1,11 +1,10 @@
package com.shsening.autouploadvideos
import CookieHelper
-import Profile
+import CookieHelper2
import SessionProfile
import SessionProfileManager
-import android.app.Activity
-import android.content.Intent
+import android.graphics.Bitmap
import android.net.Uri
import android.os.Bundle
import android.os.Handler
@@ -17,13 +16,7 @@
import android.webkit.WebChromeClient
import android.webkit.WebView
import android.webkit.WebViewClient
-import android.widget.ArrayAdapter
import android.widget.Button
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.ProgressBar
-import android.widget.Spinner
-import android.widget.Switch
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
@@ -31,27 +24,18 @@
import com.shsening.autouploadvideos.AppConfig.Companion.SESSION_PROFILE_PALTFORM_LISTS
import com.shsening.autouploadvideos.action.ActionDouyin
import com.shsening.autouploadvideos.action.ActionKuaishou
+import com.shsening.autouploadvideos.action.ActionRedbook
import com.shsening.autouploadvideos.action.ActionShipinhao
import com.shsening.autouploadvideos.utils.DownloadHelper
-import com.shsening.autouploadvideos.utils.DownloadReceiver
import com.shsening.autouploadvideos.utils.Utils
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.json.JSONArray
import java.io.File
-import java.io.IOException
import java.util.LinkedList
import java.util.Queue
-import java.util.UUID
+
class UploadSessionActivity : AppCompatActivity() {
-
+ private var RedbooklUrl: String? = "https://creator.xiaohongshu.com/publish/publish?from=menu"
+ private var DingyuehaolUrl: String? = null
private lateinit var sessionProfileManager: SessionProfileManager
lateinit var sessionProfileWebView:SessionProfileWebView
@@ -99,11 +83,12 @@
override fun onPageStarted(
view: WebView?,
url: String?,
- favicon: android.graphics.Bitmap?
+ favicon: Bitmap?
) {
super.onPageStarted(view, url, favicon)
}
override fun onPageFinished(view: WebView?, url: String?) {
+ println("杩欐槸鍏朵粬椤甸潰"+url)
super.onPageFinished(view, url)
view?.requestFocus() // 纭繚 WebView 鑾峰彇鐒︾偣
//inject action
@@ -117,6 +102,11 @@
"蹇墜" -> {
val action =
ActionKuaishou(activityReference, threadHandler, currentTask)
+ action.checkIfContentLoaded()
+ }
+ "灏忕孩涔�" -> {
+ val action =
+ ActionRedbook(activityReference, threadHandler, currentTask)
action.checkIfContentLoaded()
}
"瑙嗛鍙�" -> {
@@ -133,8 +123,7 @@
CookieHelper.saveSessionProfileUrlCookies(
activityReference,
currentTask.sessionProfileId!!,
- url,
- cookies
+ url
)
} else {
Log.w("shsening", "No cookies found for URL: $url")
--
Gitblit v1.9.1