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

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

 ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs

@@ -388,7 +388,7 @@


            this.dicSensorStatuView.Clear();



            //添加列表控件 
            //添加列表控件

            frameLayoutDraw.RemoveAll();

            var listView = new VerticalFrameControl(35);

            listView.Height = frameLayoutDraw.Height;

@@ -448,8 +448,7 @@
            listView.AddChidrenFrame(frameDevice);

            frameDevice.InitControl(device);

            //添加阴影特效

            var btnTemp = new ButtonBase();

            btnTemp.AddBottomShadow(frameDevice);

            frameDevice.SetViewShadow(true);



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

            this.dicSensorStatuView[mainkeys] = frameDevice;