Merge pull request #172 from TeamOpenSmartGlasses/dev

Dev

Author: nic-olo

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/SmartGlassesAndroidService.java

@@ -258,6 +258,7 @@ public void sendUiUpdate() {
 
             // Update preferred wearable if connected
             if(connectionState == 2){
+                Log.d(TAG, "sendUiUpdate updates preferred wearable");
                 savePreferredWearable(this, smartGlassesRepresentative.smartGlassesDevice.deviceModelName);
                 onGlassesConnected(smartGlassesRepresentative.smartGlassesDevice);
                 EventBus.getDefault().post(new SmartGlassesConnectedEvent(smartGlassesRepresentative.smartGlassesDevice));
@@ -309,11 +310,13 @@ public static void saveApiKey(Context context, String key) {
 
     /** Gets the preferred wearable from shared preference. */
     public static String getPreferredWearable(Context context) {
+//        Log.d(TAG, "GETTING PREFERRED WEARABLE");
         return PreferenceManager.getDefaultSharedPreferences(context).getString(context.getResources().getString(R.string.PREFERRED_WEARABLE), "");
     }
 
     /** Saves the preferred wearable in user shared preference. */
     public static void savePreferredWearable(Context context, String wearableName) {
+//        Log.d(TAG, "SAVING PREFERRED WEARABLE");
         PreferenceManager.getDefaultSharedPreferences(context)
                 .edit()
                 .putString(context.getResources().getString(R.string.PREFERRED_WEARABLE), wearableName)
@@ -628,11 +631,6 @@ public static void sendReferenceCard(String title, String body) {
         EventBus.getDefault().post(new ReferenceCardSimpleViewRequestEvent(title, body));
     }
 
-    //show a reference card on the smart glasses with title and body text
-    public static void sendReferenceCard(String title, String body, int lingerTimeMs) {
-        EventBus.getDefault().post(new ReferenceCardSimpleViewRequestEvent(title, body, lingerTimeMs));
-    }
-
     //show a text wall card on the smart glasses
     public static void sendTextWall(String text) {
         EventBus.getDefault().post(new TextWallViewRequestEvent(text));

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/SmartGlassesRepresentative.java

@@ -196,7 +196,7 @@ public int getConnectionState(){
 
     public void showReferenceCard(String title, String body){
         if (smartGlassesCommunicator != null) {
-            smartGlassesCommunicator.displayReferenceCardSimple(title, body, -1);
+            smartGlassesCommunicator.displayReferenceCardSimple(title, body);
         }
     }
 
@@ -259,7 +259,7 @@ public void onDoubleTextWallViewEvent(DoubleTextWallViewRequestEvent receivedEve
     public void onReferenceCardSimpleViewEvent(ReferenceCardSimpleViewRequestEvent receivedEvent){
         Log.d(TAG, "SHOWING REFERENCE CARD");
         if (smartGlassesCommunicator != null) {
-            smartGlassesCommunicator.displayReferenceCardSimple(receivedEvent.title, receivedEvent.body, receivedEvent.lingerTimeMs);
+            smartGlassesCommunicator.displayReferenceCardSimple(receivedEvent.title, receivedEvent.body);
 //            homeUiAfterDelay(referenceCardDelayTime);
         }
     }

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/eventbusmessages/GlassesBatteryLevelEvent.java renamed to SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/eventbusmessages/BatteryLevelEvent.java

@@ -1,8 +1,10 @@
 package com.teamopensmartglasses.smartglassesmanager.eventbusmessages;
 
-public class GlassesBatteryLevelEvent {
+public class BatteryLevelEvent {
+    // -1 is auto brightness
+
     public final int batteryLevel;
-    public GlassesBatteryLevelEvent(int batteryLevel) {
+    public BatteryLevelEvent(int batteryLevel) {
         this.batteryLevel = batteryLevel;
     }
 }

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/eventbusmessages/BrightnessLevelEvent.java

@@ -0,0 +1,8 @@
+package com.teamopensmartglasses.smartglassesmanager.eventbusmessages;
+
+public class BrightnessLevelEvent {
+    public final int brightnessLevel;
+    public BrightnessLevelEvent(int brightnessLevel) {
+        this.brightnessLevel = brightnessLevel;
+    }
+}

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/eventbusmessages/GlassesDisplayPowerEvent.java

@@ -0,0 +1,8 @@
+package com.teamopensmartglasses.smartglassesmanager.eventbusmessages;
+
+public class GlassesDisplayPowerEvent {
+    public boolean turnedOn;
+    public GlassesDisplayPowerEvent(boolean turnedOn){
+        this.turnedOn = turnedOn;
+    }
+}

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/eventbusmessages/GlassesHeadDownEvent.java

@@ -0,0 +1,8 @@
+package com.teamopensmartglasses.smartglassesmanager.eventbusmessages;
+
+public class GlassesHeadDownEvent {
+
+    public GlassesHeadDownEvent(){
+
+    }
+}

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/eventbusmessages/GlassesHeadUpEvent.java

@@ -0,0 +1,8 @@
+package com.teamopensmartglasses.smartglassesmanager.eventbusmessages;
+
+public class GlassesHeadUpEvent {
+
+    public GlassesHeadUpEvent(){
+
+    }
+}

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/smartglassescommunicators/AndroidSGC.java

@@ -563,7 +563,7 @@ public void destroy(){
         }
     }
 
-    public void displayReferenceCardSimple(String title, String body, int lingerTimeMs){
+    public void displayReferenceCardSimple(String title, String body){
         try{
             //build json object to send command result
             JSONObject commandResponseObject = new JSONObject();
@@ -759,7 +759,7 @@ public void displayPromptView(String prompt, String [] options){
     }
 
     public void displayTextLine(String text){
-        displayReferenceCardSimple("", text, -1);
+        displayReferenceCardSimple("", text);
     }
 
     public void displayCenteredText(String text){
@@ -768,7 +768,7 @@ public void displayCenteredText(String text){
     }
 
     public void displayCustomContent(String json) {
-        displayReferenceCardSimple("CustomDisplayNotImplemented", json, -1);
+        displayReferenceCardSimple("CustomDisplayNotImplemented", json);
     }
 
 

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/teamopensmartglasses/smartglassesmanager/smartglassescommunicators/AudioWearableSGC.java

@@ -45,7 +45,7 @@ public void destroy(){
         killme = true;
     }
 
-    public void displayReferenceCardSimple(String title, String body, int lingerTimeMs){
+    public void displayReferenceCardSimple(String title, String body){
         Log.d(TAG, "TTS reference card");
         EventBus.getDefault().post(new TextToSpeechEvent(title + ", " + body, "english"));
     }