Merge remote-tracking branch 'refs/remotes/origin/alpha-development' …

…into beta-development
domoticz · Jun 8, 2017 · 74497a2 · 74497a2
2 parents 4994617 + e653e02
commit 74497a2
Show file tree

Hide file tree

Showing 195 changed files with 4,043 additions and 4,127 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -134,7 +134,7 @@ dependencies {
     paidWearApp project(path: ':wear', configuration: 'paidRelease')
 
     def supportVersion = '25.3.1'
-    def playServicesVersion = '10.2.1'
+    def playServicesVersion = '10.2.6'
 
     compile "com.android.support:support-v4:$supportVersion"
     compile "com.android.support:appcompat-v7:$supportVersion"
@@ -145,6 +145,7 @@ dependencies {
 
     compile "com.google.firebase:firebase-core:$playServicesVersion"
     compile "com.google.firebase:firebase-crash:$playServicesVersion"
+    compile "com.google.firebase:firebase-perf:$playServicesVersion"
 
     compile "com.google.android.gms:play-services-analytics:$playServicesVersion"
     compile "com.google.android.gms:play-services-wearable:$playServicesVersion"
@@ -161,7 +162,7 @@ dependencies {
     compile 'com.larswerkman:lobsterpicker:1.0.1'
 
     compile 'com.github.zurche:plain-pie:v0.2.2'
-    compile 'com.github.PhilJay:MPAndroidChart:v3.0.1'
+    compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
 
     compile 'com.github.dexafree:MaterialList:v3.2.2'
     compile 'com.github.hotchemi:android-rate:1.0.1'
@@ -178,7 +179,10 @@ dependencies {
         transitive = true
     }
 
-    compile 'com.schibstedspain.android:leku:3.1.0'
+    compile 'com.github.matthiasrobbers:shortbread:1.0.1'
+    annotationProcessor 'com.github.matthiasrobbers:shortbread-compiler:1.0.1'
+
+    compile 'com.schibstedspain.android:leku:3.3.0'
 
     compile 'com.github.k0shk0sh:PermissionHelper:1.1.0'
     compile 'com.github.zagum:SpeechRecognitionView:1.0.2'
@@ -202,6 +206,5 @@ buildscript {
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.jakewharton.hugo'
-
-apply plugin: 'com.google.gms.google-services'
-
+apply plugin: 'com.google.firebase.firebase-perf'
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java
@@ -29,16 +29,12 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.android.volley.toolbox.ImageLoader;
-
 import java.util.ArrayList;
 
 import nl.hnogames.domoticz.R;
 import nl.hnogames.domoticz.Utils.SharedPrefUtil;
 import nl.hnogames.domoticzapi.Containers.CameraInfo;
 import nl.hnogames.domoticzapi.Domoticz;
-import nl.hnogames.domoticzapi.Utils.RequestUtil;
-import nl.hnogames.domoticzapi.Utils.SessionUtil;
 
 @SuppressWarnings("unused")
 public class CamerasAdapter extends RecyclerView.Adapter<CamerasAdapter.DataObjectHolder> {
@@ -68,7 +64,7 @@ public void setOnItemClickListener(onClickListener onClickListener) {
     @Override
     public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.camera_row, parent, false);
+            .inflate(R.layout.camera_row, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
             ((android.support.v7.widget.CardView) view.findViewById(R.id.row_global_wrapper)).setCardBackgroundColor(Color.parseColor("#3F3F3F"));
@@ -83,17 +79,13 @@ public void onBindViewHolder(DataObjectHolder holder, int position) {
             CameraInfo cameraInfo = mDataset.get(position);
             String name = cameraInfo.getName();
             String address = cameraInfo.getAddress();
-            String imageUrl = cameraInfo.getSnapShotURL();
+            String imageUrl = cameraInfo.getTotalImageURL();
 
             int numberOfDevices = cameraInfo.getDevices();
             String text = mContext.getResources().getQuantityString(R.plurals.devices, numberOfDevices, numberOfDevices);
             holder.name.setText(name);
 
-            ImageLoader imageLoader = RequestUtil.getImageLoader(domoticz, new SessionUtil(mContext), mContext);
-            holder.camera.setImageUrl(imageUrl, imageLoader);
-
-            if (!refreshTimer)
-                holder.camera.setDefaultImageResId(R.drawable.placeholder);
+            holder.camera.Start(imageUrl);
         }
     }
 
@@ -107,14 +99,14 @@ public interface onClickListener {
     }
 
     public static class DataObjectHolder extends RecyclerView.ViewHolder
-            implements View.OnClickListener {
+        implements View.OnClickListener {
         TextView name;
-        com.android.volley.toolbox.NetworkImageView camera;
+        nl.hnogames.domoticz.UI.MjpegViewer.MjpegView camera;
 
         public DataObjectHolder(View itemView) {
             super(itemView);
             name = (TextView) itemView.findViewById(R.id.name);
-            camera = (com.android.volley.toolbox.NetworkImageView) itemView.findViewById(R.id.image);
+            camera = (nl.hnogames.domoticz.UI.MjpegViewer.MjpegView) itemView.findViewById(R.id.image);
             itemView.setOnClickListener(this);
         }