Merge branch 'WJC' into temp-wxr

wxr

2021-03-16 9b44e30275621a48335fbea7b32b5065a2859c9c

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

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

                if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                {
                    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();