合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs

@@ -479,12 +479,12 @@
        #region ■ 修改干接点私有属性_________________



        /// <summary>

        /// 修改干接点私有属性

        /// 修改干接点第三级别的私有属性

        /// </summary>

        /// <param name="panel">干接点对象</param>

        /// <param name="i_value">干接点的第三级别属性的值,具体请参照第三级别属性</param>

        /// <returns></returns>

        public async Task<bool> EditorDryContactFunction(Panel panel, int i_value)

        public async Task<bool> EditorDryContactThirdFunction(Panel panel, int i_value)

        {

            var result = await panel.ConfigureHdlKeyValueAsync((Panel.KeyMode)i_value);

            //共通错误检测

@@ -537,7 +537,7 @@
                return false;

            }

            //备份设备

            await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A干接点私有属性, i_value);

            await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A干接点第三级别私有属性, i_value);



            return true;

        }

@@ -707,7 +707,13 @@
                    errorMsg = UserCenterLogic.CombineGatewayTimeOutMsg(errorMsg, null, "回复超时", false);

                }

                this.ShowTipMsg(errorMsg);

                return false;

            }

            //备份设备

            HdlThreadLogic.Current.RunThread(async () =>

            {

                await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A简约面板震动功能, datainfo);

            }, ShowErrorMode.NO);



            return success;

        }