|
|
|
@ -173,7 +173,7 @@ namespace IoTNode.DeviceServices.FBee
|
|
|
|
|
deviceRepo.Add(device);
|
|
|
|
|
}
|
|
|
|
|
device.Ip = ip;
|
|
|
|
|
this.UpdateDevice(deviceRepo, device);
|
|
|
|
|
deviceRepo.SaveChanges();
|
|
|
|
|
}
|
|
|
|
|
var gateways = deviceRepo.ReadOnlyTable().Where(o => o.Product.Name == "FBee网关").ToList();
|
|
|
|
|
foreach (var gateway in gateways)
|
|
|
|
@ -555,7 +555,7 @@ namespace IoTNode.DeviceServices.FBee
|
|
|
|
|
};
|
|
|
|
|
deviceRepo.Add(device);
|
|
|
|
|
device.IsOnline = online;
|
|
|
|
|
this.UpdateDevice(deviceRepo, device);
|
|
|
|
|
deviceRepo.SaveChanges();
|
|
|
|
|
if (device.Name == "红外转发器")
|
|
|
|
|
{
|
|
|
|
|
var buttons = new List<ButtonModel>() { new ButtonModel { Name = "测试", Value = "603", Order = 0 } }.ToJson(true);
|
|
|
|
@ -565,7 +565,7 @@ namespace IoTNode.DeviceServices.FBee
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
device.IsOnline = online;
|
|
|
|
|
this.UpdateDevice(deviceRepo, device);
|
|
|
|
|
deviceRepo.SaveChanges();
|
|
|
|
|
}
|
|
|
|
|
this.UpdateData(deviceRepo, device, device.CreateData(Keys.DeviceId, deviceId, DeviceDataType.Int, Keys.DeviceId, hidden: true, timestamp: timestamp));
|
|
|
|
|
this.UpdateData(deviceRepo, device, device.CreateData(Keys.Address, address, DeviceDataType.String, Keys.Address, hidden: true, timestamp: timestamp));
|
|
|
|
@ -1000,7 +1000,7 @@ namespace IoTNode.DeviceServices.FBee
|
|
|
|
|
var password = ms.ReadASIIString(20);
|
|
|
|
|
device.UserName = userName;
|
|
|
|
|
device.Password = password;
|
|
|
|
|
this.UpdateDevice(deviceRepo, device);
|
|
|
|
|
deviceRepo.SaveChanges();
|
|
|
|
|
ms.ReadByte();
|
|
|
|
|
ms.ReadByte();
|
|
|
|
|
ms.ReadByte();
|
|
|
|
@ -1250,9 +1250,7 @@ namespace IoTNode.DeviceServices.FBee
|
|
|
|
|
var status = props.First().Value[0];
|
|
|
|
|
if (status == 0x00)//离网
|
|
|
|
|
{
|
|
|
|
|
var model = device.To<EditDeviceModel>();
|
|
|
|
|
deviceRepo.Delete(device);
|
|
|
|
|
this.SendToServer("DeleteDevice", model);
|
|
|
|
|
DeleteDevice(deviceRepo, device);
|
|
|
|
|
}
|
|
|
|
|
else if (status == 0x03)//入网
|
|
|
|
|
{
|
|
|
|
@ -1379,6 +1377,20 @@ namespace IoTNode.DeviceServices.FBee
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static void DeleteDevice(IRepository<Device> deviceRepo, Device device)
|
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
var model = device.To<EditDeviceModel>();
|
|
|
|
|
deviceRepo.Delete(device);
|
|
|
|
|
deviceRepo.SaveChanges();
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
{
|
|
|
|
|
ex.PrintStack();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private string GetDescription(string key, short value)
|
|
|
|
|
{
|
|
|
|
|
if (key == Keys.Light)
|
|
|
|
|