Merge branch 'wxr6' into wxr4

wxr

2021-07-05 1ee407dd57a7273ef6b686ac25a40d4199f5bce9

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

@@ -63,43 +63,47 @@
            addSceneView.AddChidren(btnAddSceneText);
            #endregion

            #region 捕获场景
            FrameLayout catchSceneView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y =addSceneView.Bottom,//+ Application.GetRealWidth(10),
                Width = Application.GetRealWidth(361),
                Height = Application.GetRealWidth(202),
                Radius = (uint)Application.GetRealWidth(12),
            };
            bodyView.AddChidren(catchSceneView);

            ImageView catchSceneImageView = new ImageView()
            if (DB_ResidenceData.Instance.GatewayType == 0) { }
            else
            {
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealWidth(12),
                ImagePath = "Intelligence/CreateScene2Bg.png",
            };
            catchSceneView.AddChidren(catchSceneImageView);
                #region 捕获场景
                FrameLayout catchSceneView = new FrameLayout()
                {
                    Gravity = Gravity.CenterHorizontal,
                    Y = addSceneView.Bottom,//+ Application.GetRealWidth(10),
                    Width = Application.GetRealWidth(361),
                    Height = Application.GetRealWidth(202),
                    Radius = (uint)Application.GetRealWidth(12),
                };
                bodyView.AddChidren(catchSceneView);

            btnCatchSceneBg = new Button()
            {
                Radius = (uint)Application.GetRealWidth(12),
            };
            catchSceneView.AddChidren(btnCatchSceneBg);
                ImageView catchSceneImageView = new ImageView()
                {
                    Gravity = Gravity.CenterHorizontal,
                    Radius = (uint)Application.GetRealWidth(12),
                    ImagePath = "Intelligence/CreateScene2Bg.png",
                };
                catchSceneView.AddChidren(catchSceneImageView);

            Button btnCatchSceneText = new Button()
            {
                Y = Application.GetRealWidth(126),
                Height = Application.GetRealWidth(68),
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                TextAlignment = TextAlignment.Center,
                TextID = StringId.CatchScene,
            };
            catchSceneView.AddChidren(btnCatchSceneText);
            #endregion
                btnCatchSceneBg = new Button()
                {
                    Radius = (uint)Application.GetRealWidth(12),
                };
                catchSceneView.AddChidren(btnCatchSceneBg);

                Button btnCatchSceneText = new Button()
                {
                    Y = Application.GetRealWidth(126),
                    Height = Application.GetRealWidth(68),
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                    TextAlignment = TextAlignment.Center,
                    TextID = StringId.CatchScene,
                };
                catchSceneView.AddChidren(btnCatchSceneText);
                #endregion
            }

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

        /// <summary>