v2.8.7

solox/public/_iosPerf.py

@@ -11,8 +11,8 @@
 from collections import defaultdict, namedtuple
 from typing import Any, Iterator, Optional, Tuple, Union
 import weakref
-from public.iosperf._device import BaseDevice
-from public.iosperf._proto import *
+from solox.public.iosperf._device import BaseDevice
+from solox.public.iosperf._proto import *
 
 
 class DataType(str, enum.Enum):

solox/public/android_fps.py

@@ -6,8 +6,8 @@
 import time
 import traceback
 from logzero import logger
-from public.adb import adb
-from public.common import Devices
+from solox.public.adb import adb
+from solox.public.common import Devices
 
 d = Devices()
 

solox/public/apm.py

@@ -6,11 +6,11 @@
 from logzero import logger
 import tidevice
 import multiprocessing
-import public._iosPerf as iosP
-from public.iosperf._perf import DataType, Performance
-from public.adb import adb
-from public.common import Devices, File, Method, Platform, Scrcpy
-from public.android_fps import FPSMonitor, TimeUtils
+import solox.public._iosPerf as iosP
+from solox.public.iosperf._perf import DataType, Performance
+from solox.public.adb import adb
+from solox.public.common import Devices, File, Method, Platform, Scrcpy
+from solox.public.android_fps import FPSMonitor, TimeUtils
 
 d = Devices()
 f = File()
@@ -465,7 +465,6 @@ def getPerformance(self, perfTpe: DataType):
             perf_value = perf.start(self.pkgName, callback=self.callback)
         return perf_value
 
-
 class initPerformanceService(object):
     CONFIG_DIR = os.path.dirname(os.path.realpath(__file__))
     CONIFG_PATH = os.path.join(CONFIG_DIR, 'config.json')

solox/public/apm_pk.py

@@ -2,9 +2,9 @@
 import re
 import os
 import time
-from public.adb import adb
-from public.common import Devices, File
-from public.android_fps import FPSMonitor, TimeUtils
+from solox.public.adb import adb
+from solox.public.common import Devices, File
+from solox.public.android_fps import FPSMonitor, TimeUtils
 
 d = Devices()
 f = File()

solox/public/common.py

@@ -18,7 +18,7 @@
 from jinja2 import Environment, FileSystemLoader
 from tidevice._device import Device
 from tidevice import Usbmux
-from public.adb import adb
+from solox.public.adb import adb
 
 
 class Platform:

solox/templates/base.html

@@ -44,6 +44,12 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
                     {% block navbar_nav %}{% endblock %}
                 </div>
             </div>
+            <div class="nav-item dropdown d-none d-md-flex me-3">
+                <a  class="btn  btn-pill w-100" data-bs-toggle="modal" data-bs-target="#modal-communicate">
+                    <svg t="1702865258868" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6909" width="320" height="320"><path d="M462 643c-15.4-78-0.9-144.5 71.3-202.4 56.9-45.6 149.8-49.1 232.7-26.4C752.4 289.5 660.7 152 447.9 157.5c-108.8 2.8-193.8 50.1-281.3 117.8-98.7 76.3-116.2 215.3-91.4 292 19.6 60.4 49.4 98.6 31.2 174.6-9.7 40.7 18.3 43.9 50.1 36.3C231.7 760 248 754.8 312.9 766c64.8 11.2 149.8-6.8 195.2-21.6 1.7-0.6 3.8-1.3 5.7-1.9-27.4-27.5-44.3-61.3-51.8-99.5z" fill="#99C236" p-id="6910"></path><path d="M926.8 517.3c-28.5-46.8-91.1-84.1-160.7-103.1 0.1 0.7 0.2 1.3 0.3 2 22.1 213.4-175.7 300.3-252.6 326.3 26.6 26.7 63.2 47.4 111.1 59.9 71.3 18.6 135.8 4.4 145.4 39.4 5.6 20.4 25.7 33.8 49 16.6 83-60.9 194.8-197.7 107.5-341.1z" fill="#05A9D9" p-id="6911"></path><path d="M766.3 416.2c-0.1-0.7-0.2-1.3-0.3-2-83-22.7-175.8-19.2-232.7 26.4C461.1 498.5 446.6 565 462 643c7.5 38.2 24.4 72 51.8 99.5 76.9-26 274.6-112.9 252.5-326.3z" fill="#029F40" p-id="6912"></path></svg>
+                    {% if lan == 'cn' %} 交流 {% else %} Communicate {% endif %}
+                </a>
+            </div>
             {% if model in ['2-app','2-devices'] %}
             <div class="nav-item dropdown d-none d-md-flex me-3">
                 <a  href="/?platform=Android&lan={{ lan }}" class="btn  btn-pill w-100" >
@@ -139,6 +145,20 @@ <h2 class="page-title">
         </div>
     </footer>
 </div>
+<div class="modal modal-blur fade" id="modal-communicate" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title">{% if lan == 'cn' %} 交流 {% else %} Communicate {% endif %}</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+            请关注SMART TEST的微信公众号，方便大家及时获取社区动态和交流噢！
+            <img style="margin-top: 10px;" src="/static/image/communicate.png">
+        </div>
+      </div>
+    </div>
+  </div>
 <div class="offcanvas offcanvas-end layout-boxed" style="margin-top: 1%;margin-right: 4%;width: 25%;" tabindex="-1" id="offcanvasEnd" aria-labelledby="offcanvasEndLabel">
     <div class="offcanvas-header">
         <h2 class="offcanvas-title" id="offcanvasEndLabel">

solox/view/apis.py

@@ -7,9 +7,9 @@
 from logzero import logger
 from flask import Blueprint
 from solox import __version__
-from public.apm import CPU, Memory, Network, FPS, Battery, GPU, Target
-from public.apm_pk import CPU_PK, MEM_PK, Flow_PK, FPS_PK
-from public.common import Devices, File, Method, Install, Platform, Scrcpy
+from solox.public.apm import CPU, Memory, Network, 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, Scrcpy
 
 d = Devices()
 f = File()

solox/view/pages.py

@@ -4,7 +4,7 @@
 from flask import render_template
 from flask import request
 from logzero import logger
-from public.common import Devices,File,Method
+from solox.public.common import Devices,File,Method
 
 page = Blueprint("page", __name__)
 d = Devices()