fix: 浏览吧时窗口 Surface 持续刷新(issue #101)

This commit is contained in:
HuanCheng65 2022-06-24 07:22:00 +08:00
parent 7807cddca8
commit d786583248
No known key found for this signature in database
GPG Key ID: E9031EF91A805148
2 changed files with 13 additions and 11 deletions

View File

@ -15,7 +15,6 @@ import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.os.Process
import android.util.Log
import android.view.View
import android.webkit.WebView
import android.widget.FrameLayout
@ -173,10 +172,6 @@ class BaseApplication : Application(), IApp {
private fun checkClipBoard(activity: Activity) {
val clipBoardText = clipBoard
Log.i(
TAG,
"checkClipBoard: ${activity.clipBoardManager.hasPrimaryClip()} $clipBoardText $clipBoardHash ${getClipBoardHash()}"
)
if (clipBoardHash != getClipBoardHash() && clipBoardText != null) {
@RegExp val regex =
"((http|https)://)(([a-zA-Z0-9._-]+\\.[a-zA-Z]{2,6})|([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}))(:[0-9]{1,4})*(/[a-zA-Z0-9&%_./-~-]*)?"

View File

@ -17,6 +17,7 @@ import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
import android.view.Menu
import android.view.MenuItem
import android.view.View
@ -38,7 +39,6 @@ import com.bumptech.glide.request.RequestOptions
import com.bumptech.glide.request.target.SimpleTarget
import com.bumptech.glide.request.transition.Transition
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener
import com.google.android.material.appbar.CollapsingToolbarLayout
import com.google.android.material.button.MaterialButton
import com.google.android.material.floatingactionbutton.FloatingActionButton
@ -163,6 +163,8 @@ class ForumActivity : BaseActivity(), View.OnClickListener, OnRefreshedListener,
@BindView(R.id.collapsing_toolbar)
lateinit var collapsingToolbar: CollapsingToolbarLayout
var titleVisible = false
var headerViewHeight: Int = 0
var toolbarColor: Int = -1
var customToolbarColorEnable = false
@ -246,7 +248,8 @@ class ForumActivity : BaseActivity(), View.OnClickListener, OnRefreshedListener,
}
private fun initView() {
appbar.addOnOffsetChangedListener(OnOffsetChangedListener { _, verticalOffset ->
title = null
appbar.addOnOffsetChangedListener { _, verticalOffset ->
val toolbarScrollOffset = 0 - (verticalOffset + headerView.height)
if (toolbarScrollOffset >= 0) {
val toolbarScrollPercent = toolbarScrollOffset.toFloat() / toolbar.height
@ -270,15 +273,19 @@ class ForumActivity : BaseActivity(), View.OnClickListener, OnRefreshedListener,
} else {
if (!ThemeUtil.isTranslucentTheme(this)) customToolbarColorEnable = true
}
val titleVisible =
val isTitleVisible =
mDataBean != null && forumName != null && abs(verticalOffset) >= forumInfoView.height
val percent: Float = if (abs(verticalOffset) <= forumInfoView.height) {
abs(verticalOffset.toFloat()) / forumInfoView.height.toFloat()
} else {
1f
}
title = if (titleVisible) getString(R.string.title_forum, forumName) else null
toolbarEndBtn.visibility = if (titleVisible) View.VISIBLE else View.GONE
Log.i("OffsetChange", "changed")
if (titleVisible != isTitleVisible) {
title = if (isTitleVisible) getString(R.string.title_forum, forumName) else null
titleVisible = isTitleVisible
}
toolbarEndBtn.visibility = if (isTitleVisible) View.VISIBLE else View.GONE
toolbar.backgroundTintList =
ColorStateList.valueOf(Util.changeAlpha(toolbarColor, percent))
if (animated && ThemeUtil.isTranslucentTheme(this)) {
@ -298,7 +305,7 @@ class ForumActivity : BaseActivity(), View.OnClickListener, OnRefreshedListener,
if (ThemeUtil.isTranslucentTheme(this)) {
setCustomStatusColor(-1)
}
})
}
mAdapter = FragmentTabViewPagerAdapter(supportFragmentManager).apply {
addFragment(
if (PreloadUtil.isPreloading(this@ForumActivity))