浏览代码

Add connection information and serial number to device description

The description appears when hovering over the one-click-deploy button (top-right). This information helps the user distinguish between their devices if multiple are connected or if the same device is connected by both usb and tcpip (two entries in the list for the same device).
Robbie Cooper 6 年之前
父节点
当前提交
37e6a8f901
共有 1 个文件被更改,包括 8 次插入0 次删除
  1. 8 0
      platform/android/export/export.cpp

+ 8 - 0
platform/android/export/export.cpp

@@ -346,9 +346,17 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 								} else if (p.begins_with("ro.opengles.version=")) {
 								} else if (p.begins_with("ro.opengles.version=")) {
 									uint32_t opengl = p.get_slice("=", 1).to_int();
 									uint32_t opengl = p.get_slice("=", 1).to_int();
 									d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl)&0xFF) + "\n";
 									d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl)&0xFF) + "\n";
+								} else if (p.begins_with("ro.boot.serialno=")) {
+									d.description += "Serial: " + p.get_slice("=", 1).strip_edges() + "\n";
 								}
 								}
 							}
 							}
 
 
+							if (d.usb) {
+								d.description += "Connection: USB\n";
+							} else {
+								d.description += "Connection: " + d.id + "\n";
+							}
+
 							d.name = vendor + " " + device;
 							d.name = vendor + " " + device;
 							if (device == String()) continue;
 							if (device == String()) continue;
 						}
 						}