Browse Source

更换用户默认头像

Kyle Smart 6 tháng trước cách đây
mục cha
commit
c93edd0f12
58 tập tin đã thay đổi với 201 bổ sung143 xóa
  1. 1 1
      KulexiuForStudent/KulexiuForStudent/AppDelegate.m
  2. 21 0
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/student_avatar.imageset/Contents.json
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/student_avatar.imageset/student_avatar@2x.png
  4. 21 0
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/teacher_avatar.imageset/Contents.json
  5. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/teacher_avatar.imageset/teacher_avatar@2x.png
  6. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/tenant_defalut_avatar.imageset/tenant_defalut_avatar@2x.png
  7. 3 0
      KulexiuForStudent/KulexiuForStudent/Common/Base/LoginManger/KSLoginManager.m
  8. 5 3
      KulexiuForStudent/KulexiuForStudent/Common/Define/UserKeyHeader.h
  9. 15 5
      KulexiuForStudent/KulexiuForStudent/Common/MediaMerge/AudioMerge/KSMergeAudioControlView.m
  10. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupMemberListCell.xib
  11. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.m
  12. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.xib
  13. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatUserInfo/UserDetailBodyView.m
  14. 8 8
      KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatUserInfo/UserDetailBodyView.xib
  15. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Course/AccompanyCourse/View/AccompanyCourseInfoCell.m
  16. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Course/AccompanyCourse/View/AccompanyCourseInfoCell.xib
  17. 2 2
      KulexiuForStudent/KulexiuForStudent/Module/Course/View/AccompanyCourseCell.m
  18. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Course/View/AccompanyCourseCell.xib
  19. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeCourseTipsView.m
  20. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeCourseTipsView.xib
  21. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.m
  22. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.xib
  23. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNavView.xib
  24. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.m
  25. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.xib
  26. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.m
  27. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.xib
  28. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherShowCell.m
  29. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherShowCell.xib
  30. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeHotStyleCell.m
  31. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeHotStyleCell.xib
  32. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeTempLiveCell.m
  33. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeTempLiveCell.xib
  34. 6 5
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveApplyingView.xib
  35. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveSeatApplyCell.m
  36. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveSeatApplyCell.xib
  37. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/SeatContentView.m
  38. 2 2
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/ShareLiveView/ShareLiveDisplayView.m
  39. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/ShareLiveView/ShareLiveDisplayView.xib
  40. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkListCell.m
  41. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkListCell.xib
  42. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.m
  43. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.xib
  44. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/UserSettingViewController.m
  45. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/UseBodyView.xib
  46. 2 2
      KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.m
  47. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.xib
  48. 2 2
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TRTC/TXRTCService.m
  49. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/MainContainerView/TXClassroomMainContainer.m
  50. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/MainContainerView/VideoMaskView.m
  51. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatMineCell.m
  52. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatMineCell.xib
  53. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatOtherCell.m
  54. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatOtherCell.xib
  55. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/VideoList/TXClassroomVideoListCell.m
  56. 2 2
      KulexiuForStudent/KulexiuForStudent/Module/TXLive/Controller/TXLiveRoomViewController.m
  57. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/TXLive/View/LiveRoomHeadView.xib
  58. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/TXLive/View/TXSeatContainerView.m

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/AppDelegate.m

@@ -303,7 +303,7 @@
 - (void)configTXIM {
     TUIConfig *config = [TUIConfig defaultConfig];
     // 修改默认头像
-    config.defaultAvatarImage = [UIImage imageNamed:USERDEFAULT_LOGO];
+    config.defaultAvatarImage = [UIImage imageNamed:STUDENT_AVATAR];
     // 修改默认群组头像
     config.defaultGroupAvatarImage = [UIImage imageNamed:CLIENT_GROUP_LOGO];
     // 禁用群组九宫格头像

+ 21 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/student_avatar.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "student_avatar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/student_avatar.imageset/student_avatar@2x.png


+ 21 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/teacher_avatar.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "teacher_avatar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/teacher_avatar.imageset/teacher_avatar@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/tenant_defalut_avatar.imageset/tenant_defalut_avatar@2x.png


+ 3 - 0
KulexiuForStudent/KulexiuForStudent/Common/Base/LoginManger/KSLoginManager.m

@@ -142,6 +142,9 @@
             self.isQuitting = NO;
         }
     }
+    else {// 未挤掉账号,重置状态
+        self.isQuitting = NO;
+    }
 }
 
 - (void)resetToLoginViewController:(NSString *)tipsMsg {

+ 5 - 3
KulexiuForStudent/KulexiuForStudent/Common/Define/UserKeyHeader.h

@@ -49,10 +49,12 @@
 #define GROUP_TENANT_LOGO (@"tenant_group_default_avatal")
 
 
-#define USERDEFAULT_LOGO (@"user_default_avatal")
-#define USER_LOGO_RECTANGLE (@"user_avatarRectangle")
+#define STUDENT_AVATAR (@"student_avatar")
+#define TEACHER_AVATAR (@"teacher_avatar")
 
-#define CLIENT_USERDEFAULT_LOGO ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0 ? @"user_default_avatal" : @"tenant_defalut_avatar")
+
+
+#define CLIENT_USERDEFAULT_LOGO ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0 ? @"student_avatar" : @"tenant_defalut_avatar")
 
 #define GROUP_DEFAULT_LOGO (@"group_default_avatal")
 #define CLIENT_GROUP_LOGO ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0 ? @"group_default_avatal" : @"tenant_group_default_avatal")

+ 15 - 5
KulexiuForStudent/KulexiuForStudent/Common/MediaMerge/AudioMerge/KSMergeAudioControlView.m

@@ -104,10 +104,10 @@
     
     // 处理数据
     self.recordBubbleLabel.text = [NSString stringWithFormat:@"%zd",bgVolume];
-    self.recordCenterX.constant = 30 + ((recordVolume *1.0)/ 100)*237;
+    self.recordCenterX.constant = [self getBubbleCenterX:self.recordSlider];
     
     self.bgVolumeBubble.text = [NSString stringWithFormat:@"%zd",bgVolume];
-    self.bgCenterX.constant = 30 + ((bgVolume *1.0)/ 100)*237;
+    self.bgCenterX.constant = [self getBubbleCenterX:self.bgSlider];
 }
 
 + (instancetype)shareIntance {
@@ -128,8 +128,8 @@
     self.recordVolume = volume;
     
     self.recordBubbleLabel.text = [NSString stringWithFormat:@"%zd",volume];
-    self.recordCenterX.constant = 30 + ((volume *1.0)/ 100)*237;
-    
+    self.recordCenterX.constant = [self getBubbleCenterX:self.recordSlider];
+
     [UIView animateWithDuration:0.1f animations:^{
         [self layoutIfNeeded];
     } completion:^(BOOL finished) {
@@ -142,7 +142,7 @@
 - (void)configBgVolumeValue:(NSInteger)volume {
     self.bgVolume = volume;
     self.bgVolumeBubble.text = [NSString stringWithFormat:@"%zd",volume];
-    self.bgCenterX.constant = 30 + ((volume *1.0)/ 100)*237;
+    self.bgCenterX.constant = [self getBubbleCenterX:self.bgSlider];
     [UIView animateWithDuration:0.1f animations:^{
         [self layoutIfNeeded];
     } completion:^(BOOL finished) {
@@ -152,6 +152,16 @@
     }];
 }
 
+- (CGFloat)getBubbleCenterX:(UISlider *)slider {
+    // 根据滑块当前值计算拇指位置
+    CGRect trackRect = [slider trackRectForBounds:slider.bounds];
+    CGRect thumbRect = [slider thumbRectForBounds:slider.bounds trackRect:trackRect value:slider.value];
+    
+    // 计算气泡位置,使其中心与拇指对齐,并且位于拇指的上方
+    CGFloat bubbleX = thumbRect.origin.x + thumbRect.size.width / 2.0;
+    return bubbleX + CGRectGetMinX(slider.frame);
+}
+
 - (IBAction)cancleMerge:(id)sender {
     if (self.callback) {
         self.callback(MERGEACTION_CANCLE, self.recordVolume, self.bgVolume, self.offsetTime);

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupMemberListCell.xib

@@ -3,7 +3,7 @@
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -21,7 +21,7 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3bd-Vo-rTM">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_avatarRectangle" translatesAutoresizingMaskIntoConstraints="NO" id="GW3-Oz-aPr">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="GW3-Oz-aPr">
                                 <rect key="frame" x="14" y="10" width="44" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="44" id="Mcn-Si-qXx"/>
@@ -129,8 +129,8 @@
     </objects>
     <resources>
         <image name="group_role_teacher" width="41" height="20"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <image name="tenant_chat_chat" width="22" height="22"/>
-        <image name="user_avatarRectangle" width="44" height="44"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.m

@@ -49,7 +49,7 @@
     if ([source isKindOfClass:[GroupNoticeModel class]]) {
         GroupNoticeModel *model = source;
         self.userName.text = [NSString returnNoNullStringWithString:model.username];
-        [self.userLogo sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
+        [self.userLogo sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
 
         self.noticeTitle.text = [NSString returnNoNullStringWithString:model.title];
         NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.xib

@@ -3,7 +3,7 @@
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -21,7 +21,7 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qWq-La-TpT">
                         <rect key="frame" x="13" y="12" width="333" height="171"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_avatarRectangle" translatesAutoresizingMaskIntoConstraints="NO" id="Gkn-L8-UCb">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="Gkn-L8-UCb">
                                 <rect key="frame" x="16" y="12" width="48" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="48" id="8bz-sK-gjT"/>
@@ -158,7 +158,7 @@
     </objects>
     <resources>
         <image name="notice_action" width="24" height="25"/>
-        <image name="user_avatarRectangle" width="44" height="44"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatUserInfo/UserDetailBodyView.m

@@ -57,7 +57,7 @@
     
     [self.memberImage setImage:[UIImage imageNamed:viperImage]];
     
-    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[userInfo.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[userInfo.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     self.userName.text = [NSString returnNoNullStringWithString:userInfo.username];
     self.userIdLabel.text = [NSString stringWithFormat:@"学号:%.0f",userInfo.userId];
     self.userSubject.text = [NSString returnNoNullStringWithString:userInfo.subjectName];

+ 8 - 8
KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatUserInfo/UserDetailBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PZG-4f-DTT">
                     <rect key="frame" x="14" y="14" width="362" height="260"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="GcD-Ic-cNt">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="GcD-Ic-cNt">
                             <rect key="frame" x="20" y="18" width="60" height="60"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="60" id="JVv-tN-XaL"/>
@@ -75,7 +75,7 @@
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ix6-yj-abW">
-                                            <rect key="frame" x="48" y="24.666666666666657" width="46" height="21"/>
+                                            <rect key="frame" x="48" y="24.666666666666657" width="38.666666666666657" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="iYb-XU-9n5"/>
                                             </constraints>
@@ -84,7 +84,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yzA-J6-60W">
-                                            <rect key="frame" x="96" y="24.666666666666657" width="0.0" height="21"/>
+                                            <rect key="frame" x="88.666666666666671" y="24.666666666666657" width="0.0" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="ex4-d4-aaT"/>
                                             </constraints>
@@ -118,7 +118,7 @@
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="声部:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0W-G0-lyK">
-                                            <rect key="frame" x="48" y="25.666666666666657" width="46" height="21"/>
+                                            <rect key="frame" x="48" y="25.666666666666657" width="38.666666666666657" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="ZpX-6w-BFn"/>
                                             </constraints>
@@ -127,7 +127,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ab0-kc-WGQ">
-                                            <rect key="frame" x="96" y="25.666666666666657" width="0.0" height="21"/>
+                                            <rect key="frame" x="88.666666666666671" y="25.666666666666657" width="0.0" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="UID-JK-AxO"/>
                                             </constraints>
@@ -254,7 +254,7 @@
         <image name="home_left" width="4" height="12"/>
         <image name="mine_nomal" width="34" height="15"/>
         <image name="mine_uid" width="11" height="11"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Course/AccompanyCourse/View/AccompanyCourseInfoCell.m

@@ -51,7 +51,7 @@
     }
     else {
         self.studentName.text = [NSString returnNoNullStringWithString:teacherName];
-        [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[teacherAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[teacherAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
         self.avatalHeight.constant = 47.0f;
     }
     

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Course/AccompanyCourse/View/AccompanyCourseInfoCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -53,7 +53,7 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="s7E-Da-TcK">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="s7E-Da-TcK">
                                 <rect key="frame" x="11" y="56" width="47" height="47"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="47" id="4Ap-gR-6vk"/>
@@ -165,7 +165,7 @@
     <resources>
         <image name="course_chat" width="19" height="18"/>
         <image name="course_time" width="16" height="16"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Course/View/AccompanyCourseCell.m

@@ -46,7 +46,7 @@
         self.callback = callback;
     }
     self.sourceModel = model;
-    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     self.studentName.text = [NSString returnNoNullStringWithString:model.userName];
     self.studentSubject.text = [NSString returnNoNullStringWithString:model.subjectName];
     // time
@@ -102,7 +102,7 @@
     }
     self.lessonModel = model;
     
-    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[model.cover getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[model.cover getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     self.studentName.text = [NSString returnNoNullStringWithString:model.name];
     self.studentSubject.text = [NSString returnNoNullStringWithString:model.subjectName];
     

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Course/View/AccompanyCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -50,7 +50,7 @@
                                 <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="foX-kQ-NZi">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="foX-kQ-NZi">
                                 <rect key="frame" x="11" y="56" width="47" height="47"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="47" id="cRs-VR-QQw"/>
@@ -188,7 +188,7 @@
     <resources>
         <image name="course_chat" width="19" height="18"/>
         <image name="course_time" width="16" height="16"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeCourseTipsView.m

@@ -46,7 +46,7 @@
         [formatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.timeLabel.text = [NSString returnNoNullStringWithString:[formatter stringFromDate:beginDate]];
     }
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
 }
 
 - (void)joinRoomCallback:(HomeCourseCallback)callback {

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeCourseTipsView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3RJ-oY-GLg">
                     <rect key="frame" x="14" y="10" width="386" height="60"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="Jld-ti-AY3">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="Jld-ti-AY3">
                             <rect key="frame" x="7" y="6" width="48" height="48"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="48" id="ofG-UR-djl"/>
@@ -134,7 +134,7 @@
     </objects>
     <resources>
         <image name="homeCourse_notice" width="20" height="21"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.m

@@ -45,7 +45,7 @@
     else {
         self.teacherName.text = [NSString stringWithFormat:@"%@",source.teacherName];
     }
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
 
     if (source.courseGroupPrice > 0) {
         NSString *mountMsg = [NSString formatDoubleNum:source.courseGroupPrice];

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -101,7 +101,7 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="ZKK-49-oJ1">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="ZKK-49-oJ1">
                                 <rect key="frame" x="188" y="37" width="18" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="18" id="21n-OT-NLE"/>
@@ -177,7 +177,7 @@
     </objects>
     <resources>
         <image name="home_courseTime" width="17" height="17"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <image name="video_placeholder" width="103" height="72"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -53,7 +53,7 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="q8T-4X-XH1">
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="q8T-4X-XH1">
                     <rect key="frame" x="14" y="50" width="32" height="32"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="mbm-wS-w83"/>
@@ -128,6 +128,6 @@
     <resources>
         <image name="home_message" width="23" height="23"/>
         <image name="home_scan" width="22" height="22"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="student_avatar" width="150" height="150"/>
     </resources>
 </document>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.m

@@ -41,7 +41,7 @@
     else {
         self.teacherName.text = [NSString stringWithFormat:@"%@",source.teacherName];
     }
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     if (source.lessonPrice > 0) {
         NSString *mountMsg = [NSString formatDoubleNum:source.lessonPrice];
         NSString *descMsg = [NSString stringWithFormat:@"¥%@",mountMsg];

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -83,7 +83,7 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="cqj-eK-gnE">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="cqj-eK-gnE">
                                 <rect key="frame" x="188" y="39" width="18" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="18" id="0Vr-BO-kpU"/>
@@ -152,7 +152,7 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <image name="video_placeholder" width="103" height="72"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.m

@@ -81,7 +81,7 @@
             [self.animationView stop];
         }
     }
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     if ([NSString isEmptyString:sourceModel.username]) {
         self.teacherName.text = [NSString stringWithFormat:@"游客%.0f",sourceModel.userId];
     }

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -21,7 +21,7 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QRJ-mO-zJO">
                         <rect key="frame" x="2" y="2" width="106" height="174"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="AqF-It-spJ">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="AqF-It-spJ">
                                 <rect key="frame" x="24" y="17" width="58" height="58"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="58" id="Qhl-va-n5l"/>
@@ -179,7 +179,7 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherShowCell.m

@@ -59,7 +59,7 @@
 
     }
     self.descLabel.text = [NSString returnNoNullStringWithString:sourceModel.describe];
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     self.teacherNameLabel.text = [NSString returnNoNullStringWithString:sourceModel.username];
     self.watchCount.text = [NSString stringWithFormat:@"%@人观看",sourceModel.browse];
 //    [KSVideoHelper getVideoDuration:sourceModel.videoUrl displayInLabel:self.durationLabel];

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherShowCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -27,7 +27,7 @@
                                     <constraint firstAttribute="height" constant="94" id="BLz-7G-Kb2"/>
                                 </constraints>
                             </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="9jq-kZ-bi9">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="9jq-kZ-bi9">
                                 <rect key="frame" x="8" y="104" width="18" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="18" id="hDV-Sn-4Qi"/>
@@ -185,7 +185,7 @@
     <resources>
         <image name="introduce_play" width="10" height="10"/>
         <image name="live_image" width="23" height="10"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <image name="video_placeholder" width="103" height="72"/>
     </resources>
 </document>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeHotStyleCell.m

@@ -29,7 +29,7 @@
 - (void)configWithSource:(TeacherStyleModel *)source {
     
     [self.coverImage sd_setImageWithURL:[NSURL URLWithString:[source.cover getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     if ([NSString isEmptyString:source.username]) {
         self.teacherName.text = [NSString stringWithFormat:@"游客%@",source.userId];
     }

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeHotStyleCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -27,7 +27,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rx5-wy-C5C">
                                 <rect key="frame" x="0.0" y="173" width="370" height="43"/>
                                 <subviews>
-                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="q26-31-k6x">
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="q26-31-k6x">
                                         <rect key="frame" x="10" y="13.5" width="16" height="16"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="16" id="Qpi-G1-LPA"/>
@@ -123,7 +123,7 @@
     </objects>
     <resources>
         <image name="home_stylePlay" width="24" height="24"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeTempLiveCell.m

@@ -44,7 +44,7 @@
 - (void)configWithSource:(HomeTeacherLiveModel *)source {
     [self.coverImage sd_setImageWithURL:[NSURL URLWithString:[source.liveCoverImg getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     self.liveTitle.text = [NSString returnNoNullStringWithString:source.liveTitle];
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[source.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     if ([NSString isEmptyString:source.username]) {
         self.teacherName.text = [NSString stringWithFormat:@"游客%@",source.teacherId];
     }

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeTempLiveCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -27,7 +27,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rgs-pt-r0X">
                                 <rect key="frame" x="0.0" y="200" width="213" height="80"/>
                                 <subviews>
-                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="UqS-fb-rXq">
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="UqS-fb-rXq">
                                         <rect key="frame" x="10" y="50" width="16" height="16"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="16" id="C2I-Ix-13W"/>
@@ -143,7 +143,7 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 6 - 5
KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveApplyingView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -33,7 +33,7 @@
                                 <action selector="cancleApplyAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="x0L-0h-o81"/>
                             </connections>
                         </button>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="wTz-Qn-nGw">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="wTz-Qn-nGw">
                             <rect key="frame" x="126.5" y="64" width="48" height="48"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="48" id="jmZ-n2-cyB"/>
@@ -45,7 +45,7 @@
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="0Ka-dD-OT2">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="0Ka-dD-OT2">
                             <rect key="frame" x="239.5" y="64" width="48" height="48"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="48" id="2Oe-cF-PfY"/>
@@ -117,7 +117,8 @@
     </objects>
     <resources>
         <image name="mic_connting" width="37" height="28"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="student_avatar" width="150" height="150"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveSeatApplyCell.m

@@ -38,7 +38,7 @@
         self.callback = callback;
     }
     self.member = member;
-    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[member.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[member.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     self.userName.text = [NSString returnNoNullStringWithString:member.name];
     if (member.isConnected) {
         self.refuseButton.hidden = YES;

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveSeatApplyCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="360" height="90"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="DZT-rd-ceH">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="DZT-rd-ceH">
                         <rect key="frame" x="14" y="21" width="48" height="48"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="48" id="tal-Vf-fOZ"/>
@@ -113,6 +113,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="student_avatar" width="150" height="150"/>
     </resources>
 </document>

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Live/View/SeatContentView.m

@@ -37,7 +37,7 @@
     self.backgroundColor = [UIColor clearColor];
     
     if ([self.userId isEqualToString:UserDefault(UIDKey)]) { // 自己
-        [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[UserDefault(AvatarUrlKey) getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[UserDefault(AvatarUrlKey) getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
         self.userAvatar.layer.borderColor = HexRGB(0xf37f17).CGColor;
         self.userAvatar.layer.borderWidth = 1.0f;
         [self addSubview:self.userAvatar];
@@ -70,7 +70,7 @@
         self.nameLabel.text = [NSString returnNoNullStringWithString:UserDefault(NicknameKey)];
     }
     else { // 其他人
-        [self.userAvatar setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.userAvatar setImage:[UIImage imageNamed:STUDENT_AVATAR]];
 
         [self addSubview:self.userAvatar];
         [self.userAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -115,7 +115,7 @@
             NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
             if (self) {
                 self.nameLabel.text = [result ks_stringValueForKey:@"friendNickname"];
-                [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[[result ks_stringValueForKey:@"friendAvatar"] getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+                [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[[result ks_stringValueForKey:@"friendAvatar"] getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
             }
             else {
                 NSLog(@"-delloc------");

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Live/View/ShareLiveView/ShareLiveDisplayView.m

@@ -59,11 +59,11 @@
 
 
 - (void)configWithTeacherAvatar:(NSString *)teacherAvatarUrl teacherName:(NSString *)teacherName qrUrl:(NSString *)qrUrl {
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[teacherAvatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[teacherAvatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     UIImage *codeImage = [KSQRCreateManager createQRCodeWithUrl:qrUrl displayImage:nil scaleSize:89];
     [self.qrCodeView setImage:codeImage];
     self.tipsLabel.text = [NSString stringWithFormat:@"主讲人:%@", [NSString returnNoNullStringWithString:teacherName]];
-    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:UserDefault(AvatarUrlKey)] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:UserDefault(AvatarUrlKey)] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     self.referrerLabel.text = [NSString stringWithFormat:@"%@ 为您推荐",[NSString returnNoNullStringWithString:UserDefault(NicknameKey)]];
 }
 

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/Live/View/ShareLiveView/ShareLiveDisplayView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -29,7 +29,7 @@
                                 <constraint firstAttribute="width" secondItem="7SP-qt-lbO" secondAttribute="height" multiplier="334:84" id="anx-OJ-sYZ"/>
                             </constraints>
                         </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="gFm-57-B1x">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="gFm-57-B1x">
                             <rect key="frame" x="37" y="48" width="76" height="76"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="76" id="Lg5-8z-q88"/>
@@ -140,7 +140,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="58"/>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 </view>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="bxV-PM-Ij0">
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="bxV-PM-Ij0">
                                     <rect key="frame" x="12" y="11" width="36" height="36"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="36" id="9Nv-7W-Gj7"/>
@@ -193,7 +193,7 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="主讲人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="njD-0Z-9Q2">
-                            <rect key="frame" x="22" y="152" width="65.333333333333329" height="22"/>
+                            <rect key="frame" x="22.000000000000004" y="152" width="57.333333333333343" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="goz-4P-xae"/>
                             </constraints>
@@ -310,7 +310,7 @@
         <image name="liveShare_tips" width="334" height="84"/>
         <image name="live_status" width="10" height="10"/>
         <image name="share_logo" width="71" height="20"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkListCell.m

@@ -61,7 +61,7 @@
     }
     else {
         self.studentNameLabel.text = [NSString returnNoNullStringWithString:sourceModel.teacherName];
-        [self.studentAvatal sd_setImageWithURL:[NSURL URLWithString:[sourceModel.teacherAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.studentAvatal sd_setImageWithURL:[NSURL URLWithString:[sourceModel.teacherAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
         self.avatalHeight.constant = 47.0f;
         self.isMusicRoom = NO;
     }

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkListCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -50,7 +50,7 @@
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="RUc-4R-w37">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="RUc-4R-w37">
                                 <rect key="frame" x="11" y="56" width="47" height="47"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="47" id="ERa-d0-RjJ"/>
@@ -159,7 +159,7 @@
     <resources>
         <image name="course_chat" width="19" height="18"/>
         <image name="course_time" width="16" height="16"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.m

@@ -36,7 +36,7 @@
 - (void)configSourceModel:(VideoCourseModel *)model isInCheck:(BOOL)isCheck {
     [self.coverImage sd_setImageWithURL:[NSURL URLWithString:[model.lessonCoverUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     self.courseTitle.text = [NSString returnNoNullStringWithString:model.lessonName];
-    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     if ([NSString isEmptyString:model.username]) {
         self.teacherName.text = [NSString stringWithFormat:@"游客%.0f",model.teacherId];
     }

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.xib

@@ -3,7 +3,7 @@
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -68,7 +68,7 @@
                                 <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="3il-XM-fqj">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="3il-XM-fqj">
                                 <rect key="frame" x="11" y="122" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="20" id="1af-AW-k6Y"/>
@@ -178,7 +178,7 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <image name="video_placeholder" width="103" height="72"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/UserSettingViewController.m

@@ -85,13 +85,13 @@
 
 - (void)configMessage {
     if (![NSString isEmptyString:self.mineInfo.heardUrl]) {
-        [self.bodyView.userAvatal displayImageWithUrl:[NSURL URLWithString:[self.mineInfo.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:USERDEFAULT_LOGO] callback:^(UIImage * _Nonnull image) {
+        [self.bodyView.userAvatal displayImageWithUrl:[NSURL URLWithString:[self.mineInfo.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:STUDENT_AVATAR] callback:^(UIImage * _Nonnull image) {
             self.preDisplayImage = image;
         }];
     }
     else {
-        [self.bodyView.userAvatal setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
-        self.preDisplayImage = [UIImage imageNamed:USERDEFAULT_LOGO];
+        [self.bodyView.userAvatal setImage:[UIImage imageNamed:STUDENT_AVATAR]];
+        self.preDisplayImage = [UIImage imageNamed:STUDENT_AVATAR];
     }
     self.bodyView.nickNameLabel.text = [NSString returnNoNullStringWithString:self.mineInfo.username];
     NSString *userSex = @"";

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/UseBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -40,7 +40,7 @@
                         <view tag="1001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J2o-ST-wEv">
                             <rect key="frame" x="0.0" y="0.0" width="347" height="80"/>
                             <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="UFo-U9-qsN">
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="UFo-U9-qsN">
                                     <rect key="frame" x="12" y="13" width="54" height="54"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="54" id="RxM-37-OnT"/>
@@ -559,7 +559,7 @@
     </objects>
     <resources>
         <image name="setting_next" width="6" height="11"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="student_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.m

@@ -109,12 +109,12 @@
     [self configMemberDisplay:sourceModel.userVip];
     
     if (![NSString isEmptyString:sourceModel.heardUrl]) {
-        [self.userAvatar displayImageWithUrl:[NSURL URLWithString:[sourceModel.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:USERDEFAULT_LOGO] callback:^(UIImage * _Nonnull image) {
+        [self.userAvatar displayImageWithUrl:[NSURL URLWithString:[sourceModel.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:STUDENT_AVATAR] callback:^(UIImage * _Nonnull image) {
             self.preDisplayImage = image;
         }];
     }
     else {
-        [self.userAvatar setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.userAvatar setImage:[UIImage imageNamed:STUDENT_AVATAR]];
     }
     
     if ([NSString isEmptyString:sourceModel.subjectName]) {

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.xib

@@ -3,7 +3,7 @@
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -287,7 +287,7 @@
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </view>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="0Xj-Pq-GsW">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="0Xj-Pq-GsW">
                             <rect key="frame" x="334" y="14" width="52" height="52"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="52" id="HpZ-zd-ch0"/>
@@ -1118,7 +1118,7 @@
         <image name="mine_ticket" width="42" height="42"/>
         <image name="mine_trainRecord" width="42" height="42"/>
         <image name="mine_uid" width="11" height="11"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TRTC/TXRTCService.m

@@ -133,11 +133,11 @@
     NSString *imageName = UserDefaultObjectForKey(AvatarUrlKey);
     UIImageView *avatar = [[UIImageView alloc] initWithFrame:CGRectMake(2, 2, 80, 80)];
     if ([NSString isEmptyString:imageName]) {
-        imageName = USERDEFAULT_LOGO;
+        imageName = STUDENT_AVATAR;
         [avatar setImage:[UIImage imageNamed:imageName]];
     }
     else {
-        [avatar sd_setImageWithURL:[NSURL URLWithString:[imageName getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [avatar sd_setImageWithURL:[NSURL URLWithString:[imageName getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     }
     [layerView addSubview:avatar];
 

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/MainContainerView/TXClassroomMainContainer.m

@@ -96,7 +96,7 @@
 - (void)containerViewRenderView:(RoomMember *)member {
     self.videoBackView.hidden = NO;
     self.videoView.hidden = NO;
-    [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
 
     if([[ClassroomService sharedService].currentRoom.currentMemberId isEqualToString:member.userId]) {
 

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/MainContainerView/VideoMaskView.m

@@ -53,7 +53,7 @@
 }
 
 - (void)configUserAvatar:(NSString *)avatarUrl {
-    [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[avatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[avatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
 }
 
 - (void)addDismisTarget:(id)target action:(SEL)act{

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatMineCell.m

@@ -25,7 +25,7 @@
 }
 
 - (void)setModel:(TXClassroomTextMsg *)message {
-    [self.mineAvatarl sd_setImageWithURL:[NSURL URLWithString:[message.userInfo.avatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.mineAvatarl sd_setImageWithURL:[NSURL URLWithString:[message.userInfo.avatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     [paragraphStyle setLineSpacing:4];//调整行间距
     paragraphStyle.alignment = NSTextAlignmentLeft;

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatMineCell.xib

@@ -3,7 +3,7 @@
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="86"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_avatarRectangle" translatesAutoresizingMaskIntoConstraints="NO" id="k3M-Wn-982">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="k3M-Wn-982">
                         <rect key="frame" x="268" y="23" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="cL2-bq-BGp"/>
@@ -73,6 +73,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="user_avatarRectangle" width="44" height="44"/>
+        <image name="student_avatar" width="150" height="150"/>
     </resources>
 </document>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatOtherCell.m

@@ -27,7 +27,7 @@
 }
 
 - (void)setModel:(TXClassroomTextMsg *)message {
-    [self.otherAvatar sd_setImageWithURL:[NSURL URLWithString:[message.userInfo.avatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.otherAvatar sd_setImageWithURL:[NSURL URLWithString:[message.userInfo.avatarUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     [paragraphStyle setLineSpacing:4];//调整行间距
     NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:message.text attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:14.0f],NSForegroundColorAttributeName:HexRGB(0x333333)}];

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatOtherCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="105"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_logo" translatesAutoresizingMaskIntoConstraints="NO" id="vGs-dk-LwK">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="vGs-dk-LwK">
                         <rect key="frame" x="12" y="12" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="Ftu-P3-Drn"/>
@@ -85,6 +85,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="student_logo" width="58" height="58"/>
+        <image name="student_avatar" width="150" height="150"/>
     </resources>
 </document>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/VideoList/TXClassroomVideoListCell.m

@@ -168,7 +168,7 @@
     else {
         RoomMember *roomMember = [[ClassroomService sharedService].currentRoom getMember:member.userId];
 
-        [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[roomMember.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[roomMember.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
 
         self.member = roomMember;
         self.userId = roomMember.userId;

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/TXLive/Controller/TXLiveRoomViewController.m

@@ -2608,8 +2608,8 @@ static int clickPraiseBtnTimes  = 0;
     if (!_applyingView) {
         _applyingView = [LiveApplyingView shareInstance];
         NSString *avatar = UserDefaultObjectForKey(AvatarUrlKey);
-        [_applyingView.myAvatal sd_setImageWithURL:[NSURL URLWithString:[avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
-        [_applyingView.teacherAvatal sd_setImageWithURL:[NSURL URLWithString:[self.createrAvatal getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [_applyingView.myAvatal sd_setImageWithURL:[NSURL URLWithString:[avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
+        [_applyingView.teacherAvatal sd_setImageWithURL:[NSURL URLWithString:[self.createrAvatal getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
         MJWeakSelf;
         [_applyingView cancleApplyCallback:^{
             [weakSelf cancleApplyAction];

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/TXLive/View/LiveRoomHeadView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,7 +16,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yl0-aO-J0L">
                     <rect key="frame" x="11" y="0.0" width="100" height="38"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="GvE-me-Ml5">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="GvE-me-Ml5">
                             <rect key="frame" x="2" y="2" width="34" height="34"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="34" id="7xb-3N-CS9"/>
@@ -101,7 +101,7 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rqz-fi-Tcn">
-                    <rect key="frame" x="12" y="46" width="99" height="22"/>
+                    <rect key="frame" x="12" y="46" width="100.5" height="22"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="like_logo" translatesAutoresizingMaskIntoConstraints="NO" id="ptZ-Wz-uTV">
                             <rect key="frame" x="7" y="4" width="14" height="14"/>
@@ -111,7 +111,7 @@
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="本场点赞数0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lqe-8p-COb">
-                            <rect key="frame" x="23" y="3.5" width="69" height="15"/>
+                            <rect key="frame" x="23" y="3.5" width="70.5" height="15"/>
                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
@@ -163,6 +163,6 @@
         <image name="chatroom_member" width="32" height="32"/>
         <image name="classroom_quit" width="17" height="17"/>
         <image name="like_logo" width="14" height="14"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
     </resources>
 </document>

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/TXLive/View/TXSeatContainerView.m

@@ -56,7 +56,7 @@
     self.backgroundColor = [UIColor clearColor];
     
     if ([self.userId isEqualToString:UserDefault(IM_USERID)]) { // 自己
-        [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[UserDefault(AvatarUrlKey) getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[UserDefault(AvatarUrlKey) getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
         [self addSubview:self.userAvatar];
         [self.userAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerX.mas_equalTo(self.mas_centerX);
@@ -105,10 +105,10 @@
     else { // 其他人
         [self addSubview:self.userAvatar];
         if (self.currentMember.imageUrl) {
-            [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[self.currentMember.imageUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+            [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[self.currentMember.imageUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
         }
         else {
-            [self.userAvatar setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+            [self.userAvatar setImage:[UIImage imageNamed:STUDENT_AVATAR]];
         }
         [self.userAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerX.mas_equalTo(self.mas_centerX);
@@ -211,7 +211,7 @@
                 NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
                 if (self) {
                     self.nameLabel.text = [result ks_stringValueForKey:@"friendNickname"];
-                    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[[result ks_stringValueForKey:@"friendAvatar"] getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+                    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[[result ks_stringValueForKey:@"friendAvatar"] getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
                     self.currentMember.userName = [result ks_stringValueForKey:@"friendNickname"];
                     self.currentMember.imageUrl = [result ks_stringValueForKey:@"friendAvatar"];
                 }