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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -178,31 +178,10 @@


                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 = 8;

                    frameContr.AddChidren(btnPic);



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

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.Radius = 8;

                    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";

@@ -270,7 +249,7 @@
                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

                    frameBack.Height = Application.GetRealHeight(1650);

                    frameBack.Radius = 20;

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

                    frameDeviceTable.AddChidren(frameBack);



                    var listView = new VerticalListControl(23);

@@ -388,44 +367,10 @@
            var dic = new Dictionary<int, List<CommonDevice>>();

            foreach (var device in listDevice)

            {

                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);

            }