20200706

wxr

2020-07-06 23c075a9c27946773feccf05abc90489a6bf5203

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -38,7 +38,7 @@

        public HttpServerRequest()
        {
#if DEBUG
#if DEBUG1
            severAddress = debugSever;
#else
            severAddress = relaseaSever;
@@ -138,7 +138,7 @@
                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Password\":" + "\"" + password + "\"" + "," +
                                "\"EnterPassword\":" + "\"" + entryPassword + "\"" + "," +
                                "\"Language\":" + "\"" + MainPage.LoginUser.language.ToLower() + "\"" + "," +
                                "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
                                "\"Code\":" + "\"" + code + "\"" + "," +
                                "\"RegisterSoruce\":" + 0 + "," +
                                "\"AreaCode\":" + areaCode +
@@ -155,7 +155,7 @@
            string jsonString = "{" +

                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Company\":" + MainPage.Company + "," +
                                "\"Language\":" + "\"" +  MainPage.LoginUser.language.ToLower() + "\"" + "," +
                                "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
                                "\"AreaCode\":" + OnAppConfig.Instance.CountryNumber +
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/RegisterSendVerCode", jsonString, false);
@@ -346,6 +346,31 @@
                }
                else
                {
                    //{
                    // {
                    //  "Id": "1107487",
                    //  "HomeStatus": 2,
                    //  "UserGuid": "22980",
                    //  "Name": "啊",
                    //  "Address": null,
                    //  "Longitude": 0.0,
                    //  "Latitude": 0.0,
                    //  "RegionName": null,
                    //  "Company": null,
                    //  "ContactPerson": null,
                    //  "ContactPersonPhone": null,
                    //  "Remarks": null,
                    //  "ChangeDate": null,
                    //  "AccountType": 0,
                    //  "CreatedOnUtc": "2020-05-27T06:52:03",
                    //  "IsOthreShare": false,
                    //  "MainUserDistributedMark": null,
                    //  "HomeGateways": [
                    //    {
                    //      "GatewayUniqueId": "4E47323347591243"
                    //    }
                    //  ]
                    //}}
                    MainPage.LoginUser.regionList = new List<RegionInfoRes>();
                    foreach (var jsonData in dataStr.GetValue("PageData"))
                    {
@@ -356,16 +381,19 @@
                            RegionName = homeJsonStr.GetValue("RegionName").ToString(),
                            Name = homeJsonStr.GetValue("Name").ToString(),
                            Address = homeJsonStr.GetValue("Address").ToString(),
                            IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
                        };
                        MainPage.LoginUser.regionList.Add(home);
                        if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
                        {
                            DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
                        }
                    }
                    DB_ResidenceData.residenceData.SaveResidenceData();
                    MainPage.LoginUser.SaveUserInfo();
                }
            }
            return responsePack.StateCode;


        }
        /// <summary>
        /// 编辑住宅信息
@@ -390,6 +418,172 @@
            return RequestHttps($"{severAddress}/App/EditHome", jsonString, false);
        }

        /// <summary>
        /// 获取住宅下的成员账号
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetResidenceMemberAccount()
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("DistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountByDistributedMark", jsonString, true);
        }

        /// <summary>
        /// 删除住宅下的成员账号
        /// </summary>
        /// <returns></returns>
        public ResponsePack DeleteResidenceMemberAccount(string memberAccount)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("SubAccount", memberAccount);
            d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/DeletedSubAccount", jsonString, true);
        }

        /// <summary>
        /// 修改子账号昵称
        /// </summary>
        /// <param name="nickName"></param>
        /// <param name="subAccountGuid"></param>
        /// <returns></returns>
        public ResponsePack EditSubAccountNickName(string nickName,string subAccountGuid)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("SubAccountGuid", subAccountGuid);
            d.Add("NickName", nickName);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/EditSubAccountNickName", jsonString, true);
        }
        /// <summary>
        /// 修改子账号创建场景权限
        /// </summary>
        /// <param name="nickName"></param>
        /// <param name="subAccountGuid"></param>
        /// <returns></returns>
        public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("SubAccountGuid", subAccountGuid);
            d.Add("HomeGuid", homeGuid);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/ChangeCreateSceneState", jsonString, true);
        }

        /// <summary>
        /// 获取住宅下子账号的共享数据列表
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetShareDataByMemberAccount(string memberId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("DistributedMark", memberId);
            d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
        }

        /// <summary>
        /// 获取住宅下子账号的共享数据
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetShareData(string memberId,string hId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("DistributedMark", memberId);
            d.Add("HouseDistributedMark", hId);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
        }

        /// <summary>
        /// 增加共享数据列表
        /// </summary>
        /// <returns></returns>
        public ResponsePack AddShareData(ShareData shareData)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("ShareName", shareData.ShareName);
            d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            d.Add("ShareDataBytes", shareData.ShareDataBytes);
            d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
        }

        /// <summary>
        /// 增加共享数据
        /// </summary>
        /// <returns></returns>
        public ResponsePack EditShareData(ShareData shareData)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("DistributedMark", shareData.DistributedMark);
            d.Add("ShareName", shareData.ShareName);
            d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            d.Add("ShareDataBytes", shareData.ShareDataBytes);
            d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
        }

        /// <summary>
        /// 删除共享数据
        /// </summary>
        /// <param name="shareData"></param>
        /// <returns></returns>
        public ResponsePack DeleteShareData(ShareData shareData)
        {
            Dictionary<string, string> d = new Dictionary<string, string>();
            d.Add("DistributedMark", shareData.DistributedMark);
            d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
        }
        /// <summary>
        /// 删除子账号当前住宅的所有共享数据
        /// </summary>
        /// <returns></returns>
        public ResponsePack DeleteCurrentResidenceSharedData(ShareData shareData)
        {
            Dictionary<string, string> d = new Dictionary<string, string>();
            d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
            d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
        }

        /// <summary>
        /// 绑定子账号到住宅下
        /// </summary>
        /// <param name="subAccount"></param>
        /// <param name="nickName"></param>
        /// <returns></returns>
        public ResponsePack BindResidenceMemberAccount(string subAccount,string nickName)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("SubAccount", subAccount);
            d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("Nickname", nickName);
            d.Add("IsAllowRemoteCtrl", true);

            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/BindSubAccount", jsonString, true);
        }

        /// <summary>
        /// 获取住宅下的成员账号
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetResidenceMemberAccountInfo(string account)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("Account", account);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
        }

        #endregion

@@ -433,9 +627,11 @@
                            responseString = Encoding.UTF8.GetString(webClient.DownloadData(url));
                            revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString);
                            jt = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(revertObj.ResponseData.ToString());
                            MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString()+ "°";
                            MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString()+"%";
                            MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString();
                            MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString();
                            MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString();
                            MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString();
                            MainPage.cityInfo.weather = jt.GetValue("Weather").ToString();
                            break;
                        }
                        catch (Exception ex)
@@ -745,7 +941,7 @@
                        {
                            sid = "000101" + guid + "0102010001AABB",
                            name = ss.GetValue("Name").ToString(),
                            trait = new List<Trait>() {
                            function = new List<Trait>() {
                                    new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
                                },
                            roomIdList = roomIds,
@@ -771,7 +967,7 @@
                        {
                            sid = "000101" + guid + "0202020001AABB",
                            name = ss.GetValue("Name").ToString(),
                            trait = new List<Trait>() {
                            function = new List<Trait>() {
                                        new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
                                    },
                            roomIdList = roomIds,
@@ -798,7 +994,7 @@
                        {
                            sid = "000101" + guid + "0202040001AABB",
                            name = ss.GetValue("Name").ToString(),
                            trait = new List<Trait>() {
                            function = new List<Trait>() {
                                        new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
                                        new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
                                    },
@@ -827,7 +1023,7 @@
                        {
                            sid = "000101" + guid + "0204010001AABB",
                            name = ss.GetValue("Name").ToString(),
                            trait = new List<Trait>() {
                            function = new List<Trait>() {
                                        new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                        new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
                                        new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "mid", "high" ,"auto"} },
@@ -859,7 +1055,7 @@
                            name = ss.GetValue("Name").ToString(),
                            roomIdList = roomIds,
                            //roomIdList = new List<string>() { roomSid },
                            trait = new List<Trait>() {
                            function = new List<Trait>() {
                                        new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
                                    },// "curtain",
                            lastState = "开",
@@ -885,7 +1081,7 @@
                            name = ss.GetValue("Name").ToString(),
                            roomIdList = roomIds,
                            //roomIdList = new List<string>() { roomSid },
                            trait = new List<Trait>() {
                            function = new List<Trait>() {
                                        new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
                                    },// "rollingshutter",
                            lastState = "20%",
@@ -911,7 +1107,7 @@
                            name = ss.GetValue("Name").ToString(),
                            roomIdList = roomIds,
                            //roomIdList = new List<string>() { roomSid },
                            trait = new List<Trait>() {
                            function = new List<Trait>() {
                                        new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
                                    },
                            lastState = "20%",