From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 31 三月 2023 10:04:58 +0800 Subject: [PATCH] 1 --- Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 450 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 381 insertions(+), 69 deletions(-) diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs index 297cb8f..4735acc 100644 --- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs +++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs @@ -31,7 +31,6 @@ } #endregion - #region 鈻� 閫氱敤璇锋眰鎺ュ彛_______________________ /// <summary> /// 鏍规鐢ㄦ埛璐﹀彿鑾峰彇娉ㄥ唽鍖哄煙 鍏嶇櫥褰� // 妫�娴嬭处鍙锋槸鍚︽敞鍐屼篃鐢ㄨ繖涓帴鍙� @@ -67,7 +66,7 @@ } #endregion - #region 娉ㄥ唽銆佺櫥褰曢儴鍒� + #region * 娉ㄥ唽銆佺櫥褰曢儴鍒哶__________________________ /// <summary> /// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶 /// </summary> @@ -151,7 +150,7 @@ requestObj.memberEmail = account; } var requestJson = HttpUtil.GetSignRequestJson(requestObj); - return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson); + return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson, "", "", HttpUtil.TIME_OUT_LONG); } /// <summary> @@ -222,7 +221,7 @@ #endregion - #region 涓汉淇℃伅閮ㄥ垎 + #region * 涓汉淇℃伅閮ㄥ垎___________________________ ///// <summary> ///// 鑾峰彇鐢ㄦ埛淇℃伅 ///// </summary> @@ -237,7 +236,7 @@ // MainPage.LoginUser.userEmailInfo = info.memberEmail; // MainPage.LoginUser.userMobileInfo = info.memberPhone; // MainPage.LoginUser.userName = info.memberName; - + // if (!string.IsNullOrEmpty(info.memberPhonePrefix)) // { // MainPage.LoginUser.areaCode = info.memberPhonePrefix; @@ -291,6 +290,26 @@ memberName = userName }); return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson); + } + + /// <summary> + /// 鏍囪2.0骞冲彴鏁版嵁 + /// </summary> + /// <returns></returns> + public bool Mark (string newHomeId) + { + Dictionary<string, object> dic = new Dictionary<string, object> (); + dic.Add ("homeId", newHomeId); + dic.Add ("mark", true); + var requestJson = HttpUtil.GetSignRequestJson (dic); + var revertObj = HttpUtil.RequestHttpsPost (NewAPI.API_Post_Mark, requestJson); + if (revertObj != null) { + if (revertObj.Code == "0") { + UserConfig.Instance.CurrentRegion.indiaIsAsyncDeviceMark = true; + return true; + } + } + return false; } ///// <summary> @@ -358,15 +377,15 @@ #endregion - #region 浣忓畢閮ㄥ垎 - ///// <summary> - ///// 鑾峰彇浣忓畢鍒楄〃 - ///// </summary> - //public ResponsePackNew GetHomeList (HomeTypeEnum homeType = HomeTypeEnum.BUSPRO) - //{ - // var requestJson = HttpUtil.GetSignRequestJson (new GetHomeListObj () { homeType = homeType.ToString () }); - // return HttpUtil.RequestHttpsPost (NewAPI.API_POST_Gethomepager, requestJson); - //} + #region * 浣忓畢閮ㄥ垎___________________________ + /// <summary> + /// 鑾峰彇浣忓畢鍒楄〃 + /// </summary> + public ResponsePackNew GetHomeList (HomeTypeEnum homeType = HomeTypeEnum.BUSPRO) + { + var requestJson = HttpUtil.GetSignRequestJson (new GetHomeListObj () { homeType = homeType.ToString () }); + return HttpUtil.RequestHttpsPost (NewAPI.API_POST_Gethomepager, requestJson); + } /// <summary> /// 鑾峰彇浣忓畢鍒楄〃 /// </summary> @@ -427,6 +446,9 @@ isRemoteControl = mHome.isRemoteControl, isBindGateway = mHome.isBindGateway, regionUrl = mHome.regionUrl, + debugStaffUserId = mHome.debugStaffUserId, + debugPerm = mHome.debugPerm, + indiaIsAsyncDeviceMark = mHome.indiaIsAsyncDeviceMark }; } @@ -483,6 +505,7 @@ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Home_Delete, requestJson); } + #region 缃戝叧鐩稿叧 /// <summary> /// 缁戝畾缃戝叧 /// </summary> @@ -535,6 +558,7 @@ return ""; } } + /// <summary> /// 鑾峰彇缃戝叧淇℃伅 /// </summary> @@ -558,9 +582,9 @@ } return revertObj.Code; } + #endregion - - + #region 瀛愯处鍙风浉鍏� /// <summary> /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿 /// </summary> @@ -569,6 +593,21 @@ { var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = UserConfig.Instance.CurrentRegion.Id }); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson); + } + + /// <summary> + /// 缁戝畾瀛愯处鍙峰埌浣忓畢涓� + /// </summary> + /// <param name="subAccount"></param> + /// <param name="nickName"></param> + /// <returns></returns> + public ResponsePackNew BindResidenceMemberAccount (string subAccount, string nickName) + { + //娣诲姞瀛愯处鍙� + var requestObj = new ChildAddObj () { homeId = UserConfig.Instance.CurrentRegion.Id, account = subAccount, nickName = nickName }; + var requestJson = HttpUtil.GetSignRequestJson (requestObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Child_Add, requestJson); + } /// <summary> @@ -603,6 +642,7 @@ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson); } + /// <summary> /// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄� /// </summary> @@ -619,6 +659,54 @@ }); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson); } + #endregion + + #region 璋冭瘯浜哄憳绠$悊 + /// <summary> + /// 娣诲姞璋冭瘯浜哄憳 + /// </summary> + /// <param name="account">娣诲姞璋冭瘯浜哄憳璐﹀彿</param> + /// <returns></returns> + public ResponsePackNew AddDebugStaff (string account) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + d.Add ("account", account); + + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_DebugStaff_ADD, requestJson); + } + + /// <summary> + /// 鍒犻櫎璋冭瘯浜哄憳 + /// </summary> + /// <param name="account">娣诲姞璋冭瘯浜哄憳璐﹀彿</param> + /// <returns></returns> + public ResponsePackNew DelDebugStaff () + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_DebugStaff_DELETE, requestJson); + } + + /// <summary> + /// 娣诲姞璋冭瘯浜哄憳 + /// </summary> + /// <param name="account">娣诲姞璋冭瘯浜哄憳璐﹀彿</param> + /// <returns></returns> + public ResponsePackNew UpdateDebugPerm (bool debugPerm) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + d.Add ("debugPerm", debugPerm); + + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_DebugStaff_UPDATE, requestJson); + } + + #endregion #region 鏂版暟鎹垎浜� /// <summary> @@ -662,23 +750,92 @@ } #endregion - /// <summary> - /// 缁戝畾瀛愯处鍙峰埌浣忓畢涓� - /// </summary> - /// <param name="subAccount"></param> - /// <param name="nickName"></param> - /// <returns></returns> - public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName) - { - //娣诲姞瀛愯处鍙� - var requestObj = new ChildAddObj() { homeId = UserConfig.Instance.CurrentRegion.Id, account = subAccount, nickName = nickName }; - var requestJson = HttpUtil.GetSignRequestJson(requestObj); - return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson); + #endregion + #region * 澶囦唤鐩稿叧閮ㄥ垎___________________________ + /// <summary> + /// 鍒涘缓澶囦唤鏂囦欢澶� + /// </summary> + /// <param name="folderName"></param> + /// <returns></returns> + public ResponsePackNew GetHomeDataBackupList () + { + var requestObj = new HomeIdObj () { + homeId = UserConfig.Instance.CurrentRegion.Id, + }; + var requestJson = HttpUtil.GetSignRequestJson (requestObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_FindAll, requestJson); + } + + + /// <summary> + /// 鍒涘缓澶囦唤鏂囦欢澶� + /// </summary> + /// <param name="folderName"></param> + /// <returns></returns> + public ResponsePackNew CreateBackupFolder (string folderName) + { + var requestObj = new BackupFolderCreateObj () { + backupClassify = BackupClassify.USER_DEFINED_BACKUP.ToString (), + backupDataType = BackupDataType.HDL_ON.ToString (), + homeId = UserConfig.Instance.CurrentRegion.Id, + folderName = folderName, + }; + var requestJson = HttpUtil.GetSignRequestJson (requestObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_Create, requestJson); } + /// <summary> + /// 淇敼澶囦唤鏂囦欢澶瑰悕瀛� + /// </summary> + /// <param name="newName"></param> + /// <param name="mBackupFile"></param> + /// <returns></returns> + public ResponsePackNew UpdateBackupFolderName (string newName, BackupListNameInfoRes mBackupFile) + { + var requestObj = new UpdateBackupObj () { + folderId = mBackupFile.id, + homeId = mBackupFile.homeId, + folderName = newName, + }; + var requestJson = HttpUtil.GetSignRequestJson (requestObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_Update, requestJson); + } + + + /// <summary> + /// 鍒犻櫎澶囦唤鏂囦欢澶� + /// </summary> + /// <param name="folderId"></param> + /// <returns></returns> + public ResponsePackNew DeleteBackupFolder (string folderId) + { + var requestObj = new BackupFolderIdObj () { + homeId = UserConfig.Instance.CurrentRegion.Id, + folderId = folderId, + }; + var requestJson = HttpUtil.GetSignRequestJson (requestObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_Delete, requestJson); + } + + /// <summary> + /// 鑾峰彇澶囦唤鏂囦欢澶规墍鏈夋枃浠跺垪琛� + /// </summary> + /// <param name="folderId"></param> + /// <returns></returns> + public ResponsePackNew GetBackupFolderAllFileList (string folderId) + { + var requestObj = new BackupFolderIdObj () { + homeId = UserConfig.Instance.CurrentRegion.Id, + folderId = folderId, + }; + var requestJson = HttpUtil.GetSignRequestJson (requestObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_File_FindAll, requestJson); + } #endregion + + #region * Mqtt___________________________ /// <summary> /// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛 /// </summary> @@ -698,7 +855,7 @@ } else { - Utlis.WriteLine("GetMqttRemoteInfo error"); + Utlis.WriteLine("GetMqttRemoteInfo error Code锛�" + revertObj.Code); return null; } } @@ -707,9 +864,9 @@ return null; } } + #endregion - - #region 鑾峰彇澶╂皵閮ㄥ垎 + #region * 鑾峰彇澶╂皵閮ㄥ垎___________________________ /// <summary> /// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅 /// </summary> @@ -766,6 +923,121 @@ #endregion + #region * 涓婁紶璁惧鍒楄〃___________________________ + /// <summary> + /// 涓婁紶Oid鍒楄〃 + /// </summary> + /// <param name="mOids"></param> + /// <returns></returns> + public ResponsePackNew UploadDeviceOidList (Oids mOids) + { + var requestJson = HttpUtil.GetSignRequestJson (mOids); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Device_Oid_Add, requestJson); + } + + /// <summary> + /// 涓婁紶Sid鍒楄〃 + /// </summary> + /// <param name="mSids"></param> + /// <returns></returns> + public ResponsePackNew UploadDeviceSidList (Sids mSids) + { + var requestJson = HttpUtil.GetSignRequestJson (mSids); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Device_Sid_Add, requestJson); + } + + /// <summary> + /// 鑾峰彇璁惧鍒� + /// </summary> + /// <returns></returns> + public ResponsePackNew GetDeviceList () + { + var requestJson = HttpUtil.GetSignRequestJson (new HomeIdObj { + homeId = UserConfig.Instance.CurrentRegion.Id, + }); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_GetDevcieList, requestJson); + } + + + #endregion + + #region 闊崇璇█鎺у埗鐩稿叧___________________________ + /// <summary> + /// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃 + /// </summary> + /// <returns></returns> + public ResponsePackNew GetSpeakerList () + { + var requestJson = HttpUtil.GetSignRequestJson (new GetSpeakerObj { + homeId = UserConfig.Instance.CurrentRegion.Id, + }); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_List_Get, requestJson); + } + + /// <summary> + /// 缂栬緫闊崇鎺堟潈澶囨敞 + /// </summary> + /// <returns></returns> + public ResponsePackNew UpdateSpeakerRemark (UpdateSpeakerRemarkObj remarkObj) + { + var requestJson = HttpUtil.GetSignRequestJson (remarkObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_Remark_Update, requestJson); + } + + /// <summary> + /// 瑙i櫎闊崇缁戝畾 + /// </summary> + /// <returns></returns> + public ResponsePackNew UnbindSpeaker (string tokenId) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("tokenId", tokenId); + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_Unbind, requestJson); + } + /// <summary> + /// 鑾峰彇闊崇鍒嗛厤鐨勮澶囧拰鍦烘櫙鍒楄〃 + /// </summary> + /// <param name="getType">0 鏄煡璇㈠叏閮� 1鏄煡璇㈣澶� 2鏄煡璇㈠満鏅�</param> + /// <param name="tokenId"></param> + /// <returns></returns> + public ResponsePackNew GetSpeakerDeviceList (int getType, string tokenId) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + d.Add ("tokenId", tokenId); + if(getType > 0) { + d.Add ("isDevice", getType == 1); + } + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_DeviceList_Get, requestJson); + } + + /// <summary> + /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣 + /// </summary> + /// <returns></returns> + public ResponsePackNew UpdateSpeakerDeviceList (UpdateSpeakerDeviceListObj updateSpeakerDeviceListObj) + { + var requestJson = HttpUtil.GetSignRequestJson (updateSpeakerDeviceListObj); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_DeviceList_Update, requestJson); + } + #endregion + + /// <summary> + /// 鐢宠璁惧瀵嗛挜 + /// </summary> + /// <param name="mac"></param> + /// <returns></returns> + public ResponsePackNew ApplyDeviceSecret (string mac) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("supplier", "HDL"); + d.Add ("mac", mac); + d.Add ("spk", "BUSUDPGATEWAY"); + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_ApplyDeviceSecret, requestJson); + } //#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ///// <summary> @@ -928,24 +1200,23 @@ //#endregion //#region Kaede --鍦烘櫙鍔熻兘-------------------------- - ///// <summary> - ///// 鑾峰彇鍦烘櫙鍒楄〃 - ///// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂� - ///// </summary> - ///// <param name="roomId">鎴块棿ID</param> - ///// <returns></returns> - //public ResponsePackNew GetSceneList(string roomId = null) - //{ - // Dictionary<string, object> d = new Dictionary<string, object>(); - // d.Add("homeId", UserConfig.Instance.CurrentRegion.RegionID); - // if (roomId != null) - // { - // d.Add("roomId", roomId); - // } + /// <summary> + /// 鑾峰彇鍦烘櫙鍒楄〃 + /// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂� + /// </summary> + /// <param name="roomId">鎴块棿ID</param> + /// <returns></returns> + public ResponsePackNew GetSceneList (string roomId = null) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + if (roomId != null) { + d.Add ("roomId", roomId); + } - // var requestJson = HttpUtil.GetSignRequestJson(d); - // return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson); - //} + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_GetSecneList, requestJson); + } ///// <summary> ///// 鑾峰彇鍦烘櫙璇︽儏 ///// </summary> @@ -977,34 +1248,57 @@ ///// <summary> ///// 娣诲姞鍦烘櫙 ///// </summary> + ///// <param name="sceneList"></param> ///// <returns></returns> - //public ResponsePackNew AddScene(Scene scene) + //public ResponsePackNew AddScene (List<HDLLinkScene> sceneList) //{ - // Dictionary<string, object> d = new Dictionary<string, object>(); - // d.Add("homeId", UserConfig.Instance.CurrentRegion.RegionID); - // d.Add("scenes", new List<Scene>() { scene }); + // Dictionary<string, object> d = new Dictionary<string, object> (); + // d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + // d.Add ("scenes", sceneList); - // var requestJson = HttpUtil.GetSignRequestJson(d); - // var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson); + // var requestJson = HttpUtil.GetSignRequestJson (d); + // var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_AddSecne, requestJson); - // Utlis.WriteLine($"{pack.Data}"); + // Utlis.WriteLine ($"{pack.Data}"); // return pack; //} - ///// <summary> - ///// 缂栬緫鍦烘櫙 - ///// </summary> - ///// <param name="scene"></param> - ///// <returns></returns> - //public ResponsePackNew EditScene(Scene scene) - //{ - // Dictionary<string, object> d = new Dictionary<string, object>(); - // d.Add("homeId", UserConfig.Instance.CurrentRegion.RegionID); - // d.Add("scenes", new List<Scene>() { scene }); - // var requestJson = HttpUtil.GetSignRequestJson(d); - // return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditSecne, requestJson); - //} + /// <summary> + /// 鍏ㄩ噺鍚屾鍦烘櫙 + /// </summary> + /// <param name="sceneList"></param> + /// <returns></returns> + public ResponsePackNew SecneSyncList (List<HDLLinkScene> sceneList) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + d.Add ("scenes", sceneList); + + var requestJson = HttpUtil.GetSignRequestJson (d); + var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_Secne_SyncList, requestJson); + + Utlis.WriteLine ($"{pack.Data}"); + + return pack; + } + + + + /// <summary> + /// 鏇存柊鍦烘櫙 + /// </summary> + /// <param name="sceneList"></param> + /// <returns></returns> + public ResponsePackNew EditScene (List<HDLLinkScene> sceneList) + { + Dictionary<string, object> d = new Dictionary<string, object> (); + d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id); + d.Add ("scenes", sceneList); + + var requestJson = HttpUtil.GetSignRequestJson (d); + return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_EditSecne, requestJson); + } ///// <summary> ///// 鍒犻櫎鍦烘櫙 ///// </summary> @@ -1078,7 +1372,7 @@ // d.Add("pageSize", "1000"); // var requestJson = HttpUtil.GetSignRequestJson(d); // var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson); - + // return pack; //} ///// <summary> @@ -1137,5 +1431,23 @@ //} //#endregion + + /// <summary> + /// 淇敼璁惧澶囨敞 + /// </summary> + /// <param name="deviceId"></param> + /// <param name="homeId"></param> + /// <param name="name"></param> + /// <returns></returns> + public ResponsePackNew EditDeviceName (string deviceId,string homeId,string name) + { + var d = new Dictionary<string, object> (); + d.Add ("deviceId", deviceId); + d.Add ("homeId", homeId); + d.Add ("name", name); + var requestJson = HttpUtil.GetSignRequestJson (d); + var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_EditDeviceName, requestJson); + return pack; + } } } \ No newline at end of file -- Gitblit v1.8.0