请合并小模块

xm

2020-04-30 2eacb04ca1ec0ad20fda4186b59a9bce67004cb4

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

old mode 100755
new mode 100644
@@ -90,7 +90,7 @@
        public async Task<bool> SetPanelEpointColorInfo(Panel panel, Panel.KeyColorData colorData)

        {

            var keyNum = new Panel.KeyNumStatus();

            Type type = keyNum.GetType();

            Type type = keyNum.GetType();
            type.InvokeMember("Key" + panel.DeviceEpoint, System.Reflection.BindingFlags.SetField, null, keyNum, new object[] { true });



            var result = await panel.SetPanelColorInfoAsync(colorData, keyNum);

@@ -111,10 +111,41 @@
            //备份设备

            await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A干接点颜色调节, colorData);

            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 ■ 亮度调节___________________________

        /// <summary>

        /// 获取设备亮度配置（ui叫亮度调节,使用返回值的panelDirectionsLevel）