Merge pull request #66 from SUPLA/develop

v2.3.2
SUPLA · May 16, 2019 · c2a6a2b · c2a6a2b
2 parents ec83ba9 + 0e159af
commit c2a6a2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 52
-        versionName "2.3.1"
+        versionCode 53
+        versionName "2.3.2"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'

diff --git a/app/src/main/java/org/supla/android/db/ChannelBase.java b/app/src/main/java/org/supla/android/db/ChannelBase.java
@@ -306,6 +306,10 @@ && getFunc() != SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE)
                 case SuplaConst.SUPLA_CHANNELFNC_THERMOMETER:
                     Id = new ImageId(getUserIconId(), 1);
                     break;
+                case SuplaConst.SUPLA_CHANNELFNC_CONTROLLINGTHEGATE:
+                    Id = new ImageId(getUserIconId(), (active & 0x1) > 0 ? 2
+                            : ((active & 0x2) > 0 ? 3 : 1));
+                    break;
                 default:
                     Id = new ImageId(getUserIconId(), active+1);
                     break;