合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs

@@ -441,10 +441,10 @@
                    }
                    if (isExistScene)
                    {
                        curSceneUI = Room.CurrentRoom.GetSceneUIBySceneId(bindDevice.BindScenesId);
                        curSceneUI = Room.CurrentRoom.GetSceneUIBySceneId(bindDevice.BindScenesId);

                        devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
                        if (curSceneUI == null)
                        {
                            devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
                            if (string.IsNullOrEmpty(bindDevice.ESName))
                            {
                                btnBindName.Text = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
@@ -456,7 +456,6 @@
                        }
                        else
                        {
                            devicePic.UnSelectedImagePath = curSceneUI.IconPath;
                            btnBindName.Text = curSceneUI.Name;
                            if (curSceneUI.GetZone() != null)
                            {