改版是门锁新功能需要给测试部的版本

xm

2020-05-13 edf7c324bea0556a3df9096dd41d668a9d41bf51

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

old mode 100755
new mode 100644
@@ -316,7 +316,7 @@
            functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;

            functionSceneAutoBodyView.AddChidren(functionSceneBodyView);



            //执行初始化 
            //执行初始化

            roomSwitchContr.InitControl();

        }



@@ -502,6 +502,11 @@
                    {

                        cardContr = new Controls.DeviceFreshAirRowControl();

                    }

                    // PM2.5

                    else if (device.Type == DeviceType.PMSensor)

                    {

                        cardContr = new Controls.DevicePmSensorRowControl();

                    }

                    //彩灯(调光器)

                    else if (device.Type == DeviceType.DimmableLight)

                    {

@@ -614,8 +619,8 @@
            {

                listview2 = new VerticalListControl();

                functionSceneBodyView.AddChidren(listview2);

            }

          
            }

            foreach (var scene in listScene)

            {

                //场景卡片控件

@@ -844,14 +849,9 @@
                    string path1 = string.Empty;

                    string path2 = string.Empty;

                    //获取图片

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

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

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                    dic[typeInfo.BeloneTextId].IconPathSelected = path2;

                    if (device.Type == DeviceType.FreshAir)

                    {

                        dic[typeInfo.BeloneTextId].IconPath = "Device/FreshAirEpoint.png";

                        dic[typeInfo.BeloneTextId].IconPathSelected = "Device/FreshAirEpointSelected.png";

                    }

                    dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;

                }

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