From 25e4f0f99ab8571f8e3bf035400c1bf0fb20ca7e Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 22 Apr 2025 15:05:06 +0800 Subject: [PATCH] =?UTF-8?q?v1.1.2|=20=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AF=E4=BB=B6=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- .../app/config/IflytophaldConnectionConfig.java | 4 +- src/main/java/a8k/app/config/VersionConfig.java | 2 +- .../hardware/channel/LisUartChannelConnection.java | 118 +++++++++++++-------- .../java/a8k/extui/page/init/DeviceInitPage.java | 4 + src/main/resources/application.yml | 1 + 6 files changed, 82 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 1c3f7a2..2c0ebad 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,4 @@ tmp/ app.db !/bak/app.db -log/* \ No newline at end of file +/log/* \ No newline at end of file diff --git a/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java b/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java index 07231b4..b2e3ffb 100644 --- a/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java +++ b/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java @@ -17,11 +17,11 @@ public class IflytophaldConnectionConfig { @Value("${iflytophald.datach.port}") Integer datachPort; - String getDatachUrl(String datachannel) { + public String getDatachUrl(String datachannel) { return String.format("ws://%s:%d/%s", ip, datachPort, datachannel); } - String getCmdChBaseUrl(String cmdchannel) { + public String getCmdChBaseUrl(String cmdchannel) { return String.format("http://%s:%d/%s", ip, cmdchPort, cmdchannel); } diff --git a/src/main/java/a8k/app/config/VersionConfig.java b/src/main/java/a8k/app/config/VersionConfig.java index bc14ea9..c4e2928 100644 --- a/src/main/java/a8k/app/config/VersionConfig.java +++ b/src/main/java/a8k/app/config/VersionConfig.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; @Component @Slf4j public class VersionConfig { - static String version = "1.1.1"; + static String version = "1.1.2"; @PostConstruct public void init() { diff --git a/src/main/java/a8k/app/hardware/channel/LisUartChannelConnection.java b/src/main/java/a8k/app/hardware/channel/LisUartChannelConnection.java index 78c5e49..a2d2481 100644 --- a/src/main/java/a8k/app/hardware/channel/LisUartChannelConnection.java +++ b/src/main/java/a8k/app/hardware/channel/LisUartChannelConnection.java @@ -1,55 +1,83 @@ package a8k.app.hardware.channel; + +import a8k.app.config.IflytophaldConnectionConfig; +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import lombok.Value; import lombok.extern.slf4j.Slf4j; import org.java_websocket.client.WebSocketClient; import org.java_websocket.enums.ReadyState; import org.java_websocket.handshake.ServerHandshake; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; import java.net.URI; +// +//@Slf4j +//@Component +//@RequiredArgsConstructor +//public class LisUartChannelConnection { +// WebSocketClient conn; +// IflytophaldConnectionConfig iflytophaldConnectionConfig; +// +// @PostConstruct +// void init() { +// conn = new WebSocketClient(URI.create(iflytophaldConnectionConfig.getDatachUrl("lis"))) { +// @Override +// public void onOpen(ServerHandshake serverHandshake) { +// LisUartChannelConnection.this.onOpen(serverHandshake); +// } +// +// @Override +// public void onMessage(String s) { +// LisUartChannelConnection.this.onMessage(s); +// } +// +// @Override +// public void onClose(int i, String s, boolean b) { +// LisUartChannelConnection.this.onClose(i, s, b); +// } +// +// @Override +// public void onError(Exception e) { +// LisUartChannelConnection.this.onError(e); +// } +// }; +// } +// +// +// public void onOpen(ServerHandshake serverHandshake) { +// log.info("a8k canbus connect sucess"); +// } +// +// public void onMessage(String s) { +// } +// +// public void onClose(int i, String s, boolean b) { +// log.warn("a8k canbus lost connection..."); +// } +// +// public void onError(Exception e) { +// log.info("a8k can-websocket-channel on error"); +// } +// +// // +// // PRIVATE +// // +// @Scheduled(fixedRate = 1000) +// private void autoConnect() { +// if (!conn.isOpen()) { +// if (conn.getReadyState().equals(ReadyState.NOT_YET_CONNECTED)) { +// try { +// conn.connect(); +// } catch (IllegalStateException ignored) { +// } +// } else if (conn.getReadyState().equals(ReadyState.CLOSED)) { +// conn.reconnect(); +// } +// } +// } +//} -@Slf4j -public class LisUartChannelConnection extends WebSocketClient { - String datachurl = null; - String cmdchurl = null; - - public LisUartChannelConnection(String cmdchurl, String datachurl) { - super(URI.create(datachurl)); - log.info("new A8kCanBusConnection: {} {}", cmdchurl, datachurl); - - this.datachurl = datachurl; - this.cmdchurl = cmdchurl; - } - - @Override public void onOpen(ServerHandshake serverHandshake) { - log.info("a8k canbus connect sucess"); - } - @Override public void onMessage(String s) { - } - @Override public void onClose(int i, String s, boolean b) { - log.warn("a8k canbus lost connection..."); - } - - @Override public void onError(Exception e) { - log.info("a8k can-websocket-channel on error"); - } - - // - // PRIVATE - // - @Scheduled(fixedRate = 1000) - private void autoConnect() { - if (!isOpen()) { - if (getReadyState().equals(ReadyState.NOT_YET_CONNECTED)) { - try { - connect(); - } catch (IllegalStateException ignored) { - } - } else if (getReadyState().equals(ReadyState.CLOSED)) { - reconnect(); - } - } - } -} - - +// diff --git a/src/main/java/a8k/extui/page/init/DeviceInitPage.java b/src/main/java/a8k/extui/page/init/DeviceInitPage.java index 7a4349a..d93a208 100644 --- a/src/main/java/a8k/extui/page/init/DeviceInitPage.java +++ b/src/main/java/a8k/extui/page/init/DeviceInitPage.java @@ -52,6 +52,10 @@ public class DeviceInitPage { return gstate.getDeviceInited(); } + @ExtApiStatu(name = "", group = "设备版本", order = 4) + public String appVersion(){ + return gstate.getAppVersion(); + } // public void setInRealMode() { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1e7de1b..028be37 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,6 +6,7 @@ a8k.enableTemperatureCtrl: false device.runmode: "RealMode" iflytophald: +# ip: 192.168.8.10 ip: 127.0.0.1 cmdch.port: 19004 datach.port: 19005