From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
index 7ae9be6..713fb8c 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
+++ b/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}
};
--
Gitblit v1.8.0