更换老师学生默认头像

KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -177,7 +177,6 @@
             [USER_MANAGER queryUserInfoSendLoginUMCount];
             [self initTableBar];
             self.window.rootViewController=_tabBarController;
-            
         }
     }
     [self versionCheck];
@@ -293,7 +292,7 @@
 - (void)configTXIM {
     TUIConfig *config = [TUIConfig defaultConfig];
     // 修改默认头像
-    config.defaultAvatarImage = [UIImage imageNamed:USERDEFAULT_LOGO];
+    config.defaultAvatarImage = [UIImage imageNamed:STUDENT_AVATAR];
     // 修改默认群组头像
     config.defaultGroupAvatarImage = [UIImage imageNamed:GROUP_DEFAULT_LOGO];
     // 禁用群组九宫格头像

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/user_default_avatal.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/student_avatar.imageset/Contents.json

@@ -5,12 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "user_default_avatal@2x.png",
+      "filename" : "student_avatar@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "user_default_avatal@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/user_avatarRectangle.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/teacher_avatar.imageset/Contents.json

@@ -5,12 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "user_avatarRectangle@2x.png",
+      "filename" : "teacher_avatar@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "user_avatarRectangle@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

KulexiuForTeacher/KulexiuForTeacher/Common/Base/LoginManger/KSLoginManager.m

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

KulexiuForTeacher/KulexiuForTeacher/Common/Define/UserKeyHeader.h

@@ -49,8 +49,9 @@
 #define GROUP_COURSE_LOGO (@"chat_group_Logo")
 #define GROUP_TENANT_LOGO (@"chat_tenantGroup_Logo")
 
-#define USERDEFAULT_LOGO (@"user_default_avatal")
-#define USER_LOGO_RECTANGLE (@"user_avatarRectangle")
+
+#define STUDENT_AVATAR (@"student_avatar")
+#define TEACHER_AVATAR (@"teacher_avatar")
 
 #define GROUP_DEFAULT_LOGO (@"group_default_avatal")
 #define VIP_DEFAULT_LOGO (@"vip_chatList")

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/KSMergeAudioControlView.m

@@ -99,10 +99,10 @@
     self.bgSlider.value = bgVolume;
     // 处理数据
     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 {
@@ -123,8 +123,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) {
@@ -137,7 +137,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) {
@@ -147,6 +147,17 @@
     }];
 }
 
+
+- (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);

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/BanList/View/BanStudentListCell.m

@@ -33,7 +33,7 @@
     else {
         self.studentName.text = model.nickname;
     }
-    [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:STUDENT_AVATAR]];
     
     NSString *statusImage = isChoose ? @"choose_status" : @"unChoose_status";
     [self.statusImage setImage:[UIImage imageNamed:statusImage]];

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/BanList/View/BanStudentListCell.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="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="OMW-an-wEJ">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="70"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="fAV-uj-cGe">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="fAV-uj-cGe">
                                 <rect key="frame" x="43" y="11" width="48" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="48" id="OAz-2Q-EQo"/>
@@ -90,8 +90,8 @@
         </tableViewCell>
     </objects>
     <resources>
+        <image name="student_avatar" width="150" height="150"/>
         <image name="unChoose_status" width="18" height="18"/>
-        <image name="user_default_avatal" width="52" height="52"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/BanList/View/GroupBanBottomView.m

@@ -64,7 +64,7 @@
         [imageView addGestureRecognizer:gesture];
         [self.imageScrollView addSubview:imageView];
         
-        [imageView sd_setImageWithURL:[NSURL URLWithString:[imgUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [imageView sd_setImageWithURL:[NSURL URLWithString:[imgUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
         CGFloat width = 28;
         CGFloat leftSpace = index * (6 + width);
         [imageView mas_makeConstraints:^(MASConstraintMaker *make) {

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/BanList/View/StudentChooseDisplayCell.m

@@ -32,7 +32,7 @@
         self.callback = callback;
     }
     self.source = 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:STUDENT_AVATAR]];
     self.studentName.text = [NSString returnNoNullStringWithString:model.nickname];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/BanList/View/StudentChooseDisplayCell.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="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="Xqt-GI-iob">
                         <rect key="frame" x="0.0" y="5.6666666666666679" width="320" height="40"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="61W-tA-OJT">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="61W-tA-OJT">
                                 <rect key="frame" x="12" y="0.0" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="40" id="Sx9-pW-icG"/>
@@ -85,7 +85,7 @@
     </objects>
     <resources>
         <image name="modify_cancel" width="15" height="15"/>
-        <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>

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/UserDetail/View/KSUserDetailBodyView.m

@@ -61,7 +61,7 @@
     }
     
     
-    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.friendAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.friendAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     
     
     self.userName.text = [NSString returnNoNullStringWithString:sourceModel.friendNickname];

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/UserDetail/View/KSUserDetailBodyView.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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -350,7 +350,7 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="Cdz-aI-d13">
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="Cdz-aI-d13">
                     <rect key="frame" x="153.66666666666666" y="22" width="86" height="86"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="86" id="af5-LS-gKf"/>
@@ -412,6 +412,6 @@
     <resources>
         <image name="mineCenter_tagSvip" width="20" height="20"/>
         <image name="mineCenter_tagVip" width="20" height="20"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="student_avatar" width="150" height="150"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/View/GroupNoticeCell.m

@@ -50,7 +50,7 @@
         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];

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/ShareMusic/View/MusicChooseCell.m

@@ -63,7 +63,7 @@
     [self.typeImage setImage:[UIImage imageNamed:typeImgName]];
     
     self.uploaderName.text = [NSString returnNoNullStringWithString:owner];
-    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.addUserAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.uploaderLogo sd_setImageWithURL:[NSURL URLWithString:[songMessage.addUserAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     if (songMessage.isChoose) {
         self.bgView.layer.borderColor = THEMECOLOR.CGColor;
         self.bgView.layer.borderWidth = 1.0f;

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/ShareMusic/View/MusicChooseCell.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"/>
@@ -53,7 +53,7 @@
                                     <constraint firstAttribute="height" constant="1" id="Bak-oD-PSf"/>
                                 </constraints>
                             </view>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="1jr-x0-lYx">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="1jr-x0-lYx">
                                 <rect key="frame" x="18" y="69" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="7hc-pB-NBU"/>
@@ -141,7 +141,7 @@
     <resources>
         <image name="music_free" width="55" height="22"/>
         <image name="music_logo" width="41" height="40"/>
-        <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>

KulexiuForTeacher/KulexiuForTeacher/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];

KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyCourseInfoCell.m

@@ -50,7 +50,7 @@
         self.studentName.text = studentName;
     }
     self.studentName.text = [NSString returnNoNullStringWithString:studentName];
-    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[studentAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[studentAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     self.studentSubject.text = [NSString returnNoNullStringWithString:studentSubject];
 
     self.userId = studentId;

KulexiuForTeacher/KulexiuForTeacher/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="student_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"/>
@@ -163,7 +163,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="student_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/View/MusicRoomStudentCell.m

@@ -32,7 +32,7 @@
 }
 
 - (void)configWithStudentInfo:(Records *)studentModel hasArrangeHomework:(BOOL)hasArrange {
-    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[studentModel.studentAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.studentAvatar sd_setImageWithURL:[NSURL URLWithString:[studentModel.studentAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     NSString *name;
     if ([NSString isEmptyString:studentModel.studentName]) {
         name = [NSString stringWithFormat:@"游客:%@",studentModel.studentId];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/View/EvaluateCouseCell.m

@@ -35,7 +35,7 @@
     [formatter setDateFormat:@"HH:mm"];
     NSString *lessonEnd = [formatter stringFromDate:endDate];
     self.courseTime.text = [NSString stringWithFormat:@"%@~%@",[NSString returnNoNullStringWithString:lessonBegin],[NSString returnNoNullStringWithString:lessonEnd]];
-    [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:STUDENT_AVATAR]];
     if ([NSString isEmptyString:model.userName]) {
         self.studentName.text = [NSString stringWithFormat:@"游客%@",model.userId];
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkListCell.m

@@ -53,7 +53,7 @@
         self.studentNameLabel.text = sourceModel.studentName;
     }
     
-    [self.studentAvatal sd_setImageWithURL:[NSURL URLWithString:[sourceModel.studentAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.studentAvatal sd_setImageWithURL:[NSURL URLWithString:[sourceModel.studentAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     self.subjectLabel.text = [NSString returnNoNullStringWithString:sourceModel.subjectName];
 
     self.targetId = sourceModel.imUserId;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/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="student_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"/>
@@ -158,7 +158,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="student_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MusicShareDisplayView.m

@@ -41,7 +41,7 @@
 }
 
 - (void)configWithSource:(MusicShareModel *)model {
-    [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]];
     self.teacherName.text = [NSString returnNoNullStringWithString:model.name];
     self.countLabel.text = [NSString stringWithFormat:@"我在酷乐秀上传了%.0f支乐谱",model.musicSheetCount];
     NSInteger displayCount = 0;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.m

@@ -59,7 +59,7 @@
     NSString *endTime = [formatter stringFromDate:endDate];
     self.timeLabel.text = [NSString stringWithFormat:@"%@~%@",[NSString returnNoNullStringWithString:courseBegin], [NSString returnNoNullStringWithString:endTime]];
     
-    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     // name
     NSString *teacherName = @"";
     if ([NSString isEmptyString:model.username]) {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.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"/>
@@ -96,7 +96,7 @@
                                         </constraints>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z2r-ta-wPC">
-                                        <rect key="frame" x="7" y="2" width="61.5" height="16"/>
+                                        <rect key="frame" x="7" y="2" width="63" height="16"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <color key="textColor" red="1" green="0.50196078430000002" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -137,7 +137,7 @@
                                     <action selector="chatAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="sIl-Bo-eWo"/>
                                 </connections>
                             </button>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="iEI-Pi-SsV">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="iEI-Pi-SsV">
                                 <rect key="frame" x="128" y="65" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="LGY-r0-DDx"/>
@@ -216,7 +216,7 @@
     <resources>
         <image name="chat_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"/>
         <image name="video_placeholder" width="103" height="72"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/ReceiveEvaluate/View/ReceiveEvaluateCell.m

@@ -34,7 +34,7 @@
 }
 
 - (void)configWithSource:(ReceiveListModel *)model {
-    [self.userAvatal sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userAvatal sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     if ([NSString isEmptyString:model.userName]) {
         self.studentName.text = [NSString stringWithFormat:@"游客%@",model.userId];
     }

KulexiuForTeacher/KulexiuForTeacher/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;

KulexiuForTeacher/KulexiuForTeacher/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:TEACHER_AVATAR]];
         [self addSubview:self.userAvatar];
         [self.userAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerX.mas_equalTo(self.mas_centerX);
@@ -70,7 +70,7 @@
         
     }
     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------");

KulexiuForTeacher/KulexiuForTeacher/Module/Live/View/SeatListView/LiveMemberSeatCell.m

@@ -41,7 +41,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 (isApply) {
         [self.approveButton setTitle:@"上麦" forState:UIControlStateNormal];
@@ -75,7 +75,7 @@
     if (self) {
         if (result) {
             self.userName.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.member.name = [result ks_stringValueForKey:@"friendNickname"];
             self.member.avatar = [result ks_stringValueForKey:@"friendAvatar"];
         }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleEditHeadView.m

@@ -33,10 +33,10 @@
 
 - (void)configUserMessage:(UserInfo *)info {
     if (![NSString isEmptyString:info.heardUrl]) {
-        [self.user_avatar sd_setImageWithURL:[NSURL URLWithString:[info.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.user_avatar sd_setImageWithURL:[NSURL URLWithString:[info.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     }
     else {
-        [self.user_avatar setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.user_avatar setImage:[UIImage imageNamed:TEACHER_AVATAR]];
     }
     self.user_nickname.text = [NSString returnNoNullStringWithString:info.username];
     

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleEditHeadView.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>
@@ -29,7 +29,7 @@
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="styleEdit_next" translatesAutoresizingMaskIntoConstraints="NO" id="wVd-hF-iN1">
                                     <rect key="frame" x="367" y="41.5" width="5" height="7"/>
                                 </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="tsB-LK-3gu">
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="tsB-LK-3gu">
                                     <rect key="frame" x="289" y="17" width="56" height="56"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="56" id="oKS-fT-JBW"/>
@@ -352,7 +352,7 @@
         <image name="sex_unchoose" width="20" height="20"/>
         <image name="styleEdit_next" width="5" height="7"/>
         <image name="style_camera" width="20" 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>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/Controller/MinePageViewController.m

@@ -109,7 +109,7 @@
     [self.topView configSource:self.teacherInfo];
     // 刷新达人认证和音乐人认证状态
     [self refreshAuthStatus];
-    [self.headView.bgView sd_setImageWithURL:[NSURL URLWithString:[self.teacherInfo.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"USERDEFAULT_LOGO"]];
+    [self.headView.bgView sd_setImageWithURL:[NSURL URLWithString:[self.teacherInfo.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
 }
 
 - (void)refreshAuthStatus {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/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:STUDENT_AVATAR]];
     self.studentName.text = [NSString returnNoNullStringWithString:model.userName];
     self.studentSubject.text = [NSString returnNoNullStringWithString:model.subjectName];
     // time
@@ -77,7 +77,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:STUDENT_AVATAR]];
     if ([NSString isEmptyString:model.name]) {
         self.studentName.text = [NSString stringWithFormat:@"游客%@",model.userId];
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MinePageTopView.m

@@ -68,10 +68,10 @@
         self.unfinishCourse.text = [NSString stringWithFormat:@"%.0f",infoMessage.unExpTime];
         
         if (![NSString isEmptyString:infoMessage.heardUrl]) {
-            [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+            [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
         }
         else {
-            [self.userAvatar setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+            [self.userAvatar setImage:[UIImage imageNamed:TEACHER_AVATAR]];
         }
         if ([NSString isEmptyString:infoMessage.username]) {
             self.teacherName.text = [NSString stringWithFormat:@"游客%@",infoMessage.userId];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MinePageTopView.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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -330,7 +330,7 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="3JZ-4N-xLY">
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="3JZ-4N-xLY">
                     <rect key="frame" x="26" y="0.0" width="78" height="78"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="78" id="BQF-U0-Q5F"/>
@@ -405,6 +405,6 @@
         <image name="mineVideo_nomal" width="23" height="23"/>
         <image name="mine_instrument_logo" width="68" height="17"/>
         <image name="qualification_icon" width="39" height="16"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/UserSettingViewController.m

@@ -59,13 +59,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:TEACHER_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:TEACHER_AVATAR]];
+        self.preDisplayImage = [UIImage imageNamed:TEACHER_AVATAR];
 
     }
     self.bodyView.nickNameLabel.text = [NSString returnNoNullStringWithString:self.mineInfo.username];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineHeadView.m

@@ -120,12 +120,12 @@
     self.starView.rate = infoMessage.starGrade / 5.0f;
     
     if (![NSString isEmptyString:infoMessage.heardUrl]) {
-        [self.userAvatal displayImageWithUrl:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:USERDEFAULT_LOGO] callback:^(UIImage * _Nonnull image) {
+        [self.userAvatal displayImageWithUrl:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:TEACHER_AVATAR] callback:^(UIImage * _Nonnull image) {
             self.preDisplayImage = image;
         }];
     }
     else {
-        [self.userAvatal setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.userAvatal setImage:[UIImage imageNamed:TEACHER_AVATAR]];
     }
     
     if ([NSString isEmptyString:infoMessage.username]) {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/TenantMineHeadView.m

@@ -121,10 +121,10 @@
     self.starView.rate = infoMessage.starGrade / 5.0f;
     
     if (![NSString isEmptyString:infoMessage.heardUrl]) {
-        [self.userAvatal sd_setImageWithURL:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.userAvatal sd_setImageWithURL:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
     }
     else {
-        [self.userAvatal setImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.userAvatal setImage:[UIImage imageNamed:TEACHER_AVATAR]];
     }
     
     if ([NSString isEmptyString:infoMessage.username]) {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/TenantMineHeadView.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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,7 +16,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6w5-En-SDh">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="110"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="MUG-JJ-qQX">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="MUG-JJ-qQX">
                             <rect key="frame" x="15" y="5" width="60" height="60"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="60" id="MEV-vM-Vrt"/>
@@ -243,6 +243,6 @@
         <image name="mineMusic_nomal" width="24" height="23"/>
         <image name="mineStyle_nomal" width="23" height="23"/>
         <image name="mineVideo_nomal" width="23" height="23"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/Service/TRTC/TXRTCService.m

@@ -130,11 +130,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];
 

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/DownloadView/DownloadStatusCell.m

@@ -34,7 +34,7 @@
     }
     self.member = member;
     
-    [self.userLogo sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userLogo sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     self.userName.text = [NSString returnNoNullStringWithString:member.name];
     
     NSInteger downStatus = member.downStatus;

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/MainContainerView/TXClassroomMainContainer.m

@@ -86,7 +86,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]) {
         

KulexiuForTeacher/KulexiuForTeacher/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{

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/MemberList/MemberListCell.m

@@ -35,7 +35,7 @@
     self.member = member;
     [self refreshButtonStatus:self.micButton enable:member.microphoneEnable];
     [self refreshButtonStatus:self.cameraButton enable:member.cameraEnable];
-    [self.userImage sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    [self.userImage sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
     self.userName.text = [NSString returnNoNullStringWithString:member.name];
     self.handUpImage.hidden = !member.handUpOn;
 }

KulexiuForTeacher/KulexiuForTeacher/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:TEACHER_AVATAR]];
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     [paragraphStyle setLineSpacing:4];//调整行间距
     paragraphStyle.alignment = NSTextAlignmentLeft;

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatMineCell.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="86"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="student_logo" translatesAutoresizingMaskIntoConstraints="NO" id="k3M-Wn-982">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_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="student_logo" width="42" height="42"/>
+        <image name="teacher_avatar" width="150" height="150"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/TXChatAreaView/TxClassroomChatOtherCell.m

@@ -26,7 +26,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)}];

KulexiuForTeacher/KulexiuForTeacher/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="42" height="42"/>
+        <image name="student_avatar" width="150" height="150"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/TXFullVideo/TXFullVideoCell.m

@@ -84,7 +84,7 @@
         self.videoView.hidden = YES;
     }
     else {
-        [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[currentMember.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+        [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[currentMember.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
 
         if ([currentMember.userId isEqualToString:[ClassroomService sharedService].currentRoom.currentMember.userId]) {
             self.mineView.hidden = NO;

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/VideoList/TXClassroomVideoListCell.m

@@ -164,7 +164,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.userId = roomMember.userId;
         if ([roomMember.userId isEqualToString:[ClassroomService sharedService].currentRoom.currentMember.userId]) {
             [self remakeNameLable:roomMember];

KulexiuForTeacher/KulexiuForTeacher/Module/TXLiveModule/View/TXLiveSeat/TXLiveMemberSeatCell.m

@@ -45,7 +45,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 (isApply) {
@@ -89,7 +89,7 @@
         if (result) {
             NSDictionary *userDic = [result ks_dictionaryValueForKey:@"friend"];
             self.userName.text = [result ks_stringValueForKey:@"friendNickname"];
-            [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[[userDic ks_stringValueForKey:@"avatar"] getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+            [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[[userDic ks_stringValueForKey:@"avatar"] getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:STUDENT_AVATAR]];
             self.member.name = [result ks_stringValueForKey:@"friendNickname"];
             self.member.avatar = [userDic ks_stringValueForKey:@"avatar"];
         }

KulexiuForTeacher/KulexiuForTeacher/Module/TXLiveModule/View/TXSeatContainerView.m

@@ -56,7 +56,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:TEACHER_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) {
@@ -216,7 +216,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"];