From 2c0fc80a090dd25019e4679add61c14dea1ae63a Mon Sep 17 00:00:00 2001
From: chenhq <laoqi1988_f1@126.com>
Date: Thu, 27 Jul 2023 11:51:13 +0800
Subject: [PATCH] update FAQ

---
 FAQ.md              | 6 ++++++
 solox/public/apm.py | 6 +++---
 solox/web.py        | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index eb681b8..c50305c 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -100,3 +100,9 @@
 * 界面收集：在首页打开“Record Screen”开关，点击Start开始收集数据并同时录制视频，结束后Report管理页会显示播放按钮。
 * Python API收集：record=True。
 * Mac电脑录制视频，请检查Scrcpy是否安装成功，可以自行安装：brew install scrcpy。
+
+## 1️⃣9️⃣ Android哪些指标以来app的进程需要存活？
+
+* Cpu、Memory、Network、FPS
+* 界面如果不选择进程就点击Start收集，那么默认使用的是这个包名的主进程。
+* 界面选择了app的某个进程收集，如果收集过程中将app杀掉，然后再恢复后自动使用的是主进程，有可能和你界面选择的进程不一致。
diff --git a/solox/public/apm.py b/solox/public/apm.py
index b23e04b..9163be1 100644
--- a/solox/public/apm.py
+++ b/solox/public/apm.py
@@ -65,7 +65,7 @@ def getCpuCores(self):
 
     def getSysCpuStat(self):
         """get the total cpu usage at a certain time"""
-        cmd = f'cat /proc/stat |{d.filterType()} ^cpu'
+        cmd = 'cat /proc/stat |{} ^cpu'.format(d.filterType())
         result = adb.shell(cmd=cmd, deviceId=self.deviceId)
         r = re.compile(r'(?<!cpu)\d+')
         toks = r.findall(result)
@@ -125,7 +125,7 @@ def __init__(self, pkgName, deviceId, platform=Platform.Android, pid=None):
     def getAndroidMem(self):
         """Get the Android memory ,unit:MB"""
         try:
-            cmd = f'dumpsys meminfo {self.pid}'
+            cmd = 'dumpsys meminfo {}'.format(self.pid)
             output = adb.shell(cmd=cmd, deviceId=self.deviceId)
             m_total = re.search(r'TOTAL\s*(\d+)', output)
             m_native = re.search(r'Native Heap\s*(\d+)', output)
@@ -224,7 +224,7 @@ def getAndroidNet(self, wifi=True):
         """Get Android send/recv data, unit:KB wlan0/rmnet0"""
         try:
             net = 'wlan0' if wifi else 'rmnet0'
-            cmd = f'cat /proc/{self.pid}/net/dev |{d.filterType()} {net}'
+            cmd = 'cat /proc/{}/net/dev |{} {}'.format(self.pid, d.filterType(), net)
             output_pre = adb.shell(cmd=cmd, deviceId=self.deviceId)
             m_pre = re.search(r'{}:\s*(\d+)\s*\d+\s*\d+\s*\d+\s*\d+\s*\d+\s*\d+\s*\d+\s*(\d+)'.format(net), output_pre)
             sendNum_pre = round(float(float(m_pre.group(2)) / 1024), 2)
diff --git a/solox/web.py b/solox/web.py
index 2f3064b..2202280 100644
--- a/solox/web.py
+++ b/solox/web.py
@@ -129,8 +129,8 @@ def main(host=hostIP(), port=50003):
         pool.apply_async(openUrl, (host, port))
         pool.close()
         pool.join()
-    except Exception as e:
-        logger.exception(e)
     except KeyboardInterrupt:
         logger.info('stop solox success')
-        sys.exit()        
+        sys.exit()
+    except Exception as e:
+        logger.exception(e)