2020-7-1-2

陈嘉乐

2020-07-01 2ec9898778d3beda89278e2a53ac0e68b3035d29

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

old mode 100644
new mode 100755
@@ -22,6 +22,7 @@
            return await System.Threading.Tasks.Task.Run(async () =>
            {
                List<int> logicIdList = new List<int>();
                
                Action<string, string> action = (topic, data) =>
                {
                    var gatewayID = topic.Split('/')[0];
@@ -30,7 +31,7 @@
                    {
                        return;
                    }

                    
                    if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
                    {

@@ -43,6 +44,7 @@
                        {
                            var logicId = int.Parse(listIfon["LogicId"].ToString());
                            logicIdList.Add(logicId);
                           
                        }

                    }
@@ -180,7 +182,7 @@
            });
        }
        ///<summary>
        /// 删除逻辑
        /// 删除逻辑(0成功,其它值:失败)
        /// </summary>
        public static async System.Threading.Tasks.Task<int> DelLogic(int LogicId)
        {
@@ -297,6 +299,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 +501,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);
                                    }
                                }
@@ -514,6 +526,24 @@

                                    };
                                    accounts.Add(location);
                                }
                                break;
                            case 8:
                                {
                                    var accounts1 = new JObject();
                                    if (dictionary.ContainsKey("Type"))
                                    {
                                        accounts1.Add("Type", int.Parse(dictionary["Type"]));
                                    }
                                    if (dictionary.ContainsKey("Option4"))
                                    {
                                        accounts1.Add("Option4", dictionary["Option4"]);
                                    }
                                    if (dictionary.ContainsKey("Option2"))
                                    {
                                        accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
                                    }
                                    accounts.Add(accounts1);
                                }
                                break;
                        }
@@ -714,7 +744,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)
@@ -843,8 +873,18 @@
                    //服务返回来没有门锁成员信息，没有必要再去请求成员列表，
                    //原因：节约时间，体验效果好；
                    result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
                }

                if (string.IsNullOrEmpty(result))

                {

                    //防止为空抛异常；

                    return userlist;
                }
                var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
                var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);

                if (listInfo == null)

                {

                    //防止为空抛异常；

                    return userlist;
                }
                for (int i = 0; i < listInfo.Count; i++)
                {

@@ -1112,6 +1152,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)