Merge remote-tracking branch 'origin/CJL-LC' into wxr4

wxr

2021-07-01 8ac39f2f962329f30ee61ee8a7abe6d6b5940dd5

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