Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

@@ -64,6 +64,7 @@

        }
        #region ◆ 自动化__________________________
        public static bool If_once = true;//进来只读一次标识;
        /// <summary>
        /// 自动化功能代码入口
        /// </summary>
@@ -241,6 +242,7 @@
                if (!Config.Instance.Home.IsVirtually)
                {//虚拟的不获取网关逻辑列表
                    //重新刷新logic列表
                    If_once = true;
                    Common.Logic.LogicList.Clear();
                    Read(logicScrolView, no);
                }
@@ -271,35 +273,39 @@
            {
                if (!Config.Instance.Home.IsVirtually)//虚拟的不获取网关逻辑列表
                {
                    if (Common.Logic.LogicList.Count == 0)
                    {
                        var Idlist1 = await Send.GetLogicId(0);//
                        var Idlist2 = await Send.GetLogicId(2);//门锁常开模式
                        if (Idlist1.Count != 0)
                        {
                            var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
                            for (int j = 0; j < listlogic1.Count; j++)
                            {
                                var logic = listlogic1[j];
                                if (logic.LogicType != 0)
                                {
                                    continue;
                                }
                                Common.Logic.LogicList.Add(logic);
                            }
                        }
                        if (Idlist2.Count != 0)
                        {
                            var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
                            for (int j = 0; j < listlogic2.Count; j++)
                            {
                                var logic = listlogic2[j];
                                if (logic.LogicType != 2)
                                {
                                    continue;
                                }
                                Common.Logic.LogicList.Add(logic);
                            }
                    if (If_once)

                    {

                        if (Common.Logic.LogicList.Count == 0)

                        {

                            If_once = false;
                            var Idlist1 = await Send.GetLogicId(0);//

                            var Idlist2 = await Send.GetLogicId(2);//门锁常开模式

                            if (Idlist1.Count != 0)

                            {

                                var listlogic1 = await Send.ReadList(Idlist1.Count, 0);

                                for (int j = 0; j < listlogic1.Count; j++)

                                {

                                    var logic = listlogic1[j];

                                    if (logic.LogicType != 0)

                                    {

                                        continue;

                                    }

                                    Common.Logic.LogicList.Add(logic);

                                }

                            }

                            if (Idlist2.Count != 0)

                            {

                                var listlogic2 = await Send.ReadList(Idlist2.Count, 2);

                                for (int j = 0; j < listlogic2.Count; j++)

                                {

                                    var logic = listlogic2[j];

                                    if (logic.LogicType != 2)

                                    {

                                        continue;

                                    }

                                    Common.Logic.LogicList.Add(logic);

                                }

                            }

                        }
                    }
                }