Commit 5acce7e9 authored by wanglei's avatar wanglei

========处理跳转系统使用情况落空的问题=========

parent b7be3866
...@@ -15,14 +15,15 @@ import android.os.Build ...@@ -15,14 +15,15 @@ import android.os.Build
import android.provider.Settings import android.provider.Settings
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.widget.Toast
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.adapter.FragmentStateAdapter
import com.google.android.material.tabs.TabLayoutMediator
import com.base.superfilemanager.bean.AppBean import com.base.superfilemanager.bean.AppBean
import com.base.superfilemanager.databinding.ActivityRecentAppBinding
import com.base.superfilemanager.fragment.LaunchesFragment import com.base.superfilemanager.fragment.LaunchesFragment
import com.base.superfilemanager.fragment.ScreenTimeFragment import com.base.superfilemanager.fragment.ScreenTimeFragment
import com.base.superfilemanager.helps.ActivityLauncher import com.base.superfilemanager.helps.ActivityLauncher
...@@ -33,13 +34,14 @@ import com.base.superfilemanager.helps.TimeUtils.YESTERDAY_QUERY ...@@ -33,13 +34,14 @@ import com.base.superfilemanager.helps.TimeUtils.YESTERDAY_QUERY
import com.base.superfilemanager.helps.TimeUtils.timePair import com.base.superfilemanager.helps.TimeUtils.timePair
import com.base.superfilemanager.helps.ads.AdmobUtils import com.base.superfilemanager.helps.ads.AdmobUtils
import com.base.superfilemanager.helps.recentapp.LaunchTimeStat import com.base.superfilemanager.helps.recentapp.LaunchTimeStat
import com.base.superfilemanager.databinding.ActivityRecentAppBinding
import com.base.superfilemanager.helps.recentapp.ScreenTimeStat import com.base.superfilemanager.helps.recentapp.ScreenTimeStat
import com.base.superfilemanager.view.AdPreparationPop import com.base.superfilemanager.view.AdPreparationPop
import com.google.android.material.tabs.TabLayoutMediator
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.json.JSONObject import org.json.JSONObject
import java.util.Locale
class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() { class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() {
...@@ -87,24 +89,31 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() { ...@@ -87,24 +89,31 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() {
} }
} }
binding.tvGrand.setOnClickListener { binding.tvGrand.setOnClickListener {
val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS) val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
intent.addCategory("android.intent.category.DEFAULT") intent.addCategory("android.intent.category.DEFAULT")
intent.data = Uri.parse("package:${context.packageName}") intent.data = Uri.parse("package:${context.packageName}")
launcher.launch(intent) {
LogEx.logDebug(TAG, "launcher callback") if (intent.resolveActivity(packageManager) != null) {
val obj = JSONObject() launcher.launch(intent) {
obj.put("activity", javaClass.simpleName) LogEx.logDebug(TAG, "launcher callback")
val obj = JSONObject()
if (checkUsageAccessSettings()) { obj.put("activity", javaClass.simpleName)
binding.flPermission.visibility = View.GONE
binding.llContent.visibility = View.VISIBLE if (checkUsageAccessSettings()) {
AdPreparationPop(this@RecentAppActivity) { binding.flPermission.visibility = View.GONE
AdmobUtils.showInterstitialAd(this) {} binding.llContent.visibility = View.VISIBLE
AdPreparationPop(this@RecentAppActivity) {
AdmobUtils.showInterstitialAd(this) {}
}
intData()
} else {
finishToMain()
} }
intData()
} else {
finishToMain()
} }
} else {
Toast.makeText(this, "don't support the function!", Toast.LENGTH_SHORT).show()
finishToMain()
} }
} }
} }
...@@ -147,6 +156,7 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() { ...@@ -147,6 +156,7 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() {
} }
} }
@SuppressLint("QueryPermissionsNeeded")
private fun initAppData() { private fun initAppData() {
dataList.clear() dataList.clear()
......
...@@ -99,8 +99,6 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() { ...@@ -99,8 +99,6 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
val text = "11.23".substring(0, 4)
LogEx.logDebug(TAG, "text=$text")
val size = SPUtils.getInstance().getLong("remainSize") ?: 0 val size = SPUtils.getInstance().getLong("remainSize") ?: 0
if (size <= 0L) { if (size <= 0L) {
......
...@@ -43,7 +43,7 @@ object EventHelper { ...@@ -43,7 +43,7 @@ object EventHelper {
Log.e(TAG, "ifAgreePrivacy=$ifAgreePrivacy") Log.e(TAG, "ifAgreePrivacy=$ifAgreePrivacy")
return return
} }
val filterKey = arrayOf("click_start_to_use", "install_referrer", "ad_show", "ad_click", "ad_price") val filterKey = arrayOf("click_start_to_use", "install_referrer", "ad_show", "ad_click", "ad_price", "fcm_receiver")
if (!filterKey.contains(key)) { if (!filterKey.contains(key)) {
return return
} }
......
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