Merge pull request #26 from SirkoVZ/master

Version 0.9.2
volkszaehler · Jun 30, 2017 · ca84564 · ca84564
2 parents 1fcdb1c + a773048
commit ca84564
Show file tree

Hide file tree

Showing 14 changed files with 944 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -103,7 +103,7 @@ obj/
 /out/
 
 # User-specific configurations
-.idea/libraries/
+.idea/libraries
 .idea/.name
 .idea/compiler.xml
 .idea/copyright/profiles_settings.xml
@@ -117,6 +117,9 @@ obj/
 .idea/sqlDataSources.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml
+.idea/markdown-navigator
+.idea/markdown-navigator.xml
+projectFilesBackup
 
 # Keystore files
 

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/README.md b/README.md
@@ -9,13 +9,14 @@ Download: [https://github.com/volkszaehler/app-android/releases/latest](https://
 ![ScreenShot3](http://wiki.volkszaehler.org/_media/software/frontends/vz_app/grafik.png?w=200&tok=3e01fa "ScreenShots 3 of VolkszaehlerApp") 
 ![ScreenShot4](http://wiki.volkszaehler.org/_media/software/frontends/vz_app/einstellungen.png?w=200&tok=ede86f "ScreenShots 4 of VolkszaehlerApp") 
 
+## VolkszählerApp für Android, Version 0.9.2
 
-## VolkszählerApp für Android, Version 0.9.1
 
 Funktionen:  
 
 - Abrufen der Channelinformationen und Anzeige der letzten Werte
 - Anzeigen von Details zu jedem Channel
+- Tabellarische Ansicht der Verbrauchswerte
 - Anzeigen von Charts zu einzelnen Channels, incl. Zoom, auch mit „Touch and Move“ im Diagramm
 - Anzeigen von Gruppen-Charts und Hinzufügen weiterer Graphen ist möglich ("Long Touch" im Chart)
 - Unterstützung von Basic Authentication und HTTPS, **_ABER das Zertifikat wird nicht wirklich geprüft_**   , es werden auch ungültige oder Man-in-the-Middle-Zertifikate akzeptiert
@@ -36,12 +37,14 @@ Wenn das Clonen bzw. das Öffnen des Projektes wegen eines ausgegrauten "Use def
 ---
 
 English:
-## VolkszaehlerApp for Android, Version 0.9.1
+## VolkszaehlerApp for Android, Version 0.9.2
+
 
 Features:  
 
 - Download of Channel Information and Display of recent Values
 - Shows Details for all Channels
+- Shows Values in TableView
 - Shows Charts for every Channel, supports Zoom, (Touch and Move)
 - Shows Charts of Groups, it is possible to add further graphs (use "Long Touch" in chart screen)
 - Supports Basic Authentication und HTTPS, **_BUT the certificate is not really checked_**, the app accepts also invalid or Man-in-the-Middle certificates
@@ -61,6 +64,16 @@ If the cloning resp. opening of the project fails due to a grayed "Use default g
 
 ## Version history:
 
+### Version 0.9.2
+#### New  
+  - new TabelView of Values
+
+#### Fixed 
+  - fixed display issues with Channel of type "heat" and consumption
+
+#### Changed
+  - small optimizations
+
 ### Version 0.9.1
 
 #### Fixed 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.volkszaehler.volkszaehlerapp"
-          android:versionCode="91"
-          android:versionName="0.9.1">
+    package="org.volkszaehler.volkszaehlerapp"
+    android:versionCode="92"
+    android:versionName="0.9.2">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -44,6 +44,9 @@
             android:noHistory="true"
             android:theme="@android:style/Theme.Holo.Dialog">
         </activity>
+        <activity
+            android:name=".TableDetails"
+            android:label="@string/app_name">
+        </activity>
     </application>
-
 </manifest>
diff --git a/app/src/main/java/org/volkszaehler/volkszaehlerapp/ChannelDetails.java b/app/src/main/java/org/volkszaehler/volkszaehlerapp/ChannelDetails.java
@@ -53,6 +53,7 @@ public void onCreate(Bundle savedInstanceState) {
         String typeOfChannel = Tools.getPropertyOfChannel(myContext, mUUID, Tools.TAG_TYPE);
         switch (typeOfChannel) {
             case "power":
+            case "heat": //really for all heat?
             case "powersensor":
                 strom = true;
                 break;
@@ -177,6 +178,32 @@ public void chartsDetailsHandler(View view) {
         }
     }
 
+    public void tableDetailsHandler(View view) {
+        String range = "day";
+        switch (view.getId()) {
+            case R.id.buttonViewTableDay:
+                range = "day";
+                break;
+            case R.id.buttonViewTableWeek:
+                range = "week";
+                break;
+            case R.id.buttonViewTableMonth:
+                range = "month";
+                break;
+            case R.id.buttonViewTableYear:
+                range = "year";
+                break;
+            default:
+                range = "day";
+                break;
+        }
+
+        Intent detailTableIntent = new Intent(ChannelDetails.this, TableDetails.class);
+        detailTableIntent.putExtra("MUUID", mUUID);
+        detailTableIntent.putExtra("Range", range);
+        startActivity(detailTableIntent);
+    }
+
     private void callChart(String zeitRaum) {
         long from;
         long to;