dujia:修复组织架构UI问题

asd821226 · Sep 29, 2014 · ba13d4f · ba13d4f
1 parent 0dc14e1
commit ba13d4f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 36 deletions.
diff --git a/TeamTalk/DDOrganizationViewController.m b/TeamTalk/DDOrganizationViewController.m
@@ -77,28 +77,28 @@ - (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
     }
 }
 
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-    if ([item isKindOfClass:NSClassFromString(@"NSString")])
-    {
-        DepartmentEntity* department = [[DDDepartmentModule shareInstance] getDepartmentForID:item];
-        if (department)
-        {
-            return department.title;
-        }
-        else
-        {
-            return item;
-        }
-    }
-    else if ([item isKindOfClass:NSClassFromString(@"UserEntity")])
-    {
-        UserEntity* user = (UserEntity*)item;
-        return user.nick;
-    }
-    return nil;
-
-}
+//- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
+//{
+//    if ([item isKindOfClass:NSClassFromString(@"NSString")])
+//    {
+//        DepartmentEntity* department = [[DDDepartmentModule shareInstance] getDepartmentForID:item];
+//        if (department)
+//        {
+//            return department.title;
+//        }
+//        else
+//        {
+//            return item;
+//        }
+//    }
+//    else if ([item isKindOfClass:NSClassFromString(@"UserEntity")])
+//    {
+//        UserEntity* user = (UserEntity*)item;
+//        return user.nick;
+//    }
+//    return nil;
+//    
+//}
 
 - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item
 {

diff --git a/TeamTalk/DDOrganizationViewController.xib b/TeamTalk/DDOrganizationViewController.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
@@ -24,7 +24,7 @@
                         <rect key="frame" x="0.0" y="17" width="232" height="462"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="8Uu-ch-eyk" viewBased="YES" indentationPerLevel="16" outlineTableColumn="kfR-9B-IDi" id="wgk-zQ-x1V">
+                            <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="8Uu-ch-eyk" viewBased="YES" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="kfR-9B-IDi" id="wgk-zQ-x1V">
                                 <rect key="frame" x="0.0" y="0.0" width="232" height="462"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>

diff --git a/TeamTalk/interface/chat/addChatGroup/DDAddChatGroupCell.m b/TeamTalk/interface/chat/addChatGroup/DDAddChatGroupCell.m
@@ -34,11 +34,6 @@ - (void)drawRect:(NSRect)dirtyRect
 
 - (void)setItem:(id)item
 {
-
-    [self.avatar setWantsLayer:YES];
-    [self.avatar.layer setCornerRadius:3];
-    [self.avatar.layer setMasksToBounds:YES];
-
     if ([item isKindOfClass:NSClassFromString(@"UserEntity")])
     {
         [self.avatar setUser:item];

diff --git a/TeamTalk/modules/friendlist/DDUserlistModule.m b/TeamTalk/modules/friendlist/DDUserlistModule.m
@@ -74,10 +74,7 @@ -(void)addUser:(UserEntity*)newUser
     {
         if (newUser.userUpdated == 0)
         {
-            if (![[_allUsers allKeys] containsObject:newUser.userId])
-            {
-                [_allUsers setObject:newUser forKey:newUser.userId];
-            }
+            [_allUsers setObject:newUser forKey:newUser.userId];
         }
         else
         {

diff --git a/TeamTalk/modules/session/DDAddGroupMemberDepartmentCell.m b/TeamTalk/modules/session/DDAddGroupMemberDepartmentCell.m
@@ -25,8 +25,8 @@ - (id)initWithFrame:(NSRect)frame
 - (void)drawRect:(NSRect)dirtyRect
 {
 	[super drawRect:dirtyRect];
-    self.imageView=nil;
-    [self setWantsLayer:YES];
+//    self.imageView=nil;
+//    [self setWantsLayer:YES];
 
 
     // Drawing code here.

diff --git a/TeamTalk/utilities/Constant/CONSTANT.h b/TeamTalk/utilities/Constant/CONSTANT.h
@@ -53,7 +53,7 @@
 
 #warning 可配置
 #define SERVER_IP                           @"122.225.68.125"//
-#define SERVER_PORT                         9008//登录服务器端口
+#define SERVER_PORT                         18008//登录服务器端口
 
 #define IMAGE_MARK_START                    @"&$#@~^@[{:"
 #define IMAGE_MARK_END                      @":}]&$~@#@"