Merge branch 'tzy2' into MergeFL

wxr

2021-07-05 5a64fc39289d4121b2950c07a4b6e43cf76dd4a5

 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(() =>