20200608

wxr

2020-06-08 b71dfb3ca100340005d56e1298292807da82322d

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

@@ -1,7 +1,11 @@
using System;

using System.Collections.Generic;
using System.Text;
using HDL_ON.DAL;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;

namespace HDL_ON.UI
@@ -106,10 +110,21 @@
                    TextColor = CSS.CSS_Color.MainBackgroundColor,
                    TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = DB_ResidenceData.residenceData.residenceName,
                    Text = DB_ResidenceData.residenceData.residecenInfo.Name,
                    IsBold = true
                };
                topView.AddChidren(btnResidenceName);

#if DEBUG
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    System.Threading.Tasks.Task.Run(
                        async () => { await DAL.Net.MqttCommon.StartMqtt();
                    });
                };

#endif


                environmentalView = new FrameLayout()
                {
@@ -424,7 +439,7 @@
                    };
                    rowView.AddChidren(functionView);

                    LoadSceneFunctionDiv(functionView, function);
                    LoadSceneFunctionDiv( functionView, function);
                    index++;
                }
            }
@@ -541,6 +556,20 @@
                    view.AddChidren(btnCurtainOpen);

                    LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
                }else if(function.functionType== FunctionType.TV)
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
                    Button btnPower;
                    btnPower = new Button()
                    {
                        X = Application.GetRealWidth(131),
                        Y = Application.GetRealHeight(86),
                        Width = Application.GetRealWidth(32),
                        Height = Application.GetRealWidth(32),
                        UnSelectedImagePath = "Public/PowerClose.png",
                    };
                    view.AddChidren(btnPower);
                    LoadEvent_ControlTV(function as TV, btnPower);
                }
                else
                {
@@ -582,6 +611,24 @@
                                    break;
                            }
                            break;
                        case FunctionCategory.SwitchDevice:
                            switch (function.functionType)
                            {
                                case FunctionType.Socket:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
                                    btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
                                    break;
                            }
                            break;
                        case FunctionCategory.Electrical:
                            switch(function.functionType)
                            {
                                case FunctionType.Fan:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
                                    btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
                                    break;
                            }
                            break;
                    }
                    LoadEvent_SwitchFunction(function, btnSwitch);
                }
@@ -590,7 +637,11 @@
                btnName.MouseUpEventHandler = skipControlPageEvent;
                btnIcon.MouseUpEventHandler = skipControlPageEvent;
                btnState.MouseUpEventHandler = skipControlPageEvent;
                UpdataFunctionStates(function);
                //电视不需要更新状态
                if(function.functionType!= FunctionType.TV)
                {
                    UpdataFunctionStates(function);
                }
            }
            catch (Exception ex)
            {
@@ -606,36 +657,6 @@
        {
            try
            {
                Button btnCoverd = new Button()
                {
                    UnSelectedImagePath = "Collection/SceneCovered.png",
                };
                view.AddChidren(btnCoverd);
                LoadEvent_ControlScene(btnCoverd, function);

                Button btnDelayIcon;
                btnDelayIcon = new Button()
                {
                    X = Application.GetRealWidth(12),
                    Y = Application.GetRealWidth(12),
                    Height = Application.GetRealWidth(24),
                    Width = Application.GetRealWidth(24),
                    UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
                };
                view.AddChidren(btnDelayIcon);

                Button btnCollection;
                btnCollection = new Button()
                {
                    X = Application.GetRealWidth(116),
                    Y = Application.GetRealWidth(8),
                    Width = Application.GetMinRealAverage(32),
                    Height = Application.GetMinRealAverage(32),
                    SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                    UnSelectedImagePath = "Collection/CollectionIcon.png",
                };
                view.AddChidren(btnCollection);
                LoadEvent_FunctionCollection(btnCollection, function, false);
                Button btnName;
                btnName = new Button()
                {
@@ -665,6 +686,37 @@
                };
                view.AddChidren(btnZone);

                Button btnCoverd = new Button()
                {
                    UnSelectedImagePath = "Collection/SceneCovered.png",
                };
                view.AddChidren(btnCoverd);

                Button btnDelayIcon;
                btnDelayIcon = new Button()
                {
                    X = Application.GetRealWidth(12),
                    Y = Application.GetRealWidth(12),
                    Height = Application.GetRealWidth(24),
                    Width = Application.GetRealWidth(24),
                    UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
                };
                view.AddChidren(btnDelayIcon);

                Button btnCollection;
                btnCollection = new Button()
                {
                    X = Application.GetRealWidth(116),
                    Y = Application.GetRealWidth(8),
                    Width = Application.GetMinRealAverage(32),
                    Height = Application.GetMinRealAverage(32),
                    SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                    UnSelectedImagePath = "Collection/CollectionIcon.png",
                };
                view.AddChidren(btnCollection);
                LoadEvent_FunctionCollection(btnCollection, function, false);
              
                LoadEvent_ControlScene(btnCoverd, function);

            }
            catch (Exception ex)