From 18044f71a8a51ccb962537c8ded50a5904b17c0b Mon Sep 17 00:00:00 2001 From: chenhq Date: Mon, 10 Apr 2023 16:01:04 +0800 Subject: [PATCH] Optimize the error log --- .gitignore | 7 +- README.md | 21 ++-- README.zh.md | 4 +- solox/__init__.py | 2 +- solox/public/apm.py | 1 + solox/public/apm_pk.py | 4 +- solox/public/common.py | 48 +++++---- solox/templates/analysis.html | 74 ++++++++++++++ solox/templates/base.html | 17 ++-- solox/templates/index.html | 179 +++++++++++++++++++++------------- solox/view/apis.py | 31 +++++- solox/view/pages.py | 3 +- 12 files changed, 273 insertions(+), 118 deletions(-) diff --git a/.gitignore b/.gitignore index 216ae3e..3e59c48 100644 --- a/.gitignore +++ b/.gitignore @@ -132,5 +132,8 @@ dmypy.json # Pyre type checker .pyre/ -# report -report/ \ No newline at end of file +# solox +report/ +.log +.xls +adblog/ \ No newline at end of file diff --git a/README.md b/README.md index 40b08db..e223e03 100644 --- a/README.md +++ b/README.md @@ -25,26 +25,31 @@ We are committed to solving inefficient, cumbersome test execution, and our goal ## Installation + ```shell -1.Python:3.10+ (Python 3.6 3.7 3.8 3.9 Please download a version of solox lower than 2.5.4) +1.Python:3.10+ (Python 3.6 ~ 3.9 Please download a version of solox lower than 2.5.4) 2.pip install -U solox 3.pip install -i https://mirrors.ustc.edu.cn/pypi/web/simple -U solox (China) -notice: If Windows users need to test ios, install and start Itunes +Note: If Windows users need to test ios, install and start Itunes ``` ## Startup SoloX + ### default + ```shell python -m solox ``` + ### customize ```shell python -m solox --host={ip} --port={port} ``` -## Collect in python +## Collect in python + ```python from solox.public.apm import APM # solox version >= 2.1.2 @@ -61,7 +66,8 @@ battery = apm.collectBattery() # level:% temperature:°C current:mA voltage:mV p gpu = apm.collectGpu() # % only supports ios ``` -## Collect in API +## Collect in API + ### Start the service in the background ``` @@ -72,14 +78,16 @@ Windows: start /min python3 -m solox & ``` ### Request apm data from api + ```shell Android: http://{ip}:{port}/apm/collect?platform=Android&deviceid=ca6bd5a5&pkgname=com.bilibili.app.in&target=cpu iOS: http://{ip}:{port}/apm/collect?platform=iOS&pkgname=com.bilibili.app.in&target=cpu -target in ['cpu','memory','network','fps','battery'] +target in ['cpu','memory','network','fps','battery','gpu'] ``` ## PK Model + - 2-devices: test the same app on two different phones - 2-apps: test two different apps on two phones with the same configuration @@ -94,9 +102,8 @@ notice: only supports android ## Terminal - windows: PowerShell -- macOS：iTerm2 (https://iterm2.com/) +- macOS：iTerm2 (https://iterm2.com/) ## Thanks - https://github.com/alibaba/taobao-iphone-device - diff --git a/README.zh.md b/README.zh.md index 69895d6..ab2e2ab 100644 --- a/README.zh.md +++ b/README.zh.md @@ -27,7 +27,7 @@ SoloX - Android/iOS性能数据实时采集工具。 ## 安装 ```shell -1.Python:3.10+ (Python 3.6 3.7 3.8 3.9 请下载低于2.5.4的版本) +1.Python:3.10+ (Python 3.6 ~ 3.9 请下载低于2.5.4的版本) 2.pip install -U solox 3.pip install -i https://mirrors.ustc.edu.cn/pypi/web/simple -U solox (在国内推荐使用镜像下载) @@ -76,7 +76,7 @@ Windows: start /min python3 -m solox & Android: http://{ip}:{port}/apm/collect?platform=Android&deviceid=ca6bd5a5&pkgname=com.bilibili.app.in&target=cpu iOS: http://{ip}:{port}/apm/collect?platform=iOS&pkgname=com.bilibili.app.in&target=cpu -target in ['cpu','memory','network','fps','battery'] +target in ['cpu','memory','network','fps','battery','gpu'] ``` ## 对比模式 diff --git a/solox/__init__.py b/solox/__init__.py index b5216d0..523d82e 100644 --- a/solox/__init__.py +++ b/solox/__init__.py @@ -2,4 +2,4 @@ from __future__ import absolute_import -__version__ = '2.5.7' +__version__ = '2.5.8' diff --git a/solox/public/apm.py b/solox/public/apm.py index c72ea6f..690c89c 100644 --- a/solox/public/apm.py +++ b/solox/public/apm.py @@ -20,6 +20,7 @@ class Target: Battery = 'battery' Network = 'network' FPS = 'fps' + GPU = 'gpu' class CPU(object): diff --git a/solox/public/apm_pk.py b/solox/public/apm_pk.py index 769d0e9..f4cc9f3 100644 --- a/solox/public/apm_pk.py +++ b/solox/public/apm_pk.py @@ -153,7 +153,7 @@ def getNetWorkData(self): class FPS_PK: - def __init__(self, pkgNameList: list, deviceId1, deviceId2, surfaceview='true'): + def __init__(self, pkgNameList: list, deviceId1, deviceId2, surfaceview=True): self.pkgNameList = pkgNameList self.deviceId1 = deviceId1 self.deviceId2 = deviceId2 @@ -162,7 +162,7 @@ def __init__(self, pkgNameList: list, deviceId1, deviceId2, surfaceview='true'): def getAndroidFps(self, deviceId, pkgName): """get Android Fps, unit:HZ""" monitors = FPSMonitor(device_id=deviceId, package_name=pkgName, frequency=1, - start_time=TimeUtils.getCurrentTimeUnderline(), surfaceview=self.surfaceview) + surfaceview=self.surfaceview, start_time=TimeUtils.getCurrentTimeUnderline()) monitors.start() fps, jank = monitors.stop() return fps diff --git a/solox/public/common.py b/solox/public/common.py index ca9fb1e..8f34d91 100644 --- a/solox/public/common.py +++ b/solox/public/common.py @@ -164,7 +164,7 @@ def export_excel(self, platform, scene): android_log_file_list = ['cpu_app','cpu_sys','mem_total','mem_native','mem_dalvik', 'battery_level', 'battery_tem','upflow','downflow','fps'] ios_log_file_list = ['cpu_app','cpu_sys', 'mem_total', 'battery_tem', 'battery_current', - 'battery_voltage', 'battery_power','upflow','downflow','fps'] + 'battery_voltage', 'battery_power','upflow','downflow','fps','gpu'] log_file_list = android_log_file_list if platform == 'Android' else ios_log_file_list wb = xlwt.Workbook(encoding = 'utf-8') @@ -279,6 +279,12 @@ def getCpuLog(self, platform, scene): result = {'status': 1, 'cpuAppData': targetDic['cpuAppData'], 'cpuSysData': targetDic['cpuSysData']} return result + def getGpuLog(self, platform, scene): + targetDic = {} + targetDic['gpu'] = self.readLog(scene=scene, filename='gpu.log')[0] + result = {'status': 1, 'gpu': targetDic['gpu']} + return result + def getMemLog(self, platform, scene): targetDic = {} targetDic['memTotalData'] = self.readLog(scene=scene, filename='mem_total.log')[0] @@ -408,36 +414,39 @@ def _setAndroidPerfs(self, scene): def _setiOSPerfs(self, scene): """Aggregate APM data for iOS""" - cpuAppData = self.readLog(scene=scene, filename=f'cpu_app.log')[1] + cpuAppData = self.readLog(scene=scene, filename='cpu_app.log')[1] cpuAppRate = f'{round(sum(cpuAppData) / len(cpuAppData), 2)}%' - cpuSystemData = self.readLog(scene=scene, filename=f'cpu_sys.log')[1] + cpuSystemData = self.readLog(scene=scene, filename='cpu_sys.log')[1] cpuSystemRate = f'{round(sum(cpuSystemData) / len(cpuSystemData), 2)}%' - totalPassData = self.readLog(scene=scene, filename=f'mem_total.log')[1] + totalPassData = self.readLog(scene=scene, filename='mem_total.log')[1] totalPassAvg = f'{round(sum(totalPassData) / len(totalPassData), 2)}MB' - fpsData = self.readLog(scene=scene, filename=f'fps.log')[1] + fpsData = self.readLog(scene=scene, filename='fps.log')[1] fpsAvg = f'{int(sum(fpsData) / len(fpsData))}HZ/s' - flowSendData = self.readLog(scene=scene, filename=f'upflow.log')[1] + flowSendData = self.readLog(scene=scene, filename='upflow.log')[1] flowSend = f'{round(float(sum(flowSendData) / 1024), 2)}MB' - flowRecvData = self.readLog(scene=scene, filename=f'downflow.log')[1] + flowRecvData = self.readLog(scene=scene, filename='downflow.log')[1] flowRecv = f'{round(float(sum(flowRecvData) / 1024), 2)}MB' - batteryTemlData = self.readLog(scene=scene, filename=f'battery_tem.log')[1] + batteryTemlData = self.readLog(scene=scene, filename='battery_tem.log')[1] batteryTeml = round(sum(batteryTemlData) / len(batteryTemlData), 2) - batteryCurrentData = self.readLog(scene=scene, filename=f'battery_current.log')[1] + batteryCurrentData = self.readLog(scene=scene, filename='battery_current.log')[1] batteryCurrent = round(sum(batteryCurrentData) / len(batteryCurrentData), 2) - batteryVoltageData = self.readLog(scene=scene, filename=f'battery_voltage.log')[1] + batteryVoltageData = self.readLog(scene=scene, filename='battery_voltage.log')[1] batteryVoltage = round(sum(batteryVoltageData) / len(batteryVoltageData), 2) - batteryPowerData = self.readLog(scene=scene, filename=f'battery_power.log')[1] + batteryPowerData = self.readLog(scene=scene, filename='battery_power.log')[1] batteryPower = round(sum(batteryPowerData) / len(batteryPowerData), 2) + gpuData = self.readLog(scene=scene, filename='gpu.log')[1] + gpu = round(sum(gpuData) / len(gpuData), 2) + apm_dict = {} apm_dict['cpuAppRate'] = cpuAppRate apm_dict['cpuSystemRate'] = cpuSystemRate @@ -452,29 +461,30 @@ def _setiOSPerfs(self, scene): apm_dict['batteryCurrent'] = batteryCurrent apm_dict['batteryVoltage'] = batteryVoltage apm_dict['batteryPower'] = batteryPower + apm_dict['gpu'] = gpu return apm_dict def _setpkPerfs(self, scene): """Aggregate APM data for pk model""" - cpuAppData1 = self.readLog(scene=scene, filename=f'cpu_app1.log')[1] + cpuAppData1 = self.readLog(scene=scene, filename='cpu_app1.log')[1] cpuAppRate1 = f'{round(sum(cpuAppData1) / len(cpuAppData1), 2)}%' - cpuAppData2 = self.readLog(scene=scene, filename=f'cpu_app2.log')[1] + cpuAppData2 = self.readLog(scene=scene, filename='cpu_app2.log')[1] cpuAppRate2 = f'{round(sum(cpuAppData2) / len(cpuAppData2), 2)}%' - totalPassData1 = self.readLog(scene=scene, filename=f'mem1.log')[1] + totalPassData1 = self.readLog(scene=scene, filename='mem1.log')[1] totalPassAvg1 = f'{round(sum(totalPassData1) / len(totalPassData1), 2)}MB' - totalPassData2 = self.readLog(scene=scene, filename=f'mem2.log')[1] + totalPassData2 = self.readLog(scene=scene, filename='mem2.log')[1] totalPassAvg2 = f'{round(sum(totalPassData2) / len(totalPassData2), 2)}MB' - fpsData1 = self.readLog(scene=scene, filename=f'fps1.log')[1] + fpsData1 = self.readLog(scene=scene, filename='fps1.log')[1] fpsAvg1 = f'{int(sum(fpsData1) / len(fpsData1))}HZ/s' - fpsData2 = self.readLog(scene=scene, filename=f'fps2.log')[1] + fpsData2 = self.readLog(scene=scene, filename='fps2.log')[1] fpsAvg2 = f'{int(sum(fpsData2) / len(fpsData2))}HZ/s' - networkData1 = self.readLog(scene=scene, filename=f'network1.log')[1] + networkData1 = self.readLog(scene=scene, filename='network1.log')[1] network1 = f'{round(float(sum(networkData1) / 1024), 2)}MB' - networkData2 = self.readLog(scene=scene, filename=f'network2.log')[1] + networkData2 = self.readLog(scene=scene, filename='network2.log')[1] network2 = f'{round(float(sum(networkData2) / 1024), 2)}MB' apm_dict = {} diff --git a/solox/templates/analysis.html b/solox/templates/analysis.html index 374293b..e66cd02 100644 --- a/solox/templates/analysis.html +++ b/solox/templates/analysis.html @@ -368,6 +368,29 @@ + {% if platform == 'iOS' %} +
+
+
+
+
+ + GPU + +
+
+
+ GPU +
+
+ Avg: {{ apm_data.gpu }} +
+
+
+
+
+
+ {% endif %}
@@ -469,6 +492,24 @@
+ {% if platform == 'iOS' %} +
+
+
GPU（%）
+
+ + + + + + +
+
+
+
+
+
+ {% endif %} {% endblock %} @@ -483,6 +524,9 @@ if(platform == 'Android'){ $('#jank_loading').click(); } + if(platform == 'iOS'){ + $('#gpu_loading').click(); + } $('#battery_loading').click(); $('#networkdata_loading').click(); }); @@ -632,6 +676,36 @@ }); } + if(platform == 'iOS'){ + var gpu_chart = new ApexCharts(document.querySelector("#chart-gpu"), options('line')); + gpu_chart.render(); + $('#gpu_loading').click(function () { + $.ajax({ + url: '/apm/log', + type: "GET", + async: true, + cache: false, + data:{ + scene:'{{ scene }}', + target:'gpu', + platform:platform + }, + beforeSend: function () { + SwalLoading('Loading','') + }, + complete: function () { + swal.close(); + }, + success: function (data) { + gpu_chart.updateSeries([{ + name: 'gpu', + data: data['gpu'] + }]) + } + }); + }); + } + var fps_chart = new ApexCharts(document.querySelector("#chart-fps"), options('line')); fps_chart.render(); $('#fps_loading').click(function () { diff --git a/solox/templates/base.html b/solox/templates/base.html index 3e057e5..d312ec9 100644 --- a/solox/templates/base.html +++ b/solox/templates/base.html @@ -44,21 +44,20 @@

- - - {% if lan == 'cn' %} 比对模式 {% else %} PK Model {% endif %} + + + {% if lan == 'cn' %} 普通模式 {% else %} Normal Model {% endif %} {% else %}
- - - {% if lan == 'cn' %} 普通模式 {% else %} Normal Model {% endif %} + + + {% if lan == 'cn' %} 比对模式 {% else %} PK Model {% endif %}
- {% endif %}
@@ -137,7 +136,7 @@

  • - {% if lan == 'cn' %} 版本 {% else %} Releases {% endif %} . V2.5.6 + {% if lan == 'cn' %} 版本 {% else %} Releases {% endif %} . V2.5.8
    • diff --git a/solox/templates/index.html b/solox/templates/index.html index db08944..a1c813b 100644 --- a/solox/templates/index.html +++ b/solox/templates/index.html @@ -75,16 +75,6 @@ {% if lan == 'cn' %} 停止 {% else %} Stop {% endif %}

    - {% endblock %} @@ -152,9 +142,9 @@

    {% if lan == 'cn' %} 基础信息 {% else %} Base In {% endif %} - + {% if platform == 'iOS' %} + + {% endif %}
    @@ -180,10 +170,8 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In {% if lan == 'cn' %} 错误日志 {% else %} Error Log {% endif %} - - + + OPEN
    @@ -217,16 +205,40 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In
    - +
    {% endif %}
    - - +
    + - {% endblock %} {% block js %} @@ -278,7 +290,7 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In if(lan == 'cn' ){ SwalLoading('初始化','正在获取该设备上的所有APP, 请您稍等！'); }else{ - SwalLoading('Package initialization!','Initializing Packages, please wait。'); + SwalLoading('Package initialization!','Initializing Packages, please wait a mmoment.'); } }, @@ -287,7 +299,7 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In if(lan == 'cn' ){ SwalFire('error', '连接失败','请检查当前移动设备的是否连接了PC端', 2000); }else{ - SwalFire('error', 'Connet failed !', 'Please check if the device is connected', 2000); + SwalFire('error', 'Connet failed !', 'No devices found', 2000); } }else{ for(var i=0;i{% if lan == 'cn' %} 基础信息 {% else %} Base In if(lan == 'cn' ){ SwalLoading('初始化','正在初始化设备环境，请您稍等！'); }else{ - SwalLoading('Device initialization!','Initializing device environment, please wait。'); + SwalLoading('Device initialization!','Initializing device environment, please wait a moment.'); } }, success: function (data) { @@ -334,7 +346,7 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In if(lan == 'cn' ){ SwalFire('error', '连接失败','请检查当前移动设备的是否连接了PC端', 2000); }else{ - SwalFire('error', 'Connet failed !', 'Please check if the device is connected', 2000); + SwalFire('error', 'Connet failed !', 'No devices found', 2000); } }else{ for(var i=0;i{% if lan == 'cn' %} 基础信息 {% else %} Base In }); } + function getGpu(pkgname){ + $.ajax({ + url: Host + "/apm/gpu", + type: "GET", + async: true, + cache: false, + data:{ + pkgname:pkgname + }, + beforeSend: function () { + window.clearTimeout(timerQ); + }, + success: function (data) { + if(stop == false){ + console.log(data) + if(data['status'] == 1){ + try { + var series= gpu_chart.series[0]; + var x = (new Date()).getTime(), + y = data['gpu']; + series.addPoint([x, y], true, true); + timerQ = setTimeout(getGpu(pkgname), 1000); + }catch (e) {} + }else{ + SwalFire('error','something error',data['msg'],2000); + } + } + }, + error: function(){ + SwalFire('error','Host Error','Host is invalid',5000); + } + }); + } + function getBattery(device){ $.ajax({ url: Host + "/apm/battery", @@ -706,7 +752,7 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In }]; var seriesMem = [{ - name : 'totalPass', + name : 'total', pointInterval: 120 * 1000, data : (function () { var data = [], time = (new Date()).getTime(), i; @@ -719,7 +765,7 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In return data; }()) },{ - name : 'nativePass', + name : 'native', pointInterval: 120 * 1000, data : (function () { var data = [], time = (new Date()).getTime(), i; @@ -732,7 +778,7 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In return data; }()) },{ - name : 'dalvikPass', + name : 'dalvik', pointInterval: 120 * 1000, data : (function () { var data = [], time = (new Date()).getTime(), i; @@ -1016,12 +1062,12 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In return network_chart } - // function gpuInitialize(){ - // if(platform == 'iOS'){ - // let gpu_chart = chartsInitialize('gpu','GPU（%）'); - // return gpu_chart - // } - // } + function gpuInitialize(){ + if(platform == 'iOS'){ + let gpu_chart = chartsInitialize('gpu','GPU（%）'); + return gpu_chart + } + } function fpsInitialize(){ //初始化fps @@ -1041,7 +1087,7 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In var network_chart = networkInitialize(); var fps_chart = fpsInitialize(); var battery_chart = batteryInitialize(); - // var gpu_chart = gpuInitialize() + var gpu_chart = gpuInitialize() function collectPers(device,pkgname=null,type,title,func){ @@ -1140,6 +1186,14 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In } } + function collectGpu(pkgname){ + var gpu_checkbox = $('#gpu_checkbox').is(':checked'); + if(gpu_checkbox){ + gpuInitialize(); + cpu_chart = collectPers('',pkgname,'gpu','GPU（%）',getGpu(pkgname)); + } + } + function collectBattery(device){ var battery_checkbox = $('#battery_checkbox').is(':checked'); if(battery_checkbox){ @@ -1184,10 +1238,6 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In } } - function stopRun(){ - - } - function stopTask(){ stop = true; var wifi_switch = $('#net-switch').is(':checked'); @@ -1213,10 +1263,6 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In }else{ SwalLoading('Save data','Saving data to generate report, please do not leave.') } - // let device = $('.select-device').val(); - // let pkgname = $('.select-app').val(); - // var net_switch = $('#net-switch').is(':checked'); - // setNetWork('end',device,pkgname,net_switch) }, success: function (data) { if(data['status']==1){ @@ -1242,6 +1288,9 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In collectNetwork(device,pkgname); collectFps(device,pkgname); collectBattery(device); + if(platform == 'iOS'){ + collectGpu(pkgname); + } if(parseInt($('#running_value').val()) > 0){ var times = parseInt($('#running_value').val()) * 60 * 1000 setTimeout("stopTask()", times) @@ -1256,32 +1305,17 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In $('#stop-apm').hide(); }}); - $('#logcat-switch').change(function() { - let flag= $(this).is(':checked'); - if(flag){ - startLogcat(); - $('.apm-btn-list').hide(); - $('.apm-data').hide(); - $('.logcat-btn-list').show(); - $('.logcat-data').show(); - }else{ - $('.logcat-btn-list').hide(); - $('.logcat-data').hide(); - $('.apm-btn-list').show(); - $('.apm-data').show(); - } - }); - var status = false; + var socket = io.connect('http://' + document.domain + ':' + location.port + '/logcat',{'forceNew':true }); function startLogcat() { let device = $('.select-device').val(); if(device){ - $('#logcat_start').hide(); - $('#logcat_stop').show(); - var socket = io.connect('http://' + document.domain + ':' + location.port + '/logcat',{'forceNew':true }); + $('#run-logcat').hide(); + $('#stop-logcat').show(); + socket = io.connect('http://' + document.domain + ':' + location.port + '/logcat',{'forceNew':true }); socket.on('message', function (msg) { if(status){ - $('#logcat-content').prepend(msg.data); + $('#logcat-content').prepend(msg.data + '
    '); } }); }else{ @@ -1290,17 +1324,22 @@
    {% if lan == 'cn' %} 基础信息 {% else %} Base In }; function stopLogcat() { - $('#logcat_stop').hide(); - $('#logcat_start').show(); + $('#run-logcat').show(); + $('#stop-logcat').hide(); status = false; - socket.emit('disconnect_request'); + // socket.emit('disconnect_request'); + socket.close() }; function cppyLogcat() { - let url_content = $("#logcat-content"); - url_content.select(); - document.execCommand("copy"); + const textValue = document.createElement('textarea'); + document.body.appendChild(textValue); + textValue.value = $("#logcat-content").text(); + textValue.select(); + var result = document.execCommand('copy'); + console.log(result) + document.body.removeChild(textValue); SwalFire('success','Copy Success','',1000); }; diff --git a/solox/view/apis.py b/solox/view/apis.py index fb244a9..be5f139 100644 --- a/solox/view/apis.py +++ b/solox/view/apis.py @@ -5,7 +5,7 @@ from logzero import logger from flask import Blueprint import traceback -from solox.public.apm import CPU, MEM, Flow, FPS, Battery,Target +from solox.public.apm import CPU, MEM, Flow, FPS, Battery, GPU, Target from solox.public.apm_pk import CPU_PK, MEM_PK, Flow_PK, FPS_PK from solox.public.common import Devices, file, Method, Install, Platform @@ -133,7 +133,7 @@ def getCpuRate(): cpu = CPU_PK(pkgNameList=pkgNameList, deviceId1=deviceId1, deviceId2=deviceId2) first, second = cpu.getAndroidCpuRate() result = {'status': 1, 'first': first, 'second': second} - case '2-devices': + case '2-app': pkgNameList = pkgname.split(',') deviceId1 = d.getIdbyDevice(device.split(',')[0], 'Android') deviceId2 = d.getIdbyDevice(device.split(',')[1], 'Android') @@ -226,7 +226,7 @@ def getNetWorkData(): network = Flow_PK(pkgNameList=pkgNameList, deviceId1=deviceId1, deviceId2=deviceId2) first, second = network.getNetWorkData() result = {'status': 1, 'first': first, 'second': second} - case '2-devices': + case '2-app': pkgNameList = pkgname.split(',') deviceId1 = d.getIdbyDevice(device.split(',')[0], 'Android') deviceId2 = d.getIdbyDevice(device.split(',')[1], 'Android') @@ -306,6 +306,19 @@ def getBattery(): result = {'status': 1, 'level': 0, 'temperature': 0, 'current':0, 'voltage':0 , 'power':0} return result +@api.route('/apm/gpu', methods=['post', 'get']) +def getGpu(): + """get gpu data""" + pkgname = method._request(request, 'pkgname') + try: + gpu = GPU(pkgname=pkgname) + final = gpu.getGPU() + result = {'status': 1, 'gpu': final} + except Exception: + traceback.print_exc() + result = {'status': 1, 'gpu': 0} + return result + @api.route('/apm/create/report', methods=['post', 'get']) def makeReport(): @@ -376,7 +389,8 @@ def getLogData(): 'mem': f.getMemLog(platform, scene), 'battery': f.getBatteryLog(platform, scene), 'flow': f.getFlowLog(platform, scene), - 'fps': f.getFpsLog(platform, scene) + 'fps': f.getFpsLog(platform, scene), + 'gpu': f.getGpuLog(platform, scene) } result = fucDic[target] except Exception as e: @@ -442,7 +456,14 @@ def apmCollect(): if platform == 'Android': result = {'status': 1, 'level': final[0], 'temperature': final[1]} else: - result = {'status': 1, 'temperature': final[0], 'current': final[1], 'voltage': final[2], 'power': final[3]} + result = {'status': 1, 'temperature': final[0], 'current': final[1], 'voltage': final[2], 'power': final[3]} + case Target.GPU: + if platform == Platform.iOS: + gpu = GPU(pkgname=pkgname) + final = gpu.getGPU() + result = {'status': 1, 'gpu': final} + else: + result = {'status': 0, 'msg': 'not support android'} case _: result = {'status': 0, 'msg': 'no this target'} except Exception as e: diff --git a/solox/view/pages.py b/solox/view/pages.py index 648264b..35b8c7f 100644 --- a/solox/view/pages.py +++ b/solox/view/pages.py @@ -31,7 +31,7 @@ def index(): netdataSendWarning = (0, request.cookies.get('netdataSendWarning'))[request.cookies.get('netdataSendWarning') not in [None, 'NaN']] betteryWarning = (0, request.cookies.get('betteryWarning'))[request.cookies.get('betteryWarning') not in [None, 'NaN']] runningTime = (0, request.cookies.get('runningTime'))[request.cookies.get('runningTime') not in [None, 'NaN']] - solox_host = request.cookies.get('solox_host') + solox_host = ('', request.cookies.get('solox_host'))[request.cookies.get('solox_host') not in [None, 'NaN']] host_switch = request.cookies.get('host_switch') return render_template('index.html', **locals()) @@ -110,6 +110,7 @@ def analysis(): apm_data['batteryCurrent'] = m._setValue(json_data['batteryCurrent']) apm_data['batteryVoltage'] = m._setValue(json_data['batteryVoltage']) apm_data['batteryPower'] = m._setValue(json_data['batteryPower']) + apm_data['gpu'] = m._setValue(json_data['gpu']) f.close() except ZeroDivisionError: pass