From 25bb055b0249d86548883083bb315922e6a2076b Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 24 十一月 2020 15:39:08 +0800 Subject: [PATCH] 2020-11-24 1.注册增加服务器选择。 2.增加极光推送接口 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 328 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 215 insertions(+), 113 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index 9ba2fdf..322ecc4 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -659,7 +659,7 @@ /// <returns></returns> public ResponsePackNew GetResidenceMemberAccount() { - var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID }); + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID }); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson); } @@ -674,7 +674,7 @@ childAccountId = subaccount.childAccountId, homeId = subaccount.homeId }; - var requestJson = HttpUtil.GetSignRequestJson(requestObj); + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson); } @@ -686,7 +686,7 @@ /// <returns></returns> public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId) { - var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj() + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildNickNameObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, childAccountId = childAccountId, @@ -703,7 +703,7 @@ /// <returns></returns> public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId) { - var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj() + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildAllowCreateSceneObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, childAccountId = childAccountId, @@ -724,7 +724,7 @@ //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true); - var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll() + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeShareFindAll() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, childAccountId = childAccountId @@ -844,7 +844,7 @@ { //娣诲姞瀛愯处鍙� var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName }; - var requestJson = HttpUtil.GetSignRequestJson(requestObj); + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson); } @@ -862,7 +862,6 @@ } #endregion - /// <summary> /// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛 /// </summary> @@ -893,123 +892,226 @@ } #region 鎺ㄩ�� - // /// <summary> - // /// 鎻愪氦鎺ㄩ�侀渶瑕佺殑鍏抽敭鏍囪瘑淇℃伅 - // /// </summary> - // public bool PushserivceAddPushInfo() - // { - // try - // { - // string DeviceType = "Android"; - //#if __IOS__ - // DeviceType = "Iphone"; - //#endif - // //鏄惁鐢熸垚妯″紡 - // bool isProduce = true; - //#if DEBUG - // isProduce = false; - //#endif + /// <summary> + /// 鎻愪氦鎺ㄩ�侀渶瑕佺殑鍏抽敭鏍囪瘑淇℃伅 + /// </summary> + public bool PushSerivceAddPushInfo() + { + try + { + string deviceType = PhoneDeviceType.Android.ToString(); +#if __IOS__ + deviceType = PhoneDeviceType.IOS.ToString(); +#endif + //鏄惁鐢熸垚妯″紡 + bool isProduce = true; +#if DEBUG + isProduce = false; +#endif - // if (string.IsNullOrEmpty(UserConfig.Instance.tokenID)) return false; + if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) return false; - // var mAddpushinfoObj = new AddpushinfoObj() - // { - // pushid = UserConfig.Instance.tokenID, - // deviceName = UserConfig.Instance.phoneName, - // deviceType = DeviceType, - // produce = isProduce, + var mAddpushinfoObj = new AddpushinfoObj() + { + pushToken = OnAppConfig.Instance.PushDeviceToken, + deviceName = OnAppConfig.Instance.PhoneName, + deviceType = deviceType, + produce = isProduce, - // }; - // var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj); - // var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Pushserivce_Addpushinfo, mAddpushinfoJson); - // if (revertObj.Code == StateCode.SUCCESS) - // { - // if (revertObj.Data != null) - // { - // var pushId = revertObj.Data.ToString(); - // if (!string.IsNullOrEmpty(pushId)) - // { - // UserConfig.Instance.PushId = pushId; - // UserConfig.Instance.SaveUserConfig(); - // return true; - // } - // } - // Utlis.WriteLine("Addpushinfo 鎴愬姛"); - // } - // else - // { - // Utlis.WriteLine("Addpushinfo 澶辫触"); - // } + }; + var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj); + var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson); + if (revertObj.Code == StateCode.SUCCESS) + { + if (revertObj.Data != null) + { + var pushId = revertObj.Data.ToString(); + if (!string.IsNullOrEmpty(pushId)) + { + OnAppConfig.Instance.PushId = pushId; + OnAppConfig.Instance.SaveUserConfig(); + return true; + } + } + Utlis.WriteLine("AddToken 鎴愬姛"); + } + else + { + Utlis.WriteLine("AddToken 澶辫触"); + } + return false; + } + catch + { + return false; + } + } - // return false; - // } - // catch - // { - // return false; - // } - // } + /// <summary> + /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛� + /// </summary> + /// <returns></returns> + public ResponsePackNew PushSerivceGetpushmessagelist() + { + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMessageListObj() + { + pushId = OnAppConfig.Instance.PushId + }); + return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson); + } - // /// <summary> - // /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛� - // /// </summary> - // /// <returns></returns> - // public ResponsePackNew PushserivceGetpushmessagelist() - // { - // var urlSegmentDic = HttpUtil.GetBaseQueryDictionary(); - // urlSegmentDic.Add("pushId", UserConfig.Instance.PushId); - // return HttpUtil.RequestHttpsGet(NewAPI.API_GET_Pushserivce_Getpushmessagelist, null, urlSegmentDic); - // } + /// <summary> + /// 娓呯┖娑堟伅璁板綍 + /// </summary> + /// <returns></returns> + public bool PushSerivceClearmessagelist() + { + if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false; - // /// <summary> - // /// 娓呯┖娑堟伅璁板綍 - // /// </summary> - // /// <returns></returns> - // public bool PushserivceClearmessagelist() - // { - // if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false; + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() + { + pushId = OnAppConfig.Instance.PushId + }); - // var urlSegmentDic = new Dictionary<string, object>(); - // urlSegmentDic.Add("pushId", UserConfig.Instance.PushId); - // var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Clearmessagelist, null, null, urlSegmentDic); - // if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE) - // { - // return true; - // } - // else - // { + var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Clearmessagelist, requestJson); + if (revertObj.Code == StateCode.SUCCESS) + { + return true; + } + else + { - // } - // return false; - // } + } + return false; + } - // /// <summary> - // /// 閫�鍑虹櫥褰曪紝娓呯┖鎺ㄩ�佹爣璇� - // /// </summary> - // /// <returns></returns> - // public bool PushserivceSignOut() - // { - // if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false; - // try - // { - // var urlSegmentDic = new Dictionary<string, object>(); - // urlSegmentDic.Add("pushId", UserConfig.Instance.PushId); - // var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Deletepushinfo, null, null, urlSegmentDic); - // if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE) - // { - // return true; - // } - // else - // { + /// <summary> + /// 閫�鍑虹櫥褰曪紝娓呯┖鎺ㄩ�佹爣璇� + /// </summary> + /// <returns></returns> + public bool PushSerivceSignOut() + { + if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false; + try + { + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() { + pushId = OnAppConfig.Instance.PushId + }); + + var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson); + if (revertObj.Code == StateCode.SUCCESS) + { + return true; + } + else + { - // } - // return false; - // } - // catch - // { - // return false; - // } - // } + } + return false; + } + catch + { + return false; + } + } + /// <summary> + /// 鏍囪娑堟伅鍏ㄩ儴宸茶 + /// </summary> + /// <param name="msgId"></param> + /// <returns></returns> + public bool PushSerivceMarkAllMessageRead() + { + if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false; + + try + { + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() + { + pushId = OnAppConfig.Instance.PushId + }); + var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_ALLMarkread, requestJson); + if (revertObj.Code == StateCode.SUCCESS) + { + return true; + } + else + { + + } + return false; + } + catch + { + return false; + } + } + + /// <summary> + /// 鏍囪鎸囧畾娑堟伅宸茶 + /// </summary> + /// <param name="msgId"></param> + /// <returns></returns> + public bool PushSerivceMarkMessageRead(string msgId) + { + if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false; + + try + { + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj() + { + msgId = msgId + }); + + var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Markread, requestJson); + if (revertObj.Code == StateCode.SUCCESS) + { + return true; + } + else + { + + } + return false; + } + catch + { + return false; + } + } + + /// <summary> + /// 閫氳繃涓婚敭id鍒犻櫎涓�鏉℃帹閫佽褰� + /// </summary> + /// <param name="msgId"></param> + /// <returns></returns> + public bool PushSerivceDeleteMessage(string msgId) + { + if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false; + + try + { + var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj() + { + msgId = msgId + }); + + var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Deletepushinfo, requestJson); + if (revertObj.Code == StateCode.SUCCESS) + { + return true; + } + else + { + + } + return false; + } + catch + { + return false; + } + } #endregion #region 鑾峰彇澶╂皵閮ㄥ垎 -- Gitblit v1.8.0