blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
wxr
2020-04-21 f718d23a262a5a8e1241fdeaeb4153399f95e79d 
 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);


        }


@@ -110,6 +110,7 @@


                                "\"Account\":" + "\"" + mobileNumber + "\"" + "," +


                                "\"Password\":" + "\"" + password + "\"" + "," +


                                "\"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,7 +259,7 @@


                    });


#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)


@@ -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>


        /// 编辑住宅信息


@@ -537,6 +584,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 +606,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;