2022年12月01日09:56:23

wjc

2022-12-01 351bdda734832d821a9764b0cde8be5d83c4ec50

 ZigbeeApp/Shared/Phone/Device/Logic/Method.cs

@@ -21,7 +21,7 @@
        /// <param name="device">Device.</param>
        public static void RoomNmae(Button button, CommonDevice device)
        {
            button.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);
            button.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameByDevice(device);
        }
        /// <summary>
        /// 返回楼层所有的房间的列表
@@ -32,7 +32,7 @@
        public static List<Common.Room> GetRoomList(string type, string floorId = null)
        {
            var list = new List<Common.Room>();
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
            for (int i = 0; i < listAllRoom.Count; i++)
            {
                if (type == "action_logicscene" || type == "action_lockscene")
@@ -75,7 +75,7 @@
            var deviceUIlist = new List<CommonDevice>();
            foreach (var deviceKey in room.ListDevice)
            {
                var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
                var device = LocalDevice.Current.GetDevice(deviceKey);
                if (device == null)
                {
                    continue;
@@ -87,7 +87,7 @@
                }
                if (device.Type == DeviceType.DoorLock)
                {
                    var myInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                    var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                    if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
                    {
                        //暂时不支持S-one门锁;
@@ -293,16 +293,29 @@
                    break;
                case DeviceType.TemperatureSensor:
                    {
                        var temperatureSensor = device as TemperatureSensor;
                        if (temperatureSensor.SensorDiv == 1)


                        //获取设备类型
                        var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                        //空气质量传感器
                        if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
                        {
                            patm = $"ZigeeLogic/temperature.png";
                            selectedpatm = $"ZigeeLogic/selectedtemperature.png";
                            patm = $"ZigeeLogic/airquality.png";
                            selectedpatm = $"ZigeeLogic/airqualityselected.png";
                        }
                        else
                        {
                            patm = "ZigeeLogic/humidity.png";
                            selectedpatm = "ZigeeLogic/selectedhumidity.png";
                            var temperatureSensor = device as TemperatureSensor;
                            if (temperatureSensor.SensorDiv == 1)
                            {
                                patm = $"ZigeeLogic/temperature.png";
                                selectedpatm = $"ZigeeLogic/selectedtemperature.png";
                            }
                            else
                            {
                                patm = "ZigeeLogic/humidity.png";
                                selectedpatm = "ZigeeLogic/selectedhumidity.png";
                            }
                        }
                    }
                    break;
@@ -764,7 +777,7 @@

            if (CurrentLogic.Conditions.Count == 0 || CurrentLogic.Actions.Count == 0)
            {
                var alert = new ShowMsgControl(ShowMsgType.Normal,
                var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                  Language.StringByID(MyInternationalizationString.addnull),
                  Language.StringByID(MyInternationalizationString.confrim));
                alert.Show();
@@ -773,7 +786,7 @@

            if (string.IsNullOrEmpty(name))
            {
                var alert = new ShowMsgControl(ShowMsgType.Normal,
                var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                  Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
                  Language.StringByID(MyInternationalizationString.confrim));
                alert.Show();