From 08a8afe782cd499550f94f3da0ba5788e1e12971 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 02 三月 2021 17:45:45 +0800 Subject: [PATCH] 2021-3-2-1 --- HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 121 ++++++++++++++++++++++++++++++++++------ 1 files changed, 102 insertions(+), 19 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs index abb0874..a325237 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs @@ -32,10 +32,22 @@ } } /// <summary> + /// 鑾峰彇閬ユ帶鍣ㄥ垪琛� + /// </summary> + public static ResponsePackNew GetList() + { + var jObject = new JObject { { "homeId", HomeId }, { "deviceId", "0" }}; + var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_List); + return responsePackNew; + } + /// <summary> /// 閬ユ帶鍣ㄦ坊鍔� /// </summary> /// <returns></returns> - public static ResponsePackNew Add(Control control) + /// <param name="control"></param> + /// <param name="bool_library">(true=鐮佸簱锛宖alse=鑷鐨�)</param> + /// <returns></returns> + public static ResponsePackNew Add(Control control,bool bool_library) { var jObject = new JObject { }; jObject.Add("homeId", HomeId); @@ -43,9 +55,9 @@ jObject.Add("name", control.name); jObject.Add("spk", "ir.module"); jObject.Add("type", control.type); - if (control.type == "library") + if (bool_library) { - //jObject.Add("group_id", "123"); + jObject.Add("group_id", "123"); var libraryjay = new JArray { }; for (int i = 0; i < control.library.Count; i++) { @@ -53,9 +65,43 @@ } jObject.Add("library", libraryjay); } + var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_Add); return responsePackNew; } + /// <summary> + ///绾㈠鐮佸簱璇曠爜 + /// </summary> + /// <returns></returns> + public static ResponsePackNew CodeTest(Control control) + { + var jObject = new JObject { }; + jObject.Add("homeId", HomeId); + jObject.Add("deviceId", HomeId); + jObject.Add("spk", control.spk); + if (control.spk== Entity.SPK.AcStandard) { + jObject.Add("group_id", control.group_id); + } + var libraryJay = new JArray { }; + for (int i = 0; i < control.library.Count; i++) + { + libraryJay.Add(control.library[i]); + } + var statusJay = new JArray { }; + for (int i = 0; i < control.status.Count; i++) + { + var statusJob = new JObject { }; + var job = control.status[i]; + statusJob.Add("key", job.Key); + statusJob.Add("value", job.value); + statusJay.Add(statusJob); + } + jObject.Add("library", libraryJay); + jObject.Add("status", statusJay); + var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeTest); + return responsePackNew; + } + /// <summary> /// <summary> /// 绾㈠鐮佸涔� /// </summary> @@ -118,29 +164,66 @@ return responsePackNew; } /// <summary> - /// 鑾峰彇閫昏緫 + /// 閬ユ帶鍣ㄥ垹闄� /// </summary> - /// <param name="listIdList">閫昏緫ID鍒楄〃</param> /// <returns></returns> - public static ResponsePackNew GetLogic(List<string> listIdList) + public static ResponsePackNew DeleteRemove(string deviceId) { + var job = new JObject { }; + job.Add("deviceId", deviceId); var jArray = new JArray { }; - for (int i = 0; i < listIdList.Count; i++) - { - jArray.Add(listIdList[i]); - } - var jObject = new JObject { { "userLogicIds", jArray } }; - var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Info); - //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken - if (responsePackNew.Code == StateCode.TOKEN_EXPIRED) - { - RefreshToken(); - GetLogic(listIdList); - } + jArray.Add(job); + var jObject = new JObject { { "homeId", HomeId }, { "deviceId", "0" }, { "devices", jArray } }; + var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_DeviceRemove); return responsePackNew; } + /// <summary> + /// 鏌ヨ绾㈠璁惧绫诲瀷鍒楄〃/鍝佺墝鍒楄〃/鍝佺墝绾㈠鐮佸簱鍒楄〃 + /// </summary> + /// <param name="frameLayout">鍔犺浇log鐨勭埗鎺т欢</param> + /// <param name="action">鍥炶皟鍑芥暟</param> + public static void GetDeviceTypesList(FrameLayout frameLayout, Action<ResponsePackNew> action, string id, string if_str) + { - + DAL.Server.ResponsePackNew responsePackNew = null; + Loading loading = new Loading(); + frameLayout.AddChidren(loading); + loading.Start(); + new System.Threading.Thread(() => + { + try + { + string url = ""; + var jObject = new JObject { }; + if (if_str == "璁惧绫诲瀷鍒楄〃") + { + url = "/smart-footstone/app/ir/device-type/list"; + } + else if (if_str == "鍝佺墝鍒楄〃") + { + url = "/smart-footstone/app/ir/brand/list"; + jObject.Add("deviceTypeId", id); + } + else if (if_str == "鍝佺墝绾㈠鐮佸簱鍒楄〃") + { + url = "/smart-footstone/app/ir/code/list"; + jObject.Add("brandId", id); + } + responsePackNew = RequestServerhomeId(jObject, url); + } + catch { } + finally + { + Application.RunOnMainThread(() => + { + loading.Hide(); + action(responsePackNew); + }); + } + }) + { IsBackground = true }.Start(); + + } /// <summary> ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� -- Gitblit v1.8.0