删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

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

@@ -105,7 +105,7 @@
                        localDeviceList.Add(dev);
                    }
                    //获取本地场景列表
                    scList = Shared.Common.Room.AllRoomSceneUIList;
                    scList = HdlSceneLogic.Current.GetAllRoomSceneList();
                    //获取网关场景表
                    var gwSceneObj = await currentKey.GetSceneInfoAsync();
                    if (gwSceneObj != null && gwSceneObj.getSceneInfo != null)
@@ -472,7 +472,7 @@
                    }
                    if (isExistScene)
                    {
                        curSceneUI = Room.CurrentRoom.GetSceneUIBySceneId(bindDevice.BindScenesId);

                        curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);

                        devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
                        if (curSceneUI == null)
                        {
@@ -488,9 +488,10 @@
                        else
                        {
                            btnBindNameText = curSceneUI.Name;
                            if (curSceneUI.GetZone() != null)
                            string myName = HdlSceneLogic.Current.GetZoneById(curSceneUI.Id);
                            if (myName != null)
                            {
                                btnFloorRoomNameText = curSceneUI.GetZone();
                                btnFloorRoomNameText = myName;
                            }
                        }
                    }
@@ -503,7 +504,7 @@
                            if (tempDev != null)
                            {
                                //获取设备所属房间
                                var tempDevRoom = Common.Room.CurrentRoom.GetRoomByDevice(tempDev);
                                var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);

                                if (tempDevRoom != null)
                                {
@@ -520,14 +521,12 @@
                                    {
                                        btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
                                    }
                                }
                                var deviceUi = Common.LocalDevice.Current.GetDeviceUI(tempDev);
                                if (deviceUi != null)
                                {
                                    devicePic.UnSelectedImagePath = deviceUi.IconPath;
                                    devicePic.Width = Application.GetRealWidth(110);
                                    devicePic.Text = "";
                                }
                                }



                                devicePic.UnSelectedImagePath = tempDev.IconPath;

                                devicePic.Width = Application.GetRealWidth(110);

                                devicePic.Text = "";

                                if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
                                {
                                    btnBindNameText = tempDev.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);