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

Rework

Browse Source
This commit is contained in:
jens 2021-12-08 19:57:27 +01:00
parent 359dd545c7
commit 0008642044
4 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/jens/automation2/Action.java
View File

@ -36,6 +36,7 @@ public class Action
startOtherActivity, startOtherActivity,
waitBeforeNextAction, waitBeforeNextAction,
wakeupDevice, wakeupDevice,
turnScreenOnOrOff,
setAirplaneMode, setAirplaneMode,
setDataConnection, setDataConnection,
speakText, speakText,
@ -91,6 +92,8 @@ public class Action
return context.getResources().getString(R.string.waitBeforeNextAction); return context.getResources().getString(R.string.waitBeforeNextAction);
case wakeupDevice: case wakeupDevice:
return context.getResources().getString(R.string.wakeupDevice); return context.getResources().getString(R.string.wakeupDevice);
case turnScreenOnOrOff:
return context.getResources().getString(R.string.turnScreenOnOrOff);
case vibrate: case vibrate:
return context.getResources().getString(R.string.vibrate); return context.getResources().getString(R.string.vibrate);
case setAirplaneMode: case setAirplaneMode:
@ -233,6 +236,13 @@ public class Action
{ {
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.wakeupDevice)); returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.wakeupDevice));
} }
else if(this.getAction().equals(Action_Enum.turnScreenOnOrOff))
{
if(getParameter1())
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOn));
else
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOff));
}
else if(this.getAction().equals(Action_Enum.playSound)) else if(this.getAction().equals(Action_Enum.playSound))
{ {
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound)); returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound));
@ -416,6 +426,25 @@ public class Action
e.printStackTrace(); e.printStackTrace();
} }
break; break;
case turnScreenOnOrOff:
if(getParameter1())
{
Actions.wakeupDevice(Long.parseLong(this.getParameter2()));
// wakeupDevice() will create a separate thread. That'll take some time, we wait 100ms.
try
{
Thread.sleep(100);
}
catch (InterruptedException e)
{
e.printStackTrace();
}
}
else
{
Actions.turnOffScreen();
}
break;
case setAirplaneMode: case setAirplaneMode:
Actions.setAirplaneMode(this.getParameter1(), toggleActionIfPossible); Actions.setAirplaneMode(this.getParameter1(), toggleActionIfPossible);
break; break;

15
app/src/main/java/com/jens/automation2/Actions.java
View File

@ -1097,7 +1097,7 @@ public class Actions
try try
{ {
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
WakeLock wakeLock = pm.newWakeLock((WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON | PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "Automation:Wakelock"); WakeLock wakeLock = pm.newWakeLock((PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "Automation:Wakelock");
wakeLock.acquire(); wakeLock.acquire();
try try
@ -1118,21 +1118,22 @@ public class Actions
} }
} }
public void turnOnScreen() public static void turnOnScreen()
{ {
// turn on screen // turn on screen
Log.v("ProximityActivity", "ON!"); Miscellaneous.logEvent("i", "Actions", "Turning screen on.", 3);
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
WakeLock wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "tag"); WakeLock wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "tag");
wakeLock.acquire(); wakeLock.acquire();
} }
@TargetApi(21) //Suppress lint error for PROXIMITY_SCREEN_OFF_WAKE_LOCK @TargetApi(21) //Suppress lint error for PROXIMITY_SCREEN_OFF_WAKE_LOCK
public void turnOffScreen(){ public static void turnOffScreen()
// turn off screen {
Log.v("ProximityActivity", "OFF!"); Miscellaneous.logEvent("i", "Actions", "Turning screen off.", 3);
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
WakeLock wakeLock = pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, "tag"); // WakeLock wakeLock = pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, "tag");
WakeLock wakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK , "tag");
wakeLock.acquire(); wakeLock.acquire();
} }

7
app/src/main/java/com/jens/automation2/ActivityManageRule.java
View File

@ -1409,6 +1409,8 @@ public class ActivityManageRule extends Activity
items.add(new Item(typesLong[i].toString(), R.drawable.plane)); items.add(new Item(typesLong[i].toString(), R.drawable.plane));
else if(types[i].toString().equals(Action_Enum.wakeupDevice.toString())) else if(types[i].toString().equals(Action_Enum.wakeupDevice.toString()))
items.add(new Item(typesLong[i].toString(), R.drawable.alarm)); items.add(new Item(typesLong[i].toString(), R.drawable.alarm));
else if(types[i].toString().equals(Action_Enum.turnScreenOnOrOff.toString()))
items.add(new Item(typesLong[i].toString(), R.drawable.smartphone));
else if(types[i].toString().equals(Action_Enum.changeSoundProfile.toString())) else if(types[i].toString().equals(Action_Enum.changeSoundProfile.toString()))
items.add(new Item(typesLong[i].toString(), R.drawable.sound)); items.add(new Item(typesLong[i].toString(), R.drawable.sound));
else if(types[i].toString().equals(Action_Enum.triggerUrl.toString())) else if(types[i].toString().equals(Action_Enum.triggerUrl.toString()))
@ -1543,6 +1545,11 @@ public class ActivityManageRule extends Activity
newAction.setAction(Action_Enum.wakeupDevice); newAction.setAction(Action_Enum.wakeupDevice);
getActionWakeupDeviceDialog(ActivityManageRule.this).show(); getActionWakeupDeviceDialog(ActivityManageRule.this).show();
} }
else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.turnScreenOnOrOff.toString()))
{
newAction.setAction(Action_Enum.turnScreenOnOrOff);
getActionParameter1Dialog(ActivityManageRule.this).show();
}
else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setAirplaneMode.toString())) else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setAirplaneMode.toString()))
{ {
newAction.setAction(Action_Enum.setAirplaneMode); newAction.setAction(Action_Enum.setAirplaneMode);

3
app/src/main/res/values/strings.xml
View File

@ -726,4 +726,7 @@
<string name="unknown">unknown</string> <string name="unknown">unknown</string>
<string name="position">Position</string> <string name="position">Position</string>
<string name="triggerWrong">" There's something wrong with this trigger. It could not be loaded correctly."</string> <string name="triggerWrong">" There's something wrong with this trigger. It could not be loaded correctly."</string>
<string name="turnScreenOnOrOff">Turn screen on or off</string>
<string name="turnScreenOn">turn screen on</string>
<string name="turnScreenOff">turn screen off</string>
</resources> </resources>