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

完成部分network

Browse Source
This commit is contained in:
yuqian 2026-01-13 14:52:12 +08:00
parent e5a7720af1
commit aa06fc263f
5 changed files with 62 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/SetNumberOrWordUtils.kt
View File

@ -95,5 +95,8 @@ object SetNumberOrWordUtils {
} }
} }
fun setYesOrNo(boolean: Boolean): String {
return if (boolean) "Yes" else "No"
}
} }

56
myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/NetworkFragment.kt
View File

@ -14,6 +14,7 @@ import com.xyzshell.andinfo.libs.NetworkInfo
import com.xyzshell.myphoneinfo.R import com.xyzshell.myphoneinfo.R
import com.xyzshell.myphoneinfo.custom.PermissionChecker import com.xyzshell.myphoneinfo.custom.PermissionChecker
import com.xyzshell.myphoneinfo.custom.SetNumberOrWordUtils.getHoursString import com.xyzshell.myphoneinfo.custom.SetNumberOrWordUtils.getHoursString
import com.xyzshell.myphoneinfo.custom.SetNumberOrWordUtils.setYesOrNo
import com.xyzshell.myphoneinfo.databinding.FragmentNetworkBinding import com.xyzshell.myphoneinfo.databinding.FragmentNetworkBinding
import com.xyzshell.myphoneinfo.dialog.ShowLoadFragment import com.xyzshell.myphoneinfo.dialog.ShowLoadFragment
import kotlin.toString import kotlin.toString
@ -42,7 +43,6 @@ private lateinit var binding:FragmentNetworkBinding
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
networkInfo= AndInfo.instance.network networkInfo= AndInfo.instance.network
refreshStatus() refreshStatus()
setMobileInfo()
if(PermissionChecker.getMissingPermissions(context = requireContext()).isNotEmpty()){ if(PermissionChecker.getMissingPermissions(context = requireContext()).isNotEmpty()){
PermissionChecker.requestSimple( PermissionChecker.requestSimple(
requireActivity(), requireActivity(),
@ -109,13 +109,16 @@ private lateinit var binding:FragmentNetworkBinding
private fun refreshStatus() { private fun refreshStatus() {
val currentNetworkType = networkInfo.getCurrentNetworkType() val currentNetworkType = networkInfo.getCurrentNetworkType()
Log.d("NetworkFragment", "currentNetworkType: $currentNetworkType")
when (currentNetworkType) { when (currentNetworkType) {
NetworkInfo.NetworkType.WIFI -> { NetworkInfo.NetworkType.WIFI -> {
status = 1 status = 1
setWifiDetail() setWifiDetail()
setMobileInfo()
} }
NetworkInfo.NetworkType.MOBILE -> { NetworkInfo.NetworkType.MOBILE -> {
status = 2 status = 2
setWifiDetail()
setMobileInfo() setMobileInfo()
} }
else -> { else -> {
@ -139,50 +142,38 @@ private lateinit var binding:FragmentNetworkBinding
binding.noConnect.visibility=View.GONE binding.noConnect.visibility=View.GONE
binding.conText1.text=getString(R.string.mobile) binding.conText1.text=getString(R.string.mobile)
binding.connectData.visibility=View.VISIBLE binding.connectData.visibility=View.VISIBLE
binding.networkLayout.wfText1.textContent.text="Connected" Log.d("TTTTTTTT", "wifi not connected")
binding.networkLayout.wifiList.visibility=View.VISIBLE binding.networkLayout.wifiList.visibility=View.GONE
binding.networkLayout.llPubShow.visibility=View.VISIBLE binding.networkLayout.llPubShow.visibility=View.GONE
networkInfo.getMobileDetails()?.let { mobileDetails -> networkInfo.getMobileDetails()?.let { mobileDetails ->
//mobel binding.mdText1.textContent.text=setYesOrNo(mobileDetails.dualSim)
// binding.mdText1.textTitle.text=getString(R.string.dual_sim_dual_standby) binding.mdText2.textContent.text="SIM${mobileDetails.phoneType}"
// binding.mdText2.textTitle.text=getString(R.string.phone_type) binding.mdText3.textContent.text=setYesOrNo(mobileDetails.esimSupported)
// binding.mdText3.textTitle.text=getString(R.string.esim) binding.conTexts.textContent.text=if(mobileDetails.dataEnabled) getString(R.string.connected) else getString(R.string.not_connected)
//
// binding.conTexts.textTitle.text=getString(R.string.status)
//
// binding.defText1.textTitle.text=getString(R.string.data)
//
// binding.defText2.textTitle.text=getString(R.string.voice)
// binding.defText3.textTitle.text=getString(R.string.short_message)
//
// binding.simText1.textTitle.text=getString(R.string.status)
// binding.simText2.textTitle.text=getString(R.string.nation)
// binding.simText3.textTitle.text=getString(R.string.roaming)
// binding.simText4.textTitle.text=getString(R.string.network_type)
binding.mdText1.textContent.text=mobileDetails.dualSim.toString()
binding.mdText2.textContent.text=mobileDetails.phoneType.toString()
binding.mdText3.textContent.text=mobileDetails.esimSupported.toString()
binding.conTexts.textContent.text=mobileDetails.dataEnabled.toString()
binding.defText1.textContent.text=mobileDetails.dataSim.toString() binding.defText1.textContent.text=mobileDetails.dataSim.toString()
binding.defText2.textContent.text=mobileDetails.voiceSim.toString() binding.defText2.textContent.text=mobileDetails.voiceSim.toString()
binding.defText3.textContent.text=mobileDetails.smsSim.toString() binding.defText3.textContent.text=mobileDetails.smsSim.toString()
if(mobileDetails.simInfos.isNotEmpty()){ if(mobileDetails.simInfos.isNotEmpty()){
binding.simInfo1.root.visibility=View.VISIBLE
binding.simInfo1.simText1.textTitle.text=getString(R.string.status) binding.simInfo1.simText1.textTitle.text=getString(R.string.status)
binding.simInfo1.simText2.textTitle.text=getString(R.string.nation) binding.simInfo1.simText2.textTitle.text=getString(R.string.nation)
binding.simInfo1.simText3.textTitle.text=getString(R.string.roaming) binding.simInfo1.simText3.textTitle.text=getString(R.string.roaming)
binding.simInfo1.simText4.textTitle.text=getString(R.string.network_type) binding.simInfo1.simText4.textTitle.text=getString(R.string.network_type)
binding.simInfo1.simText1.textContent.text=if(status==2) true.toString() else false.toString() binding.simInfo1.simText1.textContent.text=if(mobileDetails.dataEnabled) getString(R.string.ready) else getString(R.string.not_ready)
binding.simInfo1.simText2.textContent.text=mobileDetails.simInfos[0].countryIso.toString() binding.simInfo1.simText2.textContent.text=mobileDetails.simInfos[0].countryIso.toString()
binding.simInfo1.simText3.textContent.text=mobileDetails.simInfos[0].roaming.toString() binding.simInfo1.simText3.textContent.text=if(mobileDetails.simInfos[0].roaming) getString(R.string.enable) else getString(R.string.disable)
binding.simInfo1.simText4.textContent.text=mobileDetails.simInfos[0].networkTypeText
if(mobileDetails.simInfos.size>1){ if(mobileDetails.simInfos.size>1){
binding.simInfo2.root.visibility=View.VISIBLE binding.simInfo2.root.visibility=View.VISIBLE
binding.simInfo2.simTitle.text=getString(R.string.sim_card_2)
binding.simInfo2.simText1.textTitle.text=getString(R.string.status) binding.simInfo2.simText1.textTitle.text=getString(R.string.status)
binding.simInfo2.simText2.textTitle.text=getString(R.string.nation) binding.simInfo2.simText2.textTitle.text=getString(R.string.nation)
binding.simInfo2.simText3.textTitle.text=getString(R.string.roaming) binding.simInfo2.simText3.textTitle.text=getString(R.string.roaming)
binding.simInfo2.simText4.textTitle.text=getString(R.string.network_type) binding.simInfo2.simText4.textTitle.text=getString(R.string.network_type)
binding.simInfo2.simText1.textContent.text=if(status==2) true.toString() else false.toString() binding.simInfo2.simText1.textContent.text=if(mobileDetails.dataEnabled) getString(R.string.ready) else getString(R.string.not_ready)
binding.simInfo2.simText2.textContent.text=mobileDetails.simInfos[1].countryIso.toString() binding.simInfo2.simText2.textContent.text=mobileDetails.simInfos[1].countryIso.toString()
binding.simInfo2.simText3.textContent.text=mobileDetails.simInfos[1].roaming.toString() binding.simInfo2.simText3.textContent.text=if(mobileDetails.simInfos[1].roaming) getString(R.string.enable) else getString(R.string.disable)
binding.simInfo2.simText4.textContent.text=mobileDetails.simInfos[1].networkTypeText
} }
}else{ }else{
binding.simInfo1.root.visibility=View.GONE binding.simInfo1.root.visibility=View.GONE
@ -202,18 +193,15 @@ private lateinit var binding:FragmentNetworkBinding
binding.networkLayout.wifiList.visibility=View.VISIBLE binding.networkLayout.wifiList.visibility=View.VISIBLE
binding.networkLayout.llPubShow.visibility=View.VISIBLE binding.networkLayout.llPubShow.visibility=View.VISIBLE
networkInfo.getWifiDetails()?.let { wifiDetails -> networkInfo.getWifiDetails()?.let { wifiDetails ->
Log.d("TTTTTTTT", (wifiDetails.signalLevelPercent?: "null").toString()) Log.d("TTTTTTTT", wifiDetails.connected.toString())
binding.networkLayout.wifiList.visibility=View.VISIBLE
binding.networkLayout.wfText1.textContent.text=getString(R.string.connected)
wifiDetails.signalLevelPercent?.let { percent-> wifiDetails.signalLevelPercent?.let { percent->
binding.strengthView.setStrength(calculateSignalLevel(percent = percent)) binding.strengthView.setStrength(calculateSignalLevel(percent = percent))
} }
binding.conText2.text="${wifiDetails.ssid}·${wifiDetails.linkSpeedMbps} Mbps" binding.conText2.text="${wifiDetails.ssid}·${wifiDetails.linkSpeedMbps} Mbps"
binding.conTExt3.text="${wifiDetails.signalLevelPercent}% ${wifiDetails.rssi} dBm" binding.conTExt3.text="${wifiDetails.signalLevelPercent}% ${wifiDetails.rssi} dBm"
if(wifiDetails.connected){
binding.networkLayout.wfText1.textContent.text=getString(R.string.connectivity_status)
}else{
binding.networkLayout.wfText1.textContent.text=getString(R.string.not_connected)
}
binding.networkLayout.wfText3.textContent.text=wifiDetails.bssid binding.networkLayout.wfText3.textContent.text=wifiDetails.bssid
binding.networkLayout.wfText4.textContent.text=wifiDetails.capabilities binding.networkLayout.wfText4.textContent.text=wifiDetails.capabilities

2
myphoneinfo/src/main/res/layout/fragment_network.xml
View File

@ -106,7 +106,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="No connection" android:text="@string/not_connected_ly"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" android:visibility="gone"

1
myphoneinfo/src/main/res/layout/fragment_system_show.xml
View File

@ -17,6 +17,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingVertical="@dimen/dashboard_fragment_padding_vertical"
android:paddingHorizontal="@dimen/dashboard_fragment_padding_horizontal" android:paddingHorizontal="@dimen/dashboard_fragment_padding_horizontal"
> >

9
myphoneinfo/src/main/res/values/strings.xml
View File

@ -319,8 +319,9 @@
<string name="uwb_support">UWB support</string> <string name="uwb_support">UWB support</string>
<string name="nfc_support">NFC support</string> <string name="nfc_support">NFC support</string>
<string name="secure_nfc_support">Secure NFC support</string> <string name="secure_nfc_support">Secure NFC support</string>
<string name="connectivity_status">Connected</string> <string name="connected">Connected</string>
<string name="not_connected">Not connected</string> <string name="not_connected">Disconnected</string>
<string name="not_connected_ly">Not connected</string>
<string name="gps">GPS</string> <string name="gps">GPS</string>
<string name="standard_all">802.11 b/a/g/n/ac/ax/be</string> <string name="standard_all">802.11 b/a/g/n/ac/ax/be</string>
<string name="wifi_direct_support">Wi-Fi Direct support</string> <string name="wifi_direct_support">Wi-Fi Direct support</string>
@ -328,4 +329,8 @@
<string name="wifi_passpoint_support">Wi-Fi Passpoint support</string> <string name="wifi_passpoint_support">Wi-Fi Passpoint support</string>
<string name="ghz_band_support">5GHz band support</string> <string name="ghz_band_support">5GHz band support</string>
<string name="ghz6_band_support">6GHz band support</string> <string name="ghz6_band_support">6GHz band support</string>
<string name="ready">Ready</string>
<string name="not_ready">Not ready</string>
<string name="disable">Disabled</string>
<string name="enable">Enabled</string>
</resources> </resources>