20200729

wxr

2020-07-29 e322d91c7325019710bfdb046c5fea673031455a

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -344,12 +344,38 @@
                int index = 0;
                foreach (var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
                {
                    if (!function.collection)
                        continue;
                    if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                    //音乐模块有主从关系，需要特殊处理
                    if (function.functionCategory == FunctionCategory.Music)
                    {
                        function.collection = false;
                        continue;
                        var music = function as HDL_ON.UI.Music.A31MusicModel;
                        if (music.ServerClientType == -1)
                        {
                            continue;
                        }
                        else if (music.ServerClientType == 1)
                        {
                            if (!music.MainPlayCollection)
                            {
                                continue;
                            }
                        }
                        else
                        {
                            if (!music.collection)
                            {
                                continue;
                            }
                        }
                    }
                    else
                    {
                        if (!function.collection)
                            continue;
                        if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                        {
                            function.collection = false;
                            continue;
                        }
                    }
                    if (index % 2 == 0)
                    {
@@ -373,6 +399,7 @@
                        Tag = function.sid
                    };
                    rowView.AddChidren(functionView);

                    var btnbg = new Button()
                    {
                        UnSelectedImagePath = "Collection/Functionbg.png",
@@ -407,7 +434,7 @@
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.PromptingColor1,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextID = StringId.TipNoCollcetion,
                        TextID = StringId.TipNoFunctionCollcetion,
                    };
                    view.AddChidren(btnNoCollectionTip);
                }
@@ -465,6 +492,32 @@
                    index++;
                }

                if (index == 0)
                {
                    var view = new FrameLayout();
                    sceneFunctionView.AddChidren(view);

                    var btnNoCollectionBg = new Button()
                    {
                        Y = Application.GetRealHeight(20),
                        Gravity = Gravity.CenterHorizontal,
                        Width = Application.GetRealWidth(180),
                        Height = Application.GetRealWidth(180),
                        UnSelectedImagePath = "Collection/NoCollectionBg.png",
                    };
                    view.AddChidren(btnNoCollectionBg);

                    var btnNoCollectionTip = new Button()
                    {
                        Height = Application.GetRealHeight(42),
                        Y = btnNoCollectionBg.Bottom,
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.PromptingColor1,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextID = StringId.TipNoSceneCollcetion,
                    };
                    view.AddChidren(btnNoCollectionTip);
                }
            }
            catch (Exception ex)
            {
@@ -579,7 +632,9 @@
                    view.AddChidren(btnCurtainOpen);

                    LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
                }else if(function.functionType== FunctionType.TV)
                }

                else if (function.functionType == FunctionType.TV)
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
                    Button btnPower;
@@ -594,6 +649,49 @@
                    view.AddChidren(btnPower);
                    LoadEvent_ControlTV(function as TV, btnPower);
                }

                else if (function.functionCategory == FunctionCategory.Music)
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
                    btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
                    Button btnPower;
                    btnPower = new Button()
                    {
                        X = Application.GetRealWidth(118),
                        Y = Application.GetRealWidth(83),
                        Width = Application.GetRealWidth(44),
                        Height = Application.GetRealWidth(44),
                        UnSelectedImagePath = "FunctionIcon/Music/MusicPlayIcon.png",
                        SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
                    };
                    view.AddChidren(btnPower);
                    var a31player = (function as UI.Music.A31MusicModel);
                    btnState.Text = a31player.A31PlayStatus.Title;

                    btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
                    btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1

                    //Music.SendMethod.ReadStatus(a31player);

                    btnPower.MouseUpEventHandler = (sender, e) => {
                        if (btnPower.IsSelected)
                        {
                            btnPower.IsSelected = false;
                            Music.SendMethod.Pause(a31player);
                            a31player.A31PlayStatus.status = "pause";
                            a31player.on_off = "off";
                        }
                        else
                        {
                            btnPower.IsSelected = true;
                            Music.SendMethod.Play(a31player);
                            a31player.A31PlayStatus.status = "play";
                            a31player.on_off = "on";
                        }
                        UpdataFunctionStates(a31player);
                    };
                }

                else
                {
                    Button btnSwitch;
@@ -644,7 +742,7 @@
                            }
                            break;
                        case FunctionCategory.Electrical:
                            switch(function.functionType)
                            switch (function.functionType)
                            {
                                case FunctionType.Fan:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";