From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 93dc41f..00dfbd3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -101,8 +101,8 @@
var Logicifon = jObjectdata["Data"];
logic.LogicId = int.Parse(Logicifon["LogicId"]?.ToString());
logic.IsEnable = int.Parse(Logicifon["IsEnable"]?.ToString());
- logic.LogicName = Logicifon["LogicName"]?.ToString();
- logic.LogicCustomPushText = Logicifon["LogicCustomPushText"].ToString();
+ logic.LogicName = Logicifon["LogicName"]?.ToString();
+
logic.Relationship = int.Parse(Logicifon["Relationship"]?.ToString());
logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
@@ -510,6 +510,7 @@
{ "Relationship",logic.Relationship} ,
{ "LogicType",logic.LogicType} ,
{ "LogicCustomPushText",logic.LogicCustomPushText} ,
+ { "LogicIsCustomPushText",logic.LogicIsCustomPushText} ,
{ "TimeAttribute", timeAttribute} ,
{ "Conditions", conditions },
{ "Actions", actions },
@@ -576,6 +577,7 @@
date.Add("LogicName", logic.LogicName);
date.Add("Relationship", logic.Relationship);
date.Add("LogicCustomPushText", logic.LogicCustomPushText);
+ date.Add("LogicIsCustomPushText", logic.LogicIsCustomPushText);
mainGateWay?.Send("Logic/ReviseAttribute", jObject.ToString());
//await System.Threading.Tasks.Task.Run(async () =>
//{
@@ -622,8 +624,9 @@
logic.IsEnable = int.Parse(Logicifon["IsEnable"].ToString());
logic.LogicName = Logicifon["LogicName"].ToString();
logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
- logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
- logic.LogicCustomPushText = Logicifon["LogicCustomPushText"].ToString();
+ logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
+ logic.LogicCustomPushText =Logicifon["LogicCustomPushText"].ToString();
+ logic.LogicIsCustomPushText = int.Parse(Logicifon["LogicIsCustomPushText"].ToString());
logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
@@ -1011,7 +1014,7 @@
return await WebClientAsync(2, lockifon.Url, lockifon);
}
- //鎵撳嵃NameValueCollection()鏄剧ず绱㈠紩, 閿�,鍊�
+ //鎵撳嵃NameValueCollection()鏄剧ず绱㈠紩, 閿�,鍊�
public static void PrintKeysAndValues2(NameValueCollection myCol)
{
for (int i = 0; i < myCol.Count; i++)
@@ -1139,33 +1142,36 @@
/// <returns></returns>
public static async System.Threading.Tasks.Task<string>Data(string command, string url, string method, object obj = null)
{
- var getUrl = CommonPage.RequestHttpsHost + url;//璇锋眰鍦板潃锛�
+ var getUrl ="";
var jObject = new JObject();
if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 1)
{
+ getUrl = CommonPage.RequestHttpsHost + url;//璇锋眰鍦板潃锛�
jObject.Add("IsOtherAccountCtrl", false);
+ jObject.Add("LoginAccessToken", Config.Instance.Token);
}
else
{
+ getUrl = Config.Instance.AdminRequestBaseUrl + url;//璇锋眰鍦板潃锛�
jObject.Add("IsOtherAccountCtrl", true);
+ jObject.Add("LoginAccessToken", Config.Instance.AdminRequestToken);
}
switch (command)
{
case "娣诲姞/鏇存柊":
{
jObject.Add("RequestVersion", CommonPage.RequestVersion);
- jObject.Add("LoginAccessToken", Config.Instance.Token);
+ //jObject.Add("LoginAccessToken", Config.Instance.Token);
jObject.Add("HomeId", Config.Instance.HomeId);
jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
jObject.Add("PushUserIds", new JArray { Config.Instance.Guid });
jObject.Add("PushContent", Common.Logic.CurrentLogic.LogicCustomPushText);
-
}
break;
case "鍒犻櫎":
{
jObject.Add("RequestVersion", CommonPage.RequestVersion);
- jObject.Add("LoginAccessToken", Config.Instance.Token);
+ //jObject.Add("LoginAccessToken", Config.Instance.Token);
jObject.Add("HomeId", Config.Instance.HomeId);
jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
}
--
Gitblit v1.8.0