From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs |  255 +-------------------------------------------------
 1 files changed, 8 insertions(+), 247 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index cf58a30..41c544c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
@@ -176,17 +176,23 @@
                 code = 1;
                 GetBtnText(testBtn, code, spk);
             };
+           
             //娴嬭瘯Text
             testBtn.MouseUpEventHandler += (sender, e) =>
             {
+               // testBtn.BackgroundColor = CSS.CSS_Color.viewMiddle;
                 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;
                 }
+            };
+            testBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                //testBtn.BackgroundColor = CSS.CSS_Color.textConfirmColor;
             };
             //鎺у埗澶辫触
             failedBtn.MouseUpEventHandler += (sender, e) =>
@@ -215,7 +221,7 @@
                 {
                     var library = libraryList[index-1];
                     var control = GetControl(spk, testBtn.TextID, library);
-                    PirMethod method = new PirMethod();
+                    Method method = new Method();
                     //鍙戦�佸簱娣诲姞閬ユ帶鍣ㄥ懡浠�
                     method.ThreadAddControl(control, this, (device) =>  
                     {
@@ -294,136 +300,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;
@@ -497,121 +373,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