From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 11 九月 2020 09:16:59 +0800 Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs index 32f3a09..05702e2 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs @@ -231,6 +231,9 @@ zoneInfo.ZoneId = allData.ZoneId; zoneInfo.ZoneName = allData.ZoneName; + //淇℃伅鎺ㄩ�� + zoneInfo.InformationPush = allData.IsDisablePushMessage; + //澶勭悊璁惧 foreach (var data2 in allData.DeviceList) { @@ -285,9 +288,6 @@ zoneInfo.dicAlarmDevice.Clear(); zoneInfo.dicScenes.Clear(); - - //淇℃伅鎺ㄩ�� - zoneInfo.InformationPush = resData.IsDisablePushMessage; foreach (var data in resData.Actions) { @@ -1708,11 +1708,6 @@ { return false; } - - if (zoneId > 3) - { - zoneId = 3; - } //鐘舵�佸彉鏇� var result = await Safeguard.DisablePushMessageAsync(zoneId, statu); if (result == null || result.disablePushMessageResponseData == null || result.disablePushMessageResponseData.Result == 1) @@ -1742,10 +1737,6 @@ /// <returns>0:鎺ㄩ�� 1:涓嶆帹閫�</returns> public int GetGarrisonInformationPushStatu(int zoneId) { - if (zoneId > 3) - { - zoneId = 3; - } if (this.dicAllZoneInfo.ContainsKey(zoneId) == false) { return 1; @@ -2340,7 +2331,7 @@ /// </summary> public string ZoneName; /// <summary> - /// 淇℃伅鎺ㄩ�� 0:鎺ㄩ�� 1:涓嶆帹閫� (鍙湁闃插尯ID:1,2,3鎵嶄細鏈夈��4,5鐨勯兘褰掍负3,鍥犱负瀹冩槸浠ラ槻鍖烘ā寮廔D(ActionType)涓哄崟浣嶇殑) + /// 淇℃伅鎺ㄩ�� 0:鎺ㄩ�� 1:涓嶆帹閫� /// </summary> public int InformationPush = 1; /// <summary> -- Gitblit v1.8.0