From 6d69d77ba10399bd2b44116b212a43504947df22 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Thu, 16 May 2024 17:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E9=80=9A=E9=81=93=E6=95=B0?=
 =?UTF-8?q?=E7=9B=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xypower/common/MicroPhotoContext.java   | 4 ++--
 mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/xypower/common/MicroPhotoContext.java b/common/src/main/java/com/xypower/common/MicroPhotoContext.java
index 44b2173a..8a067a8a 100644
--- a/common/src/main/java/com/xypower/common/MicroPhotoContext.java
+++ b/common/src/main/java/com/xypower/common/MicroPhotoContext.java
@@ -46,7 +46,7 @@ public class MicroPhotoContext {
         public int heartbeat;
         public int packetSize;
         public int encryption;  //0：不加密 1：明文  2：加密
-        public int channelnum;  //摄像头通道数目
+        public int channels;  //摄像头通道数目
     }
 
     public static class MasterConfig {
@@ -221,7 +221,7 @@ public class MicroPhotoContext {
             appConfig.heartbeat = jsonObject.optInt("heartbeat", 0);
             appConfig.packetSize = jsonObject.optInt("packetSize", 0);
             appConfig.encryption = jsonObject.optInt("encryption", 0);
-            appConfig.channelnum = jsonObject.optInt("channelnum", 4);
+            appConfig.channels = jsonObject.optInt("channels", 4);
 
             if (appConfig.protocol == 0) {
                 appConfig.protocol = DEFAULT_PROTOCOL;
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java
index 86abbce4..0142b6d9 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java
@@ -285,7 +285,7 @@ public class SimUtil {
                             if (integer == 0) {//所有通道
                                 ifmessageCorrect = true;
                                 MicroPhotoContext.AppConfig mpAppConfig = MicroPhotoContext.getMpAppConfig(context);
-                                int channelnum = mpAppConfig.channelnum;
+                                int channelnum = mpAppConfig.channels;
                                 if (channelnum != 0) {
                                     if (ifmessageCorrect) {
                                         for (int i = 1; i <= channelnum; i++) {