Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-22 01:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into class-abstraction

Browse Source 
# Conflicts:
#	.gitignore
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraSerializer.java
#	Main/src/main/java/com/chameleonvision/vision/enums/StreamDivisor.java
#	Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#	Main/src/main/java/com/chameleonvision/web/Server.java
#	Main/src/main/java/com/chameleonvision/web/SocketHandler.java
This commit is contained in:
Banks Troutman
2019-11-27 17:40:24 -05:00
parent 663786e21b 182ba8abe3
commit a0dddc0289
15 changed files with 275 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Main/src/main/java/com/chameleonvision/web/Server.java
View File

@@ -3,30 +3,33 @@ package com.chameleonvision.web;
import com.chameleonvision.config.ConfigManager;
import io.javalin.Javalin;
public class Server {
public static ServerHandler handler;
private static SocketHandler socketHandler;
public static void main(int port) {
handler = new ServerHandler();
socketHandler = new SocketHandler();
Javalin app = Javalin.create(javalinConfig -> javalinConfig.showJavalinBanner = false);
app.config.addStaticFiles("web");
Javalin app = Javalin.create(javalinConfig -> {
javalinConfig.showJavalinBanner = false;
javalinConfig.addStaticFiles("web");
javalinConfig.enableCorsForAllOrigins();
});
app.ws("/websocket", ws -> {
ws.onConnect(ctx -> {
handler.onConnect(ctx);
socketHandler.onConnect(ctx);
System.out.println("Socket Connected");
});
ws.onClose(ctx -> {
handler.onClose(ctx);
socketHandler.onClose(ctx);
System.out.println("Socket Disconnected");
ConfigManager.saveGeneralSettings();
});
ws.onBinaryMessage(ctx -> {
handler.onBinaryMessage(ctx);
socketHandler.onBinaryMessage(ctx);
});
});
app.post("/api/settings/general", Requesthandler::onGeneralSettings);
app.post("/api/settings/camera", Requesthandler::onCameraSettings);
app.start(port);
}
}
}