jens/Automation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

corrected date variables

Browse Source
This commit is contained in:
jens 2023-01-05 20:39:29 +01:00
parent ad0d9962b5
commit c42f65bd3a
1 changed files with 70 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
app/src/main/java/com/jens/automation2/Miscellaneous.java
View File

@ -615,27 +615,82 @@ public class Miscellaneous extends Service
source = source.replace("[serialnr]", "serialUnknown"); source = source.replace("[serialnr]", "serialUnknown");
if( if(
source.contains("[d]") | source.contains("[d]") ||
source.contains("[m]") | source.contains("[m]") ||
source.contains("[Y]") | source.contains("[Y]") ||
source.contains("[h]") | source.contains("[h]") ||
source.contains("[H]") | source.contains("[H]") ||
source.contains("[i]") | source.contains("[i]") ||
source.contains("[s]") | source.contains("[s]") ||
source.contains("[ms]") source.contains("[ms]")
) )
{ {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
source = source.replace("[d]", String.valueOf(cal.get(Calendar.DAY_OF_MONTH))); if(source.contains("[d]"))
source = source.replace("[m]", String.valueOf(cal.get(Calendar.MONTH))); {
String result = String.valueOf(cal.get(Calendar.DAY_OF_MONTH));
if(result.length() < 2)
result = "0" + result;
source = source.replace("[d]", result);
}
if(source.contains("[m]"))
{
String result = String.valueOf(cal.get(Calendar.MONTH) +1);
if(result.length() < 2)
result = "0" + result;
source = source.replace("[m]", result);
}
if(source.contains("[Y]"))
{
source = source.replace("[Y]", String.valueOf(cal.get(Calendar.YEAR))); source = source.replace("[Y]", String.valueOf(cal.get(Calendar.YEAR)));
source = source.replace("[h]", String.valueOf(cal.get(Calendar.HOUR))); }
source = source.replace("[H]", String.valueOf(cal.get(Calendar.HOUR_OF_DAY)));
source = source.replace("[i]", String.valueOf(cal.get(Calendar.MINUTE))); if(source.contains("[h]"))
{
String result = String.valueOf(cal.get(Calendar.HOUR));
if(result.length() < 2)
result = "0" + result;
source = source.replace("[h]", result);
}
if(source.contains("[H]"))
{
String result = String.valueOf(cal.get(Calendar.HOUR_OF_DAY));
if(result.length() < 2)
result = "0" + result;
source = source.replace("[H]", result);
}
if(source.contains("[i]"))
{
String result = String.valueOf(cal.get(Calendar.MINUTE));
if(result.length() < 2)
result = "0" + result;
source = source.replace("[i]", result);
}
if(source.contains("[s]"))
{
String result = String.valueOf(cal.get(Calendar.SECOND));
if(result.length() < 2)
result = "0" + result;
source = source.replace("[s]", String.valueOf(cal.get(Calendar.SECOND))); source = source.replace("[s]", String.valueOf(cal.get(Calendar.SECOND)));
}
if(source.contains("[ms]"))
{
source = source.replace("[ms]", String.valueOf(cal.get(Calendar.MILLISECOND))); source = source.replace("[ms]", String.valueOf(cal.get(Calendar.MILLISECOND)));
} }
}
if(source.contains("[notificationTitle]")) if(source.contains("[notificationTitle]"))
{ {