From 18ed2ed2098ac4783ce55a1efcb787dc5a6a3a63 Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Tue, 30 Aug 2011 16:17:19 +0000 Subject: [PATCH] android: Uses the new logging mechanism git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1879 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../src/com/pascal/androidlcl/AndroidAll.java | 102 +++++++++--------- examples/androidlcl/mainform.lfm | 18 ++-- examples/androidlcl/mainform.pas | 26 ++--- 3 files changed, 66 insertions(+), 80 deletions(-) diff --git a/examples/androidlcl/android/src/com/pascal/androidlcl/AndroidAll.java b/examples/androidlcl/android/src/com/pascal/androidlcl/AndroidAll.java index 833f4ca62..1924d278a 100644 --- a/examples/androidlcl/android/src/com/pascal/androidlcl/AndroidAll.java +++ b/examples/androidlcl/android/src/com/pascal/androidlcl/AndroidAll.java @@ -72,7 +72,10 @@ public class AndroidAll static final int amkUI_TViewGroup_LayoutParams_Create_0 = 0x00109000; // View static final int amkUI_TView_setLayoutParams_0 = 0x0010A000; - static final int amkUI_TView_setVisibility_1 = 0x0010A001; + static final int amkUI_TView_setOnClickListener_1 = 0x0010A001; + static final int amkUI_TView_OnClickListener_Start_2 = 0x0010A002; + static final int amkUI_TView_OnClickListener_Finished_3 = 0x0010A003; + static final int amkUI_TView_setVisibility_4 = 0x0010A004; // ViewGroup static final int amkUI_TViewGroup_addView_0 = 0x0010B000; static final int amkUI_TViewGroup_addView_1 = 0x0010B001; @@ -88,12 +91,9 @@ public class AndroidAll static final int amkUI_TAbsoluteLayout_LayoutParams_Create_0 = 0x0010E000; // TextView static final int amkUI_TTextView_Create_0 = 0x0010F000; - static final int amkUI_TTextView_setText_1 = 0x0010F001; - static final int amkUI_TTextView_setOnClickListener_2 = 0x0010F002; - static final int amkUI_TTextView_OnClickListener_Start_3 = 0x0010F003; - static final int amkUI_TTextView_OnClickListener_Finished_4 = 0x0010F004; - static final int amkUI_TTextView_setTextSize_5 = 0x0010F005; - static final int amkUI_TTextView_getText_6 = 0x0010F006; + static final int amkUI_TTextView_getText_1 = 0x0010F001; + static final int amkUI_TTextView_setText_2 = 0x0010F002; + static final int amkUI_TTextView_setTextSize_3 = 0x0010F003; // EditText static final int amkUI_TEditText_Create_0 = 0x00110000; // Button @@ -498,9 +498,36 @@ public class AndroidAll param_self_View.setLayoutParams(lViewGroup_LayoutParams_1); MyAndroidPipesComm.SendResult(); break; + // callbacksetter void setOnClickListener($View.OnClickListener l) + case amkUI_TView_setOnClickListener_1: + DebugOut("amkUI_TView_setOnClickListener_1"); + // Self + lInt = MyAndroidPipesComm.GetInt(); + param_self_View = (View) ViewElements.get(lInt); + // params + lPascalPointer = MyAndroidPipesComm.GetInt(); + ViewElementsTags.set(lInt, new Integer(lPascalPointer)); + + // Run the code + param_self_View.setOnClickListener( new View.OnClickListener() + { + public void onClick(View v) + { + // Perform action + DebugOut("START View.OnClickListener"); + MyAndroidPipesComm.SendMessage(AndroidPipesComm.amkUICommand, amkUI_TView_OnClickListener_Start_2); + Integer lTag = (Integer) ViewElementsTags.get(ViewElements.indexOf(v)); + MyAndroidPipesComm.SendInt(lTag.intValue()); + MyAndroidPipesComm.WaitForPascalMessage(AndroidPipesComm.amkUICommand, amkUI_TView_OnClickListener_Finished_3); + DebugOut("END View.OnClickListener"); + } + } +); + MyAndroidPipesComm.SendResult(); + break; // method void setVisibility(int visibility); - case amkUI_TView_setVisibility_1: - DebugOut("amkUI_TView_setVisibility_1"); + case amkUI_TView_setVisibility_4: + DebugOut("amkUI_TView_setVisibility_4"); // Self lInt = MyAndroidPipesComm.GetInt(); param_self_View = (View) ViewElements.get(lInt); @@ -629,9 +656,20 @@ public class AndroidAll ViewElementsTags.add(null); MyAndroidPipesComm.SendIntResult(ViewElements.size() - 1); break; + // method CharSequence getText() + case amkUI_TTextView_getText_1: + DebugOut("amkUI_TTextView_getText_1"); + // Self + lInt = MyAndroidPipesComm.GetInt(); + param_self_TextView = (TextView) ViewElements.get(lInt); + // params + // + lResult_CharSequence = param_self_TextView.getText(); + MyAndroidPipesComm.SendStringResult(lResult_CharSequence); + break; // method void setText(CharSequence AText); - case amkUI_TTextView_setText_1: - DebugOut("amkUI_TTextView_setText_1"); + case amkUI_TTextView_setText_2: + DebugOut("amkUI_TTextView_setText_2"); // Self lInt = MyAndroidPipesComm.GetInt(); param_self_TextView = (TextView) ViewElements.get(lInt); @@ -642,36 +680,9 @@ public class AndroidAll param_self_TextView.setText(lCharSequence_1); MyAndroidPipesComm.SendResult(); break; - // callbacksetter void setOnClickListener($View.OnClickListener l) - case amkUI_TTextView_setOnClickListener_2: - DebugOut("amkUI_TTextView_setOnClickListener_2"); - // Self - lInt = MyAndroidPipesComm.GetInt(); - param_self_TextView = (TextView) ViewElements.get(lInt); - // params - lPascalPointer = MyAndroidPipesComm.GetInt(); - ViewElementsTags.set(lInt, new Integer(lPascalPointer)); - - // Run the code - param_self_TextView.setOnClickListener( new View.OnClickListener() - { - public void onClick(View v) - { - // Perform action - DebugOut("START View.OnClickListener"); - MyAndroidPipesComm.SendMessage(AndroidPipesComm.amkUICommand, amkUI_TTextView_OnClickListener_Start_3); - Integer lTag = (Integer) ViewElementsTags.get(ViewElements.indexOf(v)); - MyAndroidPipesComm.SendInt(lTag.intValue()); - MyAndroidPipesComm.WaitForPascalMessage(AndroidPipesComm.amkUICommand, amkUI_TTextView_OnClickListener_Finished_4); - DebugOut("END View.OnClickListener"); - } - } -); - MyAndroidPipesComm.SendResult(); - break; // method void setTextSize(int unit_; float size); - case amkUI_TTextView_setTextSize_5: - DebugOut("amkUI_TTextView_setTextSize_5"); + case amkUI_TTextView_setTextSize_3: + DebugOut("amkUI_TTextView_setTextSize_3"); // Self lInt = MyAndroidPipesComm.GetInt(); param_self_TextView = (TextView) ViewElements.get(lInt); @@ -684,17 +695,6 @@ public class AndroidAll param_self_TextView.setTextSize(lint_1, lfloat_2); MyAndroidPipesComm.SendResult(); break; - // method CharSequence getText() - case amkUI_TTextView_getText_6: - DebugOut("amkUI_TTextView_getText_6"); - // Self - lInt = MyAndroidPipesComm.GetInt(); - param_self_TextView = (TextView) ViewElements.get(lInt); - // params - // - lResult_CharSequence = param_self_TextView.getText(); - MyAndroidPipesComm.SendStringResult(lResult_CharSequence); - break; case amkUI_TEditText_Create_0: DebugOut("amkUI_TEditText_Create_0"); ViewElements.add(new EditText(activity)); diff --git a/examples/androidlcl/mainform.lfm b/examples/androidlcl/mainform.lfm index a06e80bea..b5110cd83 100644 --- a/examples/androidlcl/mainform.lfm +++ b/examples/androidlcl/mainform.lfm @@ -1,16 +1,16 @@ object Form2: TForm2 Left = 181 - Height = 240 + Height = 276 Top = 137 Width = 320 Caption = 'Form2' - ClientHeight = 240 + ClientHeight = 276 ClientWidth = 320 LCLVersion = '0.9.31' object Button1: TButton Left = 33 Height = 25 - Top = 35 + Top = 48 Width = 87 Caption = 'Button1' OnClick = Button1Click @@ -19,7 +19,7 @@ object Form2: TForm2 object CheckBox1: TCheckBox Left = 33 Height = 21 - Top = 88 + Top = 101 Width = 94 Caption = 'CheckBox1' TabOrder = 1 @@ -27,7 +27,7 @@ object Form2: TForm2 object Edit1: TEdit Left = 33 Height = 25 - Top = 144 + Top = 157 Width = 99 TabOrder = 2 Text = 'Edit1' @@ -35,7 +35,7 @@ object Form2: TForm2 object StaticText1: TStaticText Left = 147 Height = 17 - Top = 36 + Top = 49 Width = 65 Caption = 'StaticText1' TabOrder = 3 @@ -43,7 +43,7 @@ object Form2: TForm2 object ComboBox1: TComboBox Left = 136 Height = 27 - Top = 88 + Top = 101 Width = 112 ItemHeight = 0 Items.Strings = ( @@ -57,7 +57,7 @@ object Form2: TForm2 object Edit2: TEdit Left = 147 Height = 25 - Top = 144 + Top = 157 Width = 80 TabOrder = 5 Text = 'Edit2' @@ -65,7 +65,7 @@ object Form2: TForm2 object Button2: TButton Left = 35 Height = 25 - Top = 186 + Top = 199 Width = 75 Caption = 'InputBox' OnClick = Button2Click diff --git a/examples/androidlcl/mainform.pas b/examples/androidlcl/mainform.pas index da8e07cab..ec31e093e 100644 --- a/examples/androidlcl/mainform.pas +++ b/examples/androidlcl/mainform.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, - StdCtrls; + StdCtrls, DbCtrls, ExtCtrls, InterfaceBase; type @@ -33,10 +33,6 @@ var implementation -{$ifdef LCLAndroid} -uses androidpipescomm; -{$endif} - { TForm2 } procedure TForm2.Button1Click(Sender: TObject); @@ -47,19 +43,13 @@ begin if CheckBox1.Checked then lChecked := 'True' else lChecked := 'False'; - {$ifdef LCLAndroid} - vAndroidPipesComm.Log('3'); - {$endif} + WidgetSet.DebugLogLn('3'); lEdit1Text := Edit1.Text; - {$ifdef LCLAndroid} - vAndroidPipesComm.Log('4'); - {$endif} + WidgetSet.DebugLogLn('4'); lComboBox := IntToStr(ComboBox1.ItemIndex); - {$ifdef LCLAndroid} - vAndroidPipesComm.Log('5'); - {$endif} + WidgetSet.DebugLogLn('5'); Edit2.Text := 'Edit1.Text='+lEdit1Text+LineEnding+ @@ -72,13 +62,9 @@ end; procedure TForm2.Button2Click(Sender: TObject); begin - {$ifdef LCLAndroid} - vAndroidPipesComm.Log('TForm2.Button2Click'); - {$endif} + WidgetSet.DebugLogLn('TForm2.Button2Click'); InputBox('Caption', 'Prompt', 'Default'); - {$ifdef LCLAndroid} - vAndroidPipesComm.Log('TForm2.Button2Click'); - {$endif} + WidgetSet.DebugLogLn('TForm2.Button2Click 2'); end; initialization