2020-07-08-01

陈嘉乐

2020-07-08 4230f40556c36ac1d9f1aae1d80f6cb81754e708

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

old mode 100755
new mode 100644
@@ -10,6 +10,7 @@
{
    public class SkipView:FrameLayout
    {
        
        /// <summary>
        /// 其它界面跳进来的入口
        /// </summary>
@@ -64,6 +65,7 @@

        }
        #region ◆ 自动化__________________________
        public static bool If_once = true;//进来只读一次标识;
        /// <summary>
        /// 自动化功能代码入口
        /// </summary>
@@ -240,7 +242,8 @@
            {

                if (!Config.Instance.Home.IsVirtually)
                {//虚拟的不获取网关逻辑列表
                    //重新刷新logic列表
                 //重新刷新logic列表
                    If_once = true;

                    Common.Logic.LogicList.Clear();
                    Read(logicScrolView, no);
                }
@@ -271,35 +274,40 @@
            {
                if (!Config.Instance.Home.IsVirtually)//虚拟的不获取网关逻辑列表
                {
                    if (Common.Logic.LogicList.Count == 0)
                    if (If_once)
                    {
                        var Idlist1 = await Send.GetLogicId(0);//
                        var Idlist2 = await Send.GetLogicId(2);//门锁常开模式
                        if (Idlist1.Count != 0)
                        if (Common.Logic.LogicList.Count == 0)
                        {
                            var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
                            for (int j = 0; j < listlogic1.Count; j++)
                            If_once = false;
                            var Idlist1 = await Send.GetLogicId(0);//
                            var Idlist2 = await Send.GetLogicId(2);//门锁常开模式
                            if (Idlist1.Count != 0)
                            {
                                var logic = listlogic1[j];
                                if (logic.LogicType != 0)
                                var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
                                for (int j = 0; j < listlogic1.Count; j++)
                                {
                                    continue;
                                    var logic = listlogic1[j];
                                    if (logic.LogicType != 0)
                                    {
                                        continue;
                                    }
                                    Common.Logic.LogicList.Add(logic);
                                }
                                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++)
                            if (Idlist2.Count != 0)
                            {
                                var logic = listlogic2[j];
                                if (logic.LogicType != 2)
                                var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
                                for (int j = 0; j < listlogic2.Count; j++)
                                {
                                    continue;
                                    var logic = listlogic2[j];
                                    if (logic.LogicType != 2)
                                    {
                                        continue;
                                    }
                                    Common.Logic.LogicList.Add(logic);
                                }
                                Common.Logic.LogicList.Add(logic);
                            }

                        }
                    }
                }
@@ -313,6 +321,7 @@
            CommonPage.Loading.Hide();
        }
        static RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
       
        /// <summary>
        /// 加载自动化列表界面
        /// </summary>
@@ -862,6 +871,8 @@
            return false;
        }

  

    }
}