Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

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

@@ -16,7 +16,7 @@
        /// <param name="updataFunction"></param>
        public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null)
        {
            Application.RunOnMainThread(() =>
            Application.RunOnMainThread((Action)(() =>
            {

                try
@@ -43,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++)
@@ -53,10 +53,11 @@
                                    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:
                                            #region 按钮状态更新
                                            if (cTag == updataFunction.sid + "_Switch")
                                            {
@@ -93,7 +94,7 @@
                                            }
                                            #endregion
                                            #region 功能状态信息更新
                                            else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
                                            else if (cTag == updataFunction.spk + "_laststates_" + updataFunction.sid)
                                            {
                                                try
                                                {
@@ -160,7 +161,7 @@
                                        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
                                                {
@@ -183,7 +184,7 @@
                {
                    MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
                }
            });
            }));
        }
    }
}