合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs

@@ -31,10 +31,6 @@
        /// </summary>

        private SeekBarControl seekBarColor = null;

        /// <summary>

        /// MaxLevel

        /// </summary>

        private const int MaxLevel = 254;

        /// <summary>

        /// 亮度进度值是否在改变中

        /// </summary>

        private bool isLightProgressing = false;

@@ -98,7 +94,7 @@
            seekBarLight.ProgressTextSize = 14;

            seekBarLight.ProgressTextColor = UserCenterColor.Current.TextGrayColor2;

            seekBarLight.Gravity = Gravity.Frame;

            seekBarLight.Progress = (int)(((ColorTemperatureLight)this.device).Level * 1.0 / MaxLevel * 100);

            seekBarLight.Progress = HdlDeviceCommonLogic.Current.CalculateLightLevelPersent(((ColorTemperatureLight)this.device).Level);

            frameWhiteBack.AddChidren(seekBarLight);



            //色温

@@ -226,7 +222,7 @@
                else

                {

                    //如果住宅为虚拟住宅,直接改缓存

                    ((ColorTemperatureLight)this.device).Level = value * MaxLevel / 100;

                    ((ColorTemperatureLight)this.device).Level = HdlDeviceCommonLogic.Current.CalculateLightLevel(value);

                    //亮度 XX

                    this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

                }

@@ -281,7 +277,7 @@
                    if (nowLightValue != oldLightValue)

                    {

                        oldLightValue = nowLightValue;

                        ((ColorTemperatureLight)this.device).SetLevel((int)(oldLightValue * MaxLevel / 100.0));

                        ((ColorTemperatureLight)this.device).SetLevel(HdlDeviceCommonLogic.Current.CalculateLightLevel(oldLightValue));

                    }

                    //发送色温值

                    if (nowColorValue != oldColorValue)

@@ -295,7 +291,7 @@
                if (nowLightValue != oldLightValue)

                {

                    //发送亮度值

                    ((ColorTemperatureLight)this.device).SetLevel((int)(nowLightValue * MaxLevel / 100.0));

                    ((ColorTemperatureLight)this.device).SetLevel(HdlDeviceCommonLogic.Current.CalculateLightLevel(nowLightValue));

                }

                if (nowColorValue != oldColorValue)

                {

@@ -354,7 +350,7 @@
                if (level == 0)

                {

                    //如果当前是打开状态,并且亮度为0的话,则需要变成100%亮度

                    this.device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, this.device, new object[] { 254 });

                    this.device.GetType().InvokeMember("SetLevel", System.Reflection.BindingFlags.InvokeMethod, null, this.device, new object[] { 255 });

                }

                else

                {

@@ -493,7 +489,11 @@
            if (this.isLightProgressing == false)

            {

                //当进度值在手动变更中时,不接收推送

                seekBarLight.Progress = (int)(((ColorTemperatureLight)this.device).Level * 1.0 / MaxLevel * 100);

                int progress = HdlDeviceCommonLogic.Current.CalculateLightLevelPersent(((ColorTemperatureLight)this.device).Level);

                if (seekBarLight.Progress != progress)

                {

                    seekBarLight.Progress = progress;

                }

            }

            if (this.isColorProgressing == false)

            {