Merge pull request #4 from Fleker/Fleker-roomnames

Adds action to handle rooms said by label
RowanPWLab · Nov 13, 2018 · b554c7a · b554c7a
2 parents 69e31c1 + 624e9c1
commit b554c7a
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,4 @@ freeline_project_description.json
 
 # A backup file of old custom actions file
 actions - OLD*
+creds.data
diff --git a/CustomCommands/actions.json b/CustomCommands/actions.json
@@ -51,7 +51,7 @@
               {
                 "deviceExecution": {
                   "command": "com.acme.commands.Room_Number",
-                  "params": {       
+                  "params": {
                     "number": "$number"
                   }
                 }
@@ -60,6 +60,75 @@
           }
         }
       }
+    },
+    {
+      "name": "com.acme.actions.Room_Name",
+      "availability": {
+        "deviceClasses": [
+          {
+            "assistantSdkDevice": {}
+          }
+        ]
+      },
+      "intent": {
+        "name": "com.acme.intents.Room_Name",
+        "parameters": [
+          {
+            "name": "name",
+            "type": "RoomName"
+          }
+        ],
+        "trigger": {
+          "queryPatterns": [
+            "Where is (room)? $RoomName:name",
+            "How do I get to (room)? $RoomName:name"
+          ]
+        }
+      },
+      "fulfillment": {
+        "staticFulfillment": {
+          "templatedResponse": {
+            "items": [
+              {
+                "deviceExecution": {
+                  "command": "com.acme.commands.Room_Name",
+                  "params": {
+                    "name": "$name"
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "types": [
+    {
+      "name": "$RoomName",
+      "entities": [
+        {
+          "key": "346",
+          "synonyms": [
+            "office",
+            "E C E office"
+          ]
+        },
+        {
+          "key": "306",
+          "synonyms": [
+            "bathroom",
+            "womans bathroom"
+          ]
+        },
+        {
+          "key": "100",
+          "synonyms": [
+            "atrium",
+            "commons area"
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/CustomCommands/creds.data b/CustomCommands/creds.data
diff --git a/MainProgram/app/src/main/java/com/example/androidthings/assistant/AssistantActivity.java b/MainProgram/app/src/main/java/com/example/androidthings/assistant/AssistantActivity.java
@@ -332,6 +332,13 @@ public void onClick(View view) {
                             } catch (IOException e) {
                                 Log.e(TAG, "Cannot set value of LED", e);
                             }
+                        } else if (intentName.equals("com.acme.commands.Room_Name")) {
+                            try {
+                                String room = parameters.getString("name");
+                                Log.d(TAG, "Looking for Room_Name: Room: " + room);
+                            } catch (JSONException e) {
+                                Log.e(TAG, "Cannot get value of command", e);
+                            }
                         }
                     }
                 })