Merge branch 'Dev-Branch' into wjc

wjc

2023-03-30 cae4d4b5b508a666fbd0dff3c2a981fdff841bc8

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs

@@ -138,6 +138,13 @@
            {
                tipMsg = "确定关闭?";
            }
            if (Language.CurrentLanguage != "Chinese")
            {

                tipMsg = "Are you sure to close?";
                if (this.btnSwitch.IsSelected)
                    tipMsg = "Are you sure to open it?";
            }
            Action action = () => {

                this.btnPictrue.CanClick = false;
@@ -155,7 +162,7 @@
                    });
                });
            };
            new PublicAssmebly().TipOptionMsg(StringId.EmptyString, tipMsg, action);
            new PublicAssmebly().TipOptionMsg(StringId.Tip, tipMsg, action);

        }