paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-09 15:28:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl-customdrawn-android: Fixes the accelerometer values to be according to the specification, implements TApplication.Minimize and TApplication.Terminate

Browse Source 
git-svn-id: trunk@34765 -
This commit is contained in:
sekelsenmat 2012-01-17 15:29:04 +00:00
parent 47a0602c58
commit e791df5c47
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/interfaces/customdrawn/customdrawnint.pas
View File

@ -266,6 +266,10 @@ var
javaActivityClass: JClass = nil;
javaActivityObject: jobject = nil;
// Other classes and objects
javaAndroidAppActivityClass: JClass = nil;
javaJavaLandSystemClass: JClass = nil;
// Fields of our Activity
// Strings
javaField_lcltext: JfieldID=nil;
@ -317,6 +321,10 @@ var
javaMethod_LCLDoStopReadingAccelerometer: jmethodid = nil;
javaMethod_LCLDoSendMessage: jmethodid = nil;
javaMethod_LCLDoRequestPositionInfo: jmethodid = nil;
// Methods from android.app.Activity
javaMethod_Activity_finish: jmethodid = nil;
// Methods from java.lang.System
javaMethod_System_exit: jmethodid = nil;
// This is utilized to store the information such as invalidate requests in events
eventResult: jint;

32
lcl/interfaces/customdrawn/customdrawnobject_android.inc
View File

@ -316,9 +316,9 @@ begin
end;
1: // ACCELEROMETER
begin
Accelerometer.xaxis := arraydata[0];
Accelerometer.yaxis := arraydata[1];
Accelerometer.zaxis := arraydata[2];
Accelerometer.xaxis := -1*arraydata[0];
Accelerometer.yaxis := -1*arraydata[1];
Accelerometer.zaxis := -1*arraydata[2];
if Assigned(Accelerometer.OnSensorChanged) then
Accelerometer.OnSensorChanged(Accelerometer);
end;
@ -385,6 +385,9 @@ begin
__android_log_write(ANDROID_LOG_FATAL, 'lclapp', 'javaEnvRef^.FindClass failed');
Exit(JNI_ERR);
end;
// Now other classes
javaAndroidAppActivityClass := javaEnvRef^^.FindClass(javaEnvRef,'android/app/Activity');
javaJavaLandSystemClass := javaEnvRef^^.FindClass(javaEnvRef,'java/lang/System');
// Register Pascal exported calls
if javaEnvRef^^.RegisterNatives(javaEnvRef, javaActivityClass, @NativeMethods[0],length(NativeMethods))<0 then
@ -449,6 +452,10 @@ begin
javaMethod_LCLDoStopReadingAccelerometer := javaEnvRef^^.GetMethodID(javaEnvRef, javaActivityClass, 'LCLDoStopReadingAccelerometer', '()V');
javaMethod_LCLDoSendMessage := javaEnvRef^^.GetMethodID(javaEnvRef, javaActivityClass, 'LCLDoSendMessage', '()V');
javaMethod_LCLDoRequestPositionInfo := javaEnvRef^^.GetMethodID(javaEnvRef, javaActivityClass, 'LCLDoRequestPositionInfo', '()V');
// Methods from android.app.Activity
javaMethod_Activity_finish := javaEnvRef^^.GetMethodID(javaEnvRef, javaAndroidAppActivityClass, 'finish', '()V');
// Methods from java.lang.System
javaMethod_System_exit := javaEnvRef^^.GetStaticMethodID(javaEnvRef, javaJavaLandSystemClass, 'exit', '(I)V');
__android_log_write(ANDROID_LOG_INFO, 'lclapp', 'JNI_OnLoad finished');
result:=JNI_VERSION_1_4;// 1_6 is another option
@ -697,7 +704,8 @@ end;*)
------------------------------------------------------------------------------}
procedure TCDWidgetSet.AppMinimize;
begin
// Windows.SendMessage(FAppHandle, WM_SYSCOMMAND, SC_MINIMIZE, 0);
// calling Activity.Free doesnt close the app, only hides it, so it is good for AppMinimize
javaEnvRef^^.CallVoidMethod(javaEnvRef, javaActivityObject, javaMethod_Activity_finish);
end;
{------------------------------------------------------------------------------
@ -833,18 +841,24 @@ begin
end;
{------------------------------------------------------------------------------
Method: TWinCEWidgetSet.AppTerminate
Method: TCDWidgetSet.AppTerminate
Params: None
Returns: Nothing
Tells Windows to halt and destroy
Terminates the application
------------------------------------------------------------------------------}
procedure TCDWidgetSet.AppTerminate;
var
lParams: array[0..0] of JValue;
begin
//DebugLn('Trace:TWinCEWidgetSet.AppTerminate - Start');
end;
DebugLn('[TCDWidgetSet.AppTerminate] Start');
// Call the method
lParams[0].i := 0;
javaEnvRef^^.CallStaticVoidMethodA(javaEnvRef, javaJavaLandSystemClass, javaMethod_System_exit, @lParams[0]);
DebugLn('[TCDWidgetSet.AppTerminate] End');
end;
procedure TCDWidgetSet.AppSetIcon(const Small, Big: HICON);
begin