diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AnalysisActivity.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AnalysisActivity.kt index aa360d1..1e79461 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AnalysisActivity.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AnalysisActivity.kt @@ -17,6 +17,7 @@ import kotlin.collections.component2 class AnalysisActivity : AppCompatActivity() { private lateinit var binding: ActivityAnalysisBinding + private val cpu = AndInfo.instance.cpu private var dialogCpuInfo: DialogCpuInfo? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -38,7 +39,6 @@ class AnalysisActivity : AppCompatActivity() { } private fun initText() { - val cpu = AndInfo.instance.cpu //processor binding.proText1.textTitle.text=getString(R.string.hardware) binding.proText1.textContent.text=cpu.getProcessorName() @@ -98,8 +98,11 @@ class AnalysisActivity : AppCompatActivity() { itemGroupBinding.clu1Text3.textTitle.text=getString(R.string.cluster) itemGroupBinding.clu1Text3.textContent.text="$coresRangeList" itemGroupBinding.clu1Text4.textTitle.text=getString(R.string.max_frequency) - itemGroupBinding.clu1Text4.textContent.text=processor.cluster.frequency.toString()+" MHz" + val maxFrequency= cpu.getCoresDetailedInfo()[processor.core.coreId.toInt()].maxFrequency + itemGroupBinding.clu1Text4.textContent.text="${maxFrequency/ 1_000_000} MHz" + val minFrequency= cpu.getCoresDetailedInfo()[processor.core.coreId.toInt()].minFrequency itemGroupBinding.clu1Text5.textTitle.text=getString(R.string.min_frequency) + itemGroupBinding.clu1Text5.textContent.text="${minFrequency/ 1_000_000} MHz" itemBinding.clusterInfo.addView(itemGroup) println(" CPU${processor.core.coreId}: ${processor.cluster.uarch}") } diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/CameraFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/CameraFragment.kt index 1ef761d..843cac2 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/CameraFragment.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/CameraFragment.kt @@ -152,7 +152,7 @@ class CameraFragment : Fragment() { } } } - +// binding.open2.text=cameraInfo.get binding.videoCheck1.content.text=getString(R.string.hight_speed_video) binding.videoCheck2.content.text=getString(R.string.video_stabilization) diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt index 1fd8ec2..e67c6a1 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt @@ -259,11 +259,15 @@ class HardWareFragment : Fragment() { } } binding.gpuText3.textTitle.text = getString(R.string.max_frequency) + binding.gpuText3.textContent.text = "${gpu.getMaxFrequency()} MHz" binding.gpuText4.textTitle.text = getString(R.string.architecture) + binding.gpuText4.textContent.text=gpu.getArchitecture() binding.gpuText5.textTitle.text = getString(R.string.cores) binding.gpuText5.textContent.text = gpu.getOpenGLExtensionCount().toString() binding.gpuText6.textTitle.text = getString(R.string.total_l2) + binding.gpuText6.textContent.text="${gpu.getCacheSize()} KB" binding.gpuText7.textTitle.text = getString(R.string.bus_width) + binding.gpuText7.textContent.text = "${gpu.getBandwidth()} GB/s" binding.gpuText8.textTitle.text = getString(R.string.vulkan_support) binding.gpuText8.textContent.text = gpu.isVulkanSupported().toString() binding.gpuText9.textTitle.text = getString(R.string.vulkan_API) @@ -274,8 +278,8 @@ class HardWareFragment : Fragment() { dialogExtension?.setContent(it.joinToString()) } } - binding.openItem1.text = gpu.getVendorName() - binding.openItem2.text = gpu.getRendererName() +// binding.openItem1.text = gpu.getVendorName() +// binding.openItem2.text = gpu.getRendererName() binding.openItem3.text = gpu.getOpenGLVersion() } diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCameraMore.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCameraMore.kt index 4c8fa00..d9bbd4e 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCameraMore.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCameraMore.kt @@ -68,6 +68,9 @@ class DialogCameraMore(private val name:String,private val id:String) :BaseDialo cameraInfo.getFocal35mmEquivalent(it)?.let { size -> binding.tv9.setValue("${size.toInt()}x") } + cameraInfo.getFieldOfView(it)?.let { size -> + binding.tv10.setValue(size) + } // 快门速度 cameraInfo.getShutterSpeedRange(it)?.let { size -> binding.tv11.setValue(size) @@ -132,7 +135,6 @@ class DialogCameraMore(private val name:String,private val id:String) :BaseDialo toTitleCase(capability.replace("_", " ")) } binding.more5.text=allInfo - binding.tv10.setValue(capabilities?.get(0) ?: "") } diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCpuInfo.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCpuInfo.kt index 8f23053..09c72eb 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCpuInfo.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogCpuInfo.kt @@ -30,7 +30,8 @@ class DialogCpuInfo :BaseDialogFragment(DialogCpuInfoBindi val itemBinding= ItemDialogCpuBinding.bind(view) itemBinding.cpuTv02.text=setColonBoldText("processor :${processor.core.coreId}") - itemBinding.cpuTv03.text=setColonBoldText("BogoMIPS :" ) + val speedMetric= cpu.getCoresDetailedInfo()[processor.core.coreId.toInt()].speedMetric + itemBinding.cpuTv03.text=setColonBoldText("BogoMIPS : ${String.format("%.2f GHz",speedMetric)}" ) itemBinding.cpuTv04.text=setColonBoldText("Features :${cpu.getCpuFeatures().joinToString(",")}") itemBinding.cpuTv05.text=setColonBoldText("CPU implementer :${processor.core.midr?.implementer}") itemBinding.cpuTv06.text=setColonBoldText("CPU architecture :${processor.core.midr?.architecture}") @@ -40,16 +41,6 @@ class DialogCpuInfo :BaseDialogFragment(DialogCpuInfoBindi binding.container.addView(view) } binding.hardwareTv.text=setColonBoldText("Hardware :${cpu.getProcessorName()}") -// binding.cpuTv01.text=setColonBoldText("Processor :${cpu.getProcessorName()}") -// binding.cpuTv02.text=setColonBoldText("processor :1") -// binding.cpuTv03.text=setColonBoldText("BogoMIPS :3.84" ) -// binding.cpuTv04.text=setColonBoldText("Features :fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid") -// binding.cpuTv05.text=setColonBoldText("CPU implementer :0×41") -// binding.cpuTv06.text=setColonBoldText("CPU architecture :8") -// binding.cpuTv07.text=setColonBoldText("CPU variant :0×0") -// binding.cpuTv08.text=setColonBoldText("CPU part :0×d03") -// binding.cpuTv09.text=setColonBoldText("CPU revision :4") -// binding.hardwareTv.text=setColonBoldText("Hardware :vendor Kirin710") } fun setColonBoldText( text: String) : SpannableString { val colonIndex = text.indexOf(":") diff --git a/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml b/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml index f9b0f0b..55773f0 100644 --- a/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml +++ b/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml @@ -159,22 +159,22 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - - + + + + + + + + + + + + + + + +