From aa6fa8a79eccd11541b72724c46596c415582bc8 Mon Sep 17 00:00:00 2001 From: lunaticbum Date: Fri, 20 Sep 2024 14:04:34 +0900 Subject: [PATCH] ... --- .../com/mime/dualscreenview/activity/Intro.kt | 33 ++++++++++--------- .../dualscreenview/view/PagedTextLayout.kt | 2 -- app/src/main/res/drawable/simple_bg.xml | 6 ++++ app/src/main/res/layout/simple_toast.xml | 14 ++++++++ 4 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable/simple_bg.xml create mode 100644 app/src/main/res/layout/simple_toast.xml diff --git a/app/src/main/java/com/mime/dualscreenview/activity/Intro.kt b/app/src/main/java/com/mime/dualscreenview/activity/Intro.kt index cc80e8a..d677bd7 100644 --- a/app/src/main/java/com/mime/dualscreenview/activity/Intro.kt +++ b/app/src/main/java/com/mime/dualscreenview/activity/Intro.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.content.pm.ActivityInfo import android.content.res.Configuration import android.graphics.Bitmap -import android.net.ConnectivityManager import android.net.Uri import android.os.Build import android.os.Bundle @@ -16,11 +15,11 @@ import android.text.InputType import android.text.SpannableStringBuilder import android.text.style.RelativeSizeSpan import android.util.Log -import android.view.Gravity import android.view.KeyEvent import android.view.View import android.view.View.GONE import android.view.View.VISIBLE +import android.view.View.inflate import android.webkit.JavascriptInterface import android.webkit.WebSettings import android.webkit.WebView @@ -56,21 +55,15 @@ import com.mime.dualscreenview.view.PagedTextViewInterface import com.mime.dualscreenview.view.TouchArea import com.mime.dualscreenview.webcontents.BaseWebContentsViewer import com.mime.dualscreenview.webcontents.MainControllInterface -import com.mime.dualscreenview.webcontents.contentsinfo.Booktoki import com.mime.dualscreenview.webcontents.contentsinfo.GotoSomeWhere import com.mime.dualscreenview.webcontents.contentsinfo.NewtokiOne -import com.mime.dualscreenview.webcontents.getT import io.realm.kotlin.UpdatePolicy import io.realm.kotlin.ext.copyFromRealm -import io.realm.kotlin.ext.isManaged import io.realm.kotlin.ext.query -import io.realm.kotlin.ext.realmListOf import org.jsoup.Jsoup import java.lang.System.currentTimeMillis import java.text.SimpleDateFormat import java.util.Date -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit import kotlin.random.Random @@ -431,8 +424,10 @@ class Intro : Base() , MainControllInterface, PagedTextViewInterface { super.onPageStarted(view, url, favicon) } + override fun onPageFinished(webView: WebView?, url: String?) { super.onPageFinished(webView, url) +// val delayed = 3500L + Math.abs(Random.nextLong().rem(9999L)) finishedUrl = url ?: "" webView?.postDelayed({ webView?.evaluateJavascript( @@ -444,22 +439,29 @@ class Intro : Base() , MainControllInterface, PagedTextViewInterface { } } - }, 11000L) + }, delayed) } } fun showToast(origin: String) { runOnUiThread { + val toast = Toast(this) + toast.duration = Toast.LENGTH_SHORT val biggerText = SpannableStringBuilder(origin) biggerText.setSpan(RelativeSizeSpan(1.6f), 0, origin.length, 0) - Toast.makeText( - baseContext, - biggerText, - Toast.LENGTH_SHORT - ).show() + val view: View = inflate(this, com.mime.dualscreenview.R.layout.simple_toast,null) + view.findViewById(com.mime.dualscreenview.R.id.text).text = biggerText + toast.setView(view) + toast.show() +// Toast.makeText( +// baseContext, +// biggerText, +// Toast.LENGTH_SHORT +// ).show() } } + var delayed = 3500L + Math.abs(Random.nextLong().rem(9999L)) var finishedUrl : String? = null inner class SaveHelper { @JavascriptInterface @@ -472,9 +474,10 @@ class Intro : Base() , MainControllInterface, PagedTextViewInterface { // Blog.LOGE("finishedUrl >>> ${finishedUrl} :::: view_padding.get(0)\n${contents}") if (contents.length > 20) { Uri.parse(finishedUrl).path?.let { + delayed = 3500L + Math.abs(Random.nextLong().rem(9999L)) HistoryManager.getBooPageInfoContentsSave(it, contents).apply { HistoryManager.getBookPageInfo(it) { book -> - showToast("saved ${book?.getTitleItem()} :: lenght = ${contents.length}") + showToast("saved ${book?.getTitleItem()} \n:: lenght = ${contents.length} \n:: saveTarget = ${saveTarget.size}\n:: delayed >> ${delayed}") } }.apply { HistoryManager.getBookInfos(it) { saveItem(it)} diff --git a/app/src/main/java/com/mime/dualscreenview/view/PagedTextLayout.kt b/app/src/main/java/com/mime/dualscreenview/view/PagedTextLayout.kt index 948650a..09dd242 100644 --- a/app/src/main/java/com/mime/dualscreenview/view/PagedTextLayout.kt +++ b/app/src/main/java/com/mime/dualscreenview/view/PagedTextLayout.kt @@ -286,9 +286,7 @@ class PagedTextLayout : ConstraintLayout , PagedTextGenerateInterface { } fun forceUpdateUI() { -// mPagedTextViewInterface?.onTouch(TouchArea.Center) hiddenTextView?.doUpdate() -// hanler?.postDelayed(touchTimeover, 3000L) } override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) { diff --git a/app/src/main/res/drawable/simple_bg.xml b/app/src/main/res/drawable/simple_bg.xml new file mode 100644 index 0000000..19f69e2 --- /dev/null +++ b/app/src/main/res/drawable/simple_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/simple_toast.xml b/app/src/main/res/layout/simple_toast.xml new file mode 100644 index 0000000..3d081d9 --- /dev/null +++ b/app/src/main/res/layout/simple_toast.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file