Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs

@@ -104,7 +104,7 @@
                else

                {

                    //开启需要确认

                    this.ShowMassage(ShowMsgType.Confirm, i_resetMsg, () =>

                    HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, i_resetMsg, () =>

                    {

                        btnSwitch.IsSelected = !btnSwitch.IsSelected;

                        HdlThreadLogic.Current.RunThread(() =>