2020-05-07-3

陈嘉乐

2020-05-07 70fe48768ea3695780f4b2ae32e940d50bb580c7

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

@@ -20,6 +20,31 @@
            {
                case 0:
                    {
                        //  if (doorLock == null)
                        //  {
                        //      ///防止抛异常
                        //      Send.CurrentDoorLock = new DoorLock();
                        //  }
                        //  ///备注：WJC的
                        ////  Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
                        //  ///进来刷新一次设备列表；
                        //  Common.Logic.LogicDviceList.Clear();
                        //  if (Common.Logic.LogicDviceList.Count == 0)
                        //  {
                        //      Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                        //  }
                        //  var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
                        //  UserView.HomePage.Instance.AddChidren(addLogicPage);
                        //  UserView.HomePage.Instance.PageIndex += 1;
                        //  addLogicPage.Show();
                        //  addLogicPage.action += (w) =>
                        //  {
                        //      //doorLock.IsDoorLockNormallyMode = w;
                        //      /////留给徐梅用的
                        //      //UpdateNomallyOpenStatus();
                        //  };


                        //new一个新逻辑对象；
                        //新增正常自动化入口
                        Common.Logic.CurrentLogic = new Common.Logic();
@@ -241,9 +266,12 @@
            //下拉刷新自动化列表的事件
            logicScrolView.BeginHeaderRefreshingAction += () =>
            {
                //重新刷新logic列表
                Common.Logic.LogicList.Clear();
                Read(logicScrolView, no);
                if (!Config.Instance.Home.IsVirtually)
                {//虚拟的不获取网关逻辑列表
                    //重新刷新logic列表
                    Common.Logic.LogicList.Clear();
                    Read(logicScrolView, no);
                }
                //关闭刷新View；
                logicScrolView.EndHeaderRefreshing();
            };
@@ -258,6 +286,14 @@
        /// <param name="logicScrolView"></param>
        private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
        {
            //if (Config.Instance.HomeId != UserCenter.UserCenterResourse.AccountOption.OldHomeStringId)
            //{
            //    //切换住宅清除之前缓存数据;
            //    Common.Logic.LogicList.Clear();
            //    Common.Logic.LockLogicList.Clear();
            //    Common.Logic.SoneLogicList.Clear();
            //}

            CommonPage.Loading.Start();
            try
            {