Changeset 4

Timestamp:

Aug 24, 2019, 12:56:52 PM (5 years ago)

Author:

chronos

Message:

• Modified: Moved call history loading to API class.

Files:

• (root) (modified) (1 prop)
• trunk (modified) (1 prop)
• trunk/OdorikApi.identcache (deleted)
• trunk/OdorikApi.stat (deleted)
• trunk/UFormCalls.fmx (modified) (1 diff)
• trunk/UFormCalls.pas (modified) (3 diffs)
• trunk/UOdorikApi.pas (modified) (3 diffs)

trunk

@@ -3 +3 @@
 __recovery
 __history
+OdorikApi.dproj.local

@@ -3 +3 @@
 __recovery
 __history
+OdorikApi.dproj.local

trunk/UFormCalls.fmx

@@ -62 +62 @@
       ExplicitSize.cx = 98.000000000000000000
       ExplicitSize.cy = 49.000000000000000000
-      object ListView1: TListView
-        ItemAppearanceClassName = 'TListItemAppearance'
-        ItemEditAppearanceClassName = 'TListItemShowCheckAppearance'
-        HeaderAppearanceClassName = 'TListHeaderObjects'
-        FooterAppearanceClassName = 'TListHeaderObjects'
+      object ListBox1: TListBox
         Align = Client
-        Margins.Left = 10.000000000000000000
-        Margins.Top = 10.000000000000000000
-        Margins.Right = 10.000000000000000000
-        Margins.Bottom = 10.000000000000000000
-        Size.Width = 276.000000000000000000
-        Size.Height = 317.000000000000000000
+        Size.Width = 296.000000000000000000
+        Size.Height = 337.000000000000000000
         Size.PlatformDefault = False
         TabOrder = 0
+        DisableFocusEffect = True
+        DefaultItemStyles.ItemStyle = ''
+        DefaultItemStyles.GroupHeaderStyle = ''
+        DefaultItemStyles.GroupFooterStyle = ''
+        Viewport.Width = 296.000000000000000000
+        Viewport.Height = 337.000000000000000000
       end
     end

trunk/UFormCalls.pas

@@ -8 +8 @@
   FMX.ListView.Types, FMX.ListView.Appearances, FMX.ListView.Adapters.Base,
   FMX.ListView, FMX.TabControl, FMX.StdCtrls, FMX.Controls.Presentation,
-  System.DateUtils, System.TimeSpan, System.JSON;
+  System.DateUtils, System.TimeSpan, System.JSON, Generics.Collections,
+  UOdorikApi, FMX.Layouts, FMX.ListBox;
 
 type
@@ -19 +20 @@
     TabItemActive: TTabItem;
     TabItemStatistics: TTabItem;
-    ListView1: TListView;
+    ListBox1: TListBox;
     procedure SpeedButtonBackClick(Sender: TObject);
     procedure TabControl1Change(Sender: TObject);
@@ -50 +51 @@
 end;
 
-function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
-const
-  Neg: array[Boolean] of string = ('+', '-');
-var
-  Bias: Integer;
-begin
-  Result := FormatDateTime('yyyy''-''mm''-''dd''T''hh'':''nn'':''ss''.''zzz', Value); { Do not localize }
-  Bias := Trunc(TTimeZone.Local.GetUtcOffset(Value).TotalMinutes);
-  if (Bias <> 0) and ApplyLocalBias then
-  begin
-    Result := Format('%s%s%.2d:%.2d', [Result, Neg[Bias > 0],                         { Do not localize }
-                                       Abs(Bias) div MinsPerHour,
-                                       Abs(Bias) mod MinsPerHour]);
-  end else
-    Result := Result + 'Z'; { Do not localize }
-end;
-
 procedure TFormCalls.TabControl1Change(Sender: TObject);
 var
-  Response: string;
   IntervalFrom: TDateTime;
   IntervalTo: TDateTime;
   ListViewItem: TListViewItem;
-  Lines: TArray<string>;
-  I: Integer;
-  LJsonResponse: TJSONValue;
-  jv: TJSONValue;
-  joName: TJSONObject;
+  Call: TCall;
+  CallHistory: TList<TCall>;
 begin
   ListView1.Items.Clear;
   IntervalTo := Now;
   IntervalFrom := IntervalTo - OneHour * 24;
-  Response := FormMain.OdorikApi.SendGet('/calls.json', 'from=' + DateTimeToXMLTime(IntervalFrom) +
-    '&to=' + DateTimeToXMLTime(IntervalTo));
-  LJsonResponse := TJSONObject.ParseJSONValue(Response);
-  for jv in LJsonResponse as TJSONArray do begin
-    joName := jv as TJSONObject;
+  CallHistory := FormMain.OdorikApi.GetCallHistory(IntervalFrom, IntervalTo);
+  for Call in CallHistory do begin
     ListViewItem := ListView1.Items.Add;
-    ListViewItem.Text := joName.Get('source_number').JSONValue.Value;
+    ListViewItem.Text := Call.SourceNumber;
   end;
 end;

trunk/UOdorikApi.pas

@@ -4 +4 @@
 
 uses
-  System.SysUtils, System.Types, System.Classes, IdHTTP
+  System.SysUtils, System.Types, System.Classes, Generics.Collections, IdHTTP
   {$IFDEF ANDROID},IdSSLOpenSSLHeaders{$endif}, IdIOHandler, IdIOHandlerSocket,
-  IdIOHandlerStack, IdSSL, IdSSLOpenSSL;
+  IdIOHandlerStack, IdSSL, IdSSLOpenSSL, System.DateUtils, System.TimeSpan,
+  System.JSON;
 
 type
+  TCall = class
+    Oid: Integer;
+    RedirectionParentId: Integer;
+    Date: TDateTime;
+    Direction: string;
+    SourceNumber: string;
+    DestinatioNumber: string;
+    DestinationName: string;
+    Length: Integer;
+    RingingLength: Integer;
+    Status: string;
+    Price: Currency;
+    PricePerMinute: Currency;
+    BalanceAfter: Currency;
+    Line: Integer;
+    Recording: string;
+  end;
+
   TOdorikApi = class(TComponent)
   private
@@ -17 +36 @@
     Password: string;
     ServerUrl: string;
-    function GetCredit: Double;
+    function GetCredit: Currency;
     function SendGet(Path: string; Parameters: string = ''): string;
+    function GetCallHistory(TimeFrom, TimeTo: TDateTime): TList<TCall>;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -53 +73 @@
 end;
 
-function TOdorikApi.GetCredit: Double;
+function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
+const
+  Neg: array[Boolean] of string = ('+', '-');
+var
+  Bias: Integer;
+begin
+  Result := FormatDateTime('yyyy''-''mm''-''dd''T''hh'':''nn'':''ss''.''zzz', Value); { Do not localize }
+  Bias := Trunc(TTimeZone.Local.GetUtcOffset(Value).TotalMinutes);
+  if (Bias <> 0) and ApplyLocalBias then
+  begin
+    Result := Format('%s%s%.2d:%.2d', [Result, Neg[Bias > 0],                         { Do not localize }
+                                       Abs(Bias) div MinsPerHour,
+                                       Abs(Bias) mod MinsPerHour]);
+  end else
+    Result := Result + 'Z'; { Do not localize }
+end;
+
+function TOdorikApi.GetCallHistory(TimeFrom, TimeTo: TDateTime): TList<TCall>;
+var
+  Response: string;
+  LJsonResponse: TJSONValue;
+  jv: TJSONValue;
+  joName: TJSONObject;
+  Call: TCall;
+begin
+  Result := TList<TCall>.Create;
+  Response := SendGet('/calls.json', 'from=' + DateTimeToXMLTime(TimeFrom) +
+    '&to=' + DateTimeToXMLTime(TimeTo));
+  LJsonResponse := TJSONObject.ParseJSONValue(Response);
+  for jv in LJsonResponse as TJSONArray do begin
+    joName := jv as TJSONObject;
+    Call := TCall.Create;
+    Call.SourceNumber := joName.Get('source_number').JSONValue.Value;
+    Call.DestinatioNumber := joName.Get('destination_number').JSONValue.Value;
+    Result.Add(Call);
+  end;
+end;
+
+function TOdorikApi.GetCredit: Currency;
 var
   Response: string;

@@ -3 +3 @@
 __recovery
 __history
+OdorikApi.dproj.local