2019-10-29-1

WJC

2019-10-29 c41d2d0317ee437ba13e01780bc180e3ef51fd52

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

old mode 100755
new mode 100644
@@ -748,6 +748,12 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void AutomationBtn_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
        {
            ///第一次进来初始化设备列表；
            Common.Logic.LogicDviceList.Clear();
            if (Common.Logic.LogicDviceList.Count == 0)
            {
                Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
            }
            functionBtn.IsSelected = false;
            sceneBtn.IsSelected = false;
            automationBtn.IsSelected = true;
@@ -1807,9 +1813,9 @@
        /// <summary>
        /// 自动化
        /// </summary>
        public async void ShowAutotion()
        {



        private async void ShowAutotion()
        {
           
            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

            

            var bjFrameLayout = new FrameLayout
@@ -1944,12 +1950,7 @@
                            }
                            else
                            {
                                Common.Logic.LogicDviceList.Clear();
                                if (Common.Logic.LogicDviceList.Count == 0)
                                {
                                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                                }
                                Common.Logic.CurrentLogic.LogicType = 2;
                             
                                Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
                                Logic.TemplatePage templatePage = new Logic.TemplatePage();
                                Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
@@ -1975,34 +1976,19 @@
            CommonPage.Loading.Start();
            if (Common.Logic.LogicList.Count == 0)
            {
                //var Idlist = await Logic.Send.GetLogicId();
                //if (Idlist.Count != 0)
                //{
                //    foreach (var LogicId in Idlist)
                //    {
                //        var logic = await Logic.Send.GetLogic(LogicId);
                //        if (logic != null)
                //        {
                //            Common.Logic.LogicList.Add(logic);
                //        }
                //    }
                //}
                var Idlist = await Logic.Send.GetLogicId();
                var Idlist = await Logic.Send.GetLogicId(0);
                if (Idlist.Count != 0)
                {
                    var listlogic = await Logic.Send.ReadList(Idlist.Count);
                    for (int i = 0; i < Idlist.Count; i++)
                    var listlogic = await Logic.Send.ReadList(Idlist.Count,0);
                    //foreach可能集合已被修改,枚举操作可能不会执行,可能出现崩溃(建议for)。
                    for (int j = 0; j < listlogic.Count; j++)
                    {
                        var LogicId = Idlist[i];
                        //foreach可能集合已被修改,枚举操作可能不会执行,可能出现崩溃(建议for)。
                        for (int j = 0; j < listlogic.Count; j++)
                        var logic = listlogic[j];
                        if (logic.LogicType != 0)
                        {
                            var logic = listlogic[j];
                            if (logic.LogicId == LogicId)
                            {
                                Common.Logic.LogicList.Add(logic);
                            }
                            continue;
                        }
                        Common.Logic.LogicList.Add(logic);
                    }
                }
            }
@@ -2015,7 +2001,7 @@
        /// 自动化列表界面
        /// </summary>
        /// <param name="refresview">Refresview.</param>
        public async void Automationview(VerticalScrolViewLayout refresview)
        private async void Automationview(VerticalScrolViewLayout refresview)
        {
            refresview.RemoveAll();
            foreach (var logic in Common.Logic.LogicList)
@@ -2103,11 +2089,6 @@
                bjRow.AddRightView(edit);
                edit.MouseUpEventHandler += (sender, e) =>
                {
                    Common.Logic.LogicDviceList.Clear();
                    if (Common.Logic.LogicDviceList.Count == 0)
                    {
                        Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                    }
                    Common.Logic.CurrentLogic = logic;
                    var logicCommunalPage = new Logic.LogicCommunalPage();
                    HomePage.Instance.AddChidren(logicCommunalPage);
@@ -2146,8 +2127,6 @@


        }

        #endregion

        #region ◆ 控制状态_________________________

@@ -2614,5 +2593,6 @@
                }
            }
        }
        #endregion
    }
}