diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/deviceManager/thread/HarmonyProvider.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/deviceManager/thread/HarmonyProvider.java index fd6b64f..304b8c6 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/deviceManager/thread/HarmonyProvider.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/deviceManager/thread/HarmonyProvider.java @@ -6,17 +6,22 @@ import net.northking.cctp.upperComputer.deviceManager.thread.util.ThreadJob; import net.northking.cctp.upperComputer.deviceManager.thread.util.ThreadScope; import net.northking.cctp.upperComputer.driver.harmony.HarmonyDevice; import net.northking.cctp.upperComputer.driver.harmony.hdc.HDCConnectStatus; +import net.northking.cctp.upperComputer.driver.harmony.hdc.HDCSession; +import net.northking.cctp.upperComputer.driver.harmony.hdc.Hdc; import net.northking.cctp.upperComputer.driver.harmony.hyppium.HyppiumAgent; import net.northking.cctp.upperComputer.driver.harmony.hyppium.data.DisplaySize; import net.northking.cctp.upperComputer.driver.harmony.ui.UiComponent; import net.northking.cctp.upperComputer.exception.ExecuteException; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.Closeable; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.Map; /** * 鸿蒙设备调用提供器 @@ -466,14 +471,27 @@ public class HarmonyProvider implements Closeable,InitDevice { LinkedHashMap deviceInfo = new LinkedHashMap<>(); //region 设备号 deviceInfo.put("serial", harmonyDevice.getHdcDevice().getConnectKey()); + Map infoMap = new HashMap<>(); + HDCSession hdcSession = Hdc.getInstance().shell(harmonyDevice.getHdcDevice(), "param get"); + String allInfo = hdcSession.readLine(); + String[] split = allInfo.split("\r\n"); + for (int i=0; i