2020-11-23 1.住宅相关接口替换。2.增加检测更新。3.增加服务器选择Dialog

JLChen

2020-11-23 abc4e92e199962da76ae58c611f2616066053194

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -248,21 +248,6 @@
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson);
        }



        ///// <summary>
        ///// 获取登录验证码
        ///// </summary>
        //public ResponsePack GetLoginVerCode(string account)
        //{

        //    string jsonString = "{" +

        //                        "\"Account\":" + "\"" + account + "\"" + "," +
        //                        "\"AreaCode\":" + "86" +
        //                        "}";
        //    return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
        //}

        /// <summary>
        /// 验证验证码
        /// </summary>
@@ -289,22 +274,6 @@
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Check, requestJson);
        }



        /// <summary>
        /// 重设密码
        /// </summary>
        /// <returns></returns>
        public ResponsePack ResetPassword(string account, string password, string rePassword, int countryIndex)
        {
            string jsonString = "{" +

                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Password\":" + "\"" + password + "\"" + "," +
                                "\"AgainPassword\":" + "\"" + rePassword + "\"" + "," +
                                "\"AreaCode\":" + countryIndex +
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/ResetPassword", jsonString, false);
        }
        #endregion

        #region 个人信息部分
@@ -613,27 +582,71 @@
            //}
            //return responsePack.StateCode;
        }

        /// <summary>
        /// 编辑住宅信息
        /// </summary>
        /// <param name="editId">0 修改住宅名字、1 修改住宅地址</param>
        /// <param name="editName"></param>
        /// <returns></returns>
        public ResponsePack EditResidenceInfo()
        public ResponsePackNew EditResidenceInfo(int editId, string editName)
        {
            //创建字典
            Dictionary<string, object> d = new Dictionary<string, object>();
            //添加元素
            d.Add("RequestVersion", MainPage.VersionString);
            d.Add("RequestSource", "2");
            d.Add("LoginAccessToken",  UserInfo.Current.loginTokenString);
            d.Add("HomeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("HomeType", 1);
            d.Add("Name", DB_ResidenceData.residenceData.residecenInfo.Name);
            d.Add("Address", DB_ResidenceData.residenceData.residecenInfo.Address);
            //添加完成以后把字典类中数据格式化为json字符串
            //将对象转为json字符串
            var requestObj = new AddOrUpdateHomeObj()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
            };

            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/App/EditHome", jsonString, false);
            if(editId == 0)
            {
                requestObj.homeName = editName;
            }
            else if(editId == 1)
            {
                requestObj.Address = editName;
            }

            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_UpdateHome, requestJson);
        }

        /// <summary>
        /// 获取刷新当前住宅网关接口
        /// </summary>
        public void GetHomeGatewayList()
        {
            if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.residecenInfo.RegionID)) return;
            var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = nowhomeId });
            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
            if (revertObj.Code == StateCode.SUCCESS)
            {
                var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
                if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
                {
                    if(mHomeGatewayRes != null)
                    {
                        if (mHomeGatewayRes.Count > 0)
                        {
                            DB_ResidenceData.residenceData.residenceGatewayMAC = mHomeGatewayRes[0].mac;
                        }
                        else
                        {
                            DB_ResidenceData.residenceData.residenceGatewayMAC = "";

                        }
                        DB_ResidenceData.residenceData.SaveResidenceData();
                    }
                   
                    if (mHomeGatewayRes != null)
                    {
                        //Utlis.WriteLine ("获得当前住宅网关个数：" + mHomeGatewayRes.content.Count);
                    }
                }
            }
            else
            {
                //提示错误
            }
        }

        /// <summary>
@@ -642,11 +655,8 @@
        /// <returns></returns>
        public ResponsePackNew GetResidenceMemberAccount()
        {
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
            var replaceToken =  UserInfo.Current.loginTokenString;
            //如果当前所分享住宅和为管理员，替换为主人token
            //待处理...
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_FindAll, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
            var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
        }

        /// <summary>
@@ -660,11 +670,8 @@
                childAccountId = subaccount.childAccountId,
                homeId = subaccount.homeId
            };
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            var replaceToken =  UserInfo.Current.loginTokenString;
            //如果当前所分享住宅和为管理员，替换为主人token
            //待处理...
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_Delete, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
        }

        /// <summary>
@@ -673,13 +680,16 @@
        /// <param name="nickName"></param>
        /// <param name="subAccountGuid"></param>
        /// <returns></returns>
        public ResponsePack EditSubAccountNickName(string nickName, string subAccountGuid)
        public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
        {
            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);
            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId,
                nickName = nickName,
            });
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);

        }
        /// <summary>
        /// 修改子账号创建场景权限
@@ -687,70 +697,105 @@
        /// <param name="nickName"></param>
        /// <param name="subAccountGuid"></param>
        /// <returns></returns>
        public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid)
        public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
        {
            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);
            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId,
                isAllowCreateScene = isAllow,
            });
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
        }

        /// <summary>
        /// 获取住宅下子账号的共享数据列表
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetShareDataByMemberAccount(string memberId)
        public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
        {
            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);
            //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);

            var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId
            });
           return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);

        }

        /// <summary>
        /// 获取住宅下子账号的共享数据
        /// 下载单个分享文件
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetShareData(string memberId, string hId)
        public byte[] GetShareData(ShareData shareData)
        {
            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);
            //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);

            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
            {
                homeId = shareData.homeId,
                homeShareId = shareData.id
            });
            var replaceToken = "";
            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            {
                replaceToken = DB_ResidenceData.residenceData.MasterToken;
            }
            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Home_Share_DownOne, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);

        }

        /// <summary>
        /// 增加共享数据列表
        /// </summary>
        /// <returns></returns>
        public ResponsePack AddShareData(ShareData shareData)
        public ResponsePackNew 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);
            //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);

            var queryDic = new Dictionary<string, object>();
            queryDic.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            queryDic.Add("childAccountId", shareData.childAccountId);
            queryDic.Add("fileName", shareData.fileName);
            var replaceToken = "";
            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            {
                replaceToken = DB_ResidenceData.residenceData.MasterToken;
            }
            return HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Home_Share_Add, shareData.ShareDataBytes, queryDic, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
        }

        /// <summary>
        /// 增加共享数据
        /// </summary>
        /// <returns></returns>
        public ResponsePack EditShareData(ShareData shareData)
        public ResponsePackNew 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);
            return AddShareData(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>
@@ -758,26 +803,32 @@
        /// </summary>
        /// <param name="shareData"></param>
        /// <returns></returns>
        public ResponsePack DeleteShareData(ShareData shareData)
        public ResponsePackNew 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);
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
            {
                homeId = shareData.homeId,
                homeShareId = shareData.id
            });
           return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
            //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>
        ///// <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>
        /// 绑定子账号到住宅下
@@ -785,20 +836,17 @@
        /// <param name="subAccount"></param>
        /// <param name="nickName"></param>
        /// <returns></returns>
        public ResponsePack BindResidenceMemberAccount(string subAccount, string nickName)
        public ResponsePackNew 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);
            //添加子账号
            var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);

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

        /// <summary>
        /// 获取住宅下的成员账号
        /// 获取住宅下的成员账号信息
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetResidenceMemberAccountInfo(string account)
@@ -1396,5 +1444,7 @@
        */

        #endregion

   
    }
}