wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: cc731ba819050f4db37b71c5a5e984f357c00a0a
TangShanKaiPing
wanggang 6 years ago
parent 1a3ddc404a
commit 096062daef
8 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File

1
projects/IoT/IoTServices/APService/APService.csproj
Unescape View File

@ -16,6 +16,5 @@
<ItemGroup>
<ProjectReference Include="..\..\..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\..\IoT.Shared\IoT.Shared.csproj" />
<ProjectReference Include="..\..\IoT.UI.Shard\IoT.UI.Shard.csproj" />
</ItemGroup>
</Project>

3
projects/IoT/IoTServices/FBeeService/Application/Domain/Entities/ClusterId.cs
Unescape View File

@ -9,6 +9,7 @@
temperature = 0x0402,
humidity = 0x0405,
voltage = 0x0001,
socket = 0x0702
socket = 0x0702,
SummationDivisor = 0x0b04
}
}

7
projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs
Unescape View File

@ -1229,6 +1229,13 @@ namespace FBeeService
}
}
}
else if (deviceId == 0x0051)
{
if (clusterId == ClusterId.SummationDivisor)
{
this.X8D07020000(sn, device.Number);
}
}
deviceRepo.SaveChanges();
this.SendDevice(device);
}

1
projects/IoT/IoTServices/LiChuangService/LiChuangService.csproj
Unescape View File

@ -17,6 +17,5 @@
<ItemGroup>
<ProjectReference Include="..\..\..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\..\IoT.Shared\IoT.Shared.csproj" />
<ProjectReference Include="..\..\IoT.UI.Shard\IoT.UI.Shard.csproj" />
</ItemGroup>
</Project>

1
projects/IoT/IoTServices/MediaService/MediaService.csproj
Unescape View File

@ -15,6 +15,5 @@
<ItemGroup>
<ProjectReference Include="..\..\..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\..\IoT.Shared\IoT.Shared.csproj" />
<ProjectReference Include="..\..\IoT.UI.Shard\IoT.UI.Shard.csproj" />
</ItemGroup>
</Project>

1
projects/IoT/IoTServices/WinService/WinService.csproj
Unescape View File

@ -15,7 +15,6 @@
<ItemGroup>
<ProjectReference Include="..\..\..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\..\IoT.Shared\IoT.Shared.csproj" />
<ProjectReference Include="..\..\IoT.UI.Shard\IoT.UI.Shard.csproj" />
</ItemGroup>
<ItemGroup>

1
projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
Unescape View File

@ -316,6 +316,7 @@
<div class="item-inner">
<div class="item-title">{{device.DisplayName||device.Name}}</div>
<div class="item-after">
<span class="badge color-green" v-if="getData(device,'电量')">{{getData(device,"电量")}}</span>
<span class="badge color-green">{{getData(device,"状态")}}</span>
</div>
</div>

15
projects/projects.sln
Unescape View File

@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinService", "IoT\IoTServic
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoT.Shared", "IoT\IoT.Shared\IoT.Shared.csproj", "{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoT.UI.Shard", "IoT\IoT.UI.Shard\IoT.UI.Shard.csproj", "{1F466C72-FD35-483E-A199-2C143CB813C1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{AF2F6203-A338-4B48-8FED-5D6385663665}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdGen", "IoT\IdGen\IdGen.csproj", "{775041E3-9B61-4B22-ABED-EAB48F54C900}"
@ -221,18 +219,6 @@ Global
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhone.Build.0 = Release|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Debug|iPhone.Build.0 = Debug|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Release|Any CPU.Build.0 = Release|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Release|iPhone.ActiveCfg = Release|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Release|iPhone.Build.0 = Release|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{1F466C72-FD35-483E-A199-2C143CB813C1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{775041E3-9B61-4B22-ABED-EAB48F54C900}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{775041E3-9B61-4B22-ABED-EAB48F54C900}.Debug|Any CPU.Build.0 = Debug|Any CPU
{775041E3-9B61-4B22-ABED-EAB48F54C900}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@ -274,7 +260,6 @@ Global
{47208375-960F-41A4-A0EA-0D76F62B9123} = {2A80F0AD-9ADB-464C-BF31-06E505D1793B}
{871CD7E8-19F4-48F9-8124-66F69398C694} = {2A80F0AD-9ADB-464C-BF31-06E505D1793B}
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F} = {B39CEABB-9A42-4BA2-A167-665349113986}
{1F466C72-FD35-483E-A199-2C143CB813C1} = {B39CEABB-9A42-4BA2-A167-665349113986}
{775041E3-9B61-4B22-ABED-EAB48F54C900} = {B39CEABB-9A42-4BA2-A167-665349113986}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution

Write Preview
Loading…
Cancel
Save