yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add attributes to next alarm sensor

Browse Source
This commit is contained in:
estevez-dev
2020-06-22 23:01:02 +03:00
parent 7683d18e81
commit 5b55940ccf
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -15,4 +15,4 @@ Discuss it on [Discord](https://discord.gg/u9vq7QE) or at [Home Assistant commun
#### Projects used #### Projects used
- [HANotify](https://github.com/Crewski/HANotify) by [Crewski](https://github.com/Crewski) - [HANotify](https://github.com/Crewski/HANotify) by [Crewski](https://github.com/Crewski)
- [hassalarm](https://github.com/Johboh/hassalarm) by [Johboh](https://github.com/Johboh) - [hassalarm](https://github.com/Johboh/hassalarm) by [Johboh](https://github.com/Johboh) distributed under [MIT License](https://github.com/Johboh/hassalarm/blob/master/LICENSE)

30
android/app/src/main/java/com/keyboardcrumbs/hassclient/NextAlarmBroadcastReceiver.java
View File

@ -20,7 +20,9 @@ import android.content.SharedPreferences;
public class NextAlarmBroadcastReceiver extends BroadcastReceiver { public class NextAlarmBroadcastReceiver extends BroadcastReceiver {
private static final String TAG = "NextAlarmReceiver"; private static final String TAG = "NextAlarmReceiver";
private static final SimpleDateFormat DATE_FORMAT_LEGACY = new SimpleDateFormat("yyyy-MM-dd HH:mm:00", Locale.ENGLISH); private static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:00", Locale.ENGLISH);
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:00", Locale.ENGLISH);
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -53,23 +55,29 @@ public class NextAlarmBroadcastReceiver extends BroadcastReceiver {
prefs.getString("flutter.hassio-port", "") + "/api/webhook/" + webhookId; prefs.getString("flutter.hassio-port", "") + "/api/webhook/" + webhookId;
JSONObject dataToSend = new JSONObject(); JSONObject dataToSend = new JSONObject();
if (URLUtil.isValidUrl(requestUrl)) { if (URLUtil.isValidUrl(requestUrl)) {
final String state; dataToSend.put("type", "update_sensor_states");
JSONArray dataArray = new JSONArray();
JSONObject sensorData = new JSONObject();
JSONObject sensorAttrs = new JSONObject();
sensorData.put("unique_id", "next_alarm");
sensorData.put("type", "sensor");
final long triggerTimestamp; final long triggerTimestamp;
if (alarmClockInfo != null) { if (alarmClockInfo != null) {
triggerTimestamp = alarmClockInfo.getTriggerTime(); triggerTimestamp = alarmClockInfo.getTriggerTime();
final Calendar calendar = Calendar.getInstance(); final Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(triggerTimestamp); calendar.setTimeInMillis(triggerTimestamp);
state = DATE_FORMAT_LEGACY.format(calendar.getTime()); sensorData.put("state", DATE_TIME_FORMAT.format(calendar.getTime()));
sensorAttrs.put("date", DATE_FORMAT.format(calendar.getTime()));
sensorAttrs.put("time", TIME_FORMAT.format(calendar.getTime()));
sensorAttrs.put("timestamp", triggerTimestamp);
} else { } else {
state = ""; sensorData.put("state", "");
sensorAttrs.put("date", "");
sensorAttrs.put("time", "");
sensorAttrs.put("timestamp", 0);
} }
Log.d(TAG, "Setting time to " + state); sensorData.put("icon", "mdi:alarm");
dataToSend.put("type", "update_sensor_states"); sensorData.put("attributes", sensorAttrs);
JSONArray dataArray = new JSONArray();
JSONObject sensorData = new JSONObject();
sensorData.put("unique_id", "next_alarm");
sensorData.put("type", "sensor");
sensorData.put("state", state); //TEST DATA
dataArray.put(0, sensorData); dataArray.put(0, sensorData);
dataToSend.put("data", dataArray); dataToSend.put("data", dataArray);