Changeset 3

Timestamp:

Aug 24, 2019, 10:44:11 AM (5 years ago)

Author:

chronos

Message:

• Modified: Odorik API moved to separate unit UOdorikApi.pas.

Location:

trunk

Files:

• . (modified) (1 prop)
• OdorikApi.dpr (modified) (1 diff)
• OdorikApi.dproj (modified) (4 diffs)
• OdorikApi.dproj.local (deleted)
• OdorikApi.pas (added)
• OdorikApi.res (modified) ( previous)
• UFormCalls.fmx (modified) (4 diffs)
• UFormCalls.pas (modified) (1 diff)
• UFormMain.fmx (modified) (3 diffs)
• UFormMain.pas (modified) (11 diffs)
• UFormSettings.pas (modified) (3 diffs)
• UOdorikApi.pas (added)

trunk/OdorikApi.dpr

@@ -6 +6 @@
   UFormMain in 'UFormMain.pas' {FormMain},
   UFormSettings in 'UFormSettings.pas' {FormSettings},
-  UFormCalls in 'UFormCalls.pas' {FormCalls};
+  UFormCalls in 'UFormCalls.pas' {FormCalls},
+  UOdorikApi in 'UOdorikApi.pas';
 
 {$R *.res}

trunk/OdorikApi.dproj

@@ -7 +7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Android</Platform>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>19</TargetedPlatforms>
         <AppType>Application</AppType>
@@ -169 +169 @@
             <FormType>fmx</FormType>
         </DCCReference>
+        <DCCReference Include="UOdorikApi.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
@@ -197 +198 @@
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="libeay32.dll" Configuration="Debug" Class="File">
+                    <Platform Name="Win32">
+                        <RemoteName>libeay32.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Debug" Class="Android_LauncherIcon72">
                     <Platform Name="Android">
@@ -333 +340 @@
                     <Platform Name="Android">
                         <RemoteName>ic_launcher.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="ssleay32.dll" Configuration="Debug" Class="File">
+                    <Platform Name="Win32">
+                        <RemoteName>ssleay32.dll</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>

trunk/UFormCalls.fmx

@@ -28 +28 @@
       Size.Height = 48.000000000000000000
       Size.PlatformDefault = False
-      Text = 'Settings'
+      Text = 'Calls'
       TabOrder = 1
     end
@@ -60 +60 @@
       TabOrder = 0
       Text = 'History'
+      ExplicitSize.cx = 98.000000000000000000
+      ExplicitSize.cy = 49.000000000000000000
       object ListView1: TListView
         ItemAppearanceClassName = 'TListItemAppearance'
@@ -87 +89 @@
       TabOrder = 0
       Text = 'Active'
+      ExplicitSize.cx = 98.000000000000000000
+      ExplicitSize.cy = 49.000000000000000000
     end
     object TabItemStatistics: TTabItem
@@ -99 +103 @@
       TabOrder = 0
       Text = 'Statistics'
+      ExplicitSize.cx = 100.000000000000000000
+      ExplicitSize.cy = 49.000000000000000000
     end
   end

trunk/UFormCalls.pas

@@ -82 +82 @@
   IntervalTo := Now;
   IntervalFrom := IntervalTo - OneHour * 24;
-  Response := FormMain.SendGet('/calls.json', 'from=' + DateTimeToXMLTime(IntervalFrom) +
+  Response := FormMain.OdorikApi.SendGet('/calls.json', 'from=' + DateTimeToXMLTime(IntervalFrom) +
     '&to=' + DateTimeToXMLTime(IntervalTo));
   LJsonResponse := TJSONObject.ParseJSONValue(Response);

trunk/UFormMain.fmx

@@ -57 +57 @@
     end
   end
+  object Timer1: TTimer
+    OnTimer = Timer1Timer
+    Left = 328
+    Top = 344
+  end
   object MultiView1: TMultiView
     MasterButton = SpeedButtonMenu
@@ -64 +69 @@
     Size.Height = 473.000000000000000000
     Size.PlatformDefault = False
+    Visible = False
     TabOrder = 0
     object Rectangle1: TRectangle
@@ -124 +130 @@
     end
   end
-  object IdHTTP1: TIdHTTP
-    IOHandler = IdSSLIOHandlerSocketOpenSSL1
-    AllowCookies = True
-    ProxyParams.BasicAuthentication = False
-    ProxyParams.ProxyPort = 0
-    Request.ContentLength = -1
-    Request.ContentRangeEnd = -1
-    Request.ContentRangeStart = -1
-    Request.ContentRangeInstanceLength = -1
-    Request.Accept = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
-    Request.BasicAuthentication = False
-    Request.UserAgent = 'Mozilla/3.0 (compatible; Indy Library)'
-    Request.Ranges.Units = 'bytes'
-    Request.Ranges = <>
-    HTTPOptions = [hoForceEncodeParams]
-    Left = 192
-    Top = 336
-  end
-  object Timer1: TTimer
-    OnTimer = Timer1Timer
-    Left = 328
-    Top = 344
-  end
-  object IdSSLIOHandlerSocketOpenSSL1: TIdSSLIOHandlerSocketOpenSSL
-    MaxLineAction = maException
-    Port = 0
-    DefaultPort = 0
-    SSLOptions.Mode = sslmUnassigned
-    SSLOptions.VerifyMode = []
-    SSLOptions.VerifyDepth = 0
-    Left = 192
-    Top = 280
-  end
 end

trunk/UFormMain.pas

@@ -7 +7 @@
   FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.StdCtrls,
   FMX.Layouts, FMX.Objects, FMX.Controls.Presentation, FMX.MultiView, IniFiles,
-  System.IOUtils, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
-  IdHTTP{$IFDEF ANDROID},IdSSLOpenSSLHeaders{$endif}, IdIOHandler, IdIOHandlerSocket,
-  IdIOHandlerStack, IdSSL, IdSSLOpenSSL;
+  System.IOUtils, UOdorikApi;
 
 type
@@ -23 +21 @@
     VertScrollBox2: TVertScrollBox;
     LabelCredit: TLabel;
-    IdHTTP1: TIdHTTP;
     Timer1: TTimer;
-    IdSSLIOHandlerSocketOpenSSL1: TIdSSLIOHandlerSocketOpenSSL;
     RectangleCalls: TRectangle;
     Label1: TLabel;
@@ -31 +27 @@
     procedure FormCreate(Sender: TObject);
     procedure FormSaveState(Sender: TObject);
-    procedure ButtonReloadCreditClick(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -38 +33 @@
     { Private declarations }
   public
-    UserName: string;
-    Password: string;
-    ServerUrl: string;
+    OdorikApi: TOdorikApi;
     Credit: Double;
     ConfigFileName: string;
@@ -46 +39 @@
     procedure LoadConfig;
     procedure SaveConfig;
-    procedure GetCredit;
-    function SendGet(Path: string; Parameters: string = ''): string;
   end;
 
@@ -61 +52 @@
   UFormSettings, UFormCalls;
 
-procedure TFormMain.ButtonReloadCreditClick(Sender: TObject);
-begin
-  GetCredit;
-end;
-
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
-  {$IFDEF ANDROID}
-  IdOpenSSLSetLibPath(System.IOUtils.TPath.GetDocumentsPath);
-  {$ENDIF}
+  OdorikApi := TOdorikApi.Create(nil);
   ConfigFileName := TPath.Combine(TPath.GetHomePath, 'OdorikApi.ini');
   LoadConfig;
@@ -85 +69 @@
     procedure
     begin
-      GetCredit;
+      Credit := OdorikApi.GetCredit;
     end).Start;
-end;
-
-procedure TFormMain.GetCredit;
-var
-  Response: string;
-  Value: Extended;
-begin
-  Response := SendGet('/balance');
-  if Response <> '' then begin
-    Response := StringReplace(Response, '.', FormatSettings.DecimalSeparator, [rfReplaceAll]);
-    if TryStrToFloat(Response, Value) then
-      Credit := Value
-      else Credit := 0;
-  end else Credit := 0;
 end;
 
@@ -110 +80 @@
   with IniFile do
   try
-    UserName := ReadString('General', 'UserName', '');
-    Password := ReadString('General', 'Password', '');
-    ServerUrl := ReadString('General', 'ServerUrl', 'https://www.odorik.cz/api/v1');
+    OdorikApi.UserName := ReadString('General', 'UserName', '');
+    OdorikApi.Password := ReadString('General', 'Password', '');
+    OdorikApi.ServerUrl := ReadString('General', 'ServerUrl', 'https://www.odorik.cz/api/v1');
   finally
     IniFile.Free;
@@ -137 +107 @@
   with IniFile do
   try
-    WriteString('General', 'UserName', UserName);
-    WriteString('General', 'Password', Password);
-    WriteString('General', 'ServerUrl', ServerUrl);
+    WriteString('General', 'UserName', OdorikApi.UserName);
+    WriteString('General', 'Password', OdorikApi.Password);
+    WriteString('General', 'ServerUrl', OdorikApi.ServerUrl);
   finally
     IniFile.Free;
@@ -145 +115 @@
 end;
 
-function TFormMain.SendGet(Path: string; Parameters: string = ''): string;
-var
-  Url: string;
-begin
-  if (ServerUrl <> '') and (UserName <> '') and (Password <> '') then begin
-    Url := ServerUrl + Path + '?user=' + UserName + '&password=' + Password;
-    if Parameters <> '' then Url := Url + '&' + Parameters;
-    Result := IdHTTP1.Get(Url);
-  end else Result := '';
-end;
 
 procedure TFormMain.Timer1Timer(Sender: TObject);
@@ -160 +120 @@
   if ReloadPending then begin
     ReloadPending := False;
-    GetCredit;
+    Credit := OdorikApi.GetCredit;
   end;
   LabelCredit.Text := 'Credit: ' + FloatToStr(Credit) + ' Kè';

trunk/UFormSettings.pas

@@ -57 +57 @@
 begin
   if AResult = mrOk then
-    FormMain.Password := AValues[0];
+    FormMain.OdorikApi.Password := AValues[0];
 end;
 
 procedure TFormSettings.RectanglePasswordClick(Sender: TObject);
 begin
-  TDialogService.InputQuery('Password', ['Password'], [FormMain.Password], PasswordQuery);
+  TDialogService.InputQuery('Password', ['Password'], [FormMain.OdorikApi.Password], PasswordQuery);
 end;
 
 procedure TFormSettings.RectangleServerUrlClick(Sender: TObject);
 begin
-  TDialogService.InputQuery('Server URL', ['Server URL'], [FormMain.ServerUrl], ServerUrlQuery);
+  TDialogService.InputQuery('Server URL', ['Server URL'], [FormMain.OdorikApi.ServerUrl], ServerUrlQuery);
 end;
 
 procedure TFormSettings.RectangleUserNameClick(Sender: TObject);
 begin
-  TDialogService.InputQuery('User name', ['User name'], [FormMain.UserName], UserNameQuery);
+  TDialogService.InputQuery('User name', ['User name'], [FormMain.OdorikApi.UserName], UserNameQuery);
 end;
 
@@ -79 +79 @@
 begin
   if AResult = mrOk then
-    FormMain.ServerUrl := AValues[0];
+    FormMain.OdorikApi.ServerUrl := AValues[0];
 end;
 
@@ -91 +91 @@
 begin
   if AResult = mrOk then
-    FormMain.UserName := AValues[0];
+    FormMain.OdorikApi.UserName := AValues[0];
 end;