2019.1.10

gxc

2020-01-10 b8cbf4a8b6910eefcb83b6d3a39e9b5b5a9cd79e

 ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs

@@ -107,30 +107,10 @@


                foreach (var data in lookRoom.SceneUIList)

                {

                    var frameContr = new FrameLayout();

                    frameContr.Height = Application.GetRealHeight(470);

                    frameContr.Gravity = Gravity.CenterHorizontal;

                    //场景控件

                    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 = (uint)Application.GetRealHeight(17);

                    frameContr.AddChidren(btnPic);



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

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.RadiusEx = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

                    btnName.TextAlignment = TextAlignment.Center;

                    frameContr.AddChidren(btnName);

                    frameContr.InitControl(data);

                }

            });

        }

@@ -247,7 +227,7 @@
            var dic = new Dictionary<int, DeviceRowInfo>();

            foreach (var device in listDevice)

            {

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

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

                //按所属ID分组

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

                {

@@ -255,7 +235,7 @@
                    string path1 = string.Empty;

                    string path2 = string.Empty;

                    //获取图片

                    Common.LocalDevice.Current.GetDeviceBeloneIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    Common.LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                }

                dic[typeInfo.BeloneTextId].listDeviceKeys.Add(Common.LocalDevice.Current.GetDeviceMainKeys(device));