command exec

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

@@ -0,0 +1,30 @@
+package com.rthoni.camotion.business;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Base64;
+
+import com.luticate.utils.business.LuBusinessManager;
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.dbo.LuBoolDbo;
+import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.camotion.dataaccess.CamerasDataAccess;
+import com.rthoni.camotion.dataaccess.CommandsDataAccess;
+import com.rthoni.camotion.dbo.CameraDbo;
+import com.rthoni.camotion.dbo.CameraImageDbo;
+import com.rthoni.camotion.dbo.CommandDbo;
+
+/**
+ * Created by robin on 12/3/15.
+ */
+public class CommandsBusiness extends LuBusinessManager {
+    public static LuPromise<CommandDbo.MultipleCommandDbo> getAll(LuDataAccessConfigDbo config, int page, int perPage)
+    {
+        return CommandsDataAccess.getAll(config, page, perPage);
+    }
+
+    public static LuPromise<LuBoolDbo> exec(LuDataAccessConfigDbo config, CommandDbo command)
+    {
+        return CommandsDataAccess.exec(config, command.getId());
+    }
+}

app/src/main/java/com/rthoni/camotion/dataaccess/CommandsDataAccess.java

@@ -0,0 +1,31 @@
+package com.rthoni.camotion.dataaccess;
+
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.business.LuRequest;
+import com.luticate.utils.dataaccess.LuDataAccess;
+import com.luticate.utils.dbo.LuBoolDbo;
+import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.camotion.dbo.CommandDbo;
+import com.rthoni.camotion.dbo.SensorDbo;
+import com.rthoni.camotion.dbo.SensorValueDbo;
+
+import java.util.HashMap;
+
+/**
+ * Created by robin on 12/3/15.
+ */
+public class CommandsDataAccess extends LuDataAccess {
+
+    public static LuPromise<CommandDbo.MultipleCommandDbo> getAll(LuDataAccessConfigDbo config, int page, int perPage)
+    {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("page", "" + page);
+        params.put("perPage", "" + perPage);
+        return LuRequest.get(config, CommandDbo.MultipleCommandDbo.class, "/api/commands", params);
+    }
+
+    public static LuPromise<LuBoolDbo> exec(LuDataAccessConfigDbo config, int id)
+    {
+        return LuRequest.post(config, LuBoolDbo.class, "/api/commands/" + id + "/exec");
+    }
+}

app/src/main/java/com/rthoni/camotion/dbo/CommandDbo.java

@@ -0,0 +1,64 @@
+package com.rthoni.camotion.dbo;
+
+import com.luticate.utils.dbo.LuDbo;
+import com.luticate.utils.dbo.LuMultipleDbo;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
+/**
+ * Created by robin on 12/3/15.
+ */
+public class CommandDbo extends LuDbo {
+
+    private int _id;
+
+    private String _name;
+
+    private String _description;
+
+    public String getDescription() {
+        return _description;
+    }
+
+    public void setDescription(String description) {
+        _description = description;
+    }
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public int getId() {
+        return _id;
+    }
+
+    public void setId(int id) {
+        _id = id;
+    }
+
+    public static class MultipleCommandDbo extends LuMultipleDbo<CommandDbo> {
+    }
+
+    @Override
+    public void fromJson(JSONObject json) throws JSONException {
+        _id = json.getInt("Id");
+        _description = json.getString("Description");
+        _name = json.getString("Name");
+    }
+
+    @Override
+    public HashMap<String, Object> toArray() {
+        HashMap<String, Object> array = new HashMap<>();
+        array.put("Id", _id);
+        array.put("Description", _description);
+        array.put("Name", _name);
+        return array;
+    }
+}

app/src/main/java/com/rthoni/camotion/dbo/SensorDbo.java

@@ -12,6 +12,7 @@ import java.util.HashMap;
  * Created by robin on 12/4/15.
  */
 public class SensorDbo extends LuDbo {
+
     private int _id;
 
     private String _name;

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

@@ -25,6 +25,7 @@ import com.rthoni.camotion.dbo.LocationDbo;
 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.CommandsFragment;
 import com.rthoni.camotion.ui.fragments.DefaultFragment;
 import com.rthoni.camotion.ui.fragments.SensorsFragment;
 
@@ -40,8 +41,6 @@ public class MainActivity extends AppCompatActivity
     private SubMenu _locationsMenu;
     private NavigationView _navigationView;
 
-    private int _lastView = -1;
-
     private static final int REQUEST_CODE_ADD_ACCOUNT = 0;
 
     @Override
@@ -168,9 +167,9 @@ public class MainActivity extends AppCompatActivity
             fragment = new CamerasFragment();
         } 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) {
+        } /*else if (view == -1) {
             fragment = new DefaultFragment();
         } */else {
             return;

app/src/main/java/com/rthoni/camotion/ui/dialogs/CommandExecDialog.java

@@ -0,0 +1,72 @@
+package com.rthoni.camotion.ui.dialogs;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+
+import com.luticate.auth.business.LuticatePermissionsBusiness;
+import com.luticate.auth.business.LuticateUsersBusiness;
+import com.luticate.auth.dbo.LuFullLoginDbo;
+import com.luticate.auth.dbo.LuLoginDbo;
+import com.luticate.auth.dbo.LuPermissionDbo;
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.dbo.LuBoolDbo;
+import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.camotion.R;
+import com.rthoni.camotion.business.CommandsBusiness;
+import com.rthoni.camotion.dbo.CommandDbo;
+import com.rthoni.camotion.dbo.LocationDbo;
+
+/**
+ *
+ * Created by robin on 11/28/15.
+ */
+public abstract class CommandExecDialog {
+
+    public static void showDialog(final LuDataAccessConfigDbo config, final Context context, final CommandDbo command)
+    {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(context.getString(R.string.command_confirm, command.getName()))
+                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        showLoadingDialog(config, context, command);
+                    }
+                })
+                .setNegativeButton(android.R.string.no, null)
+                .show();
+    }
+
+    protected static void showLoadingDialog(final LuDataAccessConfigDbo config, final Context context, final CommandDbo command)
+    {
+        final ProgressDialog dlg = new ProgressDialog(context);
+        dlg.setIndeterminate(true);
+        dlg.setTitle(R.string.loading);
+        dlg.setMessage(context.getString(R.string.command_loading, command.getName()));
+        dlg.setCancelable(false);
+        dlg.show();
+        CommandsBusiness.exec(config, command).then(new LuPromise.LuConsumer<LuBoolDbo>() {
+            @Override
+            public void execute(LuBoolDbo data) {
+                dlg.hide();
+                showEndDialog(context, context.getString(R.string.command_success, command.getName()));
+            }
+        }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+            @Override
+            public void execute(LuPromise.LuPromiseError error) {
+                dlg.hide();
+                showEndDialog(context, context.getString(R.string.error, error.toString()));
+            }
+        });
+    }
+
+    protected static void showEndDialog(Context context, String text)
+    {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(text);
+        builder.setPositiveButton(android.R.string.ok, null);
+        builder.show();
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.rthoni.camotion.ui.fragments;
+
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.dbo.LuMultipleDbo;
+import com.rthoni.camotion.business.CommandsBusiness;
+import com.rthoni.camotion.dbo.CommandDbo;
+import com.rthoni.camotion.ui.views.CommandView;
+
+/**
+ *
+ * Created by robin on 11/29/15.
+ */
+public abstract class AbstractCommandsFragment extends CamotionFragment<CommandDbo, CommandView> {
+
+    @Override
+    protected LuPromise<LuMultipleDbo<CommandDbo>> getLoadPagePromise(int page, int perPage, String query) {
+        return CommandsBusiness.getAll(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), page, perPage)
+                .map(new LuPromise.LuConverter<CommandDbo.MultipleCommandDbo, LuMultipleDbo<CommandDbo>>() {
+                    @Override
+                    public LuMultipleDbo<CommandDbo> convert(CommandDbo.MultipleCommandDbo data) {
+                        return data;
+                    }
+                });
+    }
+
+    @Override
+    protected CommandView getDboView(final CommandDbo command) {
+        CommandView commandView = new CommandView(getActivity());
+        commandView.setCamotionDbo(_fullLoginDbo, _currentLocation);
+        commandView.setCommand(command);
+        commandView.setOnClickedListener(new LuPromise.LuConsumer<CommandDbo>() {
+            @Override
+            public void execute(CommandDbo command) {
+                onCommandClicked(command);
+            }
+        });
+        return commandView;
+    }
+
+    protected abstract void onCommandClicked(CommandDbo command);
+}

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

@@ -12,6 +12,11 @@ import com.rthoni.camotion.ui.views.CameraView;
  */
 public class CamerasFragment extends CamotionFragment<CameraDbo, CameraView> {
 
+    public CamerasFragment() {
+        super();
+        _perPage = 6;
+    }
+
     @Override
     protected LuPromise<LuMultipleDbo<CameraDbo>> getLoadPagePromise(int page, int perPage, String query) {
         return CamerasBusiness.getAll(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), page, perPage)

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

@@ -0,0 +1,16 @@
+package com.rthoni.camotion.ui.fragments;
+
+import com.rthoni.camotion.dbo.CommandDbo;
+import com.rthoni.camotion.ui.dialogs.CommandExecDialog;
+
+/**
+ *
+ * Created by robin on 11/29/15.
+ */
+public class CommandsFragment extends AbstractCommandsFragment {
+
+    @Override
+    protected void onCommandClicked(CommandDbo command) {
+        CommandExecDialog.showDialog(_currentLocation.getConfig(_fullLoginDbo.getLoginDbo()), getActivity(), command);
+    }
+}

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

@@ -131,7 +131,7 @@ public class CameraView extends RelativeLayout {
                 }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
                     @Override
                     public void execute(LuPromise.LuPromiseError data) {
-
+                        pause();
                     }
                 });
     }

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

@@ -0,0 +1,74 @@
+package com.rthoni.camotion.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.luticate.auth.dbo.LuFullLoginDbo;
+import com.luticate.utils.business.LuPromise;
+import com.rthoni.camotion.R;
+import com.rthoni.camotion.dbo.CommandDbo;
+import com.rthoni.camotion.dbo.LocationDbo;
+import com.rthoni.camotion.ui.dialogs.CommandExecDialog;
+
+/**
+ * Created by robin on 12/10/15.
+ */
+public class CommandView extends RelativeLayout {
+    private LuFullLoginDbo _fullLoginDbo = null;
+    private LocationDbo _currentLocation = null;
+
+    private CommandDbo _command;
+
+    private LuPromise.LuConsumer<CommandDbo> _onClicked = null;
+
+    public CommandView(Context context) {
+        super(context);
+        init();
+    }
+
+    public CommandView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public CommandView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init()
+    {
+        inflate(getContext(), R.layout.command_view, this);
+        findViewById(R.id.textViewName).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (_onClicked != null) {
+                    _onClicked.execute(_command);
+                }
+            }
+        });
+    }
+
+    public void setCamotionDbo(LuFullLoginDbo fullLoginDbo, LocationDbo currentLocation)
+    {
+        _fullLoginDbo = fullLoginDbo;
+        _currentLocation = currentLocation;
+    }
+
+    public CommandDbo getCommand() {
+        return _command;
+    }
+
+    public void setCommand(CommandDbo command) {
+        _command = command;
+        ((TextView)findViewById(R.id.textViewName)).setText(command.getName());
+    }
+
+    public void setOnClickedListener(LuPromise.LuConsumer<CommandDbo> onClicked)
+    {
+        _onClicked = onClicked;
+    }
+}

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -0,0 +1,19 @@
+<?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/textAppearanceLarge"
+        android:text=""
+        android:id="@+id/textViewName"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:padding="15dp"/>
+
+</RelativeLayout>

app/src/main/res/values/strings.xml

@@ -1,5 +1,8 @@
 <resources>
     <string name="app_name">Camotion</string>
+    <string name="account_type">com.rthoni.camotion.account</string>
+
+    <string name="error">Error : %1$s</string>
 
     <string name="add_location_title">Add Camotion Account</string>
 
@@ -16,17 +19,19 @@
     <string name="username">Username</string>
     <string name="password">Password</string>
     <string name="domain">Domain</string>
-    <string name="check_account">Check account</string>
 
     <string name="error_name">Location name is required</string>
     <string name="error_username">Username is required</string>
     <string name="error_password">Password is required</string>
     <string name="error_domain">Domain is required</string>
-    <string name="account_type">com.rthoni.camotion.account</string>
 
     <string name="loading">Loading…</string>
     <string name="login_progress">Logging in…</string>
 
+    <string name="command_confirm">Do you really want to execute \'%1$s\' ?</string>
+    <string name="command_loading">Executing \'%1$s\'&#8230;</string>
+    <string name="command_success">Successfully executed \'%1$s\'</string>
+
     <string name="camera">Cameras</string>
     <string name="sensors">Sensors</string>
     <string name="commands">Commands</string>

luticateutils/src/main/java/com/luticate/utils/business/LuRequest.java

@@ -41,7 +41,15 @@ public class LuRequest {
                     T dbo = type.newInstance();
                     try {
                         JSONObject json = new JSONObject(response);
-                        dbo.fromJson(json.getJSONObject("Data"));
+                        JSONObject obj = null;
+                        if (!json.isNull("Data")) {
+                            obj = json.optJSONObject("Data");
+                            if (obj == null) {
+                                obj = new JSONObject();
+                                obj.put("Value", json.opt("Data"));
+                            }
+                        }
+                        dbo.fromJson(obj);
                         promise.resolve(dbo);
                     } catch (Exception e)
                     {

luticateutils/src/main/java/com/luticate/utils/dbo/LuBoolDbo.java

@@ -9,14 +9,25 @@ import java.util.HashMap;
  * Created by robin on 11/27/15.
  */
 public class LuBoolDbo extends LuDbo {
-    private boolean _bool;
+    public boolean isValue() {
+        return _value;
+    }
+
+    public void setValue(boolean value) {
+        _value = value;
+    }
+
+    private boolean _value;
 
     @Override
     public void fromJson(JSONObject json) throws JSONException {
+        _value = json.getBoolean("Value");
     }
 
     @Override
     public HashMap<String, Object> toArray() {
-        return null;
+        HashMap<String, Object> array = new HashMap<>();
+        array.put("Value", _value);
+        return array;
     }
 }

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

@@ -23,7 +23,7 @@ public abstract class AbstractPaginationFragment<Dbo extends LuDbo> extends Frag
 
     protected int _page = 0;
 
-    protected int _perPage = 6;
+    protected int _perPage = 15;
 
     protected int _maxPage = 1;
 

luticateutils/src/main/java/com/luticate/utils/ui/views/DefaultPaginationView.java

@@ -30,6 +30,18 @@ public class DefaultPaginationView extends AbstractPaginationView {
     public void init()
     {
         inflate(getContext(), R.layout.default_pagination_view_layout, this);
+        findViewById(R.id.previousPageView).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                loadPreviousPage();
+            }
+        });
+        findViewById(R.id.nextPageView).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                loadNextPage();
+            }
+        });
     }
 
     @Override
@@ -43,8 +55,8 @@ public class DefaultPaginationView extends AbstractPaginationView {
             tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                            loadPage(page);
-                        }
+                        loadPage(page);
+                    }
                 });
             tv.setTextAppearance(getContext(), android.R.style.TextAppearance_DeviceDefault_Large);
             layout.addView(tv);