Browse Source

新加用户排序不正确,全市部门在线人数和总人数显示不正确

lqq 9 years ago
parent
commit
70c60ff4fd

File diff suppressed because it is too large
+ 1 - 3
Client/Lxtalk.dproj


BIN
Client/Lxtalk.res


+ 27 - 31
Client/MainFrm.pas

@@ -14565,6 +14565,7 @@ begin
   RealICQContacterTreeView.OnHeadImageMouseLeave := NodeOnHeadImageMouseLeave;
   RealICQContacterTreeView.AdjustPosition := False;
   RealICQContacterTreeView.AutoChangeOnlineNumeric := False;
+  RealICQContacterTreeView.AutoCalculate := False;
   if not AFinded then
   begin
     RealICQContacterTreeView.HideSystemScrollBar;
@@ -14754,18 +14755,13 @@ begin
     for iLoop := RealICQClient.MoreUsers.Count - 1 downto 0 do
     begin
       RealICQUser := RealICQClient.MoreUsers.Objects[iLoop] as TRealICQUser;
-      ItemIndex := RealICQContacterTreeView.EmployeeItems.IndexOf(RealICQUser.LoginName);
-      if ItemIndex >= 0 then
-      begin
-        Employee := RealICQContacterTreeView.EmployeeItems.Objects[ItemIndex] as TRealICQEmployee;
-        UpdateEmployeeNode(Employee, RealICQUser, False);
-        Continue;
-      end;
 
       ItemIndex := RealICQContacterTreeView.BranchItems.IndexOf(RealICQUser.BranchID);
       if ItemIndex < 0 then
         Continue;
-
+      ItemIndex := RealICQContacterTreeView.EmployeeItems.IndexOf(RealICQUser.LoginName);
+      if ItemIndex >= 0 then
+        RealICQContacterTreeView.EmployeeItems.Delete(ItemIndex);
       Employee := TRealICQEmployee.Create(RealICQUser.LoginName);
       Employee.BranchID := RealICQUser.BranchID;
       Employee.HasAddFreindButton := True;
@@ -14777,29 +14773,29 @@ begin
       RealICQContacterTreeView.AddEmployee(Employee);
 
       UpdateEmployeeNode(Employee, RealICQUser, False);
-      ParentNode := Employee.Node.Parent;
-      while ParentNode <> nil do
-      begin
-        TmpBranch := ParentNode.Data;
-        TmpBranch.EmployeeCount := TmpBranch.EmployeeCount - 1;
-        if (Employee.LoginState <> stOffline) and (Employee.LoginState <> stHidden) then
-          TmpBranch.OnlineEmployee := TmpBranch.OnlineEmployee - 1;
-        ParentNode := ParentNode.Parent;
-      end;
-
-      if Assigned(Employee.Node.Parent) then
-      begin
-        UpdateEmployeeNode(Employee, RealICQUser, False);
-        if (not Assigned(Employee.Node.Parent.Parent)) and (Employee.LoginState <> stOffline) and (Employee.LoginState <> stHidden) then
-        begin
-          TmpBranch := Employee.Node.Parent.data;
-          TmpBranch.OnlineEmployee := TmpBranch.OnlineEmployee - 1;
-          TmpBranch.EmployeeCount := TmpBranch.EmployeeCount - 1;
-          TmpBranch.Update;
-        end;
-      end
-      else
-        FreeAndNil(Employee);
+//      ParentNode := Employee.Node.Parent;
+//      while ParentNode <> nil do
+//      begin
+//        TmpBranch := ParentNode.Data;
+//        TmpBranch.EmployeeCount := TmpBranch.EmployeeCount - 1;
+//        if (Employee.LoginState <> stOffline) and (Employee.LoginState <> stHidden) then
+//          TmpBranch.OnlineEmployee := TmpBranch.OnlineEmployee - 1;
+//        ParentNode := ParentNode.Parent;
+//      end;
+
+//      if Assigned(Employee.Node.Parent) then
+//      begin
+//        UpdateEmployeeNode(Employee, RealICQUser, False);
+//        if (not Assigned(Employee.Node.Parent.Parent)) and (Employee.LoginState <> stOffline) and (Employee.LoginState <> stHidden) then
+//        begin
+//          TmpBranch := Employee.Node.Parent.data;
+//          TmpBranch.OnlineEmployee := TmpBranch.OnlineEmployee - 1;
+//          TmpBranch.EmployeeCount := TmpBranch.EmployeeCount - 1;
+//          TmpBranch.Update;
+//        end;
+//      end
+//      else
+//        FreeAndNil(Employee);
     end;
     {$endregion}
 

File diff suppressed because it is too large
+ 1 - 1
Controls/RealICQComponents.dproj


BIN
Controls/RealICQComponents.res


File diff suppressed because it is too large
+ 5396 - 5251
Controls/RealICQUI/RealICQContacterTreeView.pas


File diff suppressed because it is too large
+ 3 - 3
ZWT/XML/ClientConfig.xml


+ 3 - 3
ZWT/XML/DefaultConfig.xml

@@ -2,9 +2,9 @@
 <DefaultConfig>
 	<SkinName Value="VStyle"/>
 	<UIMainColor Value="15392442"/>
-	<MainFormLeft Value="873"/>
-	<MainFormTop Value="-1"/>
-	<MainFormWidth Value="258"/>
+	<MainFormLeft Value="1881"/>
+	<MainFormTop Value="199"/>
+	<MainFormWidth Value="-300"/>
 	<MainFormHeight Value="734"/>
 	<TalkingFormLeft Value="695"/>
 	<TalkingFormTop Value="128"/>

+ 1 - 1
ZWT/XML/ServerConfig.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="gb2312"?>
 <ServerConfig>
-	<LoginServer Address="120.26.136.253" Port="443"/>
+	<LoginServer Address="192.168.0.74" Port="4443"/>
 	<CaServer Address="120.26.136.253" Port="9602"/>
 </ServerConfig>