Changeset 3 for trunk/UFormMain.pas

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)
• UFormMain.pas (modified) (11 diffs)

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è';