From 4c17caa61bc3b0a05a2b303bccdfedfbf3853f6d Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 24 十一月 2020 15:58:10 +0800 Subject: [PATCH] 2020-11-24 1.优化登录界面失败提示。 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 479 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 291 insertions(+), 188 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index c323407..322ecc4 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -68,29 +68,29 @@ } - public string GetRequestResultMsg(string resultCode) - { - string result = ""; - switch (resultCode.ToUpper()) - { - case "USERNAMEORPWDERROR": - result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError); - break; - case "ACCOUNTNOEXISTS": - result = Language.StringByID(StringId.ACCOUNTNOEXISTS); - break; - case "SENDFAIL": - result = Language.StringByID(StringId.FailedToSendVerificationCode); - break; - case "EXIST": - result = Language.StringByID(StringId.AccountAlreadyUse); - break; - case "Self:Net_Error": - result = Language.StringByID(StringId.NetworkAnomaly); - break; - } - return result; - } + //public string GetRequestResultMsg(string resultCode) + //{ + // string result = ""; + // switch (resultCode.ToUpper()) + // { + // case "USERNAMEORPWDERROR": + // result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError); + // break; + // case "ACCOUNTNOEXISTS": + // result = Language.StringByID(StringId.ACCOUNTNOEXISTS); + // break; + // case "SENDFAIL": + // result = Language.StringByID(StringId.FailedToSendVerificationCode); + // break; + // case "EXIST": + // result = Language.StringByID(StringId.AccountAlreadyUse); + // break; + // case "Self:Net_Error": + // result = Language.StringByID(StringId.NetworkAnomaly); + // break; + // } + // return result; + //} #region 鈻� 閫氱敤璇锋眰鎺ュ彛_______________________ /// <summary> @@ -112,15 +112,15 @@ { var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj() { - refreshToken = UserInfo.Current.refreshToken, + refreshToken = UserInfo.Current.refreshToken, }); var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson); if (revertObj.Code.ToUpper() == StateCode.SUCCESS) { var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString()); - UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken; - UserInfo.Current.lastTime = DateTime.Now; - UserInfo.Current.SaveUserInfo(); + UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken; + UserInfo.Current.lastTime = DateTime.Now; + UserInfo.Current.SaveUserInfo(); return true; } return false; @@ -260,7 +260,7 @@ /// <returns></returns> public ResponsePackNew ValidatorCode(VerifyType verifyType, string account, string code, bool isPhone, bool verifySuccessFail = true) { - var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType , verifySuccessFail = verifySuccessFail }; + var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType, verifySuccessFail = verifySuccessFail }; if (isPhone) { //鎵嬫満 @@ -289,26 +289,26 @@ if (resultObj.Code == StateCode.SUCCESS) { var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString()); - UserInfo.Current.userEmailInfo = info.memberEmail; - UserInfo.Current.userMobileInfo = info.memberPhone; - UserInfo.Current.userName = info.memberName; - UserInfo.Current.areaCode = info.memberPhonePrefix; + UserInfo.Current.userEmailInfo = info.memberEmail; + UserInfo.Current.userMobileInfo = info.memberPhone; + UserInfo.Current.userName = info.memberName; + UserInfo.Current.areaCode = info.memberPhonePrefix; //鏄惁闇�瑕佽幏鍙栧ご鍍� if (bGetHeadImage) { var headImageBytes = DownHeadImage(); - if (headImageBytes != null) + if (headImageBytes != null && headImageBytes.Length > 0) { - UserInfo.Current.headImagePageBytes = headImageBytes; + UserInfo.Current.headImagePageBytes = headImageBytes; FileStream fs = null; try { - UserInfo.Current.headImagePageBytes = headImageBytes; + 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; + UserInfo.Current.headImagePagePath = filePath; } catch (Exception ex) { @@ -325,7 +325,7 @@ } } - UserInfo.Current.SaveUserInfo(); + UserInfo.Current.SaveUserInfo(); MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�"); } @@ -396,10 +396,11 @@ /// <returns></returns> public ResponsePackNew EditUserName(string userName) { - var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes() { - memberName = userName - }); - return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson); + var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes() + { + memberName = userName + }); + return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson); } /// <summary> @@ -426,7 +427,7 @@ /// <returns></returns> public string BindAccount(string account, string code = "", bool isPhone = false) { - var requestObj = new BindWithAccountObj() { verifyCode = code}; + var requestObj = new BindWithAccountObj() { verifyCode = code }; if (isPhone) { //鎵嬫満 @@ -448,7 +449,7 @@ /// <returns></returns> public string UnBindAccount(bool isPhone) { - var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE": "EMAIL" }; + var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE" : "EMAIL" }; var requestJson = HttpUtil.GetSignRequestJson(requestObj); return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code; } @@ -599,11 +600,11 @@ homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, }; - if(editId == 0) + if (editId == 0) { requestObj.homeName = editName; } - else if(editId == 1) + else if (editId == 1) { requestObj.Address = editName; } @@ -626,7 +627,7 @@ var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString()); if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID) { - if(mHomeGatewayRes != null) + if (mHomeGatewayRes != null) { if (mHomeGatewayRes.Count > 0) { @@ -639,7 +640,7 @@ } DB_ResidenceData.residenceData.SaveResidenceData(); } - + if (mHomeGatewayRes != null) { //Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count); @@ -658,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); } @@ -673,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); } @@ -685,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, @@ -702,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, @@ -723,12 +724,12 @@ //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 }); - return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson); } @@ -813,7 +814,7 @@ homeId = shareData.homeId, homeShareId = shareData.id }); - return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson); + 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); @@ -843,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); } @@ -861,7 +862,6 @@ } #endregion - /// <summary> /// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛 /// </summary> @@ -892,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 鑾峰彇澶╂皵閮ㄥ垎 @@ -1126,32 +1229,32 @@ #endregion #region 澶囦唤閮ㄥ垎 - /// <summary> - /// 鑾峰彇浣忓畢澶囦唤鍒楄〃 - /// </summary> - public Dictionary<int, string> GetRegionLastBackupId() - { - //Dialog dialog = new Dialog(); - //dialog.Show(); + ///// <summary> + ///// 鑾峰彇浣忓畢澶囦唤鍒楄〃 + ///// </summary> + //public Dictionary<int, string> GetRegionLastBackupId() + //{ + // //Dialog dialog = new Dialog(); + // //dialog.Show(); - Dictionary<int, string> backupList = new Dictionary<int, string>(); - Dictionary<string, object> d = new Dictionary<string, object>(); - d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200); - var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d); - var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true); - if (revertObj == null || revertObj.ResponseData == null) - { - return new Dictionary<int, string>(); - } - var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString()); - foreach (var j in jt) - { - var folderId = (int)j.GetValue("FolderID"); - var folderName = j.GetValue("FolderName").ToString(); - backupList.Add(folderId, folderName); - } - return backupList; - } + // Dictionary<int, string> backupList = new Dictionary<int, string>(); + // Dictionary<string, object> d = new Dictionary<string, object>(); + // d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200); + // var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d); + // var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true); + // if (revertObj == null || revertObj.ResponseData == null) + // { + // return new Dictionary<int, string>(); + // } + // var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString()); + // foreach (var j in jt) + // { + // var folderId = (int)j.GetValue("FolderID"); + // var folderName = j.GetValue("FolderName").ToString(); + // backupList.Add(folderId, folderName); + // } + // return backupList; + //} /* 2020-09-01 寮冪敤 鎭㈠鏃ф暟鎹姛鑳藉湪bus杞欢涓婂疄鐜� /// <summary> @@ -1598,6 +1701,6 @@ #endregion - + } } \ No newline at end of file -- Gitblit v1.8.0