Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Common/Logic.cs

@@ -8,6 +8,7 @@
    {
        public static List<Logic> LogicList = new List<Logic>();
        public static List<Logic> LockLogicList = new List<Logic>();
        public static List<Logic> SoneLogicList = new List<Logic>();
        public static List<ZigBee.Device.CommonDevice> LogicDviceList = new List<ZigBee.Device.CommonDevice>();
        public static Logic CurrentLogic;
        /// <summary>