From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001 From: tzy <hxb@hdlchina.com.cn> Date: 星期三, 09 六月 2021 11:11:28 +0800 Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy" --- HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 264 ---------------------------------------------------- 1 files changed, 3 insertions(+), 261 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs index b684f7e..1a97eef 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs @@ -148,7 +148,6 @@ }; fLayout.AddChidren(succeedBtn); #endregion - #region 鐐瑰嚮浜嬩欢 //琛ㄧず搴撳垪琛ㄧ储寮曞��(鐩墠鍙�20涓簱) int index = 1; @@ -177,13 +176,14 @@ code = 1; GetBtnText(testBtn, code, spk); }; + //娴嬭瘯Text testBtn.MouseUpEventHandler += (sender, e) => { var library = libraryList[index - 1]; var control = GetControl(spk, testBtn.TextID, library); //鍙戦�佹祴璇曠爜鍛戒护 - PirMethod.ThreadSend(control, (responsePackNew) => { }, "搴撶爜娴嬭瘯", "frame", this, null); + Method.ThreadSend(control, (responsePackNew) => { }, "搴撶爜娴嬭瘯", "frame", this, null); if (code == 3) { //鏍囪鏈�鍚庨偅涓爜 if_bool = true; @@ -216,20 +216,7 @@ { var library = libraryList[index-1]; var control = GetControl(spk, testBtn.TextID, library); - if (spk == SPK.TvIr) - { - //澶囨敞锛氫紵鍗楄姹傚皬绫崇數瑙嗘崲鎺塻pk=ir.tvxm锛堝惉璇存槸涓存椂瑙e喅鏂规锛� - var brand = brandList.Find((c) => c.id == library.brandId); - if (brand != null) - { - if (brand.brandName.Contains("灏忕背") || brand.brandName.Contains("Xiaomi")) - { - //鏇存崲spk - control.spk = "ir.tvxm"; - } - } - } - PirMethod method = new PirMethod(); + Method method = new Method(); //鍙戦�佸簱娣诲姞閬ユ帶鍣ㄥ懡浠� method.ThreadAddControl(control, this, (device) => { @@ -308,136 +295,6 @@ } } break; - case SPK.FanIr: - { - switch (textInt) - { - case StringId.dianyuan: - { - key = "on_off"; - value = "on"; - } - break; - case StringId.zhongsu: - { - key = "middle"; - value = ""; - } - break; - case StringId.yaotou: - { - key = "swing"; - value = ""; - } - break; - } - } - break; - case SPK.PjtIr: - { - switch (textInt) - { - case StringId.dianyuan: - { - key = "on_off"; - value = "on"; - } - break; - case StringId.yinliangjia: - { - key = "volume+"; - value = ""; - } - break; - case StringId.yinliangjian: - { - key = "volume-"; - value = ""; - } - break; - } - } - break; - case SPK.StbIr: - { - switch (textInt) - { - case StringId.dianyuan: - { - key = "on_off"; - value = "on"; - } - break; - case StringId.yinliangjia: - { - key = "volume+"; - value = ""; - } - break; - case StringId.yinliangjian: - { - key = "volume-"; - value = ""; - } - break; - } - } - break; - case SPK.DvDIr: - { - - } - break; - case SPK.PurifierIr: - { - switch (textInt) - { - case StringId.dianyuan: - { - key = "on_off"; - value = "on"; - } - break; - case StringId.zidong: - { - key = "auto"; - value = ""; - } - break; - case StringId.jingyin: - { - key = "mute"; - value = "0"; - } - break; - } - } - break; - case SPK.HeaterIr: - { - switch (textInt) - { - case StringId.dianyuan: - { - key = "on_off"; - value = "on"; - } - break; - case StringId.wendujia: - { - key = "temp+"; - value = ""; - } - break; - case StringId.wendujian: - { - key = "temp-"; - value = ""; - } - break; - } - } - break; } AttributesStatus buttonObj = new AttributesStatus(); buttonObj.key = key; @@ -511,121 +368,6 @@ case 3: { textValue = StringId.jingyin; - } - break; - } - } - break; - case SPK.FanIr: - { - switch (code) - { - case 1: - { - textValue = StringId.dianyuan; - } - break; - case 2: - { - textValue = StringId.zhongsu; - } - break; - case 3: - { - textValue = StringId.yaotou; - } - break; - } - } - break; - case SPK.PjtIr: - { - switch (code) - { - case 1: - { - textValue = StringId.dianyuan; - } - break; - case 2: - { - textValue = StringId.yinliangjia; - } - break; - case 3: - { - textValue = StringId.yinliangjian; - } - break; - } - } - break; - case SPK.StbIr: - { - switch (code) - { - case 1: - { - textValue = StringId.dianyuan; - } - break; - case 2: - { - textValue = StringId.yinliangjia; - } - break; - case 3: - { - textValue = StringId.yinliangjian; - } - break; - } - } - break; - case SPK.DvDIr: - { - - } - break; - case SPK.PurifierIr: - { - switch (code) - { - case 1: - { - textValue = StringId.dianyuan; - } - break; - case 2: - { - textValue = StringId.zidong; - } - break; - case 3: - { - textValue = StringId.jingyin; - } - break; - } - } - break; - case SPK.HeaterIr: - { - switch (code) - { - case 1: - { - textValue = StringId.dianyuan; - } - break; - case 2: - { - textValue = StringId.wendujia; - } - break; - case 3: - { - textValue = StringId.wendujian; } break; } -- Gitblit v1.8.0