2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -196,30 +196,9 @@
                foreach (var data in listScene)

                {

                    //场景图片

                    var frameContr = new FrameLayoutControl();

                    frameContr.UseClickStatu = false;

                    frameContr.Height = Application.GetRealHeight(470);

                    var frameContr = new ScenePictrueControl();

                    listView.AddChidrenFrame(frameContr);



                    //场景图片

                    var btnPic = new ImageView();

                    btnPic.X = Application.GetRealWidth(179);

                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = 17;

                    frameContr.AddChidren(btnPic);



                    var btnName = new NormalViewControl(251, 282, true);

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Gravity = Gravity.CenterVertical;

                    btnName.BackgroundColor = 0xff333333;

                    btnName.Radius = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

                    btnName.TextAlignment = TextAlignment.Center;

                    frameContr.AddChidren(btnName);

                    frameContr.InitControl(data);



                    var btnSelect = new IconViewControl(58);

                    btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";

@@ -253,6 +232,8 @@
                        }

                    };

                }

                //调整一下高度

                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(185));

            });

        }



@@ -279,13 +260,13 @@
                }

                else

                {

                    var frameBack = new FrameLayoutControl(false);

                    var frameBack = new FrameLayout();

                    frameBack.X = ControlCommonResourse.XXLeft;

                    frameBack.Y = Application.GetRealHeight(178);

                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

                    frameBack.Height = Application.GetRealHeight(1650);

                    frameBack.RadiusEx = 20;

                    frameBack.Radius = (uint)Application.GetRealHeight(58);

                    frameDeviceTable.AddChidren(frameBack);



                    var listView = new VerticalListControl(23);

@@ -382,6 +363,9 @@
                    }

                };

            }



            //列表自己有个23的Y轴坐标

            listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23), Application.GetRealHeight(300 - 23));

        }



        #endregion

@@ -404,44 +388,10 @@
                    //如果已经分享了,则不显示

                    continue;

                }

                var typeInfo = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });

                if (device.Type == DeviceType.IASZone)

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

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

                {

                    //这个强制为传感器

                    typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId1200;

                    typeInfo.ConcreteType = Common.DeviceConcreteType.Sensor;

                }

                if (device.Type == DeviceType.OnOffOutput)

                {

                    //继电器的时候,需要特殊处理

                    if (device.DfunctionType == DeviceFunctionType.A开关)

                    {

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uSwitch;

                    }

                    else if (device.DfunctionType == DeviceFunctionType.A插座)

                    {

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uSocket1;

                    }

                    else if (device.DfunctionType == DeviceFunctionType.A灯光)

                    {

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uLight;

                    }

                    else

                    {

                        //继电器

                        typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId2300;

                    }

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

                    {

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

                    }

                }

                else

                {

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

                    {

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

                    }

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

                }

                dic[typeInfo.BeloneTextId].Add(device);

            }