Merge branch 'WJC' into temp-wxr

wxr

2021-03-16 9b44e30275621a48335fbea7b32b5065a2859c9c

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs

@@ -140,10 +140,12 @@
            fLayout.AddChidren(succeedBtn);
            #endregion
            #region 点击事件
            //表示库列表索引值
            int index= 1; 
            //表示测试码索引值
            //表示库列表索引值(目前只20个库)
            int index = 1; 
            //表示测试码索引值(目前只测试3个码)
            int code = 1;
            //表示测试最后一个码；
            bool if_bool = false;
            //左
            leftIconBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -165,22 +167,31 @@
                code = 1;
                GetBtnText(testBtn, code, spk);
            };
           
            //测试Text
            testBtn.MouseUpEventHandler += (sender, e) =>
            {
                var library = libraryList[index];
                var control = GetControl(spk, testBtn.TextID, library);
                //发送测试码命令
                CodeTest(control);
                if (code == 3) {
                    //标记最后那个码
                    if_bool = true;
                }
            };
            //控制失败
            failedBtn.MouseUpEventHandler += (sender, e) =>
            {
                if (index < 20)
                {
                    //先加
                    index++;
                    //更新文本
                    sumBtn.Text = "(" + index.ToString() + "/20)";
                }
                code = 1;
                //更新状态
                GetBtnText(testBtn, code, spk);
            };
            //控制成功
@@ -190,13 +201,22 @@
                {
                    code++;
                }
                //更新状态
                GetBtnText(testBtn, code, spk);
                if (code == 3)
                if (if_bool)
                {
                    var library = libraryList[index];
                    var control = GetControl(spk, testBtn.TextID, library);
                    Method method = new Method();
                    method.ThreadAddControl(control, this, true);
                    //发送库添加遥控器命令
                    method.ThreadAddControl(control, this, (cont) =>
                    {
                        MainPage.BasePageView.RemoveViewByTag("PirView");
                        AddControlComplete addControlComplete = new AddControlComplete();
                        MainPage.BasePageView.AddChidren(addControlComplete);
                        addControlComplete.Show(cont, true);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    });

                }
            };
@@ -216,11 +236,11 @@
            string value = "";
            switch (spk)
            {
                case SPK.AcStandard:
                case SPK.AcIr:
                    {
                        switch (textInt)
                        {
                            case StringId.dianshi:
                            case StringId.dianyuan:
                                {
                                    key = "on_off";
                                    value = "on";
@@ -241,11 +261,11 @@
                        }
                    }
                    break;
                case SPK.ElectricTV:
                case SPK.TvIr:
                    {
                        switch (textInt)
                        {
                            case StringId.dianshi:
                            case StringId.dianyuan:
                                {
                                    key = "on_off";
                                    value = "on";
@@ -253,8 +273,8 @@
                                break;
                            case StringId.yinliangjia:
                                {
                                    key = "on_off";
                                    value = "on";
                                    key = "volume+";
                                    value = "50";
                                }
                                break;
                            case StringId.jingyin:
@@ -267,21 +287,23 @@
                    }
                    break;
            }
            ButtonObj buttonObj = new ButtonObj();
            buttonObj.Key = key;
            AttributesStatus buttonObj = new AttributesStatus();
            buttonObj.key = key;
            buttonObj.value = value;

            Control control = new Control();
            control.spk = spk;
            control.name = spk;
            control.group_id = library.irIndex;
            control.groupId = library.irIndex;
            control.type = "library";
            control.status.Add(buttonObj);
            control.deviceId = Pir.currPir.deviceId;
            control.sid = "";
            string[] strings = library.irCode.Split(',');
            for (int array = 0; array < strings.Length; array++)
            for (int arrayStr = 0; arrayStr < strings.Length; arrayStr++) 
            {
                //var intValue = Convert.ToInt32(strings[array],16);
                control.library.Add(strings[array]);
                //var intValue = Convert.ToInt32(strings[arrayStr],16);
                control.library.Add(strings[arrayStr].Replace("0x",""));
            }

            return control;
@@ -303,7 +325,6 @@
            {
                try
                {
                    //发送按键删除；
                    responsePackNew = PirSend.CodeTest(control);
                }
                catch { }
@@ -318,8 +339,8 @@
                        }
                        else
                        {
                            Method method = new Method();
                            method.ErrorShow(responsePackNew);
                            //Method method = new Method();
                            //method.ErrorShow(responsePackNew);
                        }

                    });
@@ -340,7 +361,7 @@
            int textValue = 0;
            switch (spk)
            {
                case SPK.AcStandard:
                case SPK.AcIr:
                    {
                        switch (code)
                        {
@@ -362,7 +383,7 @@
                        }
                    }
                    break;
                case SPK.ElectricTV:
                case SPK.TvIr:
                    {
                        switch (code)
                        {