From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |  500 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 277 insertions(+), 223 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 4d75015..4ab1481 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -161,23 +161,9 @@
                 };
                 topView.AddChidren(btnTop);
 
-                btnLinkStateTip = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    Y = Application.GetRealHeight(46),
-                    Width = Application.GetRealWidth(6),
-                    Height = Application.GetRealWidth(6),
-                    BackgroundColor = CSS_Color.LinkTipFail,
-                    Radius = (uint)Application.GetRealWidth(3),
-                };
-                topView.AddChidren(btnLinkStateTip);
-                //鏇存柊閾炬帴鐘舵�乮con棰滆壊
-                CheckLinkStatus();//2020-12-22
-                
-
                 btnResidenceName = new Button()
                 {
-                    X = Application.GetRealWidth(26),
+                    X = Application.GetRealWidth(16),
                     Y = Application.GetRealHeight(32),
                     Width = Application.GetRealWidth(300),
                     Height = Application.GetRealHeight(33),
@@ -188,12 +174,26 @@
                     IsBold = true
                 };
                 topView.AddChidren(btnResidenceName);
+                btnLinkStateTip = new Button()
+                {
+                    //X = Application.GetRealWidth(16),
+                    Y = btnResidenceName.Bottom,
+                    Height = Application.GetRealWidth(14),
+                    BackgroundColor = CSS_Color.LinkTipFail,
+                    TextAlignment = TextAlignment.Center,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    TextColor = CSS_Color.MainBackgroundColor,
+                };
+                topView.AddChidren(btnLinkStateTip);
+                //btnLinkStateTip.Width = btnLinkStateTip.GetTextWidth();
+                //鏇存柊閾炬帴鐘舵�乮con棰滆壊
 
+
+                int ddd = 0;
 #if DEBUG
-                int msdId = 111;
                 btnResidenceName.MouseUpEventHandler = (sender, e) =>
                 {
-                    Control.Ins.AuthGateway();
+
                 };
 #endif
 
@@ -203,6 +203,8 @@
                     Height = Application.GetRealHeight(32),
                 };
                 topView.AddChidren(environmentalView);
+                CheckLinkStatus();//2020-12-22
+
                 #region 鐜鏁版嵁
                 var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
                 var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
@@ -390,7 +392,7 @@
                     SelectedImagePath = "Collection/DefenseStatusIcon.png",
                     UnSelectedImagePath = "Collection/DisarmStatusIcon.png"
                 };
-                if (false && DB_ResidenceData.Instance.GatewayType == 1)
+                if (DB_ResidenceData.Instance.GatewayType == 1)
                 {
                         
                     topView.AddChidren(btnSecurityStatus);
@@ -551,152 +553,6 @@
             }
 
 
-#if DEBUG
-
-
-            //FunctionList.List.Functions.Add(new Function()
-            //{
-            //    spk = SPK.SensorDryContact,
-            //    name = "骞叉帴鐐�",
-            //    attributes = new List<FunctionAttributes>()
-            //    {
-            //        new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
-            //    },
-            //});
-
-            //FunctionList.List.Functions.Add(new Function()
-            //{
-            //    spk = SPK.AirSwitch,
-            //    name = "鏅鸿兘绌哄紑",
-            //    attributes = new List<FunctionAttributes>()
-            //    {
-            //        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
-            //    },
-            //});
-
-            //FunctionList.List.Functions.Add(new Function()
-            //{
-            //    spk = SPK.AirFreshStandard,
-            //    name = "娴嬭瘯鏂伴",
-            //    attributes = new List<FunctionAttributes>()
-            //    {
-            //        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
-            //        new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
-            //    },
-            //});
-
-
-            FunctionList.List.Functions.Add(new Function()
-            {
-                spk = SPK.HvacAirFreshJinmao,
-                name = "娴嬭瘯閲戣寕鏂伴",
-                attributes = new List<FunctionAttributes>()
-                {
-                    new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
-                    new FunctionAttributes(){ key = "mode",curValue= "humidification",state = "humidification" ,value = new List<string>(){ "humidification", "fan" } },
-                    new FunctionAttributes(){ key = "energy",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
-                    new FunctionAttributes(){ key = "fan",curValue= "level_1",state = "level_1" ,value = new List<string>(){ "level_1", "level_2", "level_3","auto" } },
-                    new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){  },min = 0,max = 100 },
-                    new FunctionAttributes(){ key = "indoor_temp",curValue= "26",state = "26" ,value = new List<string>(){  },min = 0,max = 100 },
-                    new FunctionAttributes(){ key = "indoor_humidity",curValue= "0",state = "0" ,value = new List<string>(){  },min = 0,max = 100 },
-                    new FunctionAttributes(){ key = "filter_remain",curValue= "0",state = "0" ,value = new List<string>(){  },min = 0,max = 100 },
-                    new FunctionAttributes(){ key = "filter_timeout",curValue= "false",state = "false" ,value = new List<string>(){ "true", "false"  }},
-                },
-            });
-
-            //FunctionList.List.Functions.Add(new Function()
-            //{
-            //    spk = SPK.SensorGas,
-            //    name = "鐕冩皵浼犳劅鍣�",
-            //    attributes = new List<FunctionAttributes>()
-            //    {
-            //        new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
-            //        new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
-            //    },
-            //});
-
-            //FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
-            //                            attributes = new List<FunctionAttributes>() {
-            //                                new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
-            //                                new FunctionAttributes(){ key = "computer",value = new List<string>(){"鐢佃剳" } },
-            //                                new FunctionAttributes(){ key = "video",value = new List<string>(){"瑙嗛" } },
-            //                                new FunctionAttributes(){ key = "source",value = new List<string>(){"淇″彿婧�" } },
-            //                                new FunctionAttributes(){ key = "zoom+",value = new List<string>(){"鍙樼劍+" } },
-            //                                new FunctionAttributes(){ key = "zoom-",value = new List<string>(){"鍙樼劍-" } },
-            //                                new FunctionAttributes(){ key = "page+",value = new List<string>(){"鐢婚潰+" } },
-            //                                new FunctionAttributes(){ key = "page-",value = new List<string>(){"鐢婚潰-" } },
-            //                                new FunctionAttributes(){ key = "menu",value = new List<string>(){"鑿滃崟" } },
-            //                                new FunctionAttributes(){ key = "ok",value = new List<string>(){"纭" } },
-            //                                new FunctionAttributes(){ key = "up",value = new List<string>(){"涓�" } },
-            //                                new FunctionAttributes(){ key = "left",value = new List<string>(){"宸�" } },
-            //                                new FunctionAttributes(){ key = "right",value = new List<string>(){"鍙�" } },
-            //                                new FunctionAttributes(){ key = "down",value = new List<string>(){"涓�" } },
-            //                                new FunctionAttributes(){ key = "exit",value = new List<string>(){"閫�鍑�" } },
-            //                                new FunctionAttributes(){ key = "volume+",value = new List<string>(){"闊抽噺+" } },
-            //                                new FunctionAttributes(){ key = "volume-",value = new List<string>(){"闊抽噺-" } },
-            //                                new FunctionAttributes(){ key = "mute",value = new List<string>(){"闈欓煶" } },
-            //                                new FunctionAttributes(){ key = "auto",value = new List<string>(){"鑷姩" } },
-            //                                new FunctionAttributes(){ key = "pause",value = new List<string>(){"鏆傚仠" } },
-            //                            }
-            //});
-
-            //FunctionList.List.Functions.Add(new Function()
-            //{
-            //    spk = SPK.StbIr,
-            //    name = "娴嬭瘯鏈洪《鐩�",
-            //    attributes = new List<FunctionAttributes>() {
-            //                                new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
-            //                                new FunctionAttributes(){ key = "computer",value = new List<string>(){"鐢佃剳" } },
-            //                                new FunctionAttributes(){ key = "video",value = new List<string>(){"瑙嗛" } },
-            //                                new FunctionAttributes(){ key = "source",value = new List<string>(){"淇″彿婧�" } },
-            //                                new FunctionAttributes(){ key = "zoom+",value = new List<string>(){"鍙樼劍+" } },
-            //                                new FunctionAttributes(){ key = "zoom-",value = new List<string>(){"鍙樼劍-" } },
-            //                                new FunctionAttributes(){ key = "page+",value = new List<string>(){"鐢婚潰+" } },
-            //                                new FunctionAttributes(){ key = "page-",value = new List<string>(){"鐢婚潰-" } },
-            //                                new FunctionAttributes(){ key = "menu",value = new List<string>(){"鑿滃崟" } },
-            //                                new FunctionAttributes(){ key = "ok",value = new List<string>(){"纭" } },
-            //                                new FunctionAttributes(){ key = "up",value = new List<string>(){"涓�" } },
-            //                                new FunctionAttributes(){ key = "left",value = new List<string>(){"宸�" } },
-            //                                new FunctionAttributes(){ key = "right",value = new List<string>(){"鍙�" } },
-            //                                new FunctionAttributes(){ key = "down",value = new List<string>(){"涓�" } },
-            //                                new FunctionAttributes(){ key = "exit",value = new List<string>(){"閫�鍑�" } },
-            //                                new FunctionAttributes(){ key = "volume+",value = new List<string>(){"闊抽噺+" } },
-            //                                new FunctionAttributes(){ key = "volume-",value = new List<string>(){"闊抽噺-" } },
-            //                                new FunctionAttributes(){ key = "mute",value = new List<string>(){"闈欓煶" } },
-            //                                new FunctionAttributes(){ key = "auto",value = new List<string>(){"鑷姩" } },
-            //                                new FunctionAttributes(){ key = "pause",value = new List<string>(){"鏆傚仠" } },
-            //                            }
-            //});
-
-            //FunctionList.List.Functions.Add(new Function()
-            //{
-            //    spk = SPK.TvIr,
-            //    name = "娴嬭瘯鐢佃",
-            //    attributes = new List<FunctionAttributes>() {
-            //                                new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
-            //                                new FunctionAttributes(){ key = "computer",value = new List<string>(){"鐢佃剳" } },
-            //                                new FunctionAttributes(){ key = "video",value = new List<string>(){"瑙嗛" } },
-            //                                new FunctionAttributes(){ key = "source",value = new List<string>(){"淇″彿婧�" } },
-            //                                new FunctionAttributes(){ key = "zoom+",value = new List<string>(){"鍙樼劍+" } },
-            //                                new FunctionAttributes(){ key = "zoom-",value = new List<string>(){"鍙樼劍-" } },
-            //                                new FunctionAttributes(){ key = "page+",value = new List<string>(){"鐢婚潰+" } },
-            //                                new FunctionAttributes(){ key = "page-",value = new List<string>(){"鐢婚潰-" } },
-            //                                new FunctionAttributes(){ key = "menu",value = new List<string>(){"鑿滃崟" } },
-            //                                new FunctionAttributes(){ key = "ok",value = new List<string>(){"纭" } },
-            //                                new FunctionAttributes(){ key = "up",value = new List<string>(){"涓�" } },
-            //                                new FunctionAttributes(){ key = "left",value = new List<string>(){"宸�" } },
-            //                                new FunctionAttributes(){ key = "right",value = new List<string>(){"鍙�" } },
-            //                                new FunctionAttributes(){ key = "down",value = new List<string>(){"涓�" } },
-            //                                new FunctionAttributes(){ key = "exit",value = new List<string>(){"閫�鍑�" } },
-            //                                new FunctionAttributes(){ key = "volume+",value = new List<string>(){"闊抽噺+" } },
-            //                                new FunctionAttributes(){ key = "volume-",value = new List<string>(){"闊抽噺-" } },
-            //                                new FunctionAttributes(){ key = "mute",value = new List<string>(){"闈欓煶" } },
-            //                                new FunctionAttributes(){ key = "auto",value = new List<string>(){"鑷姩" } },
-            //                                new FunctionAttributes(){ key = "pause",value = new List<string>(){"鏆傚仠" } },
-            //                            }
-            //});
-#endif
-
         }
         /// <summary>
         /// 鍔犺浇鍐呭鍖哄煙
@@ -803,43 +659,41 @@
                 var list = FunctionList.List.GetDeviceFunctionList();
                 foreach (var function in list)
                 {
+
+
                     //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
                     if (SPK.MusicSpkList().Contains( function.spk))
                     {
+                        continue;
                         //var music = function as Music.A31MusicModel;
-                        var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
-                        if (music == null)
-                        {
-                            continue;
-                        }
-                        if (music.ServerClientType == -1)
-                        {
-                            continue;
-                        }
-                        else if (music.ServerClientType == 1)
-                        {
-                            if (!music.MainPlayCollection)
-                            {
-                                continue;
-                            }
-                        }
-                        else
-                        {
-                            if (!music.collect)
-                            {
-                                continue;
-                            }
-                        }
+                        //var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
+                        //if (music == null)
+                        //{
+                        //    continue;
+                        //}
+                        //if (music.ServerClientType == -1)
+                        //{
+                        //    continue;
+                        //}
+                        //else if (music.ServerClientType == 1)
+                        //{
+                        //    if (!music.MainPlayCollection)
+                        //    {
+                        //        continue;
+                        //    }
+                        //}
+                        //else
+                        //{
+                        //    if (!music.collect)
+                        //    {
+                        //        continue;
+                        //    }
+                        //}
                     }
                     else
                     {
                         if (!function.collect)
                             continue;
-                        //if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
-                        //{
-                        //    function.collection = false;
-                        //    continue;
-                        //}
                     }
                     if (index % 2 == 0)
                     {
@@ -863,17 +717,34 @@
                         Tag = function.sid
                     };
                     rowView.AddChidren(functionView);
-
-                    var btnbg = new Button()
-                    {
-                        UnSelectedImagePath = "Collection/Functionbg.png",
-                        SelectedImagePath = "Collection/FunctionOnbg.png",
-                        Tag = function.sid
-                    };
-                    functionView.AddChidren(btnbg);
                     functionViews.Add(functionView);
-                    LoadDeviceFunctionDiv(functionView, function);
+                    //缁垮缓浜哄眳鐜锛岀鎶�绯荤粺
+                    if (function.spk == SPK.AcstParent)
+                    {
+                        LoadAcstDiv(functionView, function);
+                    }
+                    else //鍏朵粬璁惧
+                    {
+
+                        var btnbg = new Button()
+                        {
+                            UnSelectedImagePath = "Collection/Functionbg.png",
+                            SelectedImagePath = "Collection/FunctionOnbg.png",
+                            Tag = function.sid
+                        };
+                        functionView.AddChidren(btnbg);
+                        LoadDeviceFunctionDiv(functionView, function);
+
+
+
+                        if (SPK.ArmSensorSpkList().Contains(function.spk))
+                        {
+                            btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
+                            btnbg.SelectedImagePath = "Collection/FunctionArmOnbg.png";
+                        }
+                    }
                     index++;
+
                 }
 
                 if (index == 0)
@@ -1011,11 +882,6 @@
                 };
                 view.AddChidren(btnIcon);
 
-
-                btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
-                btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
-
-
                 Button btnName;
                 btnName = new Button()
                 {
@@ -1046,6 +912,7 @@
                 };
                 view.AddChidren(btnZone);
 
+
                 Button btnState;
                 btnState = new Button()
                 {
@@ -1060,6 +927,69 @@
                     Tag = "state",
                     Text = function.lastState
                 };
+
+
+                if (function.spk == SPK.SenesorMegahealth)
+                {
+                    btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
+                    btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
+                    btnName.TextColor = CSS_Color.MainBackgroundColor;
+                    btnZone.TextColor = CSS_Color.MainBackgroundColor;
+                    btnState.TextColor = CSS_Color.MainBackgroundColor;
+
+                    var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
+                    if (tempStatus != null)
+                    {
+                        switch (tempStatus.state)
+                        {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+                            case "0":
+                                function.lastState = Language.StringByID(StringId.SensorNormalState);
+                                break;
+                            case "1":
+                                function.lastState = Language.StringByID(StringId.SomeoneIn);
+                                break;
+                            case "2":
+                                if (function.extSet.labModel)
+                                {
+                                    function.lastState = Language.StringByID(StringId.SomeoneRunning);
+                                }
+                                else
+                                {
+                                    function.lastState = Language.StringByID(StringId.Someone);
+                                }
+                                break;
+                            case "3":
+                                if (function.extSet.labModel)
+                                {
+                                    function.lastState = Language.StringByID(StringId.SomeoneSitting);
+                                }
+                                else
+                                {
+                                    function.lastState = Language.StringByID(StringId.Someone);
+                                }
+                                break;
+                            case "4":
+                                function.lastState = Language.StringByID(StringId.SomeoneFell);
+                                break;
+                            case "5":
+                                if (function.extSet.labModel)
+                                {
+                                    function.lastState = Language.StringByID(StringId.SomeoneStanding);
+                                }
+                                else
+                                {
+                                    function.lastState = Language.StringByID(StringId.Someone);
+                                }
+                                break;
+                        }
+                        btnState.Text = function.lastState;
+                    }
+                }
+                else
+                {
+                    btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+                    btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+                }
 
                 if (function.spk != SPK.LightSwitch)
                 {
@@ -1086,6 +1016,7 @@
                 LoadEvent_FunctionCollection(btnCollection, function);
                 if (//SPK.CurtainSpkList().Contains(function.spk))
                     function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
+                    function.spk == SPK.CurtainDream ||
                     function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
                 {
                     btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
@@ -1137,6 +1068,7 @@
                 {
                     btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
                     btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
+                    btnCollection.Visible = false;
                     Button btnPower;
                     btnPower = new Button()
                     {
@@ -1148,8 +1080,8 @@
                         SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
                     };
                     view.AddChidren(btnPower);
-                    var a31player = (function as UI.Music.A31MusicModel);
-                    btnState.Text = a31player.A31PlayStatus.Title;
+
+                    btnState.Text = function.GetAttrState("song_name");
 
                     btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
                     btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
@@ -1158,21 +1090,22 @@
 
                     btnPower.MouseUpEventHandler = (sender, e) =>
                     {
+
+                        string status = "off";
                         if (btnPower.IsSelected)
                         {
                             btnPower.IsSelected = false;
-                            Music.SendMethod.Pause(a31player);
-                            a31player.A31PlayStatus.status = "pause";
-                            a31player.trait_on_off.curValue = "off";
+                            status = "off";
                         }
                         else
                         {
                             btnPower.IsSelected = true;
-                            Music.SendMethod.Play(a31player);
-                            a31player.A31PlayStatus.status = "play";
-                            a31player.trait_on_off.curValue = "on";
+                            status = "on";
                         }
-                        UpdataFunctionStates(a31player);
+                       function.SetAttrState("on_off", status);
+                        Dictionary<string, string> dic = new Dictionary<string, string>();
+                        dic.Add("on_off", status);
+                        Music.SendMethod.Current.SendControlCommand(function, dic);
                     };
                 }
 
@@ -1208,6 +1141,24 @@
                     LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
 
                 }
+                
+                else if (function.spk == SPK.SenesorMegahealth)
+                {
+                    //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
+                    //btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
+                    //btnIcon.IsSelected = true;
+                    btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
+                    btnState.TextColor = CSS_Color.MainColor;//PromptingColor1
+                }
+
+                //绱ф�ユ眰鍔�
+                else if (function.spk == SPK.SensorHelp)
+                {
+                    btnName.TextColor = CSS_Color.MainBackgroundColor;
+                    btnName.SelectedTextColor = CSS_Color.MainBackgroundColor;
+                    btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+                    btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+                }
 
                 else
                 {
@@ -1230,14 +1181,14 @@
                 //鍙栨秷鏀惰棌浜嬩欢
                 Action cannelCollect = () => {
                     function.collect = false;
-                    if (SPK.MusicSpkList().Contains(function.spk))//澶勭悊闊充箰涓讳粠鍏崇郴
-                    {
-                        if ((function as Music.A31MusicModel).ServerClientType == 1)
-                        {
-                            (function as Music.A31MusicModel).MainPlayCollection = false;
-                            Music.A31MusicModel.Save();
-                        }
-                    }
+                    //if (SPK.MusicSpkList().Contains(function.spk))//澶勭悊闊充箰涓讳粠鍏崇郴
+                    //{
+                    //    if ((function as Music.A31MusicModel).ServerClientType == 1)
+                    //    {
+                    //        (function as Music.A31MusicModel).MainPlayCollection = false;
+                    //        Music.A31MusicModel.Save();
+                    //    }
+                    //}
                     string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
                     LoadDeviceFunctionControlZone();
                     function.CollectFunction();
@@ -1254,12 +1205,115 @@
                 {
                     UpdataFunctionStates(function);
                 }
+
+                var btnOffline = new Button()
+                {
+                    X = btnIcon.Right,
+                    Y = Application.GetRealWidth(16),
+                    Height = Application.GetMinRealAverage(32),
+                    TextID = StringId.DeviceOffline,
+                    TextColor = CSS_Color.WarningColor,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    Tag = "OnlineTag",
+                    Visible = !function.online
+                };
+                view.AddChidren(btnOffline);
+
             }
             catch (Exception ex)
             {
                 MainPage.Log("homepage LoadControlView error : " + ex.Message);
             }
         }
+        /// <summary>
+        /// 鍔犺浇缁垮缓绉戞妧绯荤粺鍗$墖
+        /// </summary>
+        void LoadAcstDiv(FrameLayout view1, Function function)
+        {
+            var view = new FrameLayout()
+            {
+                X = Application.GetRealWidth(10),
+                Y = Application.GetRealHeight(5),
+                Width = Application.GetRealWidth(160),
+                Height = Application.GetRealHeight(105),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Radius = (uint)Application.GetRealWidth(15),
+            };
+            view1.AddChidren(view);
+
+            Button btnName;
+            btnName = new Button()
+            {
+                X = Application.GetRealWidth(11),
+                Y = Application.GetRealWidth(10),
+                TextID = StringId.Acst,
+                IsBold = true,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.TextFontSize,
+                Height = Application.GetRealWidth(24),
+                Width = Application.GetRealWidth(140),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            view.AddChidren(btnName);
+
+            var btnLogo = new Button()
+            {
+                Y = Application.GetRealWidth(85),
+                UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
+                SelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
+                Width = Application.GetRealWidth(80),
+                Height = Application.GetRealWidth(37),
+            };
+            view.AddChidren(btnLogo);
+
+            Button btnFunctionViewBg;
+            btnFunctionViewBg = new Button()
+            {
+                Height = Application.GetRealWidth(100),
+                Width = Application.GetRealWidth(102),
+                UnSelectedImagePath = "FunctionIcon/FunctionBg/AcstFunctionBg.png",
+            };
+            view.AddChidren(btnFunctionViewBg);
+            btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+                var page = new AcstParentPage();
+                MainPage.BasePageView.AddChidren(page);
+                page.LoadPage();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+            };
+
+
+            Button btnAcstPower = new Button()
+            {
+                X = Application.GetRealWidth(115),
+                Y = Application.GetRealHeight(70),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                SelectedImagePath = "Public/PowerOpen.png",
+                UnSelectedImagePath = "Public/PowerClose.png",
+                IsSelected = function.trait_on_off.curValue.ToString() == "on",
+            };
+            view.AddChidren(btnAcstPower);
+            btnAcstPower.MouseUpEventHandler = (sender, e) => {
+                btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
+                string onoff = btnAcstPower.IsSelected ? "on" : "off";
+                Dictionary<string, string> d = new Dictionary<string, string>();
+                d.Add(FunctionAttributeKey.OnOff, onoff);
+                foreach(var temp in FunctionList.List.GetAcstParentList())
+                {
+                    Control.Ins.SendWriteCommand(temp, d);
+                }
+
+            };
+           
+
+
+
+        }
+
+
+
+
 
         /// <summary>
         /// 鍔犺浇鍦烘櫙鎺у埗鍗$墖

--
Gitblit v1.8.0