完成部分network
This commit is contained in:
parent
e5a7720af1
commit
aa06fc263f
@ -95,5 +95,8 @@ object SetNumberOrWordUtils {
|
||||
}
|
||||
|
||||
}
|
||||
fun setYesOrNo(boolean: Boolean): String {
|
||||
return if (boolean) "Yes" else "No"
|
||||
}
|
||||
|
||||
}
|
||||
@ -14,6 +14,7 @@ import com.xyzshell.andinfo.libs.NetworkInfo
|
||||
import com.xyzshell.myphoneinfo.R
|
||||
import com.xyzshell.myphoneinfo.custom.PermissionChecker
|
||||
import com.xyzshell.myphoneinfo.custom.SetNumberOrWordUtils.getHoursString
|
||||
import com.xyzshell.myphoneinfo.custom.SetNumberOrWordUtils.setYesOrNo
|
||||
import com.xyzshell.myphoneinfo.databinding.FragmentNetworkBinding
|
||||
import com.xyzshell.myphoneinfo.dialog.ShowLoadFragment
|
||||
import kotlin.toString
|
||||
@ -42,7 +43,6 @@ private lateinit var binding:FragmentNetworkBinding
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
networkInfo= AndInfo.instance.network
|
||||
refreshStatus()
|
||||
setMobileInfo()
|
||||
if(PermissionChecker.getMissingPermissions(context = requireContext()).isNotEmpty()){
|
||||
PermissionChecker.requestSimple(
|
||||
requireActivity(),
|
||||
@ -109,13 +109,16 @@ private lateinit var binding:FragmentNetworkBinding
|
||||
|
||||
private fun refreshStatus() {
|
||||
val currentNetworkType = networkInfo.getCurrentNetworkType()
|
||||
Log.d("NetworkFragment", "currentNetworkType: $currentNetworkType")
|
||||
when (currentNetworkType) {
|
||||
NetworkInfo.NetworkType.WIFI -> {
|
||||
status = 1
|
||||
setWifiDetail()
|
||||
setMobileInfo()
|
||||
}
|
||||
NetworkInfo.NetworkType.MOBILE -> {
|
||||
status = 2
|
||||
setWifiDetail()
|
||||
setMobileInfo()
|
||||
}
|
||||
else -> {
|
||||
@ -139,50 +142,38 @@ private lateinit var binding:FragmentNetworkBinding
|
||||
binding.noConnect.visibility=View.GONE
|
||||
binding.conText1.text=getString(R.string.mobile)
|
||||
binding.connectData.visibility=View.VISIBLE
|
||||
binding.networkLayout.wfText1.textContent.text="Connected"
|
||||
binding.networkLayout.wifiList.visibility=View.VISIBLE
|
||||
binding.networkLayout.llPubShow.visibility=View.VISIBLE
|
||||
Log.d("TTTTTTTT", "wifi not connected")
|
||||
binding.networkLayout.wifiList.visibility=View.GONE
|
||||
binding.networkLayout.llPubShow.visibility=View.GONE
|
||||
networkInfo.getMobileDetails()?.let { mobileDetails ->
|
||||
//mobel
|
||||
// binding.mdText1.textTitle.text=getString(R.string.dual_sim_dual_standby)
|
||||
// binding.mdText2.textTitle.text=getString(R.string.phone_type)
|
||||
// binding.mdText3.textTitle.text=getString(R.string.esim)
|
||||
//
|
||||
// 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.mdText1.textContent.text=setYesOrNo(mobileDetails.dualSim)
|
||||
binding.mdText2.textContent.text="SIM${mobileDetails.phoneType}"
|
||||
binding.mdText3.textContent.text=setYesOrNo(mobileDetails.esimSupported)
|
||||
binding.conTexts.textContent.text=if(mobileDetails.dataEnabled) getString(R.string.connected) else getString(R.string.not_connected)
|
||||
binding.defText1.textContent.text=mobileDetails.dataSim.toString()
|
||||
binding.defText2.textContent.text=mobileDetails.voiceSim.toString()
|
||||
binding.defText3.textContent.text=mobileDetails.smsSim.toString()
|
||||
if(mobileDetails.simInfos.isNotEmpty()){
|
||||
binding.simInfo1.root.visibility=View.VISIBLE
|
||||
binding.simInfo1.simText1.textTitle.text=getString(R.string.status)
|
||||
binding.simInfo1.simText2.textTitle.text=getString(R.string.nation)
|
||||
binding.simInfo1.simText3.textTitle.text=getString(R.string.roaming)
|
||||
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.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){
|
||||
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.simText2.textTitle.text=getString(R.string.nation)
|
||||
binding.simInfo2.simText3.textTitle.text=getString(R.string.roaming)
|
||||
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.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{
|
||||
binding.simInfo1.root.visibility=View.GONE
|
||||
@ -202,44 +193,41 @@ private lateinit var binding:FragmentNetworkBinding
|
||||
binding.networkLayout.wifiList.visibility=View.VISIBLE
|
||||
binding.networkLayout.llPubShow.visibility=View.VISIBLE
|
||||
networkInfo.getWifiDetails()?.let { wifiDetails ->
|
||||
Log.d("TTTTTTTT", (wifiDetails.signalLevelPercent?: "null").toString())
|
||||
wifiDetails.signalLevelPercent?.let { percent->
|
||||
binding.strengthView.setStrength(calculateSignalLevel(percent = percent))
|
||||
}
|
||||
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->
|
||||
binding.strengthView.setStrength(calculateSignalLevel(percent = percent))
|
||||
}
|
||||
|
||||
binding.conText2.text="${wifiDetails.ssid}·${wifiDetails.linkSpeedMbps} Mbps"
|
||||
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.conText2.text="${wifiDetails.ssid}·${wifiDetails.linkSpeedMbps} Mbps"
|
||||
binding.conTExt3.text="${wifiDetails.signalLevelPercent}% ${wifiDetails.rssi} dBm"
|
||||
|
||||
binding.networkLayout.wfText3.textContent.text=wifiDetails.bssid
|
||||
binding.networkLayout.wfText4.textContent.text=wifiDetails.capabilities
|
||||
binding.networkLayout.wfText5.textContent.text="${wifiDetails.linkSpeedMbps} Mbps"
|
||||
binding.networkLayout.wfText6.textContent.text="${wifiDetails.rssi} dBm"
|
||||
binding.networkLayout.wfText7.textContent.text="${wifiDetails.frequency} MHz"
|
||||
binding.networkLayout.wfText8.textContent.text=wifiDetails.channel.toString()
|
||||
binding.networkLayout.wfText10.textContent.text=wifiDetails.standard.toString()
|
||||
binding.networkLayout.wfText3.textContent.text=wifiDetails.bssid
|
||||
binding.networkLayout.wfText4.textContent.text=wifiDetails.capabilities
|
||||
binding.networkLayout.wfText5.textContent.text="${wifiDetails.linkSpeedMbps} Mbps"
|
||||
binding.networkLayout.wfText6.textContent.text="${wifiDetails.rssi} dBm"
|
||||
binding.networkLayout.wfText7.textContent.text="${wifiDetails.frequency} MHz"
|
||||
binding.networkLayout.wfText8.textContent.text=wifiDetails.channel.toString()
|
||||
binding.networkLayout.wfText10.textContent.text=wifiDetails.standard.toString()
|
||||
|
||||
binding.networkLayout.dhText1.textContent.text=wifiDetails.dhcpServer
|
||||
binding.networkLayout.dhText2.textContent.text=getHoursString(wifiDetails.leaseDuration?: 0)
|
||||
binding.networkLayout.dhText3.textContent.text=wifiDetails.gateway
|
||||
binding.networkLayout.dhText4.textContent.text=wifiDetails.subnetMask
|
||||
binding.networkLayout.dhText5.textContent.text=wifiDetails.dns1
|
||||
binding.networkLayout.dhText6.textContent.text=wifiDetails.dns2
|
||||
binding.networkLayout.dhText7.textContent.text=wifiDetails.ip
|
||||
val toString = wifiDetails.ipv6.toString()
|
||||
val ipv6 = toString.replace("[", "").replace("]", "")
|
||||
binding.networkLayout.dhText8.textContent.text=ipv6
|
||||
binding.networkLayout.dhText1.textContent.text=wifiDetails.dhcpServer
|
||||
binding.networkLayout.dhText2.textContent.text=getHoursString(wifiDetails.leaseDuration?: 0)
|
||||
binding.networkLayout.dhText3.textContent.text=wifiDetails.gateway
|
||||
binding.networkLayout.dhText4.textContent.text=wifiDetails.subnetMask
|
||||
binding.networkLayout.dhText5.textContent.text=wifiDetails.dns1
|
||||
binding.networkLayout.dhText6.textContent.text=wifiDetails.dns2
|
||||
binding.networkLayout.dhText7.textContent.text=wifiDetails.ip
|
||||
val toString = wifiDetails.ipv6.toString()
|
||||
val ipv6 = toString.replace("[", "").replace("]", "")
|
||||
binding.networkLayout.dhText8.textContent.text=ipv6
|
||||
|
||||
binding.networkLayout.hardCheck1.image.isSelected= wifiDetails.supportedStandards?.size==5
|
||||
binding.networkLayout.hardCheck2.image.isSelected= wifiDetails.wifiDirect == true
|
||||
binding.networkLayout.hardCheck3.image.isSelected= wifiDetails.wifiAware == true
|
||||
binding.networkLayout.hardCheck4.image.isSelected= wifiDetails.wifiPasspoint == true
|
||||
binding.networkLayout.hardCheck5.image.isSelected= wifiDetails.support5G == true
|
||||
binding.networkLayout.hardCheck6.image.isSelected= wifiDetails.support6G == true
|
||||
binding.networkLayout.hardCheck1.image.isSelected= wifiDetails.supportedStandards?.size==5
|
||||
binding.networkLayout.hardCheck2.image.isSelected= wifiDetails.wifiDirect == true
|
||||
binding.networkLayout.hardCheck3.image.isSelected= wifiDetails.wifiAware == true
|
||||
binding.networkLayout.hardCheck4.image.isSelected= wifiDetails.wifiPasspoint == true
|
||||
binding.networkLayout.hardCheck5.image.isSelected= wifiDetails.support5G == true
|
||||
binding.networkLayout.hardCheck6.image.isSelected= wifiDetails.support6G == true
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -106,7 +106,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="No connection"
|
||||
android:text="@string/not_connected_ly"
|
||||
android:layout_marginStart="30dp"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingVertical="@dimen/dashboard_fragment_padding_vertical"
|
||||
android:paddingHorizontal="@dimen/dashboard_fragment_padding_horizontal"
|
||||
>
|
||||
|
||||
|
||||
@ -319,8 +319,9 @@
|
||||
<string name="uwb_support">UWB support</string>
|
||||
<string name="nfc_support">NFC support</string>
|
||||
<string name="secure_nfc_support">Secure NFC support</string>
|
||||
<string name="connectivity_status">Connected</string>
|
||||
<string name="not_connected">Not connected</string>
|
||||
<string name="connected">Connected</string>
|
||||
<string name="not_connected">Disconnected</string>
|
||||
<string name="not_connected_ly">Not connected</string>
|
||||
<string name="gps">GPS</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>
|
||||
@ -328,4 +329,8 @@
|
||||
<string name="wifi_passpoint_support">Wi-Fi Passpoint support</string>
|
||||
<string name="ghz_band_support">5GHz 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>
|
||||
Loading…
Reference in New Issue
Block a user