合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs

@@ -2763,6 +2763,10 @@
        [System.Serializable]
        public class TaskListInfo
        {
            /// <summary>

            /// ★★★★晾衣架临时追加,后期会删掉

            /// </summary>
            public int Epoint = -1;
            /// <summary>
            /// 任务类型。
            ///<para>1：开关 （设备具有开关功能时可用）</para> 
@@ -6247,7 +6251,7 @@
                var data = new JObject
                    {
                        { "ActionType", 253},
                        { "LoginToken", Shared.Phone.HdlSafeguardLogic.Current.GetLoginToken()},
                        { "LoginToken", Shared.Phone.UserCenter.HdlSafeguardLogic.Current.GetLoginToken()},
                        { "PushNumber", strPhone},
                        { "PushNumberNote", strNote}
                    };