请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -19,7 +19,7 @@
        /// <summary>

        /// 桌布控件

        /// </summary>

        private FrameLayout frameTable = null;

        private NormalFrameLayout frameTable = null;



        #endregion



@@ -49,7 +49,7 @@
            this.ClearBodyFrame();



            //初始化桌布控件

            this.frameTable = new FrameLayout();

            this.frameTable = new NormalFrameLayout();

            frameTable.Y = Application.GetRealHeight(187);

            frameTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);

            bodyFrameLayout.AddChidren(frameTable);

@@ -118,7 +118,7 @@
                    }

                    //场景控件

                    var frameContr = new ScenePictrueControl();

                    listView.AddChidrenFrame(frameContr);

                    listView.AddChidren(frameContr);

                    frameContr.InitControl(data);

                }

            });

@@ -248,7 +248,7 @@
                    string path1 = string.Empty;

                    string path2 = string.Empty;

                    //获取图片

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

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

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                }

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