From 251fd8435120d60b353864fe5d9a31ae6e8223fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Eisfeld?= Date: Mon, 30 May 2022 15:55:23 +0200 Subject: [PATCH] Updated products and upgraded Android Studio --- LifxAppEclipse/.classpath | 12 +-- .../de/jeisfeld/lifx/lan/type/Product.java | 97 ++++++++++++------- LifxTools/.idea/gradle.xml | 1 - LifxTools/app/build.gradle | 9 +- LifxTools/app/src/main/AndroidManifest.xml | 3 +- LifxTools/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 76 insertions(+), 50 deletions(-) diff --git a/LifxAppEclipse/.classpath b/LifxAppEclipse/.classpath index 7b5fdc2..2b71fff 100644 --- a/LifxAppEclipse/.classpath +++ b/LifxAppEclipse/.classpath @@ -15,8 +15,8 @@ - - + + @@ -31,9 +31,9 @@ - - - - + + + + diff --git a/LifxJava/src/de/jeisfeld/lifx/lan/type/Product.java b/LifxJava/src/de/jeisfeld/lifx/lan/type/Product.java index e8d874d..6419cbe 100644 --- a/LifxJava/src/de/jeisfeld/lifx/lan/type/Product.java +++ b/LifxJava/src/de/jeisfeld/lifx/lan/type/Product.java @@ -18,55 +18,82 @@ public enum Product { LIFX_WHITE_900_BR30_H(19, "LIFX White 900 BR30 (High Voltage)", true, false, false, false, false, 2700, 6500, false, false, 0), LIFX_COLOR_1000_BR30(20, "LIFX Color 1000 BR30", true, true, false, false, false, 2500, 9000, false, false, 0), LIFX_COLOR_1000_2(22, "LIFX Color 1000", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_A19(27, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_BR30(28, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_A19_NIGHT_VISION(29, "LIFX A19 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0), - LIFX_BR30_NIGHT_VISION(30, "LIFX BR30 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0), + LIFX_A19(27, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_BR30(28, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_A19_NIGHT_VISION(29, "LIFX A19 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0), + LIFX_BR30_NIGHT_VISION(30, "LIFX BR30 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0), LIFX_Z(31, "LIFX Z", true, true, false, false, true, 2500, 9000, false, false, Long.MAX_VALUE), - LIFX_Z_2(32, "LIFX Z 2", true, true, false, false, true, 2500, 9000, false, false, 1532997580), - LIFX_DOWNLIGHT(36, "LIFX Downlight", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_DOWNLIGHT_2(37, "LIFX Downlight", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_BEAM(38, "LIFX Beam", true, true, false, false, true, 2500, 9000, false, false, 1532997580), + LIFX_Z_2(32, "LIFX Z 2", true, true, false, false, true, 1500, 9000, false, false, 1532997580), + LIFX_DOWNLIGHT(36, "LIFX Downlight", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_DOWNLIGHT_2(37, "LIFX Downlight", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_BEAM(38, "LIFX Beam", true, true, false, false, true, 1500, 9000, false, false, 1532997580), LIFX_DOWNLIGHT_WHITE_TO_WARM(39, "LIFX Downlight White to Warm", true, false, false, false, false, 1500, 9000, false, false, 0), - LIFX_DOWNLIGHT_3(40, "LIFX Downlight", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_A19_2(43, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_BR30_2(44, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_PLUS__A19_2(45, "LIFX+ A19", true, true, true, false, false, 2500, 9000, false, false, 0), - LIFX_PLUS_BR30_2(46, "LIFX+ BR30", true, true, true, false, false, 2500, 9000, false, false, 0), - LIFX_MINI(49, "LIFX Mini", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_MINI_WHITE_TO_WARM(50, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 4000, false, false, 0), + LIFX_DOWNLIGHT_3(40, "LIFX Downlight", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_A19_2(43, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_BR30_2(44, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_PLUS__A19_2(45, "LIFX+ A19", true, true, true, false, false, 1500, 9000, false, false, 0), + LIFX_PLUS_BR30_2(46, "LIFX+ BR30", true, true, true, false, false, 1500, 9000, false, false, 0), + LIFX_MINI(49, "LIFX Mini", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_MINI_WHITE_TO_WARM(50, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 9000, false, false, 0), LIFX_MINI_WHITE(51, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0), - LIFX_GU10(52, "LIFX GU10", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_GU10_2(53, "LIFX GU10", true, true, false, false, false, 2500, 9000, false, false, 0), + LIFX_GU10(52, "LIFX GU10", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_GU10_2(53, "LIFX GU10", true, true, false, false, false, 1500, 9000, false, false, 0), LIFX_TILE(55, "LIFX Tile", true, true, false, true, false, 2500, 9000, true, false, 0), - LIFX_CANDLE(57, "LIFX Candle", true, true, false, true, false, 2500, 9000, false, false, 0), - LIFX_MINI_COLOR(59, "LIFX Mini Color", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_MINI_WHITE_TO_WARM_2(60, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 4000, false, false, 0), + LIFX_CANDLE(57, "LIFX Candle", true, true, false, true, false, 1500, 9000, false, false, 0), + LIFX_MINI_COLOR(59, "LIFX Mini Color", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_MINI_WHITE_TO_WARM_2(60, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 9000, false, false, 0), LIFX_MINI_WHITE_2(61, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0), - LIFX_A19_3(62, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_BR30_3(63, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_PLUS__A19_3(64, "LIFX+ A19", true, true, true, false, false, 2500, 9000, false, false, 0), - LIFX_PLUS_BR30_3(65, "LIFX+ BR30", true, true, true, false, false, 2500, 9000, false, false, 0), + LIFX_A19_3(62, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_BR30_3(63, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_PLUS__A19_3(64, "LIFX+ A19", true, true, true, false, false, 1500, 9000, false, false, 0), + LIFX_PLUS_BR30_3(65, "LIFX+ BR30", true, true, true, false, false, 1500, 9000, false, false, 0), LIFX_MINI_WHITE_3(66, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0), - LIFX_CANDLE_2(68, "LIFX Candle", true, true, false, true, false, 2500, 9000, false, false, 0), + LIFX_CANDLE_2(68, "LIFX Candle", true, true, false, true, false, 1500, 9000, false, false, 0), LIFX_CANDLE_WHITE_TO_WARM(81, "LIFX Candle White to Warm", true, false, false, true, false, 2200, 6500, false, false, 0), LIFX_FILAMENT_CLEAR(82, "LIFX Filament Clear", true, false, false, false, false, 2100, 2100, false, false, 0), LIFX_FILAMENT_AMBER(85, "LIFX Filament Amber", true, false, false, false, false, 2000, 2000, false, false, 0), - LIFX_MINI_WHITE_4(88, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0), + LIFX_MINI_WHITE_4(87, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0), + LIFX_MINI_WHITE_5(88, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0), LIFX_SWITCH(89, "LIFX Switch", false, false, false, false, false, 0, 0, false, false, 0), - LIFX_CLEAN(90, "LIFX Clean", true, false, false, false, false, 2700, 2700, false, true, 0), - LIFX_COLOR(91, "LIFX Color", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_COLOR_2(92, "LIFX Color", true, true, false, false, false, 2500, 9000, false, false, 0), + LIFX_CLEAN(90, "LIFX Clean", true, true, false, false, false, 1500, 9000, false, true, 0), + LIFX_COLOR(91, "LIFX Color", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_COLOR_2(92, "LIFX Color", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_A19_US(93, "LIFX A19 US", true, true, false, false, false, 1500, 9000, false, false, 0), LIFX_BR30_4(94, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0), LIFX_CANDLE_WHITE_TO_WARM_2(96, "LIFX Candle White to Warm", true, false, false, true, false, 2200, 6500, false, false, 0), - LIFX_A19_4(97, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_BR30_5(98, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0), - LIFX_CLEAN_2(99, "LIFX Clean", true, false, false, false, false, 2700, 2700, false, true, 0), + LIFX_A19_4(97, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_BR30_5(98, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_CLEAN_2(99, "LIFX Clean", true, true, false, false, false, 1500, 9000, false, true, 0), LIFX_FILAMENT_CLEAR_2(100, "LIFX Filament Clear", true, false, false, false, false, 2100, 2100, false, false, 0), LIFX_FILAMENT_AMBER_2(101, "LIFX Filament Amber", true, false, false, false, false, 2000, 2000, false, false, 0), - LIFX_A19_NIGHT_VISION_2(109, "LIFX A19 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0), - LIFX_BR30_NIGHT_VISION_2(110, "LIFX BR30 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0), - LIFX_A19_NIGHT_VISION_3(111, "LIFX A19 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0), + LIFX_A19_NIGHT_VISION_2(109, "LIFX A19 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0), + LIFX_BR30_NIGHT_VISION_2(110, "LIFX BR30 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0), + LIFX_A19_NIGHT_VISION_3(111, "LIFX A19 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0), + LIFX_BR30_NIGHT_VISION_INTL(112, "LIFX BR30 Night Vision Intl", true, true, true, false, false, 2500, 9000, false, false, 0), + LIFX_MINI_WW_US(113, "LIFX Mini WW US", true, false, false, false, false, 2200, 6500, false, false, 0), + LIFX_MINI_WW_INTL(114, "LIFX Mini WW Intl", true, false, false, false, false, 2200, 6500, false, false, 0), + LIFX_SWITCH_2(115, "LIFX Switch", false, false, false, false, false, 0, 0, false, false, 0), + LIFX_SWITCH_3(116, "LIFX Switch", false, false, false, false, false, 0, 0, false, false, 0), + LIFX_Z_US(117, "LIFX Z US", true, true, false, false, true, 1500, 9000, false, false, 0), + LIFX_Z_INTL(118, "LIFX Z Intl", true, true, false, false, true, 1500, 9000, false, false, 0), + LIFX_BEAM_US(119, "LIFX Beam US", true, true, false, false, true, 1500, 9000, false, false, 0), + LIFX_BEAM_INTL(120, "LIFX Beam Intl", true, true, false, false, true, 1500, 9000, false, false, 0), + LIFX_COLOR_US(123, "LIFX Color US", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_COLOR_INTL(124, "LIFX Color Intl", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_WHITE_TO_WARM_US(125, "LIFX White to Warm US", true, false, false, false, false, 1500, 9000, false, false, 0), + LIFX_WHITE_TO_WARM_INTL(126, "LIFX White to Warm Intl", true, false, false, false, false, 1500, 9000, false, false, 0), + LIFX_WHITE_US(127, "LIFX White US", true, false, false, false, false, 2700, 2700, false, false, 0), + LIFX_WHITE_INTL(128, "LIFX White Intl", true, false, false, false, false, 2700, 2700, false, false, 0), + LIFX_COLOR_US_2(129, "LIFX Color US", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_COLOR_INTL_2(130, "LIFX Color Intl", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_WHITE_TO_WARM_US_2(131, "LIFX White to Warm US", true, false, false, false, false, 1500, 9000, false, false, 0), + LIFX_WHITE_TO_WARM_INTL_2(132, "LIFX White to Warm Intl", true, false, false, false, false, 1500, 9000, false, false, 0), + LIFX_WHITE_US_2(133, "LIFX White US", true, false, false, false, false, 2700, 2700, false, false, 0), + LIFX_WHITE_INTL_2(134, "LIFX White Intl", true, false, false, false, false, 2700, 2700, false, false, 0), + LIFX_GU10_COLOR_US(135, "LIFX GU10 Color US", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_GU10_COLOR_INTL(136, "LIFX GU10 Color Intl", true, true, false, false, false, 1500, 9000, false, false, 0), + LIFX_CANDLE_COLOR_US(137, "LIFX Candle Color US", true, true, false, true, false, 1500, 9000, false, false, 0), + LIFX_CANDLE_COLOR_INTL(138, "LIFX Candle Color Intl", true, true, false, true, false, 1500, 9000, false, false, 0), // JAVADOC:ON /** diff --git a/LifxTools/.idea/gradle.xml b/LifxTools/.idea/gradle.xml index 35ffc65..a0de2a1 100644 --- a/LifxTools/.idea/gradle.xml +++ b/LifxTools/.idea/gradle.xml @@ -14,7 +14,6 @@ - diff --git a/LifxTools/app/build.gradle b/LifxTools/app/build.gradle index 194ade4..927c44a 100644 --- a/LifxTools/app/build.gradle +++ b/LifxTools/app/build.gradle @@ -24,15 +24,16 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + namespace 'de.jeisfeld.lifx.app' } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.navigation:navigation-fragment:2.4.1' - implementation 'androidx.navigation:navigation-ui:2.4.1' + implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.navigation:navigation-fragment:2.4.2' + implementation 'androidx.navigation:navigation-ui:2.4.2' implementation 'androidx.fragment:fragment:1.4.1' implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' diff --git a/LifxTools/app/src/main/AndroidManifest.xml b/LifxTools/app/src/main/AndroidManifest.xml index 2dbddff..b1394f8 100644 --- a/LifxTools/app/src/main/AndroidManifest.xml +++ b/LifxTools/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/LifxTools/build.gradle b/LifxTools/build.gradle index 30178be..be40780 100644 --- a/LifxTools/build.gradle +++ b/LifxTools/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/LifxTools/gradle/wrapper/gradle-wrapper.properties b/LifxTools/gradle/wrapper/gradle-wrapper.properties index 89ba534..34281b3 100644 --- a/LifxTools/gradle/wrapper/gradle-wrapper.properties +++ b/LifxTools/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip