2020-03-26-2

WJC

2020-03-26 1fee912d2378f4fe11218257509fb3ec3ee313be

2020-03-26-2

请合并

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -17,8 +17,9 @@
                <Node name="Category" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="LogicCommunalPage.cs" selected="True" />
                    <Node name="DoorLockLogic" expanded="True">
                      <Node name="LockLogicList.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs

@@ -10,7 +10,7 @@

        public LockLogicList()
        {
            Tag = "Logic";
            Tag = "LockListView";
        }
        VerticalRefreshLayout middle;
        public void Show()

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

@@ -804,7 +804,8 @@
            }
            else if (LogicView.IfString._LockLogic == if_logic)
            {
                UserView.HomePage.Instance.RemoveViewByTag("Logic");
                UserView.HomePage.Instance.RemoveViewByTag("Logic");//移除所有标记Logic界面
                UserView.HomePage.Instance.RemoveViewByTag("LockListView");//移除所有标记LockListView界面
                var doorLockLogicList = new DoorLockLogic.LockLogicList();
                UserView.HomePage.Instance.AddChidren(doorLockLogicList);
                UserView.HomePage.Instance.PageIndex += 1;