Commit 99a6ad6d authored by wanglei's avatar wanglei

...

parent c780065b
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" /> <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />-->
<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />-->
<application <application
android:name=".MyApplication" android:name=".MyApplication"
...@@ -115,9 +116,9 @@ ...@@ -115,9 +116,9 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" /> tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<service <!-- <service-->
android:name=".service.StayNotificationService" <!-- android:name=".service.StayNotificationService"-->
android:foregroundServiceType="dataSync" /> <!-- android:foregroundServiceType="dataSync" />-->
<meta-data <meta-data
android:name="com.facebook.sdk.ApplicationId" android:name="com.facebook.sdk.ApplicationId"
......
...@@ -50,7 +50,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() { ...@@ -50,7 +50,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
BarUtils.setStatusBarColor(this, Color.TRANSPARENT) BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
startStayNotification() // startStayNotification()
// NotificationUtil.stopNotificationHandler() // NotificationUtil.stopNotificationHandler()
actionId = intent?.extras?.getInt("actionId") ?: -1 actionId = intent?.extras?.getInt("actionId") ?: -1
......
...@@ -2,6 +2,7 @@ package com.base.browserwhite.ui.adapter ...@@ -2,6 +2,7 @@ package com.base.browserwhite.ui.adapter
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.Drawable
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
...@@ -9,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView ...@@ -9,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.ViewHolder import androidx.recyclerview.widget.RecyclerView.ViewHolder
import com.base.browserwhite.R import com.base.browserwhite.R
import com.base.browserwhite.bean.WebSiteBean import com.base.browserwhite.bean.WebSiteBean
import com.base.browserwhite.bean.WebSiteBean.Companion.getLocalImage
import com.base.browserwhite.bean.defaultValue import com.base.browserwhite.bean.defaultValue
import com.base.browserwhite.databinding.ItemWebsiteGrid2Binding import com.base.browserwhite.databinding.ItemWebsiteGrid2Binding
import com.base.browserwhite.databinding.ItemWebsiteGridBinding import com.base.browserwhite.databinding.ItemWebsiteGridBinding
...@@ -16,6 +18,10 @@ import com.base.browserwhite.utils.AppPreferences ...@@ -16,6 +18,10 @@ import com.base.browserwhite.utils.AppPreferences
import com.base.browserwhite.utils.LogEx import com.base.browserwhite.utils.LogEx
import com.base.browserwhite.utils.XmlEx.inflate import com.base.browserwhite.utils.XmlEx.inflate
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.Target
class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit) : class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit) :
RecyclerView.Adapter<WebsiteAdapter.WebSiteViewHolder>() { RecyclerView.Adapter<WebsiteAdapter.WebSiteViewHolder>() {
...@@ -59,7 +65,30 @@ class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit ...@@ -59,7 +65,30 @@ class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit
binding.ivIcon.borderColor = ContextCompat.getColor(context, R.color.color_cbcdd7) binding.ivIcon.borderColor = ContextCompat.getColor(context, R.color.color_cbcdd7)
binding.ivIcon.borderWidth = 1 binding.ivIcon.borderWidth = 1
} }
Glide.with(context).load(bean.icon_url).into(binding.ivIcon) Glide.with(context).load(bean.icon_url).addListener(object : RequestListener<Drawable> {
override fun onLoadFailed(
e: GlideException?,
model: Any?,
target: Target<Drawable>,
isFirstResource: Boolean
): Boolean {
// 返回 false 以允许 Glide 显示错误占位图
return false
}
override fun onResourceReady(
resource: Drawable,
model: Any,
target: Target<Drawable>?,
dataSource: DataSource,
isFirstResource: Boolean
): Boolean {
// 返回 false 以允许 Glide 正常处理加载成功的图片
return false
}
}).error(bean.getLocalImage()).into(binding.ivIcon)
} }
binding.tvName.text = bean.name binding.tvName.text = bean.name
holder.canDrag = !bean.increase holder.canDrag = !bean.increase
...@@ -70,7 +99,30 @@ class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit ...@@ -70,7 +99,30 @@ class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit
else -> { else -> {
val binding = ItemWebsiteGrid2Binding.bind(holder.itemView) val binding = ItemWebsiteGrid2Binding.bind(holder.itemView)
Glide.with(context).load(bean.icon_url).into(binding.iv) Glide.with(context).load(bean.icon_url).addListener(object : RequestListener<Drawable> {
override fun onLoadFailed(
e: GlideException?,
model: Any?,
target: Target<Drawable>,
isFirstResource: Boolean
): Boolean {
// 返回 false 以允许 Glide 显示错误占位图
return false
}
override fun onResourceReady(
resource: Drawable,
model: Any,
target: Target<Drawable>?,
dataSource: DataSource,
isFirstResource: Boolean
): Boolean {
// 返回 false 以允许 Glide 正常处理加载成功的图片
return false
}
}).error(bean.getLocalImage()).into(binding.iv)
binding.tvName.text = bean.name binding.tvName.text = bean.name
val isAdd = AppPreferences.getInstance().getBoolean("${bean.id}_${bean.name}", defaultValue(bean.name)) val isAdd = AppPreferences.getInstance().getBoolean("${bean.id}_${bean.name}", defaultValue(bean.name))
......
...@@ -3,8 +3,6 @@ package com.base.browserwhite.ui.fragment ...@@ -3,8 +3,6 @@ package com.base.browserwhite.ui.fragment
import android.content.ClipData import android.content.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
import android.content.Intent import android.content.Intent
import android.os.Environment
import android.os.Environment.DIRECTORY_DOWNLOADS
import android.view.KeyEvent import android.view.KeyEvent
import android.view.inputmethod.EditorInfo.IME_ACTION_DONE import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
import android.widget.TextView import android.widget.TextView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment