fixed issues #11 #7 #4

genemars · Sep 21, 2015 · a272352 · a272352
1 parent 869de5c
commit a272352
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/HomeGenieAndroid/HomeGenie/AndroidManifest.xml b/HomeGenieAndroid/HomeGenie/AndroidManifest.xml
@@ -22,7 +22,6 @@
         <activity
             android:name="com.glabs.homegenie.StartActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"
             android:label="@string/app_name"
              >
             <intent-filter>

diff --git a/HomeGenieAndroid/HomeGenie/src/com/glabs/homegenie/StartActivity.java b/HomeGenieAndroid/HomeGenie/src/com/glabs/homegenie/StartActivity.java
@@ -97,6 +97,7 @@ public class StartActivity extends FragmentActivity implements EventSourceListen
         @Override
         public void run() {
             mGroupsViewFragment.UpdateCurrentGroupModules();
+            mGroupsViewFragment.UpdateCurrentGroupMenu();
             Fragment widgetPopup = getSupportFragmentManager().findFragmentByTag("WIDGET");
             if (widgetPopup != null && widgetPopup instanceof ModuleDialogFragment) {
                 ((ModuleDialogFragment) widgetPopup).refreshView();
@@ -144,10 +145,12 @@ public void onResume() {
         if (!_isPaused) {
             homegenieConnect();
         } else {
+            loaderShow();
             Control.resume(new Control.GetGroupModulesCallback() {
                 @Override
                 public void groupModulesUpdated(ArrayList<Module> modules) {
                     updateView();
+                    loaderHide();
                 }
             });
         }
@@ -468,10 +471,14 @@ public void imageDownloaded(String url, Bitmap downloadedImage) {
                     }
                     displayName = module.getDisplayName() + " (" + module.getDisplayAddress() + ")";
                     if (mGroupsViewFragment != null) {
-                        mGroupsViewFragment.RefreshView();
-                        Fragment widgetPopup = getSupportFragmentManager().findFragmentByTag("WIDGET");
-                        if (widgetPopup != null && widgetPopup instanceof ModuleDialogFragment) {
-                            ((ModuleDialogFragment) widgetPopup).refreshView();
+                        try {
+                            mGroupsViewFragment.RefreshView();
+                            Fragment widgetPopup = getSupportFragmentManager().findFragmentByTag("WIDGET");
+                            if (widgetPopup != null && widgetPopup instanceof ModuleDialogFragment) {
+                                ((ModuleDialogFragment) widgetPopup).refreshView();
+                            }
+                        } catch (Exception e) {
+                            //Log.d("onSseEvent", e.getMessage());
                         }
                     }
                 }

diff --git a/HomeGenieAndroid/HomeGenie/src/com/glabs/homegenie/adapters/GenericWidgetAdapter.java b/HomeGenieAndroid/HomeGenie/src/com/glabs/homegenie/adapters/GenericWidgetAdapter.java
@@ -437,6 +437,8 @@ protected void _updatePropertyBox(View convertView, int boxResId, String label,
         if (value == null || value.equals("")) {
             propBox.setVisibility(View.GONE);
         } else {
+            if (propBox.getVisibility() == View.GONE)
+                propBox.setVisibility(View.VISIBLE);
             TextView propLabel = (TextView) propBox.findViewById(R.id.propLabel);
             propLabel.setText(label);
             TextView propValue = (TextView) propBox.findViewById(R.id.propValue);

diff --git a/HomeGenieAndroid/HomeGenie/src/com/glabs/homegenie/fragments/GroupsViewFragment.java b/HomeGenieAndroid/HomeGenie/src/com/glabs/homegenie/fragments/GroupsViewFragment.java
@@ -51,6 +51,8 @@
 import com.viewpagerindicator.PageIndicator;
 import com.viewpagerindicator.TitlePageIndicator;
 
+import org.teleal.cling.model.types.DeviceType;
+
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Date;
@@ -244,7 +246,7 @@ public void UpdateCurrentGroupModules() {
             ModuleParameter widgetParam = m.getParameter("Widget.DisplayModule");
             String widget = "";
             if (widgetParam != null) widget = widgetParam.Value;
-            if (widget.equals("homegenie/generic/program")) {
+            if ((widget.equals("") && m.DeviceType.equals("Program")) || widget.equals("homegenie/generic/program")) {
                 mGroupPrograms.add(m);
             } else {
                 controlModules.add(m);

diff --git a/HomeGenieAndroid/deps/homegenieclientlib-1.0.2.jar b/HomeGenieAndroid/deps/homegenieclientlib-1.0.2.jar