sensors fragment; pause on pause; play on resume

app/src/main/java/com/rthoni/camotion/business/SensorsBusiness.java

@@ -16,7 +16,7 @@ public class SensorsBusiness extends LuBusinessManager {
         return SensorsDataAccess.getAll(config, page, perPage);
     }
 
-    public static LuPromise<SensorValueDbo> getImage(LuDataAccessConfigDbo config, SensorDbo sensor)
+    public static LuPromise<SensorValueDbo> getValue(LuDataAccessConfigDbo config, SensorDbo sensor)
     {
         return SensorsDataAccess.getValue(config, sensor.getId());
     }

app/src/main/java/com/rthoni/camotion/ui/MainActivity.java

@@ -24,6 +24,7 @@ import com.rthoni.camotion.ui.dialogs.LoginDialog;
 import com.rthoni.camotion.ui.fragments.CamerasFragment;
 import com.rthoni.camotion.ui.fragments.CamotionFragment;
 import com.rthoni.camotion.ui.fragments.DefaultFragment;
+import com.rthoni.camotion.ui.fragments.SensorsFragment;
 
 import java.util.List;
 
@@ -141,9 +142,9 @@ public class MainActivity extends AppCompatActivity
         CamotionFragment fragment;
         if (view == R.id.nav_cameras) {
             fragment = new CamerasFragment();
-        } /*else if (view == R.id.nav_sensors) {
+        } else if (view == R.id.nav_sensors) {
             fragment = new SensorsFragment();
-        } else if (view == R.id.nav_commands) {
+        } /*else if (view == R.id.nav_commands) {
             fragment = new CommandsFragment();
         } else if (view == -1) {
             fragment = new DefaultFragment();

app/src/main/java/com/rthoni/camotion/ui/fragments/CamerasFragment.java

@@ -1,7 +1,5 @@
 package com.rthoni.camotion.ui.fragments;
 
-import android.view.View;
-
 import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.dbo.LuMultipleDbo;
 import com.rthoni.camotion.business.CamerasBusiness;
@@ -12,7 +10,7 @@ import com.rthoni.camotion.ui.views.CameraView;
  *
  * Created by robin on 11/29/15.
  */
-public class CamerasFragment extends CamotionFragment<CameraDbo> {
+public class CamerasFragment extends CamotionFragment<CameraDbo, CameraView> {
 
     @Override
     protected LuPromise<LuMultipleDbo<CameraDbo>> getLoadPagePromise(int page, int perPage, String query) {
@@ -26,7 +24,25 @@ public class CamerasFragment extends CamotionFragment<CameraDbo> {
     }
 
     @Override
-    protected View getDboView(CameraDbo camera) {
+    public void onPause() {
+        super.onPause();
+        for (CameraView view : _views)
+        {
+            view.pause();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        for (CameraView view : _views)
+        {
+            view.play();
+        }
+    }
+
+    @Override
+    protected CameraView getDboView(CameraDbo camera) {
         CameraView imageView = new CameraView(getActivity());
         imageView.setCamotionDbo(_fullLoginDbo, _currentLocation);
         imageView.setCamera(camera);

app/src/main/java/com/rthoni/camotion/ui/fragments/CamotionFragment.java

@@ -1,5 +1,7 @@
 package com.rthoni.camotion.ui.fragments;
 
+import android.view.View;
+
 import com.luticate.auth.dbo.LuFullLoginDbo;
 import com.luticate.utils.dbo.LuDbo;
 import com.luticate.utils.ui.fragments.ViewPaginationFragment;
@@ -8,7 +10,7 @@ import com.rthoni.camotion.dbo.LocationDbo;
 /**
  * Created by robin on 12/3/15.
  */
-public abstract class CamotionFragment<Dbo extends LuDbo> extends ViewPaginationFragment<Dbo> {
+public abstract class CamotionFragment<Dbo extends LuDbo, DboView extends View> extends ViewPaginationFragment<Dbo, DboView> {
     protected LuFullLoginDbo _fullLoginDbo = null;
     protected LocationDbo _currentLocation = null;
 

app/src/main/java/com/rthoni/camotion/ui/fragments/SensorsFragment.java

@@ -0,0 +1,55 @@
+package com.rthoni.camotion.ui.fragments;
+
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.dbo.LuMultipleDbo;
+import com.rthoni.camotion.business.CamerasBusiness;
+import com.rthoni.camotion.business.SensorsBusiness;
+import com.rthoni.camotion.dbo.CameraDbo;
+import com.rthoni.camotion.dbo.SensorDbo;
+import com.rthoni.camotion.ui.views.CameraView;
+import com.rthoni.camotion.ui.views.SensorView;
+
+/**
+ *
+ * Created by robin on 11/29/15.
+ */
+public class SensorsFragment extends CamotionFragment<SensorDbo, SensorView> {
+
+    @Override
+    protected LuPromise<LuMultipleDbo<SensorDbo>> getLoadPagePromise(int page, int perPage, String query) {
+        return SensorsBusiness.getAll(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), page, perPage)
+                .map(new LuPromise.LuConverter<SensorDbo.MultipleSensorDbo, LuMultipleDbo<SensorDbo>>() {
+                    @Override
+                    public LuMultipleDbo<SensorDbo> convert(SensorDbo.MultipleSensorDbo data) {
+                        return data;
+                    }
+                });
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        for (SensorView view : _views)
+        {
+            view.pause();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        for (SensorView view : _views)
+        {
+            view.play();
+        }
+    }
+
+    @Override
+    protected SensorView getDboView(SensorDbo sensor) {
+        SensorView imageView = new SensorView(getActivity());
+        imageView.setCamotionDbo(_fullLoginDbo, _currentLocation);
+        imageView.setSensor(sensor);
+        imageView.play();
+        return imageView;
+    }
+}

app/src/main/java/com/rthoni/camotion/ui/views/SensorView.java

@@ -13,9 +13,11 @@ import com.luticate.auth.dbo.LuFullLoginDbo;
 import com.luticate.utils.business.LuPromise;
 import com.rthoni.camotion.R;
 import com.rthoni.camotion.business.CamerasBusiness;
+import com.rthoni.camotion.business.SensorsBusiness;
 import com.rthoni.camotion.dbo.CameraDbo;
 import com.rthoni.camotion.dbo.LocationDbo;
 import com.rthoni.camotion.dbo.SensorDbo;
+import com.rthoni.camotion.dbo.SensorValueDbo;
 
 /**
  * Created by robin on 12/4/15.
@@ -26,12 +28,12 @@ public class SensorView extends RelativeLayout {
 
     private SensorDbo _sensor;
 
-    private ImageView _imageView;
+    private TextView _textView;
 
     private int _interval = 500;
 
     private boolean _playing = false;
-    private LuPromise<Bitmap> _promise = null;
+    private LuPromise<SensorValueDbo> _promise = null;
 
     public void setCamotionDbo(LuFullLoginDbo fullLoginDbo, LocationDbo currentLocation)
     {
@@ -46,9 +48,10 @@ public class SensorView extends RelativeLayout {
     public void setSensor(SensorDbo sensor) {
         _sensor = sensor;
 
-        /*((TextView)findViewById(R.id.textViewName)).setText(_sensor.getName());
+        ((TextView)findViewById(R.id.textViewName)).setText(_sensor.getName());
+        _textView = (TextView)findViewById(R.id.textViewValue);
 
-        findViewById(R.id.imageViewPause).setOnClickListener(new OnClickListener() {
+        /*findViewById(R.id.imageViewPause).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 togglePlay();
@@ -82,7 +85,7 @@ public class SensorView extends RelativeLayout {
 
     private void init()
     {
-        inflate(getContext(), R.layout.sensors_layout, this);
+        inflate(getContext(), R.layout.sensor_view, this);
     }
 
     public void togglePlay()
@@ -100,13 +103,11 @@ public class SensorView extends RelativeLayout {
     public void pause()
     {
         _playing = false;
-        findViewById(R.id.imageViewPause).setVisibility(VISIBLE);
     }
 
     public void play()
     {
         _playing = true;
-        findViewById(R.id.imageViewPause).setVisibility(GONE);
         if (_promise == null || _promise.getStatus() != LuPromise.LuPromiseStatus.Running) {
             _play();
         }
@@ -114,12 +115,12 @@ public class SensorView extends RelativeLayout {
 
     private void _play()
     {
-        /*_promise = CamerasBusiness.getImage(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), _camera)
-                .then(new LuPromise.LuConsumer<Bitmap>() {
+        _promise = SensorsBusiness.getValue(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), _sensor)
+                .then(new LuPromise.LuConsumer<SensorValueDbo>() {
                     @Override
-                    public void execute(Bitmap image) {
+                    public void execute(SensorValueDbo value) {
                         if (_playing) {
-                            _imageView.setImageBitmap(image);
+                            _textView.setText(String.valueOf(value.getValue()));
                             Handler h = new Handler();
                             h.postDelayed(new Runnable() {
                                 @Override
@@ -134,6 +135,6 @@ public class SensorView extends RelativeLayout {
                     public void execute(LuPromise.LuPromiseError data) {
 
                     }
-                });*/
+                });
     }
 }

app/src/main/res/layout/cameras_layout.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical" >
-
-    <!-- Loading progress -->
-
-    <LinearLayout
-        android:id="@+id/loadStatus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="gone" >
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp" />
-
-        <TextView
-            android:id="@+id/loading_status_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/loading"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-    <!-- Layout -->
-
-    <ScrollView
-        android:id="@+id/mainScrollView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.33" >
-
-        <LinearLayout
-            android:id="@+id/imagesLayoutScrollView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

app/src/main/res/layout/commands_layout.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical" >
-
-    <!-- Loading progress -->
-
-    <LinearLayout
-        android:id="@+id/loadStatus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="gone" >
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp" />
-
-        <TextView
-            android:id="@+id/loading_status_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/loading"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-    <!-- Layout -->
-
-    <ScrollView
-        android:id="@+id/mainScrollView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.33" >
-
-        <LinearLayout
-            android:id="@+id/imagesLayoutScrollView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-
-            <ImageView
-                android:contentDescription="42"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10px"
-                android:adjustViewBounds="true"
-                android:src="@drawable/camera_loading" />
-
-            <ImageView
-                android:contentDescription="42"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10px"
-                android:adjustViewBounds="true"
-                android:src="@drawable/camera_loading" />
-
-            <ImageView
-                android:contentDescription="42"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10px"
-                android:adjustViewBounds="true"
-                android:src="@drawable/camera_loading" />
-
-            <ImageView
-                android:contentDescription="42"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10px"
-                android:adjustViewBounds="true"
-                android:src="@drawable/camera_loading" />
-
-            <ImageView
-                android:contentDescription="42"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10px"
-                android:adjustViewBounds="true"
-                android:src="@drawable/camera_loading" />
-
-            <ImageView
-                android:contentDescription="42"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10px"
-                android:adjustViewBounds="true"
-                android:src="@drawable/camera_loading" />
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

app/src/main/res/layout/sensor_view.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text=""
+        android:id="@+id/textViewName"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_toLeftOf="@+id/textViewValue"
+        android:layout_toStartOf="@+id/textViewValue"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text=""
+        android:id="@+id/textViewValue"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"/>
+</RelativeLayout>

app/src/main/res/layout/sensors_layout.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical" >
-
-    <!-- Loading progress -->
-
-    <LinearLayout
-        android:id="@+id/loadStatus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="gone" >
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp" />
-
-        <TextView
-            android:id="@+id/loading_status_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/loading"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-    <!-- Layout -->
-
-    <ScrollView
-        android:id="@+id/mainScrollView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.33" >
-
-        <LinearLayout
-            android:id="@+id/sensorsLayoutScrollView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

luticateutils/src/main/java/com/luticate/utils/ui/fragments/AbstractPaginationFragment.java

@@ -29,7 +29,7 @@ public abstract class AbstractPaginationFragment<Dbo extends LuDbo> extends Frag
 
     protected String _query = "";
 
-    protected LuMultipleDbo<Dbo> _items = new LuMultipleDbo<>();
+    protected LuMultipleDbo<Dbo> _items = null;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
@@ -48,7 +48,9 @@ public abstract class AbstractPaginationFragment<Dbo extends LuDbo> extends Frag
                 loadPage(page);
             }
         });
-        loadPage(_page);
+        if (_items == null) {
+            loadPage(_page);
+        }
     }
 
     protected void showProgress(final boolean show)
@@ -97,10 +99,13 @@ public abstract class AbstractPaginationFragment<Dbo extends LuDbo> extends Frag
     public void loadPage(final int page)
     {
         final View v = getView();
-        if (!isAdded() || v == null)
+        if (!isAdded() || v == null) {
             return;
+        }
         showProgress(true);
-        _items.setData(new Vector<Dbo>());
+        if (_items != null) {
+            _items.setData(new Vector<Dbo>());
+        }
         getLoadPagePromise(page, _perPage, _query).then(new LuPromise.LuConsumer<LuMultipleDbo<Dbo>>() {
             @Override
             public void execute(LuMultipleDbo<Dbo> items) {

luticateutils/src/main/java/com/luticate/utils/ui/fragments/ViewPaginationFragment.java

@@ -6,10 +6,15 @@ import android.widget.LinearLayout;
 import com.luticate.utils.R;
 import com.luticate.utils.dbo.LuDbo;
 
+import java.util.List;
+import java.util.Vector;
+
 /**
  * Created by robin on 12/6/15.
  */
-public abstract class ViewPaginationFragment<Dbo extends LuDbo> extends AbstractPaginationFragment<Dbo> {
+public abstract class ViewPaginationFragment<Dbo extends LuDbo, DboView extends View> extends AbstractPaginationFragment<Dbo> {
+
+    protected List<DboView> _views = new Vector<>();
 
     @Override
     protected int getLoaderViewId() {
@@ -36,12 +41,14 @@ public abstract class ViewPaginationFragment<Dbo extends LuDbo> extends Abstract
         View view = getView();
         LinearLayout layout = (LinearLayout) view.findViewById(R.id.itemsLayoutScrollView);
         layout.removeAllViews();
+        _views.clear();
         for (Dbo item : _items.getData())
         {
-            View v = getDboView(item);
+            DboView v = getDboView(item);
             layout.addView(v);
+            _views.add(v);
         }
     }
 
-    protected abstract View getDboView(Dbo dbo);
+    protected abstract DboView getDboView(Dbo dbo);
 }