From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 00dfbd3..c8b31b4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -1130,7 +1130,30 @@
/// </summary>
public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
#endregion
+ /// <summary>
+ /// 鑷繁鐢�
+ /// </summary>
+ public static void Zj(bool tag, Common.Logic logic)
+ {
+ new System.Threading.Thread(() =>
+ {
+ if (logic.LogicId != 0)
+ {
+ if (tag)
+ {
+ Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ }
+ else
+ {
+ Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST");
+ }
+ ///鍙敼鎺ㄩ�佸唴瀹癸紱
+ LogicControlSwitch(logic);
+ }
+ })
+ { IsBackground = true }.Start();
+ }
#region 璇锋眰鏈嶅姟鍣ㄦ柟娉�---
/// <summary>
/// 璇锋眰鏁版嵁鐨勫皝瑁呮柟娉�
@@ -1140,9 +1163,9 @@
/// <param name="method">璇锋眰鏂瑰紡涓篜OST/GET</param>
/// <param name="obj">瀛樺偍鍙戦�佹暟鎹殑瀵硅薄</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<string>Data(string command, string url, string method, object obj = null)
+ public static async System.Threading.Tasks.Task<string> Data(string command, string url, string method, object obj = null)
{
- var getUrl ="";
+ var getUrl = "";
var jObject = new JObject();
if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 1)
{
--
Gitblit v1.8.0