Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c

 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs

@@ -134,7 +134,12 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = aC.collect
            };
            controlView.AddChidren(btnCollection);
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            arcBar = new DiyArcSeekBar()
            {
@@ -293,8 +298,6 @@
                Width = Application.GetRealWidth(160),
                Height = Application.GetRealHeight(287),
                BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
                Animate = Animate.UpToDown,
                AnimateSpeed = 0.3f
            };
            dialogView.AddChidren(modeChangeView);

@@ -416,9 +419,7 @@
                Y = Application.GetRealHeight(172),
                Width = Application.GetRealWidth(160),
                Height = Application.GetRealHeight(243),
                AnimateSpeed = 0.3f,
                BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
                Animate = Animate.UpToDown,
            };
            dialogView.AddChidren(modeChangeView);