From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 28 三月 2023 11:54:45 +0800 Subject: [PATCH] 2023年03月28日11:52:02 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 364 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 328 insertions(+), 36 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index 2414895..ac5de30 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -44,14 +44,19 @@ /// <param name="qType">鏃堕棿鏌ヨ绫诲瀷锛歨our=杩�24灏忔椂銆亀eek=杩戜竴鍛ㄣ�乵onth = 杩戜竴鏈� </param> /// <param name="deviceId">璁惧ID</param> /// <param name="deviceKey">鍔熻兘鏌ヨ绫诲瀷锛歱m25</param> + /// <param name="time">鍏蜂綋鏌ヨ鐨勬棩鏈燂紝閲戣寕娓╂帶鍣ㄤ娇鐢�</param> /// <returns></returns> - public ResponsePackNew GetSensorHistory(string qType, string deviceId, string deviceKey) + public ResponsePackNew GetSensorHistory(string qType, string deviceId, string deviceKey, string time = "") { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("type", qType); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("deviceId", deviceId); d.Add("key", deviceKey); + if (time != "") + { + d.Add("time", time); + } var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson); @@ -143,6 +148,7 @@ { var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString()); UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken; + UserInfo.Current.AccessToken = revertData.accessToken; UserInfo.Current.RefreshToken = revertData.refreshToken; UserInfo.Current.LastTime = DateTime.Now; UserInfo.Current.SaveUserInfo(); @@ -152,6 +158,10 @@ sdm.AccessToken = UserInfo.Current.LoginTokenString; sdm.RefreshToken = UserInfo.Current.RefreshToken; #endif + } + else if (revertObj.Code == StateCode.PasswrodError) + { + UserInfo.Current.LastTime = DateTime.MinValue; } return revertObj.Code; } @@ -195,8 +205,6 @@ } #region 娉ㄥ唽銆佺櫥褰曢儴鍒� - - /// <summary> /// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶 /// </summary> @@ -330,6 +338,20 @@ } var requestJson = HttpUtil.GetSignRequestJson(requestObj); return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson); + } + /// <summary> + /// 淇敼瀵嗙爜 + /// </summary> + /// <param name="loginPwd"></param> + /// <param name="loginNewPwd"></param> + /// <returns></returns> + public ResponsePackNew UpdataPassword(string loginPwd,string loginNewPwd) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("loginPwd", loginPwd); + d.Add("loginNewPwd", loginNewPwd); + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Update_Pwd, requestJson); } /// <summary> @@ -527,7 +549,7 @@ { foreach (var home in homeList) { - if (home.isBindGateway) + if (home.isBindGateway)//鏄惁缁戝畾缃戝叧 { UserInfo.Current.regionList.Add(home); //鏂扮粦瀹氱殑浣忓畢锛岀洿鎺ュ垏鎹㈠埌鏂颁綇瀹� @@ -1025,10 +1047,10 @@ #endif //鏄惁鐢熶骇妯″紡 bool isProduce = true; -#if DEBUG - isProduce = false; -#endif - + if (HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com") + { + isProduce = false; + } if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) { Utlis.WriteLine("PushDeviceToken 涓虹┖"); @@ -1332,23 +1354,60 @@ { var requestObj = new AppVersionCheckObj() { - + }; + #if __IOS__ + requestObj.releaseSystem = "IOS"; + #else + requestObj.releaseSystem = "Android"; + #endif var requestJson = HttpUtil.GetSignRequestJson(requestObj); return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson); } - - - #endregion - #region 鑾峰彇澶╂皵閮ㄥ垎 + #region 娉ㄩ攢璐﹀彿 + /// <summary> + /// 鑾峰彇褰撳墠鐗堟湰娉ㄩ攢璐﹀彿妯″紡 + /// </summary> + /// <returns></returns> + public ResponsePackNew GetUnregisterModel() + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("version", MainPage.VersionString); + d.Add("appCode", "1588071238036582401"); +#if __IOS__ + d.Add("releaseSystem", "IOS"); +#else + d.Add("releaseSystem", "Android"); +#endif + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetUnregisterModel, requestJson); + } + /// <summary> + /// 娉ㄩ攢璐﹀彿 + /// </summary> + /// <returns></returns> + public ResponsePackNew Unregister(string pwd) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("userId", UserInfo.Current.ID); + d.Add("pwd", pwd); + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_Unregister, requestJson); + } +#endregion + +#region 鑾峰彇澶╂皵閮ㄥ垎 /// <summary> /// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅澶╂皵淇℃伅 /// </summary> public void GetCityWeatherInfo(string lon, string lat) { + MainPage.cityInfo.lon = lon; + MainPage.cityInfo.lat = lat; + System.Threading.Tasks.Task.Run(() => { while (true) @@ -1390,7 +1449,7 @@ MainPage.cityInfo.weather = jt.GetValue("Weather").ToString(); MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString(); MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString(); - + MainPage.CityWeatherAction?.Invoke(); break; } catch (Exception ex) @@ -1943,18 +2002,33 @@ #region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� /// <summary> + /// 鑾峰彇涔愭瀛愯处鍙穞oken + /// </summary> + /// <returns></returns> + public ResponsePackNew GetLcSubAccountToken() + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetLcSubToken, requestJson); + } + /// <summary> /// 鑾峰彇璁惧鍒楄〃 /// </summary> /// <returns></returns> - public ResponsePackNew GetDeviceList() + public ResponsePackNew GetDeviceList(string pageSize = "", string pageNo = "") { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); //d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId); //d.Add("roomId", DB_ResidenceData.residenceData.residecenInfo.RegionID);//鍙帶鍙傛暟锛屽綋闇�瑕佸垎椤佃幏鍙栵紝鎬庝箞鐭ラ亾鍒嗛〉鎬绘暟 //d.Add("searchType", DB_ResidenceData.residenceData.residecenInfo.RegionID); - //d.Add("pageSize", DB_ResidenceData.residenceData.residecenInfo.RegionID); - //d.Add("pageNo", DB_ResidenceData.residenceData.residecenInfo.RegionID); + if (!string.IsNullOrEmpty(pageSize)) + { + d.Add("pageSize", pageSize); + d.Add("pageNo", pageNo); + } var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson); @@ -1971,8 +2045,10 @@ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("productPlatform", productPlatform); d.Add("productBrand", productBrand); - if (productBrand != "MegaHealth") + if (productBrand == "MegaHealth" || productBrand == "IMOU") { + } + else { d.Add("networkConfig", true); } @@ -2002,7 +2078,7 @@ /// <param name="productPlatform"></param> /// <param name="productBrand"></param> /// <returns></returns> - public ResponsePackNew IndependentRegister3TyDevcie(string spk, string extDevId, string deviceName, string pairCode = "") + public ResponsePackNew IndependentRegister3TyDevcie(string spk, string extDevId, string deviceName,string productBrandIdentity, string pairCode = "") { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); @@ -2010,12 +2086,28 @@ d.Add("extDevId", extDevId); d.Add("name", deviceName); d.Add("code", pairCode); + d.Add("productBrandIdentity", productBrandIdentity); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson); } + /// <summary> + /// 鍒犻櫎绗笁鏂硅澶� + /// </summary> + /// <returns></returns> + public ResponsePackNew Delete3tyDevice(string deviceId) + { + + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); + + var requestJson = HttpUtil.GetSignRequestJson(d); + var responsePackNew = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Remove3tyDevcie, requestJson); + return responsePackNew; + } @@ -2089,6 +2181,21 @@ d.Add("name", function.name); d.Add("collect", function.collect); d.Add("roomIds", function.roomIds); + + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson); + } + /// <summary> + /// 缂栬緫璁惧淇℃伅 + /// 缁戝畾鍏崇郴銆佸悕绉般�佹敹钘� + /// </summary> + /// <returns></returns> + public ResponsePackNew UpdataDevcieName(Function function,string name) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", function.deviceId); + d.Add("name", name); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson); @@ -2172,10 +2279,55 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson); } + /// <summary> + /// 璁惧鎵╁睍閰嶇疆 + /// </summary> + public ResponsePackNew DeviceExtSet(string deviceId,ExtSet extSet) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId ); + d.Add("extSet", extSet); - #endregion + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DeviceExtSet, requestJson); + } + /// <summary> + /// 鑾峰彇璁惧娑堟伅瑙勫垯閰嶇疆 + /// </summary> + /// <returns></returns> + public ResponsePackNew GetDeviceMessageRulesSet(string deviceId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); - #region Kaede --鍦烘櫙鍔熻兘-------------------------- + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDeviceMessageRulesSet, requestJson); + } + /// <summary> + /// 璁惧娑堟伅瑙勫垯閰嶇疆 + /// </summary> + /// <param name="deviceId"></param> + /// <param name="conditionIdentify"></param> + /// <param name="push"></param> + /// <returns></returns> + public ResponsePackNew DeviceMessageRulesSet(string deviceId,string conditionIdentify,bool push) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); + d.Add("conditionIdentify", conditionIdentify); + d.Add("push", push); + + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DeviceMessageRulesSet, requestJson); + } + + +#endregion + +#region Kaede --鍦烘櫙鍔熻兘-------------------------- /// <summary> /// 鑾峰彇鍦烘櫙鍒楄〃 /// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂� @@ -2307,9 +2459,9 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code; } - #endregion +#endregion - #region Kaede --鎴块棿鍔熻兘-------------------------- +#region Kaede --鎴块棿鍔熻兘-------------------------- /// <summary> /// 鑾峰彇鎴块棿鍒楄〃 /// </summary> @@ -2384,10 +2536,10 @@ return pack; } - #endregion +#endregion - #region Kaede -- 瀹夐槻鎺ュ彛____________________________ +#region Kaede -- 瀹夐槻鎺ュ彛____________________________ /// <summary> /// 鑾峰彇瀹夐槻鍒楄〃 /// </summary> @@ -2551,10 +2703,10 @@ return pack; } - #endregion +#endregion - #region Kaede --绗笁鏂瑰搧鐗屽姛鑳�-------------------------- +#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�-------------------------- /// <summary> /// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛� /// </summary> @@ -2566,6 +2718,93 @@ return pack; } + + /// <summary> + /// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛╛Iot + /// </summary> + public ResponsePackNew Get3tyIotBrandList() + { + Dictionary<string, object> d = new Dictionary<string, object>(); + var requestJson = HttpUtil.GetSignRequestJson(d); + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetBrandList_Iot, requestJson); + + return pack; + } + /// <summary> + /// 鎼滅储绗笁鏂硅澶嘷iot + /// </summary> + /// <returns></returns> + public ResponsePackNew Search3tyIotDevice(string companyId) + { + + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("companyId", companyId); + var requestJson = HttpUtil.GetSignRequestJson(d); + + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Search3tyIotDevice, requestJson); + + return pack; + } + + /// <summary> + /// 鎼滅储绗笁鏂硅澶囧姛鑳藉垪琛╛iot + /// </summary> + /// <returns></returns> + public ResponsePackNew Get3tyIotDeviceFunctionList(string companyId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("companyId", companyId); + var requestJson = HttpUtil.GetSignRequestJson(d); + + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyIotFunction, requestJson); + return pack; + } + /// <summary> + /// 鑾峰彇绗笁鏂瑰钩鍙版敮鎸佺殑璁惧绫诲瀷鍒楄〃 + /// </summary> + /// <returns></returns> + public ResponsePackNew Get3tyIotSupportSpkList(string companyId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("companyId", companyId); + var requestJson = HttpUtil.GetSignRequestJson(d); + + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyIotFunction, requestJson); + return pack; + } + + /// <summary> + /// 璁剧疆绗笁鏂硅澶囩粦瀹氱殑浣忓畢 + /// </summary> + /// <returns></returns> + public ResponsePackNew Set3tyIotFunctionToHouse(List<string> deviceIds,string homeId, string companyId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("deviceIds", deviceIds); + d.Add("homeId", homeId); + d.Add("companyId", companyId); + var requestJson = HttpUtil.GetSignRequestJson(d); + + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Setting3tyIotFunctionToHouse, requestJson); + return pack; + } + + /// <summary> + /// 瑙g粦绗笁鏂瑰钩鍙拌处鍙� + /// </summary> + /// <returns></returns> + public ResponsePackNew Unbound3tyIotAccount(string companyId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("companyId", companyId); + var requestJson = HttpUtil.GetSignRequestJson(d); + + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Unbound3tyIotAccount, requestJson); + return pack; + } + + + /// <summary> /// 鑾峰彇缁戝畾鐨勭涓夋柟鍝佺墝鍒楄〃 /// </summary> @@ -2579,9 +2818,9 @@ return pack; } - #endregion +#endregion - #region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________ +#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________ /// <summary> /// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙� /// 2021-07-07 鏂版柟妗堟帴鍙h皟鏁村鎺� @@ -2594,10 +2833,10 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson); } - #endregion +#endregion - #region 鈻� 鍙瀵硅_________________________ +#region 鈻� 鍙瀵硅_________________________ /// <summary> /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋� /// </summary> @@ -2610,9 +2849,28 @@ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Check, requestJson); return pack; } - #endregion + /// <summary> + /// 鑾峰彇闂ㄥ彛鏈哄緲寰婃姤璀︽暟鎹� + /// </summary> + /// <param name="deviceId"></param> + /// <returns></returns> + public ResponsePackNew GetAlarmRecords(string deviceId, int pageSize, int pageNo, string alarmType = "PROWLER_ALARM") + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); + d.Add("alarmType", alarmType); + d.Add("pageSize", pageSize); + d.Add("pageNo", pageNo); + var requestJson = HttpUtil.GetSignRequestJson(d); + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_ALARM_RECORDS, requestJson); + return pack; - #region 鈻� 闂ㄩ攣鐩稿叧____________________________ + } + +#endregion + +#region 鈻� 闂ㄩ攣鐩稿叧____________________________ /// <summary> /// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�) @@ -2681,8 +2939,8 @@ return listSortLog; } - #endregion - #region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________ +#endregion +#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________ /// <summary> /// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃 /// </summary> @@ -2746,7 +3004,7 @@ var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson); } - #endregion +#endregion /// <summary> /// 缁戝畾source闈㈡澘 @@ -2807,5 +3065,39 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson); } + + + + + + + +#region 鍏変紡鍌ㄨ兘 + /// <summary> + /// 鑾峰彇浣忓畢涓嬮�嗗彉鍣ㄥ垪琛� + /// </summary> + /// <returns></returns> + public ResponsePackNew GetInverterList() + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + var requestJson = HttpUtil.GetSignRequestJson(d); + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetInverter_List, requestJson); + return pack; + } + /// <summary> + /// 鑾峰彇浣忓畢涓嬪厜浼忕粺璁$殑鏁版嵁 + /// </summary> + /// <returns></returns> + public ResponsePackNew GetInverterStatisticsInfo() + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + var requestJson = HttpUtil.GetSignRequestJson(d); + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetInverter_StatisticsInfo, requestJson); + return pack; + } +#endregion + } } \ No newline at end of file -- Gitblit v1.8.0