20201223-2

wei

2020-12-23 f345087dbefecef9146fdb13481cb9ee3320d576

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -106,7 +106,7 @@
        /// 刷新Token
        /// </summary>
        /// <returns></returns>
        public bool RefreshToken()
        public string RefreshToken()
        {
            var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
            {
@@ -120,9 +120,8 @@
                UserInfo.Current.RefreshToken = revertData.refreshToken;
                UserInfo.Current.LastTime = DateTime.Now;
                UserInfo.Current.SaveUserInfo();
                return true;
            }
            return false;
            return revertObj.Code;
        }

        #endregion
@@ -131,17 +130,40 @@
        /// 绑定调试人员提交的住宅,一个住宅只能绑定一次
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew BindingResidence(string key)
        public ResponsePackNew BindingResidence(string strUrl)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            //d.Add("homeId", homeId);
            d.Add("secretKey", key);
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindlingResidence, requestJson, HttpUtil.GlobalRequestHttpsHost);
            try
            {
                if (strUrl.Contains("app/home/deliver") == false)
                {
                    //非法的URL 返回一个自定义的状态码
                    return new ResponsePackNew() { Code = "-100" };
                }
                var client = new RestSharp.RestClient(strUrl);

                var request = new RestSharp.RestRequest(RestSharp.Method.GET);
                request.Timeout = 5 * 1000;
                request.AddHeader("content-type", "application/json");
                request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);

                var response = client.Execute(request);
                if (response.StatusCode == HttpStatusCode.OK)
                {
                    return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
                }
                else
                {
                    return null;
                }
            }
            catch
            {
                return null;
            }
        }

        #region 注册、登录部分
       


        /// <summary>
        /// 通用 发送验证码方法
@@ -287,7 +309,7 @@
        /// 获取用户信息
        /// </summary>
        /// <returns></returns>
        public void GetUserInfo(bool bGetHeadImage = true)
        public string GetUserInfo(bool bGetHeadImage = true)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
            var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
@@ -321,57 +343,7 @@
                UserInfo.Current.SaveUserInfo();
                MainPage.Log("获取用户信息成功。");
            }


            //    Dictionary<string, object> d = new Dictionary<string, object>();
            //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            //var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);

            //if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS)
            //{
            //    var dataStr = JObject.FromObject(revertObj.ResponseData);
            //    //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109",  < !--帐号Id-- >
            //     UserInfo.Current.userEmailInfo = dataStr.GetValue("Email").ToString();
            //     UserInfo.Current.userMobileInfo = dataStr.GetValue("Phone").ToString();
            //    FileStream fs = null;
            //    try
            //    {
            //        var headImageString = dataStr.GetValue("HeadImage").ToString();
            //        if (!string.IsNullOrEmpty(headImageString))
            //        {
            //            var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
            //            var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
            //             UserInfo.Current.headImagePageBytes = headImageBytes;
            //            var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
            //            fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
            //            fs.Write(headImageBytes, 0, headImageBytes.Length);
            //            fs.Flush();
            //             UserInfo.Current.headImagePagePath = filePath;
            //        }
            //    }
            //    catch (Exception ex)
            //    {
            //        MainPage.Log($"download headImage error : {ex.Message}");
            //    }
            //    finally
            //    {
            //        if (fs != null)
            //        {
            //            fs.Close();
            //        }
            //    }
            //    // "GesturePwd": null,  < !--手势密码-- >
            //    // "StringPwd": null , < !--字符串密码-- >
            //     UserInfo.Current.userName = dataStr.GetValue("UserName").ToString();

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

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

            return resultObj.Code;
        }

        /// <summary>
@@ -503,6 +475,7 @@
                            homeRegionName = mHome.homeRegionName,
                            homeRegionId = mHome.homeRegionId,
                            Address = mHome.homeAddress,
                            isAllowCreateScene = mHome.isAllowCreateScene,
                        };
                        UserInfo.Current.regionList.Add(home);
                    }
@@ -598,10 +571,14 @@
                            if (mHomeGatewayRes.Count > 0)
                            {
                                DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
                                if(mHomeGatewayRes[0].gatewayStatus)
                                {
                                    DriverLayer.Control.Ins.IsRemote = true;
                                    //DriverLayer.Control.Ins.IsRemote = true;
                                    DriverLayer.Control.Ins.GatewayOnline = true;
                                }
                                else
                                {
                                    DriverLayer.Control.Ins.GatewayOnline = false;
                                }
                                DB_ResidenceData.Instance.SaveResidenceData();
                                return;
@@ -621,6 +598,27 @@
            {

            }
        }
        /// <summary>
        /// 获取网关信息
        /// </summary>
        public string GetGatewayInfo()
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGatewayInfo, jsonString);
            if (revertObj.Code == StateCode.SUCCESS)
            {
                var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<HomeGatewayInfo>(revertObj.Data.ToString());
                if (mHomeGatewayRes != null)
                {
                    DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes;
                    DB_ResidenceData.Instance.SaveResidenceData();
                }
            }
            return revertObj.Code;
        }

        /// <summary>
@@ -1798,6 +1796,7 @@
            d.Add("deviceIds", functionIds);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            MainPage.Log($"读取设备状态：{requestJson}");
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_RefreshDeviceStatus, requestJson);
        }

@@ -1928,7 +1927,7 @@
            d.Add("userSceneIds",new List<string>() { seceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
        }
        /// <summary>
        /// 添加场景
@@ -1941,7 +1940,11 @@
            d.Add("scenes", new List<Scene>() { scene });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);

            MainPage.Log($"{pack.Data}");

            return pack;
        }
        /// <summary>
        /// 编辑场景
@@ -2027,6 +2030,7 @@
            {
                d.Add("roomType", GetType);
            }
            d.Add("pageSize", "1000");
            var requestJson = HttpUtil.GetSignRequestJson(d);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);