feat: overview kernel version and font scale

Author: surunzi

src/common/langs/en-US.json

@@ -106,5 +106,8 @@
   "no": "No",
   "minSdkVersion": "Min SDK Version",
   "targetSdkVersion": "Target SDK Version",
-  "onlyPackage": "Only Packages"
+  "onlyPackage": "Only Packages",
+  "kernelVersion": "Kernel Version",
+  "physicalResolution": "Physical Resolution",
+  "fontScale": "Font Scale"
 }

src/common/langs/zh-CN.json

@@ -106,5 +106,8 @@
   "no": "否",
   "minSdkVersion": "最小 SDK 版本",
   "targetSdkVersion": "目标 SDK 版本",
-  "onlyPackage": "仅显示应用"
+  "onlyPackage": "仅显示应用",
+  "kernelVersion": "内核版本",
+  "physicalResolution": "物理分辨率",
+  "fontScale": "字体缩放"
 }

src/main/lib/adb.ts

@@ -57,6 +57,10 @@ async function getOverview(deviceId: string) {
   const device = await client.getDevice(deviceId)
   const properties = await device.getProperties()
   const cpus = await getCpus(deviceId)
+  const [kernelVersion, fontScale] = await shell(deviceId, [
+    'uname -r',
+    'settings get system font_scale',
+  ])
 
   return {
     name: getMarketName(properties) || properties['ro.product.name'],
@@ -68,6 +72,8 @@ async function getOverview(deviceId: string) {
     sdkVersion: properties['ro.build.version.sdk'],
     serialNum: properties['ro.serialno'] || '',
     cpuNum: cpus.length,
+    kernelVersion,
+    fontScale: toNum(fontScale),
     ...(await getStorage(deviceId)),
     ...(await getMemory(deviceId)),
     ...(await getScreen(deviceId)),
@@ -141,23 +147,25 @@ async function screencap(deviceId: string) {
 }
 
 async function getScreen(deviceId: string) {
-  const wmSize = await shell(deviceId, 'wm size')
-  const wmDensity = await shell(deviceId, 'wm density')
-
-  const useOverrideResolution = contain(wmSize, 'Override')
-  const useOverrideDensity = contain(wmDensity, 'Override')
-  const resolution = getPropValue(
-    useOverrideResolution ? 'Override size' : 'Physical size',
-    wmSize
-  )
-  const density = getPropValue(
-    useOverrideDensity ? 'Override density' : 'Physical density',
-    wmDensity
-  )
+  const [wmSize, wmDensity] = await shell(deviceId, ['wm size', 'wm density'])
+
+  const physicalResolution = getPropValue('Physical size', wmSize)
+  const physicalDensity = getPropValue('Physical density', wmDensity)
+
+  const hasOverrideResolution = contain(wmSize, 'Override')
+  const hasOverrideDensity = contain(wmDensity, 'Override')
+  const resolution = hasOverrideResolution
+    ? getPropValue('Override size', wmSize)
+    : physicalResolution
+  const density = hasOverrideDensity
+    ? getPropValue('Override density', wmDensity)
+    : physicalDensity
 
   return {
     resolution,
+    physicalResolution,
     density,
+    physicalDensity,
   }
 }
 

src/main/lib/adb/base.ts

@@ -8,6 +8,7 @@ import Adb, { Client } from '@devicefarmer/adbkit'
 import getPort from 'licia/getPort'
 import toNum from 'licia/toNum'
 import types from 'licia/types'
+import isStr from 'licia/isStr'
 
 let client: Client
 
@@ -91,11 +92,23 @@ export async function init(c: Client) {
   client = c
 }
 
-export async function shell(deviceId: string, cmd: string): Promise<string> {
+export async function shell(deviceId: string, cmd: string): Promise<string>
+export async function shell(deviceId: string, cmd: string[]): Promise<string[]>
+export async function shell(
+  deviceId: string,
+  cmd: string | string[]
+): Promise<string | string[]> {
   const device = await client.getDevice(deviceId)
-  const socket = await device.shell(cmd)
-  const output = await Adb.util.readAll(socket)
-  return output.toString()
+  const cmds: string[] = isStr(cmd) ? [cmd] : cmd
+
+  const socket = await device.shell(cmds.join('\necho "aya_separator"\n'))
+  const output = (await Adb.util.readAll(socket)).toString()
+
+  if (cmds.length === 1) {
+    return output
+  }
+
+  return map(output.split('aya_separator'), trim)
 }
 
 export async function forwardTcp(deviceId: string, remote: string) {

src/main/lib/adb/cpu.ts

@@ -83,12 +83,14 @@ export async function getCpus(deviceId: string, speed = true) {
   })
 
   if (speed) {
-    const freqCmd = map(cpus, (cpu, idx) => {
-      return `cat /sys/devices/system/cpu/cpu${idx}/cpufreq/scaling_cur_freq`
-    }).join('\n')
-    const freq: string = await shell(deviceId, freqCmd)
+    const freqs = await shell(
+      deviceId,
+      map(cpus, (cpu, idx) => {
+        return `cat /sys/devices/system/cpu/cpu${idx}/cpufreq/scaling_cur_freq`
+      })
+    )
     const speeds: number[] = []
-    each(freq.split('\n'), (line) => {
+    each(freqs, (line) => {
       line = trim(line)
       if (!line) {
         return

src/main/lib/adb/fps.ts

@@ -51,12 +51,12 @@ async function getFpsByLatency(deviceId: string, pkg: string) {
     return fps
   }
 
-  const latencyCmd = map(layers, (layer) => {
-    return `dumpsys SurfaceFlinger --latency "${layer}"`
-  }).join('\n echo "aya_separator";\n')
-
-  const latency = await shell(deviceId, latencyCmd)
-  const latencies = latency.split('aya_separator')
+  const latencies = await shell(
+    deviceId,
+    map(layers, (layer) => {
+      return `dumpsys SurfaceFlinger --latency "${layer}"`
+    })
+  )
   const allFps = map(latencies, (latency) => {
     latency = trim(latency)
     let fps = 0