Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

 HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs

@@ -14,23 +14,24 @@
        /// 更新功能状态
        /// </summary>
        /// <param name="updataFunction"></param>
        public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView,Room room=null)
        public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null)
        {
            try
            Application.RunOnMainThread((Action)(() =>
            {
                Application.RunOnMainThread(() =>

                try
                {
                    if (view == null || scrolView == null)
                    if (view == null || scrolView == null || updataFunction == null)
                    {
                        return;
                    }
                    if(!scrolView.ScrollEnabled)
                    if (!scrolView.ScrollEnabled)
                    {
                        return;
                    }
                    if (room != null)
                    {
                        if (!updataFunction.roomIds.Contains(room.uid))
                        if (!updataFunction.roomIds.Contains(room.roomId))
                        {
                            return;
                        }
@@ -42,9 +43,9 @@
                            continue;
                        }
                        var viewTag = scrolView.GetChildren(i).Tag.ToString();
                        if (viewTag == updataFunction.sid)
                        if (scrolView.GetChildren(i).Tag != null && viewTag == updataFunction.spk + updataFunction.sid)
                        {
                            if (scrolView.GetChildren(i).Tag != null && scrolView.GetChildren(i).Tag.ToString() == updataFunction.sid)
                            //if ( && scrolView.GetChildren(i).Tag.ToString() == updataFunction.sid)
                            {
                                var fcView = scrolView.GetChildren(i) as FrameLayout;
                                for (int j = 0; j < fcView.ChildrenCount; j++)
@@ -52,10 +53,13 @@
                                    if (fcView.GetChildren(j).Tag == null)
                                        continue;
                                    var cTag = fcView.GetChildren(j).Tag.ToString();
                                    switch (updataFunction.functionCategory)
                                    switch (updataFunction.Spk_Prefix)
                                    {
                                        case FunctionCategory.Light:
                                        case FunctionCategory.Thermostat:
                                        case FunctionCategory.AC:
                                        case FunctionCategory.FloorHeat:
                                        case FunctionCategory.Electric:
                                        case FunctionCategory.AirFresh:
                                            #region 按钮状态更新
                                            if (cTag == updataFunction.sid + "_Switch")
                                            {
@@ -74,14 +78,13 @@
                                            {
                                                try
                                                {
                                                    (fcView.GetChildren(j) as DiyImageSeekBar).Progress = Convert.ToInt32(updataFunction.GetAttrState(FunctionAttributeKey.Brightness));
                                                    if (updataFunction.trait_on_off.curValue.ToString() == "on")
                                                    {
                                                        (fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
                                                        (fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                                                    }
                                                    else
                                                    {
                                                        (fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
                                                        (fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.PromptingColor2;
                                                    }
                                                }
@@ -92,7 +95,7 @@
                                            }
                                            #endregion
                                            #region 功能状态信息更新
                                            else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
                                            else if (cTag == updataFunction.spk + "_laststates_" + updataFunction.sid)
                                            {
                                                try
                                                {
@@ -105,30 +108,43 @@
                                                }
                                            }
                                            break;
                                            #endregion
                                        #endregion
                                        case FunctionCategory.Curtain:
                                            #region 窗帘更新
                                            var uCurtain = updataFunction as Curtain;
                                            if (cTag == updataFunction.functionType + "_off_" + updataFunction.sid)
                                            var percent = updataFunction.GetAttrState(FunctionAttributeKey.OnOff) == "off" ? 0 : 100;
                                            if(updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
                                            {
                                                try
                                                string percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
                                                int.TryParse(percentString, out percent);
                                            }
                                            if (percent == 0)
                                            {
                                                if (cTag == updataFunction.sid + "_off")
                                                {
                                                    (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.curValue.ToString() == "off";
                                                    try
                                                    {
                                                        (fcView.GetChildren(j) as Button).IsSelected = true;
                                                    }
                                                    catch { }
                                                }
                                                catch (Exception ex)
                                                else
                                                {
                                                    MainPage.Log($"{this.GetType()} error 3 : {ex.Message}");
                                                    (fcView.GetChildren(j) as Button).IsSelected = false;
                                                }
                                            }
                                            else
                                            {
                                                try
                                                if (cTag == updataFunction.sid + "_on")
                                                {
                                                    (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.curValue.ToString() == "on";
                                                    try
                                                    {
                                                        (fcView.GetChildren(j) as Button).IsSelected = true;
                                                    }
                                                    catch { }
                                                }
                                                catch (Exception ex)
                                                else
                                                {
                                                    MainPage.Log($"{this.GetType()} error 4 : {ex.Message}");
                                                    (fcView.GetChildren(j) as Button).IsSelected = false;
                                                }
                                            }
                                            #endregion
@@ -136,11 +152,11 @@
                                        case FunctionCategory.Music:
                                            #region 音乐更新
                                            var uMusic = updataFunction as Music.A31MusicModel;
                                            if (cTag == updataFunction.functionType + "_State_" + updataFunction.sid)
                                            if (cTag == updataFunction.spk + "_State_" + updataFunction.sid)
                                            {
                                                try
                                                {
                                                    (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play" ;
                                                    (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play";
                                                }
                                                catch (Exception ex)
                                                {
@@ -154,13 +170,12 @@
                            }
                        }
                    }
                });
            }
            catch (Exception ex)
            {
                MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
            }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
                }
            }));
        }

  }
}
    }
}