Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

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;

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++) {