Selaa lähdekoodia

采用交替显示方式解决切换App会导致进度窗挡住提示框。

Chenshilong 9 vuotta sitten
vanhempi
commit
0c7a3ec7e2
4 muutettua tiedostoa jossa 22 lisäystä ja 2 poistoa
  1. 2 2
      Dprs/CSL/Measure_Cloud.dof
  2. BIN
      Dprs/CSL/Measure_Cloud.res
  3. 14 0
      Forms/mProgressProFrm.pas
  4. 6 0
      Frames/ProjectFme.pas

+ 2 - 2
Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1088
+Build=1089
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1088
+FileVersion=3.1.3.1089
 InternalName=
 LegalCopyright=
 LegalTrademarks=

BIN
Dprs/CSL/Measure_Cloud.res


+ 14 - 0
Forms/mProgressProFrm.pas

@@ -41,6 +41,7 @@ procedure ProgressProRun(AText: string; APos: Integer = 10;
                          ATextType: TProgressMemoType = pmtAdd; APosType: TProgressPosType = pptAdd);
 procedure ProgressProTitle(ATitle: string);
 function ProgressProHandle: THandle;
+procedure ProgressProHide;     // 进度窗太大,会挡住其它提示条,所以隐藏先。
 
 var
   ProgressProForm: TProgressProForm = nil;
@@ -69,6 +70,13 @@ procedure ProgressProFree;
 begin
   if ProgressProForm <> nil then
   begin
+    if not ProgressProForm.Visible then
+    begin
+      ProgressProForm.Visible := True;
+      ProgressProForm.Update;
+    end;
+
+       
     with ProgressProForm.Gauge1 do
     begin
       if (Progress <> MaxValue) then
@@ -176,4 +184,10 @@ begin
   (ProgressProForm as TWinControl).PerForm(wm_SysCommand, sc_DragMove, 0);
 end;
 
+procedure ProgressProHide;
+begin
+  if ProgressProForm <> nil then
+    ProgressProForm.Hide;
+end;
+
 end.

+ 6 - 0
Frames/ProjectFme.pas

@@ -1012,11 +1012,17 @@ begin
         btnPass.Enabled := False;
         btnNotPass.Enabled := btnPass.Enabled;
         ShowPhaseHint;
+        ProgressProHide;
         TipMessage('^_^ 恭喜!数据已成功上传到云端服务器。', ProgressProHandle);
       end
       else
+      begin
+        ProgressProHide;
         WarningMessage('数据上传失败请重试!失败原因:' + sResult, ProgressProHandle);
+      end;
+
     except
+      ProgressProHide;
       WarningMessage('数据上传失败请重试!网络较差,数据文件无法送达云端:' + sResult, ProgressProHandle);
     end;
   finally