Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Missing code for meteo sensors #62

Merged
merged 2 commits into from Mar 17, 2019
Merged

Missing code for meteo sensors #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e71e7a
Merge pull request #4 from SUPLA/master
lesny8 Mar 16, 2019
cd3fa9a
Missing...
lesny8 Mar 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 51 additions & 0 deletions app/src/main/java/org/supla/android/db/ChannelBase.java
View file
Open in desktop
Expand Up @@ -172,9 +172,18 @@ public String getNotEmptyCaption(Context context) {
case SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE:
idx = R.string.channel_func_humidityandtemperature;
break;
case SuplaConst.SUPLA_CHANNELFNC_WINDSENSOR:
idx = R.string.channel_func_windsensor;
break;
case SuplaConst.SUPLA_CHANNELFNC_PRESSURESENSOR:
idx = R.string.channel_func_pressuresensor;
break;
case SuplaConst.SUPLA_CHANNELFNC_RAINSENSOR:
idx = R.string.channel_func_rainsensor;
break;
case SuplaConst.SUPLA_CHANNELFNC_WEIGHTSENSOR:
idx = R.string.channel_func_weightsensor;
break;
case SuplaConst.SUPLA_CHANNELFNC_NOLIQUIDSENSOR:
idx = R.string.channel_func_noliquidsensor;
break;
Expand Down Expand Up @@ -376,9 +385,18 @@ && getFunc() != SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE)
case SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE:
img_idx = whichImage == WhichOne.First ? R.drawable.thermometer : R.drawable.humidity;
break;
case SuplaConst.SUPLA_CHANNELFNC_WINDSENSOR:
img_idx = R.drawable.wind;
break;
case SuplaConst.SUPLA_CHANNELFNC_PRESSURESENSOR:
img_idx = R.drawable.pressure;
break;
case SuplaConst.SUPLA_CHANNELFNC_RAINSENSOR:
img_idx = R.drawable.rain;
break;
case SuplaConst.SUPLA_CHANNELFNC_WEIGHTSENSOR:
img_idx = R.drawable.weight;
break;
case SuplaConst.SUPLA_CHANNELFNC_NOLIQUIDSENSOR:
img_idx = active == 1 ? R.drawable.liquid : R.drawable.noliquid;
break;
Expand Down Expand Up @@ -550,6 +568,14 @@ protected CharSequence getHumanReadableValue(WhichOne whichOne, ChannelValue val
return "---";
}

case SuplaConst.SUPLA_CHANNELFNC_WINDSENSOR:
if (getOnLine()) {
double wind = value.getDouble(-1);
return String.format("%.1f m/s", wind);

} else {
return "--- m/s";
}
case SuplaConst.SUPLA_CHANNELFNC_PRESSURESENSOR:
if (getOnLine()) {
double pressure = value.getDouble(-1);
Expand All @@ -558,6 +584,31 @@ protected CharSequence getHumanReadableValue(WhichOne whichOne, ChannelValue val
} else {
return "--- hPa";
}
case SuplaConst.SUPLA_CHANNELFNC_RAINSENSOR:
if (getOnLine()) {
double rain = value.getDouble(-1);
return String.format("%.2f l/m2", rain/1000.00);

} else {
return "--- l/m2";
}
case SuplaConst.SUPLA_CHANNELFNC_WEIGHTSENSOR:
if (getOnLine()) {
double weight = value.getDouble(-1);

if (weight >= 2000) {

return String.format("%.2f kg", weight / 1000.00);

} else if (weight >= 1) {

return String.format("%d g", (int) weight);

}

} else {
return "--- kg";
}

case SuplaConst.SUPLA_CHANNELFNC_DISTANCESENSOR:
case SuplaConst.SUPLA_CHANNELFNC_DEPTHSENSOR:
Expand Down
25 changes: 23 additions & 2 deletions app/src/main/java/org/supla/android/listview/ChannelLayout.java
View file
Open in desktop
Expand Up @@ -219,7 +219,10 @@ private void SetDimensions() {
int width = getResources().getDimensionPixelSize(R.dimen.channel_img_width);

if (mFunc == SuplaConst.SUPLA_CHANNELFNC_THERMOMETER
|| mFunc == SuplaConst.SUPLA_CHANNELFNC_PRESSURESENSOR) {
|| mFunc == SuplaConst.SUPLA_CHANNELFNC_WINDSENSOR
|| mFunc == SuplaConst.SUPLA_CHANNELFNC_PRESSURESENSOR
|| mFunc == SuplaConst.SUPLA_CHANNELFNC_RAINSENSOR
|| mFunc == SuplaConst.SUPLA_CHANNELFNC_WEIGHTSENSOR) {

width *= 2.5;

Expand Down Expand Up @@ -279,10 +282,28 @@ private void SetDimensions() {
SetImgDimensions(Img1, false, 0);
SetTextDimensions(Text1, Img1, true, getResources().getDimensionPixelSize(R.dimen.channel_emimgtext_width), getResources().getDimensionPixelSize(R.dimen.channel_emimgtext_height));

} else if (mFunc == SuplaConst.SUPLA_CHANNELFNC_WINDSENSOR) {

SetImgDimensions(Img1, false, 0);
SetTextDimensions(Text1, Img1, true, getResources().getDimensionPixelSize(R.dimen.channel_weathersensors_imgtext_width), getResources().getDimensionPixelSize(R.dimen.channel_weathersensors_imgtext_height));
Text1.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);

} else if (mFunc == SuplaConst.SUPLA_CHANNELFNC_PRESSURESENSOR) {

SetImgDimensions(Img1, false, 0);
SetTextDimensions(Text1, Img1, true, getResources().getDimensionPixelSize(R.dimen.channel_emimgtext_width), getResources().getDimensionPixelSize(R.dimen.channel_emimgtext_height));
SetTextDimensions(Text1, Img1, true, getResources().getDimensionPixelSize(R.dimen.channel_weathersensors_imgtext_width), getResources().getDimensionPixelSize(R.dimen.channel_weathersensors_imgtext_height));
Text1.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);

} else if (mFunc == SuplaConst.SUPLA_CHANNELFNC_RAINSENSOR) {

SetImgDimensions(Img1, false, 0);
SetTextDimensions(Text1, Img1, true, getResources().getDimensionPixelSize(R.dimen.channel_weathersensors_imgtext_width), getResources().getDimensionPixelSize(R.dimen.channel_weathersensors_imgtext_height));
Text1.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);

} else if (mFunc == SuplaConst.SUPLA_CHANNELFNC_WEIGHTSENSOR) {

SetImgDimensions(Img1, false, 0);
SetTextDimensions(Text1, Img1, true, getResources().getDimensionPixelSize(R.dimen.channel_weight_imgtext_width), getResources().getDimensionPixelSize(R.dimen.channel_weight_imgtext_height));
Text1.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);

} else if (mFunc == SuplaConst.SUPLA_CHANNELFNC_THERMOSTAT
Expand Down
Binary file modified app/src/main/res/drawable/pressure.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/rain.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/weight.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/wind.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/src/main/res/values-pl/strings.xml
View file
Open in desktop
Expand Up @@ -36,7 +36,10 @@
<string name="channel_func_thermometer">Termometr</string>
<string name="channel_func_humidity">Wilgotność</string>
<string name="channel_func_humidityandtemperature">Temperatura i wilgotność</string>
<string name="channel_func_windsensor" translatable="false">Prędkość wiatru</string>
<string name="channel_func_pressuresensor">Czujnik ciśnienia</string>
<string name="channel_func_rainsensor" translatable="false">Pomiar opadów</string>
<string name="channel_func_weightsensor" translatable="false">Waga</string>
<string name="channel_func_dimmer">Ściemniacz</string>
<string name="channel_func_rgblighting">Oświetlenie RGB</string>
<string name="channel_func_dimmerandrgblighting">Ściemniacz i oświetlenie RGB</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Expand Up @@ -30,6 +30,10 @@
<dimen name="channel_distanceimgtext_height">50dp</dimen>
<dimen name="channel_distanceimg_width">150dp</dimen>
<dimen name="channel_distanceimg_height">15dp</dimen>
<dimen name="channel_weight_imgtext_width">100dp</dimen>
<dimen name="channel_weight_imgtext_height">50dp</dimen>
<dimen name="channel_weathersensors_imgtext_width">100dp</dimen>
<dimen name="channel_weathersensors_imgtext_height">50dp</dimen>
<dimen name="rgb_wheel_width">35dp</dimen>
<dimen name="rgb_wheel_arrow_height">30dp</dimen>
<dimen name="rgb_detail_tab_height">80dp</dimen>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Expand Up @@ -45,7 +45,10 @@
<string name="channel_func_thermometer">Thermometer</string>
<string name="channel_func_humidity">Humidity</string>
<string name="channel_func_humidityandtemperature">Temperature and Humidity</string>
<string name="channel_func_windsensor" translatable="false">Wind sensor</string>
<string name="channel_func_pressuresensor" translatable="false">Pressure sensor</string>
<string name="channel_func_rainsensor" translatable="false">Rain sensor</string>
<string name="channel_func_weightsensor" translatable="false">Weight sensor</string>
<string name="channel_func_dimmer">Dimmer</string>
<string name="channel_func_rgblighting">RGB Lighting</string>
<string name="channel_func_dimmerandrgblighting">Dimmer and RGB lighting</string>
Expand Down