2020--6-9

wxr

2020-06-09 77e7b5223dd04a6e036dc952efb38f2b770a6828

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -92,8 +92,8 @@
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("Account", account);
            d.Add("Code", vCode);
            d.Add("Language", MainPage.LoginUser.language);
            d.Add("AreaCode", MainPage.LoginUser.areaCode);
            d.Add("Language", Language.CurrentLanguage);
            d.Add("AreaCode", "86");
            var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/LoginValidCode", jsonString, false);
        }
@@ -109,7 +109,8 @@
            string jsonString = "{" +

                                "\"Account\":" + "\"" + mobileNumber + "\"" + "," +
                                "\"Password\":" + "\"" + password + "\"" + "," +
                                "\"Language\":" + "\"" + language + "\"" + 
                                "\"Language\":" + "\"" + language + "\"" +
                                "\"AreaCode\":" + "\"" + "86" + "\"" +
                                "}";
            return RequestHttps($"{severAddress}/SignIn", jsonString, false);
        }
@@ -173,7 +174,7 @@

            string jsonString = "{" +

                                "\"Account\":" + "\"" + phoneNum + "\"" + "," +
                                "\"AreaCode\":" + MainPage.LoginUser.areaCode + 
                                "\"AreaCode\":" + "86" + 
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
        }
@@ -238,21 +239,17 @@

            if (revertObj.StateCode.ToUpper() == "SUCCESS")
            {
                var dataStr = Newtonsoft.Json.Linq.JObject.FromObject(revertObj.ResponseData);
                //MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
                var dataStr = JObject.FromObject(revertObj.ResponseData);
                //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109",  < !--帐号Id-- >
                MainPage.LoginUser.userEmailInfo = dataStr.GetValue("Email").ToString();
                MainPage.LoginUser.userMobileInfo = dataStr.GetValue("Phone").ToString();
                //"HeadImage": null,  < !--头相，类型byte[] -->
                FileStream fs = null;
                try
                {
                    var headImageString = dataStr.GetValue("HeadImage").ToString();
                    var ss = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(headImageString);
                    var bytes = Encoding.UTF8.GetBytes(headImageString);
                    MainPage.LoginUser.headImagePageBytes = bytes;
                    //var bytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(headImageString);
                    //var byteStr = Encoding.UTF8.GetString(bytes);
                    var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
                    var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
                    MainPage.LoginUser.headImagePageBytes = headImageBytes;
                    var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");

#if DEBUG
@@ -262,10 +259,10 @@
                    });
#endif
                    fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
                    fs.Write(bytes, 0, bytes.Length);
                    fs.Write(headImageBytes, 0, headImageBytes.Length);
                    fs.Flush();
                    MainPage.LoginUser.headImagePagePath = filePath;
                }catch (Exception ex)
                } catch (Exception ex)
                {
                    MainPage.Log($"download headImage error : {ex.Message}");
                }
@@ -278,11 +275,30 @@
                }
                // "GesturePwd": null,  < !--手势密码-- >
                // "StringPwd": null , < !--字符串密码-- >
                MainPage.LoginUser.userName = dataStr.GetValue("Remark").ToString();
                MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();

                Application.RunOnMainThread(() =>
                {
                });

                MainPage.LoginUser.SaveUserInfo();
                MainPage.Log("获取用户信息成功。");
            }

        }

        /// <summary>
        /// 更新用户昵称
        /// </summary>
        /// <param name="userName"></param>
        /// <returns></returns>
        public ResponsePack EditUserName(string userName)
        {
            Dictionary<string, string> d = new Dictionary<string, string>();
            d.Add("UserName", userName);
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/UpdateUserName", requestJson, true);
            return revertObj;

        }

@@ -310,7 +326,7 @@
        /// <summary>
        /// 获取住宅列表
        /// </summary>
        public ResponsePack GetHomePager()
        public string GetHomePager()
        {
            string jsonString = "{" +

                                "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
@@ -318,7 +334,38 @@
                                "\"HomeType\":" + "\"" + "1" + "\"" + "," +
                                "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
                                "}";
            return RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);
            var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);

            if (responsePack.StateCode.ToUpper() == "SUCCESS")
            {
                var dataStr = JObject.FromObject(responsePack.ResponseData);
                //没有住宅
                if (dataStr.GetValue("PageData").ToString() == "[]")
                {

                }
                else
                {
                    MainPage.LoginUser.regionList = new List<RegionInfoRes>();
                    foreach (var jsonData in dataStr.GetValue("PageData"))
                    {
                        var homeJsonStr = JObject.FromObject(jsonData);
                        var home = new RegionInfoRes()
                        {
                            RegionID = homeJsonStr.GetValue("Id").ToString(),
                            RegionName = homeJsonStr.GetValue("RegionName").ToString(),
                            Name = homeJsonStr.GetValue("Name").ToString(),
                            Address = homeJsonStr.GetValue("Address").ToString(),
                        };
                        MainPage.LoginUser.regionList.Add(home);
                    }
                    DB_ResidenceData.residenceData.SaveResidenceData();
                    MainPage.LoginUser.SaveUserInfo();
                }
            }
            return responsePack.StateCode;


        }
        /// <summary>
        /// 编辑住宅信息
@@ -343,6 +390,146 @@
            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="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

@@ -537,6 +724,18 @@
            var roomList = new Dictionary<JObject, Room>();

            var roomsObject = jt.FindAll((room) => room.GetValue("FileName").ToString().StartsWith("Room_") && room.GetValue("FileName").ToString().Split('_').Length == 2);
            foreach(var pp in jt)
            {
                if(pp.GetValue("FileName").ToString().StartsWith("Equipment"))
                {
                    MainPage.Log(pp.GetValue("FileName").ToString());


                }


            }
            roomsObject = jt.FindAll((room) => room.GetValue("FileName").ToString().StartsWith("Equipment_OnePortBus"));
            foreach (var roomJObj in roomsObject)
            {
                Dictionary<string, object> d = new Dictionary<string, object>();
@@ -547,18 +746,18 @@
                var byresss = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonBytes);
                var byteStr = Encoding.UTF8.GetString(byresss);
                var ss = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(byteStr);
                var RootPath = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/";
                var filePath = Path.Combine(RootPath, ss.GetValue("BackGroundImage").ToString()) + ".png";
                var room1 = new Room()
                {
                    sid = Guid.NewGuid().ToString(),
                    name = ss.GetValue("Name").ToString(),
                    floorIndex = 1,
                    backgroundImage = "Classification/Room/Roombg.png",
                    //backgroundImage = ss.GetValue("BackGroundImage").ToString() == "Room/r1.png" ? "Classification/Room/Roombg.png" : filePath,
                };
                DB_ResidenceData.residenceData.rooms.Add(room1);
                roomList.Add(ss, room1);
                //var RootPath = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/";
                //var filePath = Path.Combine(RootPath, ss.GetValue("BackGroundImage").ToString()) + ".png";
                //var room1 = new Room()
                //{
                //    sid = Guid.NewGuid().ToString(),
                //    name = ss.GetValue("Name").ToString(),
                //    floorIndex = 1,
                //    backgroundImage = "Classification/Room/Roombg.png",
                //    //backgroundImage = ss.GetValue("BackGroundImage").ToString() == "Room/r1.png" ? "Classification/Room/Roombg.png" : filePath,
                //};
                //DB_ResidenceData.residenceData.rooms.Add(room1);
                //roomList.Add(ss, room1);

            }
            var index = 1;
@@ -686,7 +885,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,
@@ -712,7 +911,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,
@@ -739,7 +938,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" } },
                                    },
@@ -768,7 +967,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"} },
@@ -800,7 +999,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 = "开",
@@ -826,7 +1025,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%",
@@ -852,7 +1051,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%",