2021-3-12-3

陈嘉乐

2021-03-12 bd2c6c39668f2495d14440ae2d6bb7a7856e9d2f

 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,17 +201,20 @@
                {
                    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,(control1) => {
                    //发送库添加遥控器命令
                    method.ThreadAddControl(control, this, (cont) =>
                    {
                        MainPage.BasePageView.RemoveViewByTag("PirView");
                        AddControlComplete addControlComplete = new AddControlComplete();
                        MainPage.BasePageView.AddChidren(addControlComplete);
                        addControlComplete.Show(control1,true);
                        addControlComplete.Show(cont, true);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    });

@@ -247,11 +261,11 @@
                        }
                    }
                    break;
                case SPK.ElectricTV:
                case SPK.TvIr:
                    {
                        switch (textInt)
                        {
                            case StringId.dianshi:
                            case StringId.dianyuan:
                                {
                                    key = "on_off";
                                    value = "on";
@@ -259,8 +273,8 @@
                                break;
                            case StringId.yinliangjia:
                                {
                                    key = "on_off";
                                    value = "on";
                                    key = "volume+";
                                    value = "50";
                                }
                                break;
                            case StringId.jingyin:
@@ -284,12 +298,11 @@
            control.type = "library";
            control.status.Add(buttonObj);
            control.deviceId = Pir.currPir.deviceId;
            control.sid = "";
            string[] strings = library.irCode.Split(',');
            for (int arrayStr = 0; arrayStr < strings.Length; arrayStr++) 
            {
                //var intValue = Convert.ToInt32(strings[arrayStr],16);
                //intValue
                //control.library1.Add((uint)intValue);
                control.library.Add(strings[arrayStr].Replace("0x",""));
            }

@@ -326,8 +339,8 @@
                        }
                        else
                        {
                            Method method = new Method();
                            method.ErrorShow(responsePackNew);
                            //Method method = new Method();
                            //method.ErrorShow(responsePackNew);
                        }

                    });
@@ -370,7 +383,7 @@
                        }
                    }
                    break;
                case SPK.ElectricTV:
                case SPK.TvIr:
                    {
                        switch (code)
                        {