fix #210

smart-test-ti · Aug 28, 2023 · cb81e1a · cb81e1a
1 parent e084978
commit cb81e1a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/solox/__init__.py b/solox/__init__.py
@@ -2,4 +2,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '2.7.4'
+__version__ = '2.7.5'
diff --git a/solox/public/common.py b/solox/public/common.py
@@ -164,7 +164,7 @@ def devicesCheck(self, platform, deviceid=None, pkgname=None):
                 raise Exception('platform must be Android or iOS')        
 
     def getDdeviceDetail(self, deviceId, platform):
-        result = {}
+        result = dict()
         match(platform):
             case Platform.Android:
                 result['brand'] = adb.shell(cmd='getprop ro.product.brand', deviceId=deviceId)
@@ -179,7 +179,7 @@ def getDdeviceDetail(self, deviceId, platform):
                 result['brand'] = ios_device.get_value("DeviceClass", no_session=True)
                 result['name'] = ios_device.get_value("DeviceName", no_session=True)
                 result['version'] = ios_device.get_value("ProductVersion", no_session=True)
-                result['serialno'] = ios_device.get_value("SerialNumber", no_session=True)
+                result['serialno'] = deviceId
                 result['wifiadr'] = ios_device.get_value("WiFiAddress", no_session=True)
             case _:
                 raise Exception('{} is undefined'.format(platform)) 

diff --git a/solox/templates/base.html b/solox/templates/base.html
@@ -130,7 +130,7 @@ <h2 class="page-title">
                         </li>
                         <li class="list-inline-item">
                             <a href="https://github.com/smart-test-ti/SoloX/releases" target="_blank" class="link-secondary" rel="noopener">
-                                {% if lan == 'cn' %} 版本 {% else %} Releases {% endif %} . V2.7.4
+                                {% if lan == 'cn' %} 版本 {% else %} Releases {% endif %} . V2.7.5
                             </a>
                         </li>
                     </ul>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		from __future__ import absolute_import

		__version__ = '2.7.4'
		__version__ = '2.7.5'