2-group-android/DevCheck-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 2-group-android:5eba4eda533b5bb14329be8e6d2cc1961af4417c
Branches Tags
2-group-android:main
..
compare: 2-group-android:1871d1c453f82ddce868c8a3d3179b98d151138a
Branches Tags
2-group-android:main

No commits in common. "5eba4eda533b5bb14329be8e6d2cc1961af4417c" and "1871d1c453f82ddce868c8a3d3179b98d151138a" have entirely different histories.
5eba4eda53 ... 1871d1c453

2 changed files with 8 additions and 19 deletions
Show Stats Expand all files Collapse all files

24
myphoneinfo/andinfo/src/main/java/com/xyzshell/andinfo/libs/NetworkInfo.kt
View File

@ -12,7 +12,6 @@ import android.telephony.*
import android.util.Log
import androidx.annotation.RequiresPermission
import androidx.core.app.ActivityCompat
import java.util.Arrays
import kotlin.text.compareTo
/**
@ -134,18 +133,11 @@ class NetworkInfo(private val context: Context) {
return null
}
val cm = context
.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val activeNetwork = cm.activeNetwork ?: return createEmptyWifiDetails()
val caps = cm.getNetworkCapabilities(activeNetwork) ?: return createEmptyWifiDetails()
val connected = caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
if (!connected) return createEmptyWifiDetails()
return try {
val wifiInfo = wifiManager.connectionInfo ?: return createEmptyWifiDetails()
val connected = wifiInfo.networkId != -1
if (!connected) return createEmptyWifiDetails()
val dhcp = wifiManager.dhcpInfo
val ssid = wifiInfo.ssid?.removePrefix("\"")?.removeSuffix("\"")
@ -254,7 +246,6 @@ class NetworkInfo(private val context: Context) {
@RequiresPermission(Manifest.permission.READ_PHONE_STATE)
fun getMobileDetails(): MobileDetails? {
if (!checkPhonePermissions()) {
Log.i("XXXX","没有权限 READ_PHONE_STATE")
return null
}
@ -355,7 +346,6 @@ class NetworkInfo(private val context: Context) {
simInfos = sims
)
} catch (e: Exception) {
Log.i("XXXX","获取移动数据详情异常: ${e.message}")
null
}
}
@ -456,14 +446,14 @@ class NetworkInfo(private val context: Context) {
/**
* 获取Wi-Fi相关权限列表
*/
fun getWifiPermissionsList(): Array<String> {
fun getWifiPermissionsList(): List<String> {
val perms = mutableListOf<String>()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
perms.add(Manifest.permission.ACCESS_FINE_LOCATION)
} else {
perms.add(Manifest.permission.ACCESS_WIFI_STATE)
}
return perms.toTypedArray()
return perms
}
/**
@ -479,8 +469,8 @@ class NetworkInfo(private val context: Context) {
/**
* 获取电话相关权限列表
*/
fun getPhonePermissionsList(): Array<String> {
return arrayOf(Manifest.permission.READ_PHONE_STATE)
fun getPhonePermissionsList(): List<String> {
return listOf(Manifest.permission.READ_PHONE_STATE)
}
/**

3
myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/DashboardFragment.kt
View File

@ -7,7 +7,6 @@ import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.RequiresPermission
import androidx.core.app.ActivityCompat
import androidx.recyclerview.widget.GridLayoutManager
import com.xyzshell.andinfo.AndInfo
@ -75,8 +74,8 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>() {
}
@RequiresPermission(Manifest.permission.READ_PHONE_STATE)
private fun initCpu() {
binding.layoutCpu.run {
recyclerCpu.run {
adapter = CpuAdapter(requireContext()).apply {