Commit 43a22ec3 authored by wanglei's avatar wanglei

尝试修复bug

parent de074bb9
...@@ -155,11 +155,17 @@ class FileApp : Application() { ...@@ -155,11 +155,17 @@ class FileApp : Application() {
private fun initEvenParams() { private fun initEvenParams() {
var networkType: NetworkUtils.NetworkType? = null
try {
networkType = NetworkUtils.getNetworkType()
} catch (e: Exception) {
e.printStackTrace()
}
eventParams = EventParams( eventParams = EventParams(
ScreenUtils.getScreenHeight(), ScreenUtils.getScreenHeight(),
ScreenUtils.getScreenWidth(), ScreenUtils.getScreenWidth(),
DeviceUtils.getModel(), DeviceUtils.getModel(),
NetworkUtils.getNetworkType(), networkType,
AppUtils.getAppVersionName(), AppUtils.getAppVersionName(),
DeviceUtils.getAndroidID() DeviceUtils.getAndroidID()
) )
......
...@@ -61,12 +61,18 @@ object EventHelper { ...@@ -61,12 +61,18 @@ object EventHelper {
.put("${pkg}_32", isCharging(FileApp.fContext)) .put("${pkg}_32", isCharging(FileApp.fContext))
.put("${pkg}_33", GravitySensorManager.sensorParam) .put("${pkg}_33", GravitySensorManager.sensorParam)
} else { } else {
var networkType: NetworkUtils.NetworkType? = null
try {
networkType = NetworkUtils.getNetworkType()
} catch (e: Exception) {
e.printStackTrace()
}
d2.put("${pkg}_1", "${ScreenUtils.getScreenHeight()}") d2.put("${pkg}_1", "${ScreenUtils.getScreenHeight()}")
.put("${pkg}_2", "${ScreenUtils.getScreenWidth()}") .put("${pkg}_2", "${ScreenUtils.getScreenWidth()}")
.put("${pkg}_4", Build.MANUFACTURER) .put("${pkg}_4", Build.MANUFACTURER)
.put("${pkg}_3", DeviceUtils.getModel()) .put("${pkg}_3", DeviceUtils.getModel())
.put("${pkg}_5", Build.VERSION.SDK_INT) .put("${pkg}_5", Build.VERSION.SDK_INT)
.put("${pkg}_6", "${NetworkUtils.getNetworkType()}") .put("${pkg}_6", "$networkType")
.put("${pkg}_8", AppUtils.getAppVersionName()) .put("${pkg}_8", AppUtils.getAppVersionName())
.put("${pkg}_9", DeviceUtils.getAndroidID()) .put("${pkg}_9", DeviceUtils.getAndroidID())
.put("${pkg}_10", ConfigHelper.gid) .put("${pkg}_10", ConfigHelper.gid)
......
...@@ -6,7 +6,7 @@ data class EventParams( ...@@ -6,7 +6,7 @@ data class EventParams(
val screenHeight: Int, val screenHeight: Int,
val screenWidth: Int, val screenWidth: Int,
val mode: String, val mode: String,
val networkType: NetworkType, val networkType: NetworkType?,
val appVersionName: String, val appVersionName: String,
val androidID: String val androidID: String
) )
\ No newline at end of file
...@@ -9,6 +9,7 @@ import android.view.LayoutInflater ...@@ -9,6 +9,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import com.zxhyis.toolss.R import com.zxhyis.toolss.R
import com.zxhyis.toolss.ad.EventHelper import com.zxhyis.toolss.ad.EventHelper
import com.zxhyis.toolss.databinding.FragmentAppListBinding import com.zxhyis.toolss.databinding.FragmentAppListBinding
...@@ -19,6 +20,7 @@ import com.zxhyis.toolss.logic.ReportInterface ...@@ -19,6 +20,7 @@ import com.zxhyis.toolss.logic.ReportInterface
import com.zxhyis.toolss.logic.setOnClick import com.zxhyis.toolss.logic.setOnClick
import com.zxhyis.toolss.ui.dialog.AppDetailDialog.showAppDetailDialog import com.zxhyis.toolss.ui.dialog.AppDetailDialog.showAppDetailDialog
import com.zxhyis.toolss.ui.page.appmanager.UsageAccessSettings.checkUsageAccessSettings import com.zxhyis.toolss.ui.page.appmanager.UsageAccessSettings.checkUsageAccessSettings
import kotlinx.coroutines.launch
import net.sourceforge.pinyin4j.PinyinHelper import net.sourceforge.pinyin4j.PinyinHelper
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat
...@@ -39,6 +41,7 @@ class AppListFragment() : Fragment(), ReportInterface { ...@@ -39,6 +41,7 @@ class AppListFragment() : Fragment(), ReportInterface {
private var type: Int = 0 private var type: Int = 0
var isAsc: Boolean = true var isAsc: Boolean = true
private var needPermission: Boolean = false private var needPermission: Boolean = false
private var onViewCreated: Boolean = false
fun setInitData( fun setInitData(
launcher: ActivityLauncher, launcher: ActivityLauncher,
...@@ -68,7 +71,7 @@ class AppListFragment() : Fragment(), ReportInterface { ...@@ -68,7 +71,7 @@ class AppListFragment() : Fragment(), ReportInterface {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
onViewCreated = true
LogEx.logDebug(TAG, "onViewCreated") LogEx.logDebug(TAG, "onViewCreated")
if (needPermission && !requireContext().checkUsageAccessSettings()) { if (needPermission && !requireContext().checkUsageAccessSettings()) {
...@@ -125,13 +128,15 @@ class AppListFragment() : Fragment(), ReportInterface { ...@@ -125,13 +128,15 @@ class AppListFragment() : Fragment(), ReportInterface {
list.clear() list.clear()
list.addAll(dataList) list.addAll(dataList)
orderList() orderList()
if (adapter == null) { if (isVisible || onViewCreated) {
initRv() if (adapter == null) {
} initRv()
if (isRefreshData) { }
binding.progressbar.visibility = View.GONE if (isRefreshData) {
binding.progressbar.visibility = View.GONE
}
adapter?.setData(list)
} }
adapter?.setData(list)
} }
/** /**
......
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