Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunto classe Sensor e testSensor. NON SO se giusto

Browse Source
This commit is contained in:
f19stefano96
2018-05-31 21:14:58 +02:00
parent 749e9ed078
commit 09f96fc590
9 changed files with 551 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/4.4/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/4.4/fileHashes/fileHashes.lock
View File

Binary file not shown.

30
.idea/modules/SeniorAssistant_main.iml generated
View File

@@ -9,10 +9,40 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/zway-lib-0.2.9-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.api-client:google-api-client:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-jackson2:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-jetty:1.11.0-beta" level="project" />
<orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-java6:1.11.0-beta" level="project" />
<orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.http-client:google-http-client:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
<orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-client:9.3.11.v20160721" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-http:9.3.11.v20160721" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-client:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-common:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-io:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-util:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-api:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" name="Gradle: com.google.guava:guava-jdk5:17.0" level="project" />
<orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty:6.1.26" level="project" />
<orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3" level="project" />
<orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
<orderEntry type="library" name="Gradle: org.mortbay.jetty:servlet-api:2.5-20081211" level="project" />
</component>
</module>

30
.idea/modules/SeniorAssistant_test.iml generated
View File

@@ -10,13 +10,43 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="SeniorAssistant_main" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../lib/zway-lib-0.2.9-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.api-client:google-api-client:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-jackson2:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-jetty:1.11.0-beta" level="project" />
<orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client-java6:1.11.0-beta" level="project" />
<orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.http-client:google-http-client:1.23.0" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
<orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-client:9.3.11.v20160721" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-http:9.3.11.v20160721" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-client:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-common:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-io:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-util:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-api:9.3.12.v20160915" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
<orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" name="Gradle: com.google.guava:guava-jdk5:17.0" level="project" />
<orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty:6.1.26" level="project" />
<orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3" level="project" />
<orderEntry type="library" name="Gradle: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
<orderEntry type="library" name="Gradle: org.mortbay.jetty:servlet-api:2.5-20081211" level="project" />
</component>
<component name="TestModuleProperties" production-module="SeniorAssistant_main" />
</module>

277
.idea/workspace.xml generated
View File

@@ -2,7 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/device/Sensor.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/device/ZWaySimpleCallback.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/java/TestSensor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_main.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_test.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.gradle/" />
<ignored path="$PROJECT_DIR$/build/" />
@@ -21,11 +29,20 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="TestLights.java" pinned="false" current-in-tab="true">
<file leaf-file-name="Sensor.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/device/Sensor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TestLights.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<state relative-caret-position="51">
<caret line="9" column="76" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="9" selection-end-column="76" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -33,17 +50,47 @@
</provider>
</entry>
</file>
<file leaf-file-name="TestSensor.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/test/java/TestSensor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="19" column="33" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#161#162#0" expanded="true" />
<element signature="e#217#218#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Hue.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="59" column="56" lean-forward="true" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
<state relative-caret-position="884">
<caret line="59" column="56" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="34" column="29" selection-start-line="34" selection-start-column="29" selection-end-line="34" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>nameLights</find>
@@ -64,7 +111,7 @@
<component name="GradleLocalSettings">
<option name="myGradleHomes">
<map>
<entry key="$PROJECT_DIR$" value="C:\Users\Dawit\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" />
<entry key="$PROJECT_DIR$" value="C:\Users\f19st\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" />
</map>
</option>
<option name="myGradleVersions">
@@ -239,9 +286,9 @@
</option>
<option name="modificationStamps">
<map>
<entry key="$PROJECT_DIR$" value="6111089685131" />
<entry key="$PROJECT_DIR$" value="6111164529373" />
<entry key="$PROJECT_DIR$/.gradle" value="0" />
<entry key="$PROJECT_DIR$/build.gradle" value="2680631353" />
<entry key="$PROJECT_DIR$/build.gradle" value="950490900" />
<entry key="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" value="2083459160" />
<entry key="$PROJECT_DIR$/settings.gradle" value="2435099665" />
</map>
@@ -430,6 +477,10 @@
<list>
<option value="$PROJECT_DIR$/src/test/java/TestLights.java" />
<option value="$PROJECT_DIR$/src/main/java/device/Hue.java" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/src/main/java/device/ZWaySimpleCallback.java" />
<option value="$PROJECT_DIR$/src/main/java/device/Sensor.java" />
<option value="$PROJECT_DIR$/src/test/java/TestSensor.java" />
</list>
</option>
</component>
@@ -443,9 +494,10 @@
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-9" />
<option name="width" value="980" />
<option name="height" value="1040" />
<option name="x" value="-149" />
<option name="y" value="336" />
<option name="width" value="1346" />
<option name="height" value="688" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -453,7 +505,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="AndroidView" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -466,35 +517,6 @@
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="device" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="manage" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
@@ -508,11 +530,16 @@
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
</panes>
</component>
@@ -662,67 +689,41 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7867000" />
<option name="totallyTimeSpent" value="10736000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info anchor="right" id="Palette" />
<window_info anchor="right" id="sbt" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="right" id="Maven Projects" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info id="Capture Tool" />
<window_info id="Designer" />
<window_info anchor="bottom" id="Build" weight="0.32965517" />
<window_info anchor="right" id="Database" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Messages" order="7" />
<window_info anchor="right" id="Palette&#9;" />
<window_info id="Image Layers" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32965517" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="right" id="Maven Projects" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Terminal" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="bottom" id="sbt-shell-toolwindow" />
<window_info id="Learn" />
<window_info id="Capture Tool" />
<window_info id="Designer" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24963397" />
<window_info anchor="bottom" id="Build" visible="true" weight="0.3290938" />
<window_info anchor="right" id="Database" />
<window_info anchor="right" id="Gradle" />
<window_info anchor="right" id="Theme Preview" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="Build" order="7" weight="0.3290938" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="Palette" order="3" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290938" />
<window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="2" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24963397" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="right" id="Gradle" order="3" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -736,9 +737,6 @@
<option name="LAST_COMMIT_MESSAGE" value="non so" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/Rest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
@@ -746,23 +744,110 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="34" column="29" selection-start-line="34" selection-start-column="29" selection-end-line="34" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/device/ZWaySimpleCallback.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="229" column="54" selection-start-line="229" selection-start-column="54" selection-end-line="229" selection-end-column="54" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1753#1754#0" expanded="true" />
<element signature="e#1809#1810#0" expanded="true" />
<element signature="e#1879#1880#0" expanded="true" />
<element signature="e#1943#1944#0" expanded="true" />
<element signature="e#2003#2004#0" expanded="true" />
<element signature="e#2058#2059#0" expanded="true" />
<element signature="e#2284#2285#0" expanded="true" />
<element signature="e#2345#2346#0" expanded="true" />
<element signature="e#2426#2427#0" expanded="true" />
<element signature="e#2491#2492#0" expanded="true" />
<element signature="e#2716#2717#0" expanded="true" />
<element signature="e#2779#2780#0" expanded="true" />
<element signature="e#3158#3159#0" expanded="true" />
<element signature="e#3219#3220#0" expanded="true" />
<element signature="e#3285#3286#0" expanded="true" />
<element signature="e#3356#3357#0" expanded="true" />
<element signature="e#3422#3423#0" expanded="true" />
<element signature="e#3481#3482#0" expanded="true" />
<element signature="e#3549#3550#0" expanded="true" />
<element signature="e#3611#3612#0" expanded="true" />
<element signature="e#3692#3693#0" expanded="true" />
<element signature="e#3757#3758#0" expanded="true" />
<element signature="e#3978#3979#0" expanded="true" />
<element signature="e#4041#4042#0" expanded="true" />
<element signature="e#4113#4114#0" expanded="true" />
<element signature="e#4188#4189#0" expanded="true" />
<element signature="e#4255#4256#0" expanded="true" />
<element signature="e#4321#4322#0" expanded="true" />
<element signature="e#4399#4400#0" expanded="true" />
<element signature="e#4462#4463#0" expanded="true" />
<element signature="e#4532#4533#0" expanded="true" />
<element signature="e#4606#4607#0" expanded="true" />
<element signature="e#4675#4676#0" expanded="true" />
<element signature="e#4736#4737#0" expanded="true" />
<element signature="e#4805#4806#0" expanded="true" />
<element signature="e#4878#4879#0" expanded="true" />
<element signature="e#4944#4945#0" expanded="true" />
<element signature="e#5009#5010#0" expanded="true" />
<element signature="e#6219#6220#0" expanded="true" />
<element signature="e#6267#6268#0" expanded="true" />
<element signature="e#6344#6345#0" expanded="true" />
<element signature="e#6404#6405#0" expanded="true" />
<element signature="e#6459#6460#0" expanded="true" />
<element signature="e#6512#6513#0" expanded="true" />
<element signature="e#6586#6587#0" expanded="true" />
<element signature="e#6637#6638#0" expanded="true" />
<element signature="e#6695#6696#0" expanded="true" />
<element signature="e#6766#6767#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="59" column="56" lean-forward="true" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
<state relative-caret-position="884">
<caret line="59" column="56" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/device/Sensor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<state relative-caret-position="51">
<caret line="9" column="76" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="9" selection-end-column="76" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/TestSensor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="19" column="33" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#161#162#0" expanded="true" />
<element signature="e#217#218#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

13
build.gradle
View File

@@ -21,5 +21,16 @@ dependencies {
compile 'com.google.api-client:google-api-client:1.23.0'
compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.11.0-beta'
// z-way-lib and all its dependencies (from https://github.com/pathec/ZWay-library-for-Java)
compile files('lib/zway-lib-0.2.9-SNAPSHOT.jar')
compile 'com.google.code.gson:gson:2.4'
compile 'org.apache.commons:commons-lang3:3.4'
compile 'org.eclipse.jetty:jetty-client:9.3.11.v20160721'
compile 'org.eclipse.jetty:jetty-http:9.3.11.v20160721'
compile 'org.eclipse.jetty:jetty-io:9.3.11.v20160721'
compile 'org.eclipse.jetty:jetty-util:9.3.11.v20160721'
compile 'org.eclipse.jetty.websocket:websocket-api:9.3.12.v20160915'
compile 'org.eclipse.jetty.websocket:websocket-client:9.3.12.v20160915'
compile 'org.eclipse.jetty.websocket:websocket-common:9.3.12.v20160915'
compile 'org.slf4j:slf4j-simple:1.7.21'
}

42
src/main/java/device/Sensor.java Normal file
View File

@@ -0,0 +1,42 @@
package device;
import de.fh_zwickau.informatik.sensor.IZWayApi;
import de.fh_zwickau.informatik.sensor.ZWayApiHttp;
import de.fh_zwickau.informatik.sensor.model.devices.Device;
import de.fh_zwickau.informatik.sensor.model.devices.DeviceList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Sensor {
// init logger
Logger logger = LoggerFactory.getLogger(Sensor.class);
// sample RaZberry IP address
String ipAddress = "http://172.30.1.137:8083";
// sample username and password
String username = "admin";
String password = "raz4reti2";
IZWayApi zwayApi;
public Sensor() {
// create an instance of the Z-Way library; all the params are mandatory (we are not going to use the remote service/id)
zwayApi = new ZWayApiHttp(ipAddress, 8083, "http", username, password, 0, false, new ZWaySimpleCallback());
}
// get all the Z-Wave devices
DeviceList allDevices = zwayApi.getDevices();
public boolean IsLowLuminescence(int Luminescence) {
for (Device dev : allDevices.getAllDevices()) {
if (dev.getDeviceType().equalsIgnoreCase("SensorMultilevel"))
if (dev.getProbeType().equalsIgnoreCase("luminescence"))
if (Integer.parseInt(dev.getMetrics().getLevel()) < Luminescence)
return true;
else
return false;
}
return false;
}
}

233
src/main/java/device/ZWaySimpleCallback.java Normal file
View File

@@ -0,0 +1,233 @@
package device;
import de.fh_zwickau.informatik.sensor.IZWayApiCallbacks;
import de.fh_zwickau.informatik.sensor.model.devicehistory.DeviceHistory;
import de.fh_zwickau.informatik.sensor.model.devicehistory.DeviceHistoryList;
import de.fh_zwickau.informatik.sensor.model.devices.Device;
import de.fh_zwickau.informatik.sensor.model.devices.DeviceList;
import de.fh_zwickau.informatik.sensor.model.instances.Instance;
import de.fh_zwickau.informatik.sensor.model.instances.InstanceList;
import de.fh_zwickau.informatik.sensor.model.locations.Location;
import de.fh_zwickau.informatik.sensor.model.locations.LocationList;
import de.fh_zwickau.informatik.sensor.model.modules.ModuleList;
import de.fh_zwickau.informatik.sensor.model.namespaces.NamespaceList;
import de.fh_zwickau.informatik.sensor.model.notifications.Notification;
import de.fh_zwickau.informatik.sensor.model.notifications.NotificationList;
import de.fh_zwickau.informatik.sensor.model.profiles.Profile;
import de.fh_zwickau.informatik.sensor.model.profiles.ProfileList;
import de.fh_zwickau.informatik.sensor.model.zwaveapi.controller.ZWaveController;
import de.fh_zwickau.informatik.sensor.model.zwaveapi.devices.ZWaveDevice;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Mandatory callback class for the Z-Way Library in use.
* Really trivial implementation: log all the responses at debug level.
*
* @author <a href="mailto:luigi.derussis@uniupo.it">Luigi De Russis</a>
* @version 1.0 (24/05/2017)
* @see <a href="https://github.com/pathec/ZWay-library-for-Java">Z-Way Library on GitHub</a> for documentation about the used library
*/
public class ZWaySimpleCallback implements IZWayApiCallbacks {
@Override
public void getStatusResponse(String s) {
this.logMessage("Status response: " + s);
}
@Override
public void getRestartResponse(Boolean aBoolean) {
this.logMessage("Restart response: " + aBoolean);
}
@Override
public void getLoginResponse(String s) {
this.logMessage("Login response: " + s);
}
@Override
public void getNamespacesResponse(NamespaceList namespaceList) {
this.logMessage("Namespaces are: " + namespaceList);
}
@Override
public void getModulesResponse(ModuleList moduleList) {
this.logMessage("Modules are: " + moduleList);
}
@Override
public void getInstancesResponse(InstanceList instanceList) {
this.logMessage("Instances are: " + instanceList);
}
@Override
public void postInstanceResponse(Instance instance) {
this.logMessage("Received a POST for the instance: " + instance);
}
@Override
public void getInstanceResponse(Instance instance) {
this.logMessage("The instance is: " + instance);
}
@Override
public void putInstanceResponse(Instance instance) {
this.logMessage("Received a PUT for the instance: " + instance);
}
@Override
public void deleteInstanceResponse(boolean b) {
this.logMessage("The instance has been deleted? " + String.valueOf(b));
}
@Override
public void getDevicesResponse(DeviceList deviceList) {
this.logMessage("Devices are: " + deviceList);
}
@Override
public void putDeviceResponse(Device device) {
this.logMessage("Received a PUT for device: " + device);
}
@Override
public void getDeviceResponse(Device device) {
this.logMessage("The device is: " + device);
}
@Override
public void getDeviceCommandResponse(String s) {
this.logMessage("The device command is: " + s);
}
@Override
public void getLocationsResponse(LocationList locationList) {
this.logMessage("Locations are: " + locationList);
}
@Override
public void postLocationResponse(Location location) {
this.logMessage("Received a POST for location: " + location);
}
@Override
public void getLocationResponse(Location location) {
this.logMessage("The location is: " + location);
}
@Override
public void putLocationResponse(Location location) {
this.logMessage("Received a PUT for location: " + location);
}
@Override
public void deleteLocationResponse(boolean b) {
this.logMessage("Location has been deleted? " + b);
}
@Override
public void getProfilesResponse(ProfileList profileList) {
this.logMessage("Profiles are: " + profileList);
}
@Override
public void postProfileResponse(Profile profile) {
this.logMessage("Received a POST for profile: " + profile);
}
@Override
public void getProfileResponse(Profile profile) {
this.logMessage("The profile is: " + profile);
}
@Override
public void putProfileResponse(Profile profile) {
this.logMessage("Received a PUT for profile: " + profile);
}
@Override
public void deleteProfileResponse(boolean b) {
this.logMessage("Profile has been deleted? " + b);
}
@Override
public void getNotificationsResponse(NotificationList notificationList) {
this.logMessage("Notifications are: " + notificationList);
}
@Override
public void getNotificationResponse(Notification notification) {
this.logMessage("The notification is: " + notification);
}
@Override
public void putNotificationResponse(Notification notification) {
this.logMessage("Received a PUT for notification: " + notification);
}
@Override
public void getDeviceHistoriesResponse(DeviceHistoryList deviceHistoryList) {
this.logMessage("Device histories are: " + deviceHistoryList);
}
@Override
public void getDeviceHistoryResponse(DeviceHistory deviceHistory) {
this.logMessage("The device history is: " + deviceHistory);
}
@Override
public void getZWaveDeviceResponse(ZWaveDevice zWaveDevice) {
this.logMessage("The Z-Wave device is: " + zWaveDevice);
}
@Override
public void getZWaveControllerResponse(ZWaveController zWaveController) {
this.logMessage("The Z-Wave controller is: " + zWaveController);
}
@Override
public void apiError(String s, boolean b) {
this.logError("API Error: " + s);
}
@Override
public void httpStatusError(int i, String s, boolean b) {
this.logError("HTTP Status Error: " + i + s);
}
@Override
public void authenticationError() {
this.logError("Authentication Error");
}
@Override
public void responseFormatError(String s, boolean b) {
this.logError("Wrong format: " + s);
}
@Override
public void message(int i, String s) {
this.logMessage("You've got a message: " + i + " " + s);
}
/**
* Utility method to print the log messages of this class.
*
* @param message the {@link String} to print
*/
private void logMessage(String message) {
Logger logger = LoggerFactory.getLogger(Sensor.class);
logger.debug(message);
}
/**
* Utility method to print the error messages of this class.
*
* @param error the {@link String} to print
*/
private void logError(String error) {
Logger logger = LoggerFactory.getLogger(Sensor.class);
logger.error(error);
}
}

23
src/test/java/TestSensor.java Normal file
View File

@@ -0,0 +1,23 @@
import device.Hue;
import device.Sensor;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
public class TestSensor {
Sensor sensor = new Sensor();
Hue hue = new Hue();
@Test
public void firstTestSensor() {
assertTrue(sensor.IsLowLuminescence(50));
}
@Test
public void secondTestSensor() {
if(sensor.IsLowLuminescence(50)) {
hue.turnOn();
hue.setBrightness(200);
}
}
}