Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs

@@ -181,7 +181,8 @@
                this.MouseUpEventHandler -= ButtonBase_MouseUpEventHandler;

                return;

            }

            if (CanClick == true)

            //2020.05.14追加IsFormAdding:界面还在加载中,不能再点击

            if (CanClick == true && ControlCommonResourse.IsFormAdding == false)

            {

                //Log出力

                this.WriteLog(0);