moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add analog stick double click event, add button long press event, add virtual controller settings draft

Browse Source
This commit is contained in:
Karim Mreisi 2015-01-26 09:38:52 +01:00
parent 1d6b7e1b2e
commit d83526ff5c
9 changed files with 509 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/app.iml
View File

@ -8,10 +8,12 @@
</facet> </facet>
<facet type="android" name="Android"> <facet type="android" name="Android">
<configuration> <configuration>
<option name="SELECTED_BUILD_VARIANT" value="nonRootRelease" /> <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleNonRootRelease" /> <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootReleaseSources" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateNonRootReleaseSources" /> <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateNonRootDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@ -21,22 +23,28 @@
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="false"> <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/release" /> <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/release" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/nonRoot/release" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/nonRoot/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/nonRoot/release" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/nonRoot/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/nonRoot/release" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/nonRoot/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/nonRoot/release" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/nonRoot/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/nonRoot/release" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/nonRoot/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRootRelease/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRootRelease/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRootRelease/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRootRelease/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRootRelease/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRootRelease/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRootRelease/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/nonRoot/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/nonRoot/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/nonRoot/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/nonRoot/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/nonRoot/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/nonRoot/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" />
@ -51,13 +59,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />

6
app/src/main/AndroidManifest.xml
View File

@ -76,6 +76,12 @@
android:theme="@style/StreamTheme" android:theme="@style/StreamTheme"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" > android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
</activity> </activity>
<activity
android:name=".binding.input.virtual_controller.VirtualControllerSettings"
android:screenOrientation="landscape"
android:theme="@style/StreamTheme"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
</activity>
<service <service
android:name=".discovery.DiscoveryService" android:name=".discovery.DiscoveryService"
android:label="mDNS PC Auto-Discovery Service" /> android:label="mDNS PC Auto-Discovery Service" />

2
app/src/main/java/com/limelight/Game.java
View File

@ -205,7 +205,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
{ {
FrameLayout frameLayout = (FrameLayout) findViewById(R.id.frameLayout); FrameLayout frameLayout = (FrameLayout) findViewById(R.id.frameLayout);
virtualController = new VirtualController(conn, frameLayout, getApplicationContext(), getWindowManager()); virtualController = new VirtualController(conn, frameLayout, getApplicationContext());
} }
// The connection will be started when the surface gets created // The connection will be started when the surface gets created

126
app/src/main/java/com/limelight/binding/input/virtual_controller/AnalogStick.java
View File

@ -8,6 +8,7 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -21,11 +22,20 @@ public class AnalogStick extends View
MOVED MOVED
} }
private enum _CLICK_STATE
{
SINGLE,
DOUBLE
}
private static final boolean _PRINT_DEBUG_INFORMATION = false; private static final boolean _PRINT_DEBUG_INFORMATION = false;
public interface AnalogStickListener public interface AnalogStickListener
{ {
void onMovement(float x, float y); void onMovement(float x, float y);
void onClick();
void onRevoke();
void onDoubleClick();
} }
public void addAnalogStickListener (AnalogStickListener listener) public void addAnalogStickListener (AnalogStickListener listener)
@ -46,8 +56,11 @@ public class AnalogStick extends View
} }
} }
private int normalColor = 0xF0888888; private int normalColor = 0xF0888888;
private int pressedColor = 0xF00000FF; private int pressedColor = 0xF00000FF;
private long timeoutDoubleClick = 250;
private long timeLastClick = 0;
float radius_complete = 0; float radius_complete = 0;
float radius_dead_zone = 0; float radius_dead_zone = 0;
@ -56,8 +69,10 @@ public class AnalogStick extends View
float position_stick_x = 0; float position_stick_x = 0;
float position_stick_y = 0; float position_stick_y = 0;
boolean pressed = false; boolean viewPressed = false;
boolean analogStickActive = false;
_STICK_STATE stick_state = _STICK_STATE.NO_MOVEMENT; _STICK_STATE stick_state = _STICK_STATE.NO_MOVEMENT;
_CLICK_STATE click_state = _CLICK_STATE.SINGLE;
List<AnalogStickListener> listeners = new ArrayList<AnalogStickListener>(); List<AnalogStickListener> listeners = new ArrayList<AnalogStickListener>();
OnTouchListener onTouchListener = null; OnTouchListener onTouchListener = null;
@ -69,8 +84,10 @@ public class AnalogStick extends View
position_stick_x = getWidth() / 2; position_stick_x = getWidth() / 2;
position_stick_y = getHeight() / 2; position_stick_y = getHeight() / 2;
stick_state = _STICK_STATE.NO_MOVEMENT; stick_state = _STICK_STATE.NO_MOVEMENT;
pressed = false; click_state = _CLICK_STATE.SINGLE;
viewPressed = false;
analogStickActive = false;
} }
@ -125,16 +142,25 @@ public class AnalogStick extends View
paint.setStyle(Paint.Style.STROKE); paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(getPercent(getCorrectWidth() / 2, 2)); paint.setStrokeWidth(getPercent(getCorrectWidth() / 2, 2));
paint.setColor(normalColor); // draw outer circle
if (!viewPressed || click_state == _CLICK_STATE.SINGLE)
{
paint.setColor(normalColor);
}
else
{
paint.setColor(pressedColor);
}
// draw outer circle canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_complete, paint);
canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_complete, paint);
paint.setColor(normalColor);
// draw dead zone // draw dead zone
canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_dead_zone, paint); canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_dead_zone, paint);
// draw stick depending on state (no movement, moved, active(out of dead zone)) // draw stick depending on state (no movement, moved, active(out of dead zone))
if (pressed) if (analogStickActive)
{ {
switch (stick_state) switch (stick_state)
{ {
@ -232,7 +258,41 @@ public class AnalogStick extends View
} }
} }
private void updatePosition(float x, float y) private void clickActionCallback()
{
_DBG("click");
// notify listeners
for (AnalogStickListener listener : listeners)
{
listener.onClick();
}
}
private void doubleClickActionCallback()
{
_DBG("double click");
// notify listeners
for (AnalogStickListener listener : listeners)
{
listener.onDoubleClick();
}
}
private void revokeActionCallback()
{
_DBG("revoke");
// notify listeners
for (AnalogStickListener listener : listeners)
{
listener.onRevoke();
}
}
private void updatePosition(float x, float y)
{ {
float way_x = -(getWidth() / 2 - x); float way_x = -(getWidth() / 2 - x);
float way_y = -(getHeight() / 2 - y); float way_y = -(getHeight() / 2 - y);
@ -282,33 +342,65 @@ public class AnalogStick extends View
} }
// get masked (not specific to a pointer) action // get masked (not specific to a pointer) action
int action = event.getActionMasked(); int action = event.getActionMasked();
_CLICK_STATE lastClickState = click_state;
boolean wasPressed = analogStickActive;
switch (action) switch (action)
{ {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_POINTER_DOWN:
{
viewPressed = true;
// check for double click
if (lastClickState == _CLICK_STATE.SINGLE && timeLastClick + timeoutDoubleClick > System.currentTimeMillis())
{
click_state = _CLICK_STATE.DOUBLE;
doubleClickActionCallback();
}
else
{
click_state = _CLICK_STATE.SINGLE;
clickActionCallback();
}
timeLastClick = System.currentTimeMillis();
break;
}
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
{ {
pressed = true; if (analogStickActive || timeLastClick + timeoutDoubleClick < System.currentTimeMillis())
{
analogStickActive = true;
}
break; break;
} }
default: case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_POINTER_UP:
{ {
pressed = false; analogStickActive = false;
viewPressed = false;
revokeActionCallback();
break; break;
} }
} }
if (pressed) if (analogStickActive)
{ // when is pressed calculate new positions (will trigger movement if necessary) { // when is pressed calculate new positions (will trigger movement if necessary)
updatePosition(event.getX(), event.getY()); updatePosition(event.getX(), event.getY());
} }
else else
{ // no longer pressed reset movement { // no longer pressed reset movement
moveActionCallback(0, 0); if (wasPressed)
{
moveActionCallback(0, 0);
}
} }
// to get view refreshed // to get view refreshed

67
app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java
View File

@ -4,28 +4,44 @@ import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
/** /**
* Created by Karim on 24.01.2015. * Created by Karim on 24.01.2015.
*/ */
public class DigitalButton extends View public class DigitalButton extends View
{ {
private class TimerLongClickTimerTask extends TimerTask
{
@Override
public void run()
{
onLongClickCallback();
}
}
private static final boolean _PRINT_DEBUG_INFORMATION = false; private static final boolean _PRINT_DEBUG_INFORMATION = false;
private int normalColor = 0xF0888888; private int normalColor = 0xF0888888;
private int pressedColor = 0xF00000FF; private int pressedColor = 0xF00000FF;
private String text; private String text = "";
private int icon = -1;
private long timerLongClickTimeout = 3000;
private Timer timerLongClick = null;
private TimerLongClickTimerTask longClickTimerTask = null;
public interface DigitalButtonListener public interface DigitalButtonListener
{ {
void onClick(); void onClick();
void onLongClick();
void onRelease(); void onRelease();
} }
@ -72,6 +88,13 @@ public class DigitalButton extends View
invalidate(); invalidate();
} }
public void setIcon(int id)
{
this.icon = id;
invalidate();
}
private float getPercent(float value, float percent) private float getPercent(float value, float percent)
{ {
return value / 100 * percent; return value / 100 * percent;
@ -102,10 +125,19 @@ public class DigitalButton extends View
paint paint
); );
paint.setStyle(Paint.Style.FILL_AND_STROKE); if (icon != -1)
canvas.drawText(text, {
getPercent(getWidth(), 50), getPercent(getHeight(), 73), Drawable d = getResources().getDrawable(icon);
paint); d.setBounds(5, 5, getWidth() - 5, getHeight() - 5);
d.draw(canvas);
}
else
{
paint.setStyle(Paint.Style.FILL_AND_STROKE);
canvas.drawText(text,
getPercent(getWidth(), 50), getPercent(getHeight(), 73),
paint);
}
super.onDraw(canvas); super.onDraw(canvas);
} }
@ -119,6 +151,22 @@ public class DigitalButton extends View
{ {
listener.onClick(); listener.onClick();
} }
timerLongClick = new Timer();
longClickTimerTask = new TimerLongClickTimerTask();
timerLongClick.schedule(longClickTimerTask, timerLongClickTimeout);
}
private void onLongClickCallback()
{
_DBG("long click");
// notify listeners
for (DigitalButtonListener listener : listeners)
{
listener.onLongClick();
}
} }
private void onReleaseCallback() private void onReleaseCallback()
@ -130,6 +178,9 @@ public class DigitalButton extends View
{ {
listener.onRelease(); listener.onRelease();
} }
timerLongClick.cancel();
longClickTimerTask.cancel();
} }

122
app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java
View File

@ -1,11 +1,16 @@
package com.limelight.binding.input.virtual_controller; package com.limelight.binding.input.virtual_controller;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.view.MenuInflater;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.PopupMenu;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.Toast;
import com.limelight.R;
import com.limelight.nvstream.NvConnection; import com.limelight.nvstream.NvConnection;
import com.limelight.nvstream.input.ControllerPacket; import com.limelight.nvstream.input.ControllerPacket;
@ -37,7 +42,6 @@ public class VirtualController
private RelativeLayout.LayoutParams layoutParamsButtonStart = null; private RelativeLayout.LayoutParams layoutParamsButtonStart = null;
private RelativeLayout.LayoutParams layoutParamsButtonSelect = null; private RelativeLayout.LayoutParams layoutParamsButtonSelect = null;
// private RelativeLayout.LayoutParams layoutParamsButtonEscape = null;
private RelativeLayout.LayoutParams layoutParamsDPad = null; private RelativeLayout.LayoutParams layoutParamsDPad = null;
@ -50,12 +54,13 @@ public class VirtualController
private RelativeLayout.LayoutParams layoutParamsButtonLB = null; private RelativeLayout.LayoutParams layoutParamsButtonLB = null;
private RelativeLayout.LayoutParams layoutParamsButtonRB = null; private RelativeLayout.LayoutParams layoutParamsButtonRB = null;
private RelativeLayout.LayoutParams layoutParamsParamsStick = null; private RelativeLayout.LayoutParams layoutParamsStick = null;
private RelativeLayout.LayoutParams layoutParamsParamsStick2 = null; private RelativeLayout.LayoutParams layoutParamsStick2 = null;
private RelativeLayout.LayoutParams layoutParamsButtonConfigure = null;
private DigitalButton buttonStart = null; private DigitalButton buttonStart = null;
private DigitalButton buttonSelect = null; private DigitalButton buttonSelect = null;
// private DigitalButton buttonEscape = null;
private DigitalPad digitalPad = null; private DigitalPad digitalPad = null;
@ -71,6 +76,8 @@ public class VirtualController
private AnalogStick stick = null; private AnalogStick stick = null;
private AnalogStick stick2 = null; private AnalogStick stick2 = null;
private DigitalButton buttonConfigure = null;
NvConnection connection = null; NvConnection connection = null;
private int getPercentageV(int percent) private int getPercentageV(int percent)
@ -99,8 +106,8 @@ public class VirtualController
layoutParamsDPad = new RelativeLayout.LayoutParams(getPercentageV(30), getPercentageV(30)); layoutParamsDPad = new RelativeLayout.LayoutParams(getPercentageV(30), getPercentageV(30));
layoutParamsParamsStick = new RelativeLayout.LayoutParams(getPercentageV(40), getPercentageV(40)); layoutParamsStick = new RelativeLayout.LayoutParams(getPercentageV(40), getPercentageV(40));
layoutParamsParamsStick2 = new RelativeLayout.LayoutParams(getPercentageV(40), getPercentageV(40)); layoutParamsStick2 = new RelativeLayout.LayoutParams(getPercentageV(40), getPercentageV(40));
layoutParamsButtonA = new RelativeLayout.LayoutParams(getPercentageV(10), getPercentageV(10)); layoutParamsButtonA = new RelativeLayout.LayoutParams(getPercentageV(10), getPercentageV(10));
layoutParamsButtonB = new RelativeLayout.LayoutParams(getPercentageV(10), getPercentageV(10)); layoutParamsButtonB = new RelativeLayout.LayoutParams(getPercentageV(10), getPercentageV(10));
@ -115,10 +122,12 @@ public class VirtualController
layoutParamsButtonStart = new RelativeLayout.LayoutParams(getPercentageH(12), getPercentageV(8)); layoutParamsButtonStart = new RelativeLayout.LayoutParams(getPercentageH(12), getPercentageV(8));
layoutParamsButtonSelect = new RelativeLayout.LayoutParams(getPercentageH(12), getPercentageV(8)); layoutParamsButtonSelect = new RelativeLayout.LayoutParams(getPercentageH(12), getPercentageV(8));
layoutParamsButtonConfigure = new RelativeLayout.LayoutParams(getPercentageV(10), getPercentageV(10));
setPercentilePosition(layoutParamsDPad, 10, 35); setPercentilePosition(layoutParamsDPad, 10, 35);
setPercentilePosition(layoutParamsParamsStick, 22, 78); setPercentilePosition(layoutParamsStick, 22, 78);
setPercentilePosition(layoutParamsParamsStick2, 78, 78); setPercentilePosition(layoutParamsStick2, 78, 78);
setPercentilePosition(layoutParamsButtonA, 85, 52); setPercentilePosition(layoutParamsButtonA, 85, 52);
setPercentilePosition(layoutParamsButtonB, 92, 47); setPercentilePosition(layoutParamsButtonB, 92, 47);
@ -134,11 +143,12 @@ public class VirtualController
setPercentilePosition(layoutParamsButtonSelect, 43, 94); setPercentilePosition(layoutParamsButtonSelect, 43, 94);
setPercentilePosition(layoutParamsButtonStart, 57, 94); setPercentilePosition(layoutParamsButtonStart, 57, 94);
setPercentilePosition(layoutParamsButtonConfigure, 93, 7);
relative_layout.addView(digitalPad, layoutParamsDPad); relative_layout.addView(digitalPad, layoutParamsDPad);
relative_layout.addView(stick, layoutParamsParamsStick); relative_layout.addView(stick, layoutParamsStick);
relative_layout.addView(stick2, layoutParamsParamsStick2); relative_layout.addView(stick2, layoutParamsStick2);
relative_layout.addView(buttonA, layoutParamsButtonA); relative_layout.addView(buttonA, layoutParamsButtonA);
relative_layout.addView(buttonB, layoutParamsButtonB); relative_layout.addView(buttonB, layoutParamsButtonB);
@ -151,6 +161,8 @@ public class VirtualController
relative_layout.addView(buttonSelect, layoutParamsButtonSelect); relative_layout.addView(buttonSelect, layoutParamsButtonSelect);
relative_layout.addView(buttonStart, layoutParamsButtonStart); relative_layout.addView(buttonStart, layoutParamsButtonStart);
relative_layout.addView(buttonConfigure, layoutParamsButtonConfigure);
} }
private DigitalButton createDigitalButton(String text, final int key, Context context) private DigitalButton createDigitalButton(String text, final int key, Context context)
@ -164,6 +176,12 @@ public class VirtualController
sendControllerInputPacket(); sendControllerInputPacket();
} }
@Override
public void onLongClick()
{
}
@Override @Override
public void onRelease() { public void onRelease() {
inputMap &= ~key; inputMap &= ~key;
@ -174,7 +192,7 @@ public class VirtualController
return button; return button;
} }
public VirtualController(final NvConnection conn, FrameLayout layout, Context context, WindowManager window_manager) public VirtualController(final NvConnection conn, FrameLayout layout, final Context context)
{ {
this.connection = conn; this.connection = conn;
frame_layout = layout; frame_layout = layout;
@ -253,6 +271,12 @@ public class VirtualController
sendControllerInputPacket(); sendControllerInputPacket();
} }
@Override
public void onLongClick()
{
}
@Override @Override
public void onRelease() public void onRelease()
{ {
@ -274,6 +298,12 @@ public class VirtualController
sendControllerInputPacket(); sendControllerInputPacket();
} }
@Override
public void onLongClick()
{
}
@Override @Override
public void onRelease() public void onRelease()
{ {
@ -299,6 +329,27 @@ public class VirtualController
_DBG("LEFT STICK MOVEMENT X: "+ leftStickX + " Y: " + leftStickY); _DBG("LEFT STICK MOVEMENT X: "+ leftStickX + " Y: " + leftStickY);
sendControllerInputPacket(); sendControllerInputPacket();
} }
@Override
public void onClick()
{
}
@Override
public void onDoubleClick()
{
inputMap |= ControllerPacket.LS_CLK_FLAG;
sendControllerInputPacket();
}
@Override
public void onRevoke()
{
inputMap &= ~ControllerPacket.LS_CLK_FLAG;
sendControllerInputPacket();
}
}); });
stick2 = new AnalogStick(context); stick2 = new AnalogStick(context);
@ -313,11 +364,58 @@ public class VirtualController
_DBG("RIGHT STICK MOVEMENT X: "+ rightStickX + " Y: " + rightStickY); _DBG("RIGHT STICK MOVEMENT X: "+ rightStickX + " Y: " + rightStickY);
sendControllerInputPacket(); sendControllerInputPacket();
} }
});
@Override
public void onClick()
{
}
@Override
public void onDoubleClick()
{
inputMap |= ControllerPacket.RS_CLK_FLAG;
sendControllerInputPacket();
}
@Override
public void onRevoke()
{
inputMap &= ~ControllerPacket.RS_CLK_FLAG;
sendControllerInputPacket();
}
});
buttonStart = createDigitalButton("START", ControllerPacket.PLAY_FLAG, context); buttonStart = createDigitalButton("START", ControllerPacket.PLAY_FLAG, context);
buttonSelect = createDigitalButton("SELECT", ControllerPacket.SPECIAL_BUTTON_FLAG, context); buttonSelect = createDigitalButton("SELECT", ControllerPacket.SPECIAL_BUTTON_FLAG, context);
buttonConfigure = new DigitalButton(context);
buttonConfigure.setIcon(R.drawable.settings);
buttonConfigure.addDigitalButtonListener(new DigitalButton.DigitalButtonListener()
{
@Override
public void onClick() {
}
@Override
public void onLongClick()
{
Intent virtualControllerConfiguration = new Intent(context,VirtualControllerSettings.class);
virtualControllerConfiguration.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(virtualControllerConfiguration);
}
@Override
public void onRelease() {
}
});
refreshLayout(); refreshLayout();
} }

2
app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerConfiguration.java
View File

@ -37,7 +37,7 @@ public class VirtualControllerConfiguration extends Activity
FrameLayout frameLayout = (FrameLayout) findViewById(R.id.configure_virtual_controller_frameLayout); FrameLayout frameLayout = (FrameLayout) findViewById(R.id.configure_virtual_controller_frameLayout);
// start with configuration constructor // start with configuration constructor
virtualController = new VirtualController(null, frameLayout, this, getWindowManager()); virtualController = new VirtualController(null, frameLayout, this);
Toast.makeText(getApplicationContext(), "Not implemented yet!", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), "Not implemented yet!", Toast.LENGTH_SHORT).show();
} }

47
app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerSettings.java Normal file
View File

@ -0,0 +1,47 @@
package com.limelight.binding.input.virtual_controller;
import android.app.Activity;
import android.os.Bundle;
import android.view.MenuInflater;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.PopupMenu;
import android.widget.Toast;
import com.limelight.R;
import org.apache.http.util.VersionInfo;
/**
* Created by Karim on 26.01.2015.
*/
public class VirtualControllerSettings extends Activity
{
private static VirtualController controller = null;
private static View view = null;
static void setController(VirtualController value)
{
controller = value;
}
static void setView(View value)
{
view = value;
}
@Override
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
// We don't want a title bar
requestWindowFeature(Window.FEATURE_NO_TITLE);
// Inflate the content
setContentView(R.layout.activity_virtual_controller_settings);
Toast.makeText(getApplicationContext(), "Not implemented yet!", Toast.LENGTH_SHORT).show();
}
}

143
app/src/main/res/layout/activity_virtual_controller_settings.xml Normal file
View File

@ -0,0 +1,143 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/scrollView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical">
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Load Configuration"/>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical">
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Save Configuration"/>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical">
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Unlock layout"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Color 1"/>
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Color 2"/>
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="analog stick time out"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAlignment="center"
android:text="250ms"/>
<SeekBar
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>