合并代码后提交

Module/DeviceInfo.py

@@ -30,15 +30,11 @@ class Deviceinfo(object):
             lists = Usbmux().device_list()
             # 添加设备逻辑
             for device in lists:
+                print(device)
                 if device not in self.deviceArray:
                     self.screenProxy += 1
                     self.connectDevice(device.udid)
                     self.deviceArray.append(device)
-                    # 创建模型
-                    model = DeviceModel(device.udid,self.screenProxy,type=1)
-                    self.deviceModelList.append(model)
-                    # 发送数据
-                    self.manager.send(model.toDict())
 
             # 处理拔出设备的逻辑
             def removeDevice():
@@ -75,6 +71,17 @@ class Deviceinfo(object):
         try:
             d = wda.USBClient(identifier, 8100)
             LogManager.info("启动wda成功", identifier)
+
+            size = d.window_size()
+            width = size.width
+            height = size.height
+            scale = d.scale
+            # 创建模型
+            model = DeviceModel(identifier, self.screenProxy, width, height, scale, type=1)
+            self.deviceModelList.append(model)
+            # 发送数据
+            self.manager.send(model.toDict())
+
         except Exception as e:
             LogManager.error("启动wda失败。请检查wda是否正常", identifier)
             return
@@ -82,7 +89,7 @@ class Deviceinfo(object):
         d.app_start(WdaAppBundleId)
         d.home()
         time.sleep(2)
-        target = self.relayDeviceScreenPort()
+        target = self.relayDeviceScreenPort(identifier)
         self.pidList.append({
             "target": target,
             "id": identifier
@@ -91,9 +98,9 @@ class Deviceinfo(object):
 
 
     # 转发设备端口
-    def relayDeviceScreenPort(self):
+    def relayDeviceScreenPort(self, udid):
         try:
-            command = f"iproxy.exe {self.screenProxy} 9100"
+            command = f"iproxy.exe -u {udid} {self.screenProxy} 9100"
             # 创建一个没有窗口的进程
             startupinfo = subprocess.STARTUPINFO()
             startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW