Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

Dprs/Pro/Measure_Cloud.dpr

@@ -203,7 +203,6 @@ uses
   DbTreeImport in '..\..\Units\DbTreeImport.pas',
   DbTreeDm in '..\..\DataModules\DbTreeDm.pas' {DbTreeData: TDataModule},
   DebugUsers in '..\..\Units\DebugUsers.pas',
-  FileDownLoadFrm in '..\..\Forms\FileDownLoadFrm.pas' {FileDownLoadForm},
   OtherMeasurePhaseDm in '..\..\DataModules\OtherMeasurePhaseDm.pas' {OtherMeasurePhaseData: TDataModule},
   OtherMeasureOnceDm in '..\..\DataModules\OtherMeasureOnceDm.pas' {OtherMeasureOnceData: TDataModule},
   OMPhaseRecord in '..\..\Units\DataRecord\OMPhaseRecord.pas',
@@ -218,7 +217,6 @@ uses
 var
   Mutex: THandle;
   IPForm: TIPForm;
-  vFDForm: TFileDownLoadForm;
   sInfo, sURL, sName: string;
 
 begin
@@ -267,20 +265,6 @@ begin
             Application.Terminate;
           end;
 
-          ltUpdate:  // 升级
-          begin
-            if Application.MessageBox(PChar(sInfo), '系统提示', MB_OKCANCEL + MB_ICONQUESTION) = ID_OK then
-            begin
-              vFDForm := TFileDownLoadForm.Create(nil);
-              try
-                vFDForm.URL := sURL;
-                vFDForm.ShowModal;
-              finally
-                vFDForm.Free;
-              end;
-            end;
-          end;
-
           ltDisCon:
           begin
             Application.MessageBox('网络错误，请稍后重试！', '操作提醒', MB_OK + MB_ICONWARNING);

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -203,7 +203,6 @@ uses
   DbTreeImport in '..\..\Units\DbTreeImport.pas',
   DbTreeDm in '..\..\DataModules\DbTreeDm.pas',
   DebugUsers in '..\..\Units\DebugUsers.pas',
-  FileDownLoadFrm in '..\..\Forms\FileDownLoadFrm.pas' {FileDownLoadForm},
   OtherMeasurePhaseDm in '..\..\DataModules\OtherMeasurePhaseDm.pas' {OtherMeasurePhaseData: TDataModule},
   OtherMeasureOnceDm in '..\..\DataModules\OtherMeasureOnceDm.pas' {OtherMeasureOnceData: TDataModule},
   OMPhaseRecord in '..\..\Units\DataRecord\OMPhaseRecord.pas',

Forms/LoginFrm.pas

@@ -71,8 +71,7 @@ type
 implementation
 
 uses
-  ScUtils, ShellAPI, IniFiles, ScConfig, Md5, PHPWebDm, ConstUnit, DebugUsers,
-  FileDownLoadFrm;
+  ScUtils, ShellAPI, IniFiles, ScConfig, Md5, PHPWebDm, ConstUnit, DebugUsers;
 
 {$R *.dfm}
 
@@ -172,7 +171,6 @@ end;
 
 procedure TLoginFrm.btnLoginClick(Sender: TObject);
 var sInfo, sURL, sMD5PW: string;
-  vFDForm: TFileDownLoadForm;
 begin
   lblHint.Caption := '';
   lblHint.Update;
@@ -208,43 +206,6 @@ begin
       ModalResult := mrNone;
     end;
 
-    ltUpdate:
-  {  begin
-      // 无法对PHP返回的字符串进行排版。这里使用Delphi自身的字符串。
-      sInfo := '尊敬的用户：' + #13#13 +
-               '系统检测出您是通过SmartCost旧版本程序注册了本帐户(' + Trim(cbUser.Text) +
-               ')，因系统升级，为保障您的帐户安全和更好的为您服务，' + #13#13 +
-               '我们需要对您的邮箱进行有效性验证，并需要您重置该帐户的密码以保证您的帐号在新程序上能够正常使用。' + #13#13 +
-               '请点击“确定”按钮打开密码重置页面。';
-      Application.MessageBox(PChar(sInfo), '升级提示', MB_OK + MB_ICONINFORMATION);
-      edtPW.SetFocus;
-      edtPW.SelectAll;
-      ModalResult := mrNone;
-
-      Screen.Cursor := crHourGlass;
-      try
-        sURL := ConfigInfo.OldUserResetPwdURL + '?CheckCode=' + sCheckCode;
-        ShellExecute(Application.Handle, 'open', PChar(sURL), nil, nil, SW_SHOWNORMAL);
-      finally
-        Screen.Cursor := crDefault;
-      end;
-    end;   }
-    // 升级
-    begin
-      if Application.MessageBox(PChar(sInfo), '系统提示', MB_OKCANCEL + MB_ICONQUESTION) = ID_OK then
-      begin
-        vFDForm := TFileDownLoadForm.Create(nil);
-        try
-          vFDForm.URL := sURL;
-          vFDForm.ShowModal;
-        finally
-          vFDForm.Free;
-        end;
-      end;
-
-      ModalResult := mrNone;
-    end;
-
     ltIncomplete:
     begin
       Application.MessageBox(PChar(sInfo), '系统提示', MB_OK + MB_ICONINFORMATION);