Merge remote-tracking branch 'origin/wxr4' into WJC

JLChen

2021-06-06 4d6c9858844d1545a9b253c1b31842fa89695c1d

 HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs

@@ -51,11 +51,14 @@
        /// </summary>

        public NormalFrameLayout FrameWhiteCentet2 = null;





        /// <summary>
        /// 是否显示收藏按钮
        /// </summary>

        public bool ShowColltionButton = true;

        #endregion




        #region ■ 初始化_____________________________




        /// <summary>

        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

@@ -137,8 +140,7 @@
            btnRoomName.Text = device.GetRoomListName();

            btnRoomName.Width = btnRoomName.GetRealWidthByText();

            FrameWhiteCentet1.AddChidren(btnRoomName);

            //成员没有收藏功能

            if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false)

            if (ShowColltionButton)

            {

                var btnCollection = new IconViewControl(40);

                btnCollection.X = Application.GetRealWidth(273);

@@ -256,10 +258,10 @@
        private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)

        {

            //如果是成员没有功能

            if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)

            {

                return;

            }

            //if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)

            //{

            //    return;

            //}

            //设置图标

            var btnSetting = new PicViewControl(28, 28);

            btnSetting.X = Application.GetRealWidth(337);