20201112

wxr

2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f

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

@@ -20,6 +20,10 @@
        /// </summary>
        FrameLayout topView;
        /// <summary>
        /// 连接状态提示
        /// </summary>
        Button btnLinkStateTip;
        /// <summary>
        ///住宅名称显示
        /// </summary>
        Button btnResidenceName;
@@ -101,9 +105,20 @@
                };
                topView.AddChidren(btnTop);

                btnResidenceName = new Button()
                btnLinkStateTip = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(46),
                    Width = Application.GetRealWidth(6),
                    Height = Application.GetRealWidth(6),
                    BackgroundColor = CSS_Color.MainColor,
                    Radius = (uint)Application.GetRealWidth(3),
                };
                topView.AddChidren(btnLinkStateTip);

                btnResidenceName = new Button()
                {
                    X = Application.GetRealWidth(26),
                    Y = Application.GetRealHeight(32),
                    Width = Application.GetRealWidth(400),
                    Height = Application.GetRealHeight(33),
@@ -116,11 +131,18 @@
                topView.AddChidren(btnResidenceName);

#if DEBUG
                //搜索网关
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    System.Threading.Tasks.Task.Run(
                        async () => { await DAL.Net.MqttCommon.StartMqtt();
                    });
                    System.Threading.Tasks.Task.Run(() =>
                        {
                            DriverLayer.Control.ins.ChangeCommunicationMode(DriverLayer.CommunicationMode.local_BusUdp);
                            UdpSocket._BusSocket.SearchNetDeviceAction = (revIp) =>
                            {
                                MainPage.Log($"搜索到网络设备：{revIp}");
                            };
                            DriverLayer.Control.ins.myUdp.ReadGatewayIP();
                        });
                };
#endif

@@ -188,7 +210,7 @@
                btnPm25Values = new Button()
                {
                    X = btnPm25Icon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(30),
                    Width = Application.GetRealWidth(130),
                    Gravity = Gravity.CenterVertical,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
@@ -211,7 +233,7 @@

                var btngb = new Button()
                {
                    BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,//
                    BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
                    Alpha = 0.4f,
                };
                msgView.AddChidren(btngb);
@@ -320,7 +342,6 @@
                contentView.PageIndex = 0;

                #endregion
                bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(4), BackgroundColor = 0xAAF2F3F7 });

                LoadEvent_ChangeShowedFunctionType();
            }
@@ -342,12 +363,12 @@
            try
            {
                int index = 0;
                foreach (var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
                foreach (var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
                {
                    //音乐模块有主从关系，需要特殊处理
                    if (function.functionCategory == FunctionCategory.Music)
                    {
                        var music = function as HDL_ON.UI.Music.A31MusicModel;
                        var music = function as Music.A31MusicModel;
                        if (music.ServerClientType == -1)
                        {
                            continue;
@@ -371,11 +392,11 @@
                    {
                        if (!function.collection)
                            continue;
                        if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                        {
                            function.collection = false;
                            continue;
                        }
                        //if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                        //{
                        //    function.collection = false;
                        //    continue;
                        //}
                    }
                    if (index % 2 == 0)
                    {
@@ -457,7 +478,7 @@
            try
            {
                int index = 0;
                foreach (var function in DB_ResidenceData.residenceData.functionList.scenes)
                foreach (var function in DB_ResidenceData.functionList.scenes)
                {
                    if (!function.collection)
                        continue;
@@ -679,14 +700,14 @@
                            btnPower.IsSelected = false;
                            Music.SendMethod.Pause(a31player);
                            a31player.A31PlayStatus.status = "pause";
                            a31player.on_off = "off";
                            a31player.trait_on_off.value = "off";
                        }
                        else
                        {
                            btnPower.IsSelected = true;
                            Music.SendMethod.Play(a31player);
                            a31player.A31PlayStatus.status = "play";
                            a31player.on_off = "on";
                            a31player.trait_on_off.value = "on";
                        }
                        UpdataFunctionStates(a31player);
                    };
@@ -770,7 +791,6 @@
            }
        }


        /// <summary>
        /// 加载场景控制卡片
        /// </summary>
@@ -778,6 +798,24 @@
        {
            try
            {
                Button btnCoverd = new Button()
                {
                    UnSelectedImagePath = "Collection/SceneCovered.png",
                };
                view.AddChidren(btnCoverd);

                Button btnSettingIcon;
                btnSettingIcon = new Button()
                {
                    X = Application.GetRealWidth(4),
                    Y = Application.GetRealWidth(4),
                    Height = Application.GetRealWidth(32),
                    Width = Application.GetRealWidth(32),
                    //UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png",
                    UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
                };
                view.AddChidren(btnSettingIcon);

                Button btnName;
                btnName = new Button()
                {
@@ -807,22 +845,6 @@
                };
                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()
@@ -837,8 +859,22 @@
                view.AddChidren(btnCollection);
                LoadEvent_FunctionCollection(btnCollection, function, false);
              
                LoadEvent_ControlScene(btnCoverd, function);
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);

                btnSettingIcon.MouseUpEventHandler = (sender, e) => {
                    Action backAction = () => {
                        //LoadSceneFunctionControlZone();
                    };
                    Action refreshAction = () => {
                        btnName.Text = function.name;
                        btnZone.Text = function.GetRoomListName();
                        view.BackgroundImagePath = (function as Scene).ImagePath;
                    };
                    var aep = new SceneEditPage(function as Scene, backAction);
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(StringId.EditScene, refreshAction);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
            }
            catch (Exception ex)
            {