2019-12-19-1

WJC

2019-12-19 7a23bcdf0fe5f7442aa95ec2203cd5b6670a910d

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

@@ -380,6 +380,16 @@
                                };
                                conditions.Add(sInfo);
                                break;
                            case 7:
                                var diliInfo = new JObject
                                {
                                    ["Type"] = int.Parse(dictionary["Type"]),
                                    ["IsValid"] = int.Parse(dictionary["IsValid"]),
                                    ["AtHome"] = int.Parse(dictionary["AtHome"]),
                                    ["WhoSiteUId"] =dictionary["WhoSiteUId"],
                                };
                                conditions.Add(diliInfo);
                                break;
                        }
                    }
                    var actions = new JArray();
@@ -735,7 +745,59 @@
            //return list1;
        }

       

        /// <summary>
        /// 获取场景信息的方法
        /// </summary>
        /// <param name="SceneId"></param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<SceneUI> GetScene(int SceneId)
        {
            SceneUI sceneui = null;
            return await System.Threading.Tasks.Task.Run(async () =>
            {
                Action<string, string> action = (topic, data) =>
                {
                    var gatewayID = topic.Split('/')[0];
                    var jObjectdata = JObject.Parse(data);
                    if (jObjectdata == null)
                    {
                        return;
                    }

                    if (topic == $"{gatewayID}/Scene/GetDeviceList_Respon")
                    {
                        sceneui = new SceneUI();
                        sceneui.Name = jObjectdata["Data"]["ScenesName"].ToString();
                        sceneui.Id = int.Parse(jObjectdata["Data"]["ScenesId"].ToString());
                        
                    }
                };
                var mainGateWay = ZbGateway.MainGateWay;
                if (mainGateWay == null)
                {
                    Console.WriteLine("没有主网关");
                    return sceneui;
                }
                mainGateWay.GwResDataAction += action;

                var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 806 } };
                var jObjectdata1 = new JObject { { "ScenesId", SceneId } };
                jObject.Add("Data", jObjectdata1);
                mainGateWay?.Send("Scene/GetDeviceList", jObject.ToString());
                var dateTime = DateTime.Now;
                while ((DateTime.Now - dateTime).TotalMilliseconds < 3 * 1000)
                {
                    await System.Threading.Tasks.Task.Delay(100);
                    if (sceneui!=null)
                    {
                        break;
                    }
                }
                ZbGateway.MainGateWay.GwResDataAction -= action;
                return sceneui;
            });
        }
        #endregion

        #region  ----获取门锁
@@ -743,7 +805,7 @@
        /// <summary>
        /// 获取自己+其他成员信息
        /// </summary>
        /// <param name="doorlockMac">门锁Mac</param>
        /// <param name="doorlockMac">门锁Mac+端口</param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<List<MembershipIfon>> AllMembers(string doorlockMac)
        {
@@ -881,7 +943,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 str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
            var jObject = JObject.Parse(str);
            if (jObject == null || jObject["StateCode"].ToString() != "Success")
            {
@@ -976,7 +1038,7 @@
                postValues.Add("RequestVersion", CommonPage.RequestVersion);
                postValues.Add("LoginAccessToken", residential.Token);
                postValues.Add("HomeId", residential.Id);
                postValues.Add("DoorLockId", residential.doorlockmac);//门锁Mac
                postValues.Add("DoorLockId", residential.doorlockmac);//门锁Mac+端口
                postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
                postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
            }
@@ -1095,5 +1157,39 @@
        public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
        #endregion

        #region  存取本地文件的方法 ---暂时不用合并该方法---
        /// <summary>

        /// 文件保存

        /// </summary>

        /// <param name="FileName">文件路径</param>

        /// <param name="obj">需要序列化数据</param>

        public static void SaveLocalFile(string FileName, object obj)

        {

            //先序列化数据；

            var data = Newtonsoft.Json.JsonConvert.SerializeObject(obj);

            //数据转换为字节流；

            var byteData = System.Text.Encoding.UTF8.GetBytes(data);

            //写入数据；

            Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);

        }



        /// <summary>

        /// 文件读取

        /// </summary>

        /// <param name="FileName">文件路径</param>

        /// <returns></returns>

        public static string ReadLocalFile(string FileName)

        {

            if (System.IO.File.Exists(FileName) == false)

            {

                ///判断是否有文件;

                return null;

            }

            //读出保存该路径的文件；

            var varByte = Shared.IO.FileUtils.ReadFile(FileName);

            //字节流转换为字符串；

            return System.Text.Encoding.UTF8.GetString(varByte);

        }
        #endregion
    }
}