Skip to content

Commit 98e581c

Browse files
rareMaximrareMaxim
committed
Некоторые типы теперь в виде Enum'ов вместо строки. Поля в которых хранилось время в виде Unix - теперь TDateTime.
1 parent b5572e5 commit 98e581c

12 files changed

+403
-130
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ __recovery/
7373
Demo/token.inc
7474
Demo/freelance/
7575
Install/TTelegramBot.dcr
76+
Demo/EchoBot/Android/

‎Demo/EchoBot/EchoBot.deployproj‎

Lines changed: 83 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
<ProjectFileVersion>12</ProjectFileVersion>
55
</ProjectExtensions>
66
<PropertyGroup>
7-
<DeviceId Condition="'$(Platform)'=='Android'">8c91d16a7d24</DeviceId>
7+
<DeviceId Condition="'$(Platform)'=='Android'"/>
8+
<DeviceId Condition="'$(Platform)'=='iOSDevice32'"/>
9+
<DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
10+
<DeviceId Condition="'$(Platform)'=='iOSSimulator'"/>
811
</PropertyGroup>
12+
<ItemGroup Condition="'$(Platform)'=='iOSDevice64'"/>
13+
<ItemGroup Condition="'$(Platform)'=='Win64'"/>
14+
<ItemGroup Condition="'$(Platform)'=='iOSDevice32'"/>
915
<ItemGroup Condition="'$(Platform)'=='Win32'">
1016
<DeployFile Include="Win32\Debug\EchoBot.exe" Condition="'$(Config)'=='Debug'">
1117
<RemoteDir>EchoBot\</RemoteDir>
@@ -18,8 +24,26 @@
1824
<Required>True</Required>
1925
</DeployFile>
2026
</ItemGroup>
21-
<ItemGroup Condition="'$(Platform)'=='Win64'"/>
22-
<ItemGroup Condition="'$(Platform)'=='Linux64'"/>
27+
<ItemGroup Condition="'$(Platform)'=='OSX32'">
28+
<DeployFile Include="$(BDS)\Redist\osx32\libcgsqlite3.dylib">
29+
<RemoteDir>EchoBot.app\Contents\MacOS\</RemoteDir>
30+
<RemoteName>libcgsqlite3.dylib</RemoteName>
31+
<DeployClass>DependencyModule</DeployClass>
32+
<Operation>1</Operation>
33+
<LocalCommand/>
34+
<RemoteCommand/>
35+
<Overwrite>True</Overwrite>
36+
</DeployFile>
37+
<DeployFile Include="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib">
38+
<RemoteDir>EchoBot.app\Contents\MacOS\</RemoteDir>
39+
<RemoteName>libcgunwind.1.0.dylib</RemoteName>
40+
<DeployClass>DependencyModule</DeployClass>
41+
<Operation>1</Operation>
42+
<LocalCommand/>
43+
<RemoteCommand/>
44+
<Overwrite>True</Overwrite>
45+
</DeployFile>
46+
</ItemGroup>
2347
<ItemGroup Condition="'$(Platform)'=='Android'">
2448
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Condition="'$(Config)'=='Debug'">
2549
<RemoteDir>EchoBot\res\drawable-ldpi\</RemoteDir>
@@ -30,10 +54,10 @@
3054
<RemoteCommand/>
3155
<Overwrite>True</Overwrite>
3256
</DeployFile>
33-
<DeployFile Include="Android\Debug\AndroidManifest.xml" Condition="'$(Config)'=='Debug'">
34-
<RemoteDir>EchoBot\</RemoteDir>
35-
<RemoteName>AndroidManifest.xml</RemoteName>
36-
<DeployClass>ProjectAndroidManifest</DeployClass>
57+
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png" Condition="'$(Config)'=='Debug'">
58+
<RemoteDir>EchoBot\res\drawable-xxhdpi\</RemoteDir>
59+
<RemoteName>ic_launcher.png</RemoteName>
60+
<DeployClass>Android_LauncherIcon144</DeployClass>
3761
<Operation>1</Operation>
3862
<LocalCommand/>
3963
<RemoteCommand/>
@@ -57,24 +81,14 @@
5781
<RemoteCommand/>
5882
<Overwrite>True</Overwrite>
5983
</DeployFile>
60-
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png" Condition="'$(Config)'=='Debug'">
61-
<RemoteDir>EchoBot\res\drawable-xxhdpi\</RemoteDir>
62-
<RemoteName>ic_launcher.png</RemoteName>
63-
<DeployClass>Android_LauncherIcon144</DeployClass>
64-
<Operation>1</Operation>
65-
<LocalCommand/>
66-
<RemoteCommand/>
67-
<Overwrite>True</Overwrite>
68-
</DeployFile>
69-
<DeployFile Include="Android\Debug\libEchoBot.so" Condition="'$(Config)'=='Debug'">
70-
<RemoteDir>EchoBot\library\lib\armeabi-v7a\</RemoteDir>
71-
<RemoteName>libEchoBot.so</RemoteName>
72-
<DeployClass>ProjectOutput</DeployClass>
84+
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Condition="'$(Config)'=='Debug'">
85+
<RemoteDir>EchoBot\res\drawable-normal\</RemoteDir>
86+
<RemoteName>splash_image.png</RemoteName>
87+
<DeployClass>Android_SplashImage470</DeployClass>
7388
<Operation>1</Operation>
7489
<LocalCommand/>
7590
<RemoteCommand/>
7691
<Overwrite>True</Overwrite>
77-
<Required>True</Required>
7892
</DeployFile>
7993
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Condition="'$(Config)'=='Debug'">
8094
<RemoteDir>EchoBot\res\drawable-small\</RemoteDir>
@@ -85,19 +99,19 @@
8599
<RemoteCommand/>
86100
<Overwrite>True</Overwrite>
87101
</DeployFile>
88-
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Condition="'$(Config)'=='Debug'">
89-
<RemoteDir>EchoBot\res\drawable-normal\</RemoteDir>
102+
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Condition="'$(Config)'=='Debug'">
103+
<RemoteDir>EchoBot\res\drawable-large\</RemoteDir>
90104
<RemoteName>splash_image.png</RemoteName>
91-
<DeployClass>Android_SplashImage470</DeployClass>
105+
<DeployClass>Android_SplashImage640</DeployClass>
92106
<Operation>1</Operation>
93107
<LocalCommand/>
94108
<RemoteCommand/>
95109
<Overwrite>True</Overwrite>
96110
</DeployFile>
97-
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Condition="'$(Config)'=='Debug'">
98-
<RemoteDir>EchoBot\res\drawable-large\</RemoteDir>
111+
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png" Condition="'$(Config)'=='Debug'">
112+
<RemoteDir>EchoBot\res\drawable-xlarge\</RemoteDir>
99113
<RemoteName>splash_image.png</RemoteName>
100-
<DeployClass>Android_SplashImage640</DeployClass>
114+
<DeployClass>Android_SplashImage960</DeployClass>
101115
<Operation>1</Operation>
102116
<LocalCommand/>
103117
<RemoteCommand/>
@@ -112,14 +126,24 @@
112126
<RemoteCommand/>
113127
<Overwrite>True</Overwrite>
114128
</DeployFile>
115-
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png" Condition="'$(Config)'=='Debug'">
116-
<RemoteDir>EchoBot\res\drawable-xlarge\</RemoteDir>
117-
<RemoteName>splash_image.png</RemoteName>
118-
<DeployClass>Android_SplashImage960</DeployClass>
129+
<DeployFile Include="Android\Debug\AndroidManifest.xml" Condition="'$(Config)'=='Debug'">
130+
<RemoteDir>EchoBot\</RemoteDir>
131+
<RemoteName>AndroidManifest.xml</RemoteName>
132+
<DeployClass>ProjectAndroidManifest</DeployClass>
133+
<Operation>1</Operation>
134+
<LocalCommand/>
135+
<RemoteCommand/>
136+
<Overwrite>True</Overwrite>
137+
</DeployFile>
138+
<DeployFile Include="Android\Debug\libEchoBot.so" Condition="'$(Config)'=='Debug'">
139+
<RemoteDir>EchoBot\library\lib\armeabi-v7a\</RemoteDir>
140+
<RemoteName>libEchoBot.so</RemoteName>
141+
<DeployClass>ProjectOutput</DeployClass>
119142
<Operation>1</Operation>
120143
<LocalCommand/>
121144
<RemoteCommand/>
122145
<Overwrite>True</Overwrite>
146+
<Required>True</Required>
123147
</DeployFile>
124148
<DeployFile Include="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png" Condition="'$(Config)'=='Debug'">
125149
<RemoteDir>EchoBot\res\drawable-mdpi\</RemoteDir>
@@ -139,19 +163,19 @@
139163
<RemoteCommand/>
140164
<Overwrite>True</Overwrite>
141165
</DeployFile>
142-
<DeployFile Include="Android\Debug\classes.dex" Condition="'$(Config)'=='Debug'">
143-
<RemoteDir>EchoBot\classes\</RemoteDir>
144-
<RemoteName>classes.dex</RemoteName>
145-
<DeployClass>AndroidClassesDexFile</DeployClass>
166+
<DeployFile Include="$(NDKBasePath)\prebuilt\android-arm\gdbserver\gdbserver" Condition="'$(Config)'=='Debug'">
167+
<RemoteDir>EchoBot\library\lib\armeabi-v7a\</RemoteDir>
168+
<RemoteName>gdbserver</RemoteName>
169+
<DeployClass>AndroidGDBServer</DeployClass>
146170
<Operation>1</Operation>
147171
<LocalCommand/>
148172
<RemoteCommand/>
149173
<Overwrite>True</Overwrite>
150174
</DeployFile>
151-
<DeployFile Include="$(NDKBasePath)\prebuilt\android-arm\gdbserver\gdbserver" Condition="'$(Config)'=='Debug'">
152-
<RemoteDir>EchoBot\library\lib\armeabi-v7a\</RemoteDir>
153-
<RemoteName>gdbserver</RemoteName>
154-
<DeployClass>AndroidGDBServer</DeployClass>
175+
<DeployFile Include="Android\Debug\classes.dex" Condition="'$(Config)'=='Debug'">
176+
<RemoteDir>EchoBot\classes\</RemoteDir>
177+
<RemoteName>classes.dex</RemoteName>
178+
<DeployClass>AndroidClassesDexFile</DeployClass>
155179
<Operation>1</Operation>
156180
<LocalCommand/>
157181
<RemoteCommand/>
@@ -176,4 +200,24 @@
176200
<Overwrite>True</Overwrite>
177201
</DeployFile>
178202
</ItemGroup>
203+
<ItemGroup Condition="'$(Platform)'=='iOSSimulator'">
204+
<DeployFile Include="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib">
205+
<RemoteDir>EchoBot.app\</RemoteDir>
206+
<RemoteName>libcgunwind.1.0.dylib</RemoteName>
207+
<DeployClass>DependencyModule</DeployClass>
208+
<Operation>1</Operation>
209+
<LocalCommand/>
210+
<RemoteCommand/>
211+
<Overwrite>True</Overwrite>
212+
</DeployFile>
213+
<DeployFile Include="$(BDS)\Redist\iossimulator\libPCRE.dylib">
214+
<RemoteDir>EchoBot.app\</RemoteDir>
215+
<RemoteName>libPCRE.dylib</RemoteName>
216+
<DeployClass>DependencyModule</DeployClass>
217+
<Operation>1</Operation>
218+
<LocalCommand/>
219+
<RemoteCommand/>
220+
<Overwrite>True</Overwrite>
221+
</DeployFile>
222+
</ItemGroup>
179223
</Project>

‎Demo/EchoBot/EchoBot.dpr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ program EchoBot;
33
uses
44
System.StartUpCopy,
55
FMX.Forms,
6-
Unit3 in 'Unit3.pas' {Form3};
6+
EchoBot.Main in 'EchoBot.Main.pas' {Main};
77

88
{$R *.res}
99

1010
begin
1111
Application.Initialize;
12-
Application.CreateForm(TForm3, Form3);
12+
Application.CreateForm(TMain, Main);
1313
Application.Run;
1414
end.

0 commit comments

Comments
 (0)