From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 08 五月 2020 17:46:44 +0800 Subject: [PATCH] 请合并最新代码,优化绑定信息 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs index 90a72cc..7975fd9 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs @@ -82,6 +82,34 @@ } /// <summary> + /// 鑾峰彇闈㈡澘棰滆壊鐨勪俊鎭�(鍑洪敊浼氳繑鍥瀗ull) + /// </summary> + /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param> + /// <returns></returns> + public async Task<Panel.KeyColorData> GetPanelColorInfo(Panel panel) + { + panel.DeviceEpoint = 1; + Panel.KeyNum keyNum = (Panel.KeyNum)panel.DeviceEpoint; + var result = await panel.GetPanelColorInfoAsync(keyNum); + //鍏遍�氶敊璇娴� + string error = HdlCheckLogic.Current.CheckCommonErrorCode(result); + if (error != null) + { + this.ShowErrorMsg(error); + return null; + } + + if (result == null || result.keyColorData == null) + { + //鑾峰彇鎸夐敭闈㈡澘棰滆壊璋冭妭淇℃伅澶辫触 + string msg = Language.StringByID(R.MyInternationalizationString.uGetPanelColorRegulationInfoFail); + this.ShowErrorMsg(msg); + return null; + } + return result.keyColorData; + } + + /// <summary> /// 璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅 /// </summary> /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param> @@ -113,6 +141,37 @@ return true; } + /// <summary> + /// 璁剧疆闈㈡澘棰滆壊 + /// </summary> + /// <param name="panel">鎸夐敭闈㈡澘鐨�</param> + /// <param name="colorData">鍙缃紑鐨勯鑹�</param> + /// <returns></returns> + public async Task<bool> SetPanelColorInfo(Panel panel, Panel.KeyColorData colorData) + { + var keyNum = new Panel.KeyNumStatus(); + //榛樿绗竴涓敤闈㈡澘绗竴涓寜閿鑹蹭綔涓烘暣涓潰鏉跨殑棰滆壊 + keyNum.Key1 = true; + var result = await panel.SetPanelColorInfoAsync(colorData, keyNum); + if (result == null || result.responseData == null) + { + //璁剧疆鎸夐敭闈㈡澘鎸囩ず鐏鑹插け璐� + string msg = Language.StringByID(R.MyInternationalizationString.uSetPanelPilolightSettionFail); + this.ShowErrorMsg(msg); + return false; + } + if (result.responseData.status != 0) + { + //璁剧疆鎸夐敭闈㈡澘鎸囩ず鐏鑹插け璐� + string msg = Language.StringByID(R.MyInternationalizationString.uSetPanelPilolightSettionFail); + this.ShowErrorMsg(msg); + return false; + } + //澶囦唤璁惧 + await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A骞叉帴鐐归鑹茶皟鑺�, colorData); + return true; + } + #endregion #region 鈻� 浜害璋冭妭___________________________ -- Gitblit v1.8.0