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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs

@@ -157,7 +157,7 @@
                    || info.BeloneType == DeviceBeloneType.A插座 || info.BeloneType == DeviceBeloneType.A智能空开
                    || info.BeloneType == DeviceBeloneType.A灯光 || info.BeloneType == DeviceBeloneType.A空调
                    || info.BeloneType == DeviceBeloneType.A窗帘 || info.BeloneType == DeviceBeloneType.A继电器
                    || info.BeloneType == DeviceBeloneType.A调光器 
                    || info.BeloneType == DeviceBeloneType.A调光器
                    )
                {
                    if (typeDeviceDic.ContainsKey(info.BeloneTextId) == false)
@@ -403,7 +403,7 @@
                    };
                    string imgPath = string.Empty;
                    string imgSeletedPath = string.Empty;
                    Common.LocalDevice.Current.GetDeviceBeloneIcon(deviceType.Value, ref imgPath, ref imgSeletedPath);
                    Common.LocalDevice.Current.GetDeviceObjectIcon(deviceType.Value, ref imgPath, ref imgSeletedPath);
                    functionTypeIMG.Init(imgPath, imgSeletedPath);
                    functionTypeIMG.SetTitle(deviceType.Key);
                    typeRowLayout.AddChidren(functionTypeIMG);
@@ -433,7 +433,7 @@

            var sameTypeList = new List<DeviceUI> { };
            sameTypeList = typeDeviceDic[int.Parse((typeSender as Button).Tag.ToString())];
            

            foreach (var device in sameTypeList)
            {
                if (beforeSceneTargetDeviceUIs.Find((obj) => obj.DeviceUI.DeviceEpoint == device.DeviceEpoint && obj.DeviceUI.DeviceAddr == device.DeviceAddr) != null)