Revisión | 8 (tree) |
---|---|
Tiempo | 2019-11-12 11:48:39 |
Autor | derekwildstar |
Correção no método que atualiza o usuário
@@ -1,7 +1,7 @@ | ||
1 | 1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | 2 | <PropertyGroup> |
3 | 3 | <ProjectGuid>{1A2D6B31-BE24-4483-B88E-35711462F427}</ProjectGuid> |
4 | - <ProjectVersion>18.4</ProjectVersion> | |
4 | + <ProjectVersion>18.7</ProjectVersion> | |
5 | 5 | <FrameworkType>VCL</FrameworkType> |
6 | 6 | <MainSource>InstaLikes.dpr</MainSource> |
7 | 7 | <Base>True</Base> |
@@ -60,7 +60,10 @@ | ||
60 | 60 | <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150> |
61 | 61 | <SanitizedProjectName>InstaLikes</SanitizedProjectName> |
62 | 62 | <VerInfo_Locale>1046</VerInfo_Locale> |
63 | - <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> | |
63 | + <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=3.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> | |
64 | + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> | |
65 | + <VerInfo_MajorVer>3</VerInfo_MajorVer> | |
66 | + <VerInfo_AutoGenVersion>true</VerInfo_AutoGenVersion> | |
64 | 67 | </PropertyGroup> |
65 | 68 | <PropertyGroup Condition="'$(Base_Win32)'!=''"> |
66 | 69 | <DCC_UsePackage>DBXSqliteDriver;DBXInterBaseDriver;vclactnband;vclFireDAC;tethering;svnui;dclRBDBE1925;FireDACADSDriver;rbRIDE1925;vcltouch;vcldb;bindcompfmx;svn;inetdb;KRKOTANotifiersR;rbTC1925;FmxTeeUI;rbIDE1925;fmx;fmxdae;dbexpress;IndyCore;vclx;dsnap;VCLRESTComponents;rbTCUI1925;rbFireDAC1925;PNGComponentsR;rbRTL1925;rbDB1925;vclie;bindengine;DBXMySQLDriver;dclRBFireDAC1925;FireDACMySQLDriver;FireDACCommonODBC;dclRBE1925;rbRCL1925;UIRibbonPackageDR;IndyIPCommon;bindcompdbx;vcl;IndyIPServer;TBGWebCharts;IndySystem;dsnapcon;rbDBE1925;FireDACMSAccDriver;fmxFireDAC;vclimg;TeeDB;FireDACPgDriver;FMXTee;DbxCommonDriver;rbUSER1925;rbDIDE1925;rbADO1925;Tee;rbRest1925;xmlrtl;rbUSERDesign1925;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;rbRAP1925;bindcomp;appanalytics;rbDAD1925;IndyIPClient;rbBDE1925;bindcompvcl;TeeUI;rbCIDE1925;dbxcds;VclSmp;adortl;FireDACConnR;UserControlR;dsnapxml;dclRBADO1925;dbrtl;IndyProtocols;inetdbxpress;fmxase;$(DCC_UsePackage)</DCC_UsePackage> |
@@ -81,7 +84,6 @@ | ||
81 | 84 | <DCC_MapFile>3</DCC_MapFile> |
82 | 85 | </PropertyGroup> |
83 | 86 | <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> |
84 | - <AppEnableHighDPI>true</AppEnableHighDPI> | |
85 | 87 | <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> |
86 | 88 | <VerInfo_Locale>1033</VerInfo_Locale> |
87 | 89 | <Icon_MainIcon>..\res\icons8-heart-health-96.ico</Icon_MainIcon> |
@@ -88,6 +90,7 @@ | ||
88 | 90 | <UWP_DelphiLogo44>..\res\icons8-heart-health-96.png</UWP_DelphiLogo44> |
89 | 91 | <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> |
90 | 92 | <UWP_DelphiLogo150>..\res\icons8-heart-health-96.png</UWP_DelphiLogo150> |
93 | + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> | |
91 | 94 | </PropertyGroup> |
92 | 95 | <PropertyGroup Condition="'$(Cfg_2)'!=''"> |
93 | 96 | <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> |
@@ -97,9 +100,9 @@ | ||
97 | 100 | </PropertyGroup> |
98 | 101 | <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> |
99 | 102 | <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> |
100 | - <AppEnableHighDPI>true</AppEnableHighDPI> | |
101 | 103 | <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> |
102 | 104 | <VerInfo_Locale>1033</VerInfo_Locale> |
105 | + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> | |
103 | 106 | </PropertyGroup> |
104 | 107 | <ItemGroup> |
105 | 108 | <DelphiCompile Include="$(MainSource)"> |
@@ -139,8 +142,8 @@ | ||
139 | 142 | <Source Name="MainSource">InstaLikes.dpr</Source> |
140 | 143 | </Source> |
141 | 144 | <Excluded_Packages> |
142 | - <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> | |
143 | - <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> | |
145 | + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> | |
146 | + <Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> | |
144 | 147 | </Excluded_Packages> |
145 | 148 | </Delphi.Personality> |
146 | 149 | <Deployment Version="3"> |
@@ -166,7 +169,6 @@ | ||
166 | 169 | <Operation>1</Operation> |
167 | 170 | </Platform> |
168 | 171 | <Platform Name="Win32"> |
169 | - <RemoteDir>Contents\MacOS</RemoteDir> | |
170 | 172 | <Operation>0</Operation> |
171 | 173 | </Platform> |
172 | 174 | </DeployClass> |
@@ -176,6 +178,12 @@ | ||
176 | 178 | <Operation>1</Operation> |
177 | 179 | </Platform> |
178 | 180 | </DeployClass> |
181 | + <DeployClass Name="AndroidFileProvider"> | |
182 | + <Platform Name="Android"> | |
183 | + <RemoteDir>res\xml</RemoteDir> | |
184 | + <Operation>1</Operation> | |
185 | + </Platform> | |
186 | + </DeployClass> | |
179 | 187 | <DeployClass Name="AndroidGDBServer"> |
180 | 188 | <Platform Name="Android"> |
181 | 189 | <RemoteDir>library\lib\armeabi-v7a</RemoteDir> |
@@ -212,6 +220,18 @@ | ||
212 | 220 | <Operation>1</Operation> |
213 | 221 | </Platform> |
214 | 222 | </DeployClass> |
223 | + <DeployClass Name="AndroidSplashStylesV21"> | |
224 | + <Platform Name="Android"> | |
225 | + <RemoteDir>res\values-v21</RemoteDir> | |
226 | + <Operation>1</Operation> | |
227 | + </Platform> | |
228 | + </DeployClass> | |
229 | + <DeployClass Name="Android_Colors"> | |
230 | + <Platform Name="Android"> | |
231 | + <RemoteDir>res\values</RemoteDir> | |
232 | + <Operation>1</Operation> | |
233 | + </Platform> | |
234 | + </DeployClass> | |
215 | 235 | <DeployClass Name="Android_DefaultAppIcon"> |
216 | 236 | <Platform Name="Android"> |
217 | 237 | <RemoteDir>res\drawable</RemoteDir> |
@@ -248,6 +268,36 @@ | ||
248 | 268 | <Operation>1</Operation> |
249 | 269 | </Platform> |
250 | 270 | </DeployClass> |
271 | + <DeployClass Name="Android_NotificationIcon24"> | |
272 | + <Platform Name="Android"> | |
273 | + <RemoteDir>res\drawable-mdpi</RemoteDir> | |
274 | + <Operation>1</Operation> | |
275 | + </Platform> | |
276 | + </DeployClass> | |
277 | + <DeployClass Name="Android_NotificationIcon36"> | |
278 | + <Platform Name="Android"> | |
279 | + <RemoteDir>res\drawable-hdpi</RemoteDir> | |
280 | + <Operation>1</Operation> | |
281 | + </Platform> | |
282 | + </DeployClass> | |
283 | + <DeployClass Name="Android_NotificationIcon48"> | |
284 | + <Platform Name="Android"> | |
285 | + <RemoteDir>res\drawable-xhdpi</RemoteDir> | |
286 | + <Operation>1</Operation> | |
287 | + </Platform> | |
288 | + </DeployClass> | |
289 | + <DeployClass Name="Android_NotificationIcon72"> | |
290 | + <Platform Name="Android"> | |
291 | + <RemoteDir>res\drawable-xxhdpi</RemoteDir> | |
292 | + <Operation>1</Operation> | |
293 | + </Platform> | |
294 | + </DeployClass> | |
295 | + <DeployClass Name="Android_NotificationIcon96"> | |
296 | + <Platform Name="Android"> | |
297 | + <RemoteDir>res\drawable-xxxhdpi</RemoteDir> | |
298 | + <Operation>1</Operation> | |
299 | + </Platform> | |
300 | + </DeployClass> | |
251 | 301 | <DeployClass Name="Android_SplashImage426"> |
252 | 302 | <Platform Name="Android"> |
253 | 303 | <RemoteDir>res\drawable-small</RemoteDir> |
@@ -272,6 +322,12 @@ | ||
272 | 322 | <Operation>1</Operation> |
273 | 323 | </Platform> |
274 | 324 | </DeployClass> |
325 | + <DeployClass Name="Android_Strings"> | |
326 | + <Platform Name="Android"> | |
327 | + <RemoteDir>res\values</RemoteDir> | |
328 | + <Operation>1</Operation> | |
329 | + </Platform> | |
330 | + </DeployClass> | |
275 | 331 | <DeployClass Name="DebugSymbols"> |
276 | 332 | <Platform Name="iOSSimulator"> |
277 | 333 | <Operation>1</Operation> |
@@ -290,6 +346,11 @@ | ||
290 | 346 | <Operation>1</Operation> |
291 | 347 | <Extensions>.framework</Extensions> |
292 | 348 | </Platform> |
349 | + <Platform Name="OSX64"> | |
350 | + <RemoteDir>Contents\MacOS</RemoteDir> | |
351 | + <Operation>1</Operation> | |
352 | + <Extensions>.framework</Extensions> | |
353 | + </Platform> | |
293 | 354 | <Platform Name="Win32"> |
294 | 355 | <Operation>0</Operation> |
295 | 356 | </Platform> |
@@ -312,6 +373,11 @@ | ||
312 | 373 | <Operation>1</Operation> |
313 | 374 | <Extensions>.dylib</Extensions> |
314 | 375 | </Platform> |
376 | + <Platform Name="OSX64"> | |
377 | + <RemoteDir>Contents\MacOS</RemoteDir> | |
378 | + <Operation>1</Operation> | |
379 | + <Extensions>.dylib</Extensions> | |
380 | + </Platform> | |
315 | 381 | <Platform Name="Win32"> |
316 | 382 | <Operation>0</Operation> |
317 | 383 | <Extensions>.dll;.bpl</Extensions> |
@@ -335,6 +401,11 @@ | ||
335 | 401 | <Operation>1</Operation> |
336 | 402 | <Extensions>.dylib</Extensions> |
337 | 403 | </Platform> |
404 | + <Platform Name="OSX64"> | |
405 | + <RemoteDir>Contents\MacOS</RemoteDir> | |
406 | + <Operation>1</Operation> | |
407 | + <Extensions>.dylib</Extensions> | |
408 | + </Platform> | |
338 | 409 | <Platform Name="Win32"> |
339 | 410 | <Operation>0</Operation> |
340 | 411 | <Extensions>.bpl</Extensions> |
@@ -357,6 +428,10 @@ | ||
357 | 428 | <RemoteDir>Contents\Resources\StartUp\</RemoteDir> |
358 | 429 | <Operation>0</Operation> |
359 | 430 | </Platform> |
431 | + <Platform Name="OSX64"> | |
432 | + <RemoteDir>Contents\Resources\StartUp\</RemoteDir> | |
433 | + <Operation>0</Operation> | |
434 | + </Platform> | |
360 | 435 | <Platform Name="Win32"> |
361 | 436 | <Operation>0</Operation> |
362 | 437 | </Platform> |
@@ -372,6 +447,17 @@ | ||
372 | 447 | <Operation>1</Operation> |
373 | 448 | </Platform> |
374 | 449 | </DeployClass> |
450 | + <DeployClass Name="iPad_Launch1024x768"> | |
451 | + <Platform Name="iOSDevice32"> | |
452 | + <Operation>1</Operation> | |
453 | + </Platform> | |
454 | + <Platform Name="iOSDevice64"> | |
455 | + <Operation>1</Operation> | |
456 | + </Platform> | |
457 | + <Platform Name="iOSSimulator"> | |
458 | + <Operation>1</Operation> | |
459 | + </Platform> | |
460 | + </DeployClass> | |
375 | 461 | <DeployClass Name="iPad_Launch1536"> |
376 | 462 | <Platform Name="iOSDevice32"> |
377 | 463 | <Operation>1</Operation> |
@@ -383,6 +469,39 @@ | ||
383 | 469 | <Operation>1</Operation> |
384 | 470 | </Platform> |
385 | 471 | </DeployClass> |
472 | + <DeployClass Name="iPad_Launch1536x2048"> | |
473 | + <Platform Name="iOSDevice32"> | |
474 | + <Operation>1</Operation> | |
475 | + </Platform> | |
476 | + <Platform Name="iOSDevice64"> | |
477 | + <Operation>1</Operation> | |
478 | + </Platform> | |
479 | + <Platform Name="iOSSimulator"> | |
480 | + <Operation>1</Operation> | |
481 | + </Platform> | |
482 | + </DeployClass> | |
483 | + <DeployClass Name="iPad_Launch1668"> | |
484 | + <Platform Name="iOSDevice32"> | |
485 | + <Operation>1</Operation> | |
486 | + </Platform> | |
487 | + <Platform Name="iOSDevice64"> | |
488 | + <Operation>1</Operation> | |
489 | + </Platform> | |
490 | + <Platform Name="iOSSimulator"> | |
491 | + <Operation>1</Operation> | |
492 | + </Platform> | |
493 | + </DeployClass> | |
494 | + <DeployClass Name="iPad_Launch1668x2388"> | |
495 | + <Platform Name="iOSDevice32"> | |
496 | + <Operation>1</Operation> | |
497 | + </Platform> | |
498 | + <Platform Name="iOSDevice64"> | |
499 | + <Operation>1</Operation> | |
500 | + </Platform> | |
501 | + <Platform Name="iOSSimulator"> | |
502 | + <Operation>1</Operation> | |
503 | + </Platform> | |
504 | + </DeployClass> | |
386 | 505 | <DeployClass Name="iPad_Launch2048"> |
387 | 506 | <Platform Name="iOSDevice32"> |
388 | 507 | <Operation>1</Operation> |
@@ -394,6 +513,61 @@ | ||
394 | 513 | <Operation>1</Operation> |
395 | 514 | </Platform> |
396 | 515 | </DeployClass> |
516 | + <DeployClass Name="iPad_Launch2048x1536"> | |
517 | + <Platform Name="iOSDevice32"> | |
518 | + <Operation>1</Operation> | |
519 | + </Platform> | |
520 | + <Platform Name="iOSDevice64"> | |
521 | + <Operation>1</Operation> | |
522 | + </Platform> | |
523 | + <Platform Name="iOSSimulator"> | |
524 | + <Operation>1</Operation> | |
525 | + </Platform> | |
526 | + </DeployClass> | |
527 | + <DeployClass Name="iPad_Launch2048x2732"> | |
528 | + <Platform Name="iOSDevice32"> | |
529 | + <Operation>1</Operation> | |
530 | + </Platform> | |
531 | + <Platform Name="iOSDevice64"> | |
532 | + <Operation>1</Operation> | |
533 | + </Platform> | |
534 | + <Platform Name="iOSSimulator"> | |
535 | + <Operation>1</Operation> | |
536 | + </Platform> | |
537 | + </DeployClass> | |
538 | + <DeployClass Name="iPad_Launch2224"> | |
539 | + <Platform Name="iOSDevice32"> | |
540 | + <Operation>1</Operation> | |
541 | + </Platform> | |
542 | + <Platform Name="iOSDevice64"> | |
543 | + <Operation>1</Operation> | |
544 | + </Platform> | |
545 | + <Platform Name="iOSSimulator"> | |
546 | + <Operation>1</Operation> | |
547 | + </Platform> | |
548 | + </DeployClass> | |
549 | + <DeployClass Name="iPad_Launch2388x1668"> | |
550 | + <Platform Name="iOSDevice32"> | |
551 | + <Operation>1</Operation> | |
552 | + </Platform> | |
553 | + <Platform Name="iOSDevice64"> | |
554 | + <Operation>1</Operation> | |
555 | + </Platform> | |
556 | + <Platform Name="iOSSimulator"> | |
557 | + <Operation>1</Operation> | |
558 | + </Platform> | |
559 | + </DeployClass> | |
560 | + <DeployClass Name="iPad_Launch2732x2048"> | |
561 | + <Platform Name="iOSDevice32"> | |
562 | + <Operation>1</Operation> | |
563 | + </Platform> | |
564 | + <Platform Name="iOSDevice64"> | |
565 | + <Operation>1</Operation> | |
566 | + </Platform> | |
567 | + <Platform Name="iOSSimulator"> | |
568 | + <Operation>1</Operation> | |
569 | + </Platform> | |
570 | + </DeployClass> | |
397 | 571 | <DeployClass Name="iPad_Launch768"> |
398 | 572 | <Platform Name="iOSDevice32"> |
399 | 573 | <Operation>1</Operation> |
@@ -405,6 +579,116 @@ | ||
405 | 579 | <Operation>1</Operation> |
406 | 580 | </Platform> |
407 | 581 | </DeployClass> |
582 | + <DeployClass Name="iPad_Launch768x1024"> | |
583 | + <Platform Name="iOSDevice32"> | |
584 | + <Operation>1</Operation> | |
585 | + </Platform> | |
586 | + <Platform Name="iOSDevice64"> | |
587 | + <Operation>1</Operation> | |
588 | + </Platform> | |
589 | + <Platform Name="iOSSimulator"> | |
590 | + <Operation>1</Operation> | |
591 | + </Platform> | |
592 | + </DeployClass> | |
593 | + <DeployClass Name="iPhone_Launch1125"> | |
594 | + <Platform Name="iOSDevice32"> | |
595 | + <Operation>1</Operation> | |
596 | + </Platform> | |
597 | + <Platform Name="iOSDevice64"> | |
598 | + <Operation>1</Operation> | |
599 | + </Platform> | |
600 | + <Platform Name="iOSSimulator"> | |
601 | + <Operation>1</Operation> | |
602 | + </Platform> | |
603 | + </DeployClass> | |
604 | + <DeployClass Name="iPhone_Launch1136x640"> | |
605 | + <Platform Name="iOSDevice32"> | |
606 | + <Operation>1</Operation> | |
607 | + </Platform> | |
608 | + <Platform Name="iOSDevice64"> | |
609 | + <Operation>1</Operation> | |
610 | + </Platform> | |
611 | + <Platform Name="iOSSimulator"> | |
612 | + <Operation>1</Operation> | |
613 | + </Platform> | |
614 | + </DeployClass> | |
615 | + <DeployClass Name="iPhone_Launch1242"> | |
616 | + <Platform Name="iOSDevice32"> | |
617 | + <Operation>1</Operation> | |
618 | + </Platform> | |
619 | + <Platform Name="iOSDevice64"> | |
620 | + <Operation>1</Operation> | |
621 | + </Platform> | |
622 | + <Platform Name="iOSSimulator"> | |
623 | + <Operation>1</Operation> | |
624 | + </Platform> | |
625 | + </DeployClass> | |
626 | + <DeployClass Name="iPhone_Launch1242x2688"> | |
627 | + <Platform Name="iOSDevice32"> | |
628 | + <Operation>1</Operation> | |
629 | + </Platform> | |
630 | + <Platform Name="iOSDevice64"> | |
631 | + <Operation>1</Operation> | |
632 | + </Platform> | |
633 | + <Platform Name="iOSSimulator"> | |
634 | + <Operation>1</Operation> | |
635 | + </Platform> | |
636 | + </DeployClass> | |
637 | + <DeployClass Name="iPhone_Launch1334"> | |
638 | + <Platform Name="iOSDevice32"> | |
639 | + <Operation>1</Operation> | |
640 | + </Platform> | |
641 | + <Platform Name="iOSDevice64"> | |
642 | + <Operation>1</Operation> | |
643 | + </Platform> | |
644 | + <Platform Name="iOSSimulator"> | |
645 | + <Operation>1</Operation> | |
646 | + </Platform> | |
647 | + </DeployClass> | |
648 | + <DeployClass Name="iPhone_Launch1792"> | |
649 | + <Platform Name="iOSDevice32"> | |
650 | + <Operation>1</Operation> | |
651 | + </Platform> | |
652 | + <Platform Name="iOSDevice64"> | |
653 | + <Operation>1</Operation> | |
654 | + </Platform> | |
655 | + <Platform Name="iOSSimulator"> | |
656 | + <Operation>1</Operation> | |
657 | + </Platform> | |
658 | + </DeployClass> | |
659 | + <DeployClass Name="iPhone_Launch2208"> | |
660 | + <Platform Name="iOSDevice32"> | |
661 | + <Operation>1</Operation> | |
662 | + </Platform> | |
663 | + <Platform Name="iOSDevice64"> | |
664 | + <Operation>1</Operation> | |
665 | + </Platform> | |
666 | + <Platform Name="iOSSimulator"> | |
667 | + <Operation>1</Operation> | |
668 | + </Platform> | |
669 | + </DeployClass> | |
670 | + <DeployClass Name="iPhone_Launch2436"> | |
671 | + <Platform Name="iOSDevice32"> | |
672 | + <Operation>1</Operation> | |
673 | + </Platform> | |
674 | + <Platform Name="iOSDevice64"> | |
675 | + <Operation>1</Operation> | |
676 | + </Platform> | |
677 | + <Platform Name="iOSSimulator"> | |
678 | + <Operation>1</Operation> | |
679 | + </Platform> | |
680 | + </DeployClass> | |
681 | + <DeployClass Name="iPhone_Launch2688x1242"> | |
682 | + <Platform Name="iOSDevice32"> | |
683 | + <Operation>1</Operation> | |
684 | + </Platform> | |
685 | + <Platform Name="iOSDevice64"> | |
686 | + <Operation>1</Operation> | |
687 | + </Platform> | |
688 | + <Platform Name="iOSSimulator"> | |
689 | + <Operation>1</Operation> | |
690 | + </Platform> | |
691 | + </DeployClass> | |
408 | 692 | <DeployClass Name="iPhone_Launch320"> |
409 | 693 | <Platform Name="iOSDevice32"> |
410 | 694 | <Operation>1</Operation> |
@@ -438,6 +722,28 @@ | ||
438 | 722 | <Operation>1</Operation> |
439 | 723 | </Platform> |
440 | 724 | </DeployClass> |
725 | + <DeployClass Name="iPhone_Launch750"> | |
726 | + <Platform Name="iOSDevice32"> | |
727 | + <Operation>1</Operation> | |
728 | + </Platform> | |
729 | + <Platform Name="iOSDevice64"> | |
730 | + <Operation>1</Operation> | |
731 | + </Platform> | |
732 | + <Platform Name="iOSSimulator"> | |
733 | + <Operation>1</Operation> | |
734 | + </Platform> | |
735 | + </DeployClass> | |
736 | + <DeployClass Name="iPhone_Launch828"> | |
737 | + <Platform Name="iOSDevice32"> | |
738 | + <Operation>1</Operation> | |
739 | + </Platform> | |
740 | + <Platform Name="iOSDevice64"> | |
741 | + <Operation>1</Operation> | |
742 | + </Platform> | |
743 | + <Platform Name="iOSSimulator"> | |
744 | + <Operation>1</Operation> | |
745 | + </Platform> | |
746 | + </DeployClass> | |
441 | 747 | <DeployClass Name="ProjectAndroidManifest"> |
442 | 748 | <Platform Name="Android"> |
443 | 749 | <Operation>1</Operation> |
@@ -493,11 +799,21 @@ | ||
493 | 799 | <Operation>1</Operation> |
494 | 800 | </Platform> |
495 | 801 | </DeployClass> |
802 | + <DeployClass Name="ProjectOSXDebug"> | |
803 | + <Platform Name="OSX64"> | |
804 | + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> | |
805 | + <Operation>1</Operation> | |
806 | + </Platform> | |
807 | + </DeployClass> | |
496 | 808 | <DeployClass Name="ProjectOSXEntitlements"> |
497 | 809 | <Platform Name="OSX32"> |
498 | 810 | <RemoteDir>..\</RemoteDir> |
499 | 811 | <Operation>1</Operation> |
500 | 812 | </Platform> |
813 | + <Platform Name="OSX64"> | |
814 | + <RemoteDir>..\</RemoteDir> | |
815 | + <Operation>1</Operation> | |
816 | + </Platform> | |
501 | 817 | </DeployClass> |
502 | 818 | <DeployClass Name="ProjectOSXInfoPList"> |
503 | 819 | <Platform Name="OSX32"> |
@@ -504,6 +820,10 @@ | ||
504 | 820 | <RemoteDir>Contents</RemoteDir> |
505 | 821 | <Operation>1</Operation> |
506 | 822 | </Platform> |
823 | + <Platform Name="OSX64"> | |
824 | + <RemoteDir>Contents</RemoteDir> | |
825 | + <Operation>1</Operation> | |
826 | + </Platform> | |
507 | 827 | </DeployClass> |
508 | 828 | <DeployClass Name="ProjectOSXResource"> |
509 | 829 | <Platform Name="OSX32"> |
@@ -510,6 +830,10 @@ | ||
510 | 830 | <RemoteDir>Contents\Resources</RemoteDir> |
511 | 831 | <Operation>1</Operation> |
512 | 832 | </Platform> |
833 | + <Platform Name="OSX64"> | |
834 | + <RemoteDir>Contents\Resources</RemoteDir> | |
835 | + <Operation>1</Operation> | |
836 | + </Platform> | |
513 | 837 | </DeployClass> |
514 | 838 | <DeployClass Required="true" Name="ProjectOutput"> |
515 | 839 | <Platform Name="Android"> |
@@ -532,6 +856,10 @@ | ||
532 | 856 | <RemoteDir>Contents\MacOS</RemoteDir> |
533 | 857 | <Operation>1</Operation> |
534 | 858 | </Platform> |
859 | + <Platform Name="OSX64"> | |
860 | + <RemoteDir>Contents\MacOS</RemoteDir> | |
861 | + <Operation>1</Operation> | |
862 | + </Platform> | |
535 | 863 | <Platform Name="Win32"> |
536 | 864 | <Operation>0</Operation> |
537 | 865 | </Platform> |
@@ -571,6 +899,7 @@ | ||
571 | 899 | <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> |
572 | 900 | <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/> |
573 | 901 | <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> |
902 | + <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/> | |
574 | 903 | <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> |
575 | 904 | </Deployment> |
576 | 905 | <Platforms> |
@@ -149,9 +149,8 @@ | ||
149 | 149 | // sendo salvas na tabela medias. Este método NÃO adiciona os seguidores do |
150 | 150 | // usuário |
151 | 151 | procedure AddUser(const AUserName: String; const AFollowingId: String = ''); overload; |
152 | - // Esta função adiciona ou atualiza o usuário informado. Ela retorna true | |
153 | - // apenas quando o usuário foi efetivamente registrado, mas retorna false | |
154 | - // quando o usuário é apenas atualizado | |
152 | + // Esta função adiciona o usuário informado. Ela retorna true apenas quando | |
153 | + // o usuário foi efetivamente registrado | |
155 | 154 | function AddUser(const AInstagramUser: TInstagramUser; const AFollowingId: String = ''): Boolean; overload; |
156 | 155 | // function MediaInfo(AShortCode: String; out AMedia: TMedia): Boolean; |
157 | 156 | procedure UpdateUser(const AInstagramUser: TInstagramUser); overload; |
@@ -188,7 +187,7 @@ | ||
188 | 187 | KRK.Lib.Rtl.Win.WinInet.Utilities, Windows, WinInet, |
189 | 188 | KRK.Lib.RegExp.Utils, NetEncoding, System.RegularExpressionsCore, |
190 | 189 | UFORMPrincipal, jpeg, KRK.Lib.Vcl.Forms.FormBlender, |
191 | - UFORMStatus, UFORMAddUserParams; | |
190 | + UFORMStatus, UFORMAddUserParams, System.Generics.Collections; | |
192 | 191 | |
193 | 192 | {%CLASSGROUP 'Vcl.Controls.TControl'} |
194 | 193 |
@@ -200,6 +199,9 @@ | ||
200 | 199 | begin |
201 | 200 | Result := FDCO.ExecSQLScalar('select count(id) from user where id = :id',[AInstagramUser.id],[ftString]) = 0; |
202 | 201 | |
202 | + if not Result then | |
203 | + Exit; | |
204 | + | |
203 | 205 | FDTAUser.Append; |
204 | 206 | FDTAUserid.AsString := AInstagramUser.id; |
205 | 207 | FDTAUserusername.AsString := AInstagramUser.UserName; |
@@ -1154,15 +1156,20 @@ | ||
1154 | 1156 | |
1155 | 1157 | procedure TDAMOPrincipal.UpdateUser(const AInstagramUser: TInstagramUser); |
1156 | 1158 | begin |
1157 | - // Ao usar o AddUser para atualizar, o SQLite exclui o registro existete e | |
1158 | - // coloca outro no lugar e isso fazia a regra on delete cascade ser ativada. | |
1159 | - // Usando o pragma, desativa temporariamente as chaves estrangeiras evitando | |
1160 | - // o problema | |
1161 | - FDCO.ExecSQL('PRAGMA foreign_keys = 0;'); | |
1162 | - try | |
1163 | - AddUser(AInstagramUser); | |
1164 | - finally | |
1165 | - FDCO.ExecSQL('PRAGMA foreign_keys = 1;'); | |
1159 | + if FDCO.ExecSQLScalar('select count(id) from user where id = :id',[AInstagramUser.id],[ftString]) = 1 then | |
1160 | + begin | |
1161 | + FDTAUser.Edit; | |
1162 | + FDTAUserusername.AsString := AInstagramUser.UserName; | |
1163 | + FDTAUserrealname.AsString := AInstagramUser.RealName; | |
1164 | + FDTAUserpictureurl.AsString := AInstagramUser.PictureURL; | |
1165 | + FDTAUserbiography.AsString := AInstagramUser.Biography; | |
1166 | + FDTAUserisprivate.AsBoolean := AInstagramUser.IsPrivate; | |
1167 | + FDTAUserisverified.AsBoolean := AInstagramUser.IsVerified; | |
1168 | + FDTAUserisbusinessaccount.AsBoolean := AInstagramUser.IsBusinessAccount; | |
1169 | + FDTAUserfollowers.AsInteger := AInstagramUser.Followers; | |
1170 | + FDTAUserfollowing.AsInteger := AInstagramUser.Following; | |
1171 | + FDTAUsermedias.AsInteger := AInstagramUser.MediasTotal; | |
1172 | + FDTAUser.Post; | |
1166 | 1173 | end; |
1167 | 1174 | end; |
1168 | 1175 |