Merge branch 'wxr6' into wxr4

wxr

2021-07-05 1ee407dd57a7273ef6b686ac25a40d4199f5bce9

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

@@ -63,6 +63,10 @@
            addSceneView.AddChidren(btnAddSceneText);
            #endregion


            if (DB_ResidenceData.Instance.GatewayType == 0) { }
            else
            {
            #region 捕获场景
            FrameLayout catchSceneView = new FrameLayout()
            {
@@ -99,7 +103,7 @@
            };
            catchSceneView.AddChidren(btnCatchSceneText);
            #endregion

            }

            /*
            #region 电影场景
@@ -150,8 +154,11 @@
        void LoadEventList()
        {
            LoadEvent_SkipAddScenePage();
            if (DB_ResidenceData.Instance.GatewayType != 0)
            {
            LoadEvent_SkipCatchScenePage();
        }
        }

        /// <summary>
        /// 跳转创建场景界面