Merge branch 'WJC' into temp-wxr

wxr

2021-03-19 355bf4219bcd33f2178ed3b1aa54e0af71905fdf

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

@@ -47,7 +47,7 @@
            };
            #endregion
            UIView(vv);
            topView.topIconBtn.MouseUpEventHandler += (sender, e) =>
            topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
            {
                var form = new AddMiniRemoteControlDirection1Page();
                form.AddForm();
@@ -91,11 +91,13 @@
                {
                    pirView.stateIconBtn.IsSelected = true;
                    pirView.stateTextBtn.IsSelected = true;
                    pirView.stateTextBtn.TextID = StringId.zaixian;
                }
                else
                {
                    pirView.stateIconBtn.IsSelected = false;
                    pirView.stateTextBtn.IsSelected = false;
                    pirView.stateTextBtn.TextID = StringId.lixian;
                }
                //标记红外宝
                pirView.clickBtn.Tag = pirDevice;