2020-05-15-1

陈嘉乐

2020-05-15 d5b9ff8bf8cc36f5b13c46b66682f5988d3a6f36

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -180,7 +180,7 @@
            });
        }
        ///<summary>
        /// 删除逻辑
        /// 删除逻辑(0成功,其它值:失败)
        /// </summary>
        public static async System.Threading.Tasks.Task<int> DelLogic(int LogicId)
        {
@@ -297,6 +297,7 @@
                                    ["RemindTime"] = int.Parse(dictionary["RemindTime"]),
                                    ["EnDelay"] = int.Parse(dictionary["EnDelay"]),
                                    ["DelayTime"] = int.Parse(dictionary["DelayTime"]),
                                    ["DoorLockOpenDelayTime"] = int.Parse(dictionary["DoorLockOpenDelayTime"]),
                                };
                                if (dictionary["DateType"].ToString() == "0")
                                {
@@ -498,6 +499,15 @@
                                            ["AccountName"] = dictionary["AccountName"],

                                        };

                                        if (dictionary.ContainsKey("Option4"))
                                        {
                                            accounts1.Add("Option4",dictionary["Option4"]);
                                        }
                                        if (dictionary.ContainsKey("Option2"))
                                        {
                                            accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
                                        }
                                        accounts.Add(accounts1);
                                    }
                                }
@@ -714,7 +724,7 @@
                }
                catch { }
                var dateTime = DateTime.Now;
                while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000)
                while ((DateTime.Now - dateTime).TotalMilliseconds < 5* 1000)
                {
                    await System.Threading.Tasks.Task.Delay(100);
                    if (sum == listLogic.Count)
@@ -934,7 +944,7 @@
        {
            string s = null;
            var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//不同区域域名前缀不一样
                                                                                                 // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
                                                                                               
            var jObject = JObject.Parse(str);
            if (jObject == null || jObject["StateCode"].ToString() != "Success")
            {
@@ -959,13 +969,11 @@
                        residential.IsOtherAccountCtrl = true;
                        residential.doorlockmac = doorlockMac;
                        residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
                        //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
                        s = await ReadUserDoorLock(residential);
                    }
                    else
                    {
                        residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
                        //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
                        residential.Token = Config.Instance.Token;
                        residential.Id = Config.Instance.HomeId;
                        residential.IsOtherAccountCtrl = false;
@@ -1114,6 +1122,14 @@
        /// <param name="logic">逻辑对象</param>
        public static void Zj(bool tag, Common.Logic logic)
        {

            if (string.IsNullOrEmpty(logic.LogicCustomPushText))
            {
                ///默认推送自定义内容
                string str = logic.LogicName + Language.StringByID(R.MyInternationalizationString.defaulttext);
                logic.LogicCustomPushText = str;
            }

            new System.Threading.Thread(() =>
            {
                if (logic.LogicId != 0)