合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs

@@ -270,7 +270,7 @@
                else

                {

                    var frameBack = new FrameLayout();

                    frameBack.X = HdlControlResourse.XXLeft;

                    frameBack.X = ControlCommonResourse.XXLeft;

                    frameBack.Y = Application.GetRealHeight(178);

                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

@@ -328,15 +328,15 @@
            foreach (var device in listDevice)

            {

                var frameRow = new FrameRowControl(listView.rowSpace / 2);

                frameRow.LeftOffset = Application.GetRealWidth(46) - HdlControlResourse.XXLeft;

                frameRow.RightOffset = -HdlControlResourse.XXLeft;

                frameRow.LeftOffset = Application.GetRealWidth(46) - ControlCommonResourse.XXLeft;

                frameRow.RightOffset = -ControlCommonResourse.XXLeft;

                listView.AddChidren(frameRow);

                //图标

                var btnIcon = frameRow.AddLeftIcon(81);

                HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);

                Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);

                //名称

                var btnView = frameRow.AddLeftCaption(string.Empty, 600);

                btnView.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);

                btnView.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);

                btnView.TextSize = 15;

                //底线

                frameRow.AddBottomLine();

@@ -345,7 +345,7 @@
                btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";

                btnSelect.SelectedImagePath = "Item/ItemSelected.png";



                string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);

                string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

                if (dicSelectDevice.ContainsKey(mainKeys) == true)

                {

                    btnSelect.IsSelected = true;

@@ -397,7 +397,7 @@
                    //如果已经分享了,则不显示

                    continue;

                }

                var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);

                var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);

                if (dic.ContainsKey(typeInfo.BeloneText) == false)

                {

                    dic[typeInfo.BeloneText] = new List<CommonDevice>();