From 8d61dfc80e3bf224cf9a89465c092b98d2d148c5 Mon Sep 17 00:00:00 2001 From: BlueMatthew Date: Thu, 22 Feb 2024 14:42:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xypower/common/MicroPhotoContext.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/xypower/common/MicroPhotoContext.java b/common/src/main/java/com/xypower/common/MicroPhotoContext.java index 7ddf66f0..465179d2 100644 --- a/common/src/main/java/com/xypower/common/MicroPhotoContext.java +++ b/common/src/main/java/com/xypower/common/MicroPhotoContext.java @@ -133,12 +133,12 @@ public class MicroPhotoContext { String content = readTextFile(appPath + "data/App.json"); JSONObject jsonObject = TextUtils.isEmpty(content) ? new JSONObject() : new JSONObject(content); - appConfig.cmdid = jsonObject.optString("CMDID", ""); - appConfig.server = jsonObject.optString("server", ""); - appConfig.port = jsonObject.optInt("port", 0); - appConfig.protocol = jsonObject.optInt("protocol", DEFAULT_PROTOCOL); - appConfig.networkProtocol = jsonObject.optInt("networkProtocol", 0); - appConfig.network = jsonObject.optInt("network", 0); + appConfig.cmdid = jsonObject.optString(jsonObject.has("cmdid") ? "cmdid" : "CMDID", ""); + appConfig.server = jsonObject.optString(jsonObject.has("server") ? "server" : "Server", ""); + appConfig.port = jsonObject.optInt(jsonObject.has("port") ? "port" : "Port", 0); + appConfig.protocol = jsonObject.optInt(jsonObject.has("protocol") ? "protocol" : "Protocol", DEFAULT_PROTOCOL); + appConfig.networkProtocol = jsonObject.optInt(jsonObject.has("networkProtocol") ? "networkProtocol" : "NetworkProtocol", 0); + appConfig.network = jsonObject.optInt(jsonObject.has("network") ? "network" : "Network", 0); appConfig.heartbeat = jsonObject.optInt("heartbeat", 0); appConfig.packetSize = jsonObject.optInt("packetSize", 0); @@ -161,7 +161,7 @@ public class MicroPhotoContext { String content = readTextFile(appPath + "data/App.json"); JSONObject jsonObject = TextUtils.isEmpty(content) ? new JSONObject() : new JSONObject(content); - appConfig.cmdid = jsonObject.optString("CMDID", ""); + appConfig.cmdid = jsonObject.optString(jsonObject.has("cmdid") ? "cmdid" : "CMDID", ""); appConfig.server = jsonObject.optString(jsonObject.has("server") ? "server" : "Server", ""); appConfig.port = jsonObject.optInt(jsonObject.has("port") ? "port" : "Port", 0); appConfig.protocol = jsonObject.optInt(jsonObject.has("protocol") ? "protocol" : "Protocol", DEFAULT_PROTOCOL);