Merge branch 'dev-tzy' into temp-wxr

wxr

2021-02-26 6a09cc33a9e800f640046350a69ba63a31f1f64b

 HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs

@@ -158,17 +158,11 @@
        {
            btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
            {
                //if(!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)
                //if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                //{
                //    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GatewayOfflineCannotCreateScene), true);
                //    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.UnableToCreateScenarioPleaseBindGateway), true);
                //    return;
                //}

                if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                {
                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.UnableToCreateScenarioPleaseBindGateway), true);
                    return;
                }
                Action backAction = () => {
                    this.RemoveFromParent();
                    action();