合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs

@@ -14,10 +14,6 @@
        #region ■ 变量声明___________________________



        /// <summary>

        /// 设备Mac地址

        /// </summary>

        private string deviceMac = string.Empty;

        /// <summary>

        /// 亮度调节的信息

        /// </summary>

        private Panel.PanelSwitchLevelInfo linghtLevelInfo = null;

@@ -45,7 +41,6 @@
        {

            this.ScrollEnabled = false;



            this.deviceMac = i_deviceMac;

            this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);



            //设置头部信息

@@ -58,10 +53,10 @@
        /// <summary>

        /// 初始化中部信息

        /// </summary>

        private async void InitMiddleFrame()

        private void InitMiddleFrame()

        {

            //获取设备初始数据

            var result = await this.GetDeviceDefultData();

            var result = this.GetDeviceDefultData();

            if (result == false)

            {

                return;

@@ -96,20 +91,20 @@
            var btnSave = new BottomClickButton();

            btnSave.TextID = R.MyInternationalizationString.uSave;

            bodyFrameLayout.AddChidren(btnSave);

            btnSave.ButtonClickEvent += async (sender, e) =>

            btnSave.ButtonClickEvent += (sender, e) =>

            {

                if (valueChanged == true)

                {

                    this.ShowProgressBar();

                    //亮度调节更改(他们说随便一个回路就行)

                    result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);

                    result = HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);

                    if (result == false)

                    {

                        this.CloseProgressBar();

                        return;

                    }

                    //节能模式修改(他们说随便一个回路就行)

                    result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

                    result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

                    this.CloseProgressBar();

                    if (result == false)

                    {

@@ -139,6 +134,10 @@
            frameBack.Height = Application.GetRealHeight(170);

            bodyFrameLayout.AddChidren(frameBack);



            //当前亮度(先声明,为了对应IOS的折叠后,没有完全遮挡的问题)

            var btnProgressView1 = new NormalViewControl(200, 49, true);

            var btnProgress1 = new NormalViewControl(200, 49, true);



            //节能模式

            frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);

            //开关控件

@@ -154,12 +153,16 @@
                    frameBack.Height += value;

                    btnClickStatu.Y += value;

                    frameLinght.Y += value;

                    btnProgressView1.Visible = true;

                    btnProgress1.Visible = true;

                }

                else

                {

                    frameBack.Height -= value;

                    btnClickStatu.Y -= value;

                    frameLinght.Y -= value;

                    btnProgressView1.Visible = false;

                    btnProgress1.Visible = false;

                }

                //数据变更

                valueChanged = true;

@@ -170,20 +173,20 @@
            }



            //当前亮度

            var btnProgressView1 = new NormalViewControl(200, 49, true);

            btnProgressView1.X = ControlCommonResourse.XXLeft;

            btnProgressView1.Y = Application.GetRealHeight(161);

            btnProgressView1.TextSize = 12;

            btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;

            frameBack.AddChidren(btnProgressView1);

            var btnProgress1 = new NormalViewControl(200, 49, true);

            btnProgressView1.Visible = false;

            btnProgress1.X = Application.GetRealWidth(222);

            btnProgress1.Y = Application.GetRealHeight(158);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = energyModeInfo.level + "%";

            frameBack.AddChidren(btnProgress1);

            btnProgress1.Visible = false;



            //进度条

            var seekBar1 = new SeekBarControl();

@@ -223,6 +226,15 @@
                frameBack.Height += value;

                btnClickStatu.Y += value;

                frameLinght.Y += value;



                btnProgressView1.Visible = true;

                btnProgress1.Visible = true;

            }

            //如果当前是展示模板

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                seekBar1.Enable = false;

                btnSwitch.CanClick = false;

            }

        }



@@ -248,7 +260,7 @@
            btnProgress1.Y = Application.GetRealHeight(29);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";

            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";

            frameLinght.AddChidren(btnProgress1);



            //进度条

@@ -260,10 +272,10 @@
            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelBacklightLevel = value;

                linghtLevelInfo.panelDirectionsLevel = value;

                valueChanged = true;

            };

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;



            var btnTemp1 = new NormalViewControl(200, 49, true);

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -288,6 +300,12 @@
            btnLine.Gravity = Gravity.CenterHorizontal;

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            frameLinght.AddChidren(btnLine);



            //如果当前是展示模板

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                seekBar1.Enable = false;

            }

        }



        #endregion

@@ -312,7 +330,7 @@
            btnProgress1.Y = Application.GetRealHeight(369);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";

            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";

            frameLinght.AddChidren(btnProgress1);



            //进度条

@@ -324,10 +342,10 @@
            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelDirectionsLevel = value;

                linghtLevelInfo.panelBacklightLevel = value;

                valueChanged = true;

            };

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;



            var btnTemp1 = new NormalViewControl(200, 49, true);

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -352,6 +370,12 @@
            btnLine.Y = Application.GetRealHeight(651);

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            frameLinght.AddChidren(btnLine);



            //如果当前是展示模板

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                seekBar1.Enable = false;

            }

        }



        #endregion

@@ -362,12 +386,12 @@
        /// 获取设备初始数据

        /// </summary>

        /// <returns></returns>

        private async Task<bool> GetDeviceDefultData()

        private bool GetDeviceDefultData()

        {

            //开启进度条

            this.ShowProgressBar();

            //亮度调节(他们说随便拿一路回路就行了)

            linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);

            linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);

            if (linghtLevelInfo == null)

            {

                //关闭进度条

@@ -375,7 +399,7 @@
                return false;

            }

            //节能模式(他们说随便拿一路回路就行了)

            energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);

            energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);

            if (energyModeInfo == null)

            {

                //关闭进度条