From 57e0118a5342d7c9f27cbbf1d097364144866dc1 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Thu, 19 Oct 2023 16:08:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E7=81=AF?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=B1=9E=E6=80=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 46db249..f28368b 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -241,7 +241,7 @@ message ReplyState { message ButtonState { string id = 1; bool down = 2; - Signal.Aspect aspect = 3; // 带灯的按钮 + bool active = 3; // 带灯的按钮 } // 警铃状态 @@ -253,7 +253,7 @@ message AlarmState { // 灯状态 message LightState { string id = 1; - Signal.Aspect aspect = 2; + bool active = 2; } From 8f23c4062d952bb2d0d39fc91c6d7e4c5ee789fb Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Thu, 19 Oct 2023 17:09:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E6=8E=A7?= =?UTF-8?q?=E7=AE=B1=E4=BA=A4=E4=BA=92=E6=8E=A5=E5=8F=A3=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=97=A8=E6=8E=A7=E7=AE=B1=E6=9E=84=E5=BB=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91bug=EF=BC=9B=E5=A2=9E=E5=8A=A0=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E9=97=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/protos/device_state.proto b/protos/device_state.proto index f28368b..06d312d 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -256,6 +256,12 @@ message LightState { bool active = 2; } +// 屏蔽门状态 +message PsdState { + string id = 1; //屏蔽门的id + repeated string openDoorCodes = 2; //开启的小门的编号 +} + //////////////////////////////////////////////////////////////////////////// @@ -291,6 +297,8 @@ message AllDevicesStatus{ repeated AlarmState AlarmState = 7; // 灯状态 repeated LightState LightState = 8; + // 屏蔽门状态 + repeated PsdState psdState = 9; } //服务器端向前端推送的设备状态信息