nothing

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -5597,13 +5597,13 @@
 		BCC9F36727F69BD100647449 /* InputBar */ = {
 			isa = PBXGroup;
 			children = (
-				BCC9F36827F69BD100647449 /* InputBarControl.h */,
-				BCC9F36927F69BD100647449 /* InputView.m */,
-				BCC9F36A27F69BD100647449 /* EmojiBoardView.h */,
-				BCC9F36B27F69BD100647449 /* InputView.h */,
 				BCC9F36C27F69BD100647449 /* Cell */,
-				BCC9F36F27F69BD100647449 /* InputBarControl.m */,
+				BCC9F36A27F69BD100647449 /* EmojiBoardView.h */,
 				BCC9F37027F69BD100647449 /* EmojiBoardView.m */,
+				BCC9F36827F69BD100647449 /* InputBarControl.h */,
+				BCC9F36F27F69BD100647449 /* InputBarControl.m */,
+				BCC9F36B27F69BD100647449 /* InputView.h */,
+				BCC9F36927F69BD100647449 /* InputView.m */,
 			);
 			path = InputBar;
 			sourceTree = "<group>";
@@ -5635,16 +5635,16 @@
 		BCC9F37327F69BD100647449 /* MessageCell */ = {
 			isa = PBXGroup;
 			children = (
-				BCC9F37427F69BD100647449 /* TextMessageCell.h */,
-				BCC9F37527F69BD100647449 /* TimeStampCell.m */,
-				BCC9F37627F69BD100647449 /* TipMessageCell.h */,
 				BCC9F37727F69BD100647449 /* MessageBaseCell.h */,
+				BCC9F37D27F69BD200647449 /* MessageBaseCell.m */,
 				BCC9F37827F69BD100647449 /* MessageCell.h */,
+				BCC9F37C27F69BD200647449 /* MessageCell.m */,
+				BCC9F37427F69BD100647449 /* TextMessageCell.h */,
 				BCC9F37927F69BD100647449 /* TextMessageCell.m */,
 				BCC9F37A27F69BD200647449 /* TimeStampCell.h */,
+				BCC9F37527F69BD100647449 /* TimeStampCell.m */,
+				BCC9F37627F69BD100647449 /* TipMessageCell.h */,
 				BCC9F37B27F69BD200647449 /* TipMessageCell.m */,
-				BCC9F37C27F69BD200647449 /* MessageCell.m */,
-				BCC9F37D27F69BD200647449 /* MessageBaseCell.m */,
 			);
 			path = MessageCell;
 			sourceTree = "<group>";

KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -387,175 +387,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "B7D82011-0199-48BA-957B-388AEA5242E3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Classroom/Controller/NewClassRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "604"
-            endingLineNumber = "604"
-            landmarkName = "-memberDidJoin:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "471"
-            endingLineNumber = "471"
-            landmarkName = "-onReceiveCommandMessage:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - b239244a98a8b8be"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[ClassroomService onReceiveCommandMessage:]"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "44">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - e6e256fdd3150132"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "36">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - e6e256fdd3150132"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "148">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - e6e256fdd3150132"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "824">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - e6e256fdd3150132"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "1572">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - 7b88a94502f842fe"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke.277"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "36">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - 7b88a94502f842fe"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke.277"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "148">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - 7b88a94502f842fe"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke.277"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "824">
-               </Location>
-               <Location
-                  uuid = "C92536E5-F34F-48F5-9AFD-1501468D6CC2 - 7b88a94502f842fe"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__44-[ClassroomService onReceiveCommandMessage:]_block_invoke.277"
-                  moduleName = "KulexiuForTeacher"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/Classroom/ClassroomService.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "471"
-                  endingLineNumber = "471"
-                  offsetFromSymbolStart = "1572">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "8C885F47-AACF-49FA-AA9E-27E0C5C4C6F2"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -795,22 +626,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "9022CD2A-1D2F-452B-A763-71F6310561C8"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "226"
-            endingLineNumber = "226"
-            landmarkName = "-toDetailViewWithTypeString:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "DA157C6E-1086-4E8C-A158-8DE61D47470C"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -936,5 +751,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "59E4C3A1-EF48-4F0D-A4DA-7CBC83CDA2C2"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/AppDelegate.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "629"
+            endingLineNumber = "629"
+            landmarkName = "-getVCUserInfoDict:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CBF79138-22F2-47BB-9DC8-CE410B54ED7F"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "36"
+            endingLineNumber = "36"
+            landmarkName = "-refreshView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B583B51E-D0FF-41C3-B3F9-016C955F7C5D"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/AppDelegate.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "612"
+            endingLineNumber = "612"
+            landmarkName = "-getVCUserInfoDict:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -38,6 +38,7 @@
 #import "WXApi.h"
 #import "GuideViewController.h"
 #import "MyCourseViewController.h"
+#import "NotiferMessageViewController.h"
 
 @interface RCNaviDataInfo : NSObject
 
@@ -601,6 +602,52 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
                         [navCtrl pushViewController:detailVC animated:YES];
                     }
                 }
+                else if ([pageType isEqualToString:@"message"]) {
+                    UIViewController *vc = [UIApplication sharedApplication].keyWindow.rootViewController;
+                    if ([vc isKindOfClass:[UITabBarController class]]) {
+                        KSTabBarViewController *tabCtrl = (KSTabBarViewController *)vc;
+                        CustomNavViewController *navCtrl = (CustomNavViewController *)tabCtrl.selectedViewController;
+                        if ([navCtrl.visibleViewController isKindOfClass:NSClassFromString(@"NotiferMessageViewController")]) {
+                            NotiferMessageViewController *ctrl = (NotiferMessageViewController *)navCtrl.visibleViewController;
+                            [ctrl refreshView];
+                        }
+                        else {
+                            [self.tabBarController tabBarSelectedWithIndex:0];
+                            CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                            NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
+                            [navCtrl pushViewController:ctrl animated:YES];
+                        }
+                    }
+                    else {
+                        [self.tabBarController tabBarSelectedWithIndex:0];
+                        CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                        NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
+                        [navCtrl pushViewController:ctrl animated:YES];
+                    }
+                }
+                else {  // 统一跳转消息列表
+                    UIViewController *vc = [UIApplication sharedApplication].keyWindow.rootViewController;
+                    if ([vc isKindOfClass:[UITabBarController class]]) {
+                        KSTabBarViewController *tabCtrl = (KSTabBarViewController *)vc;
+                        CustomNavViewController *navCtrl = (CustomNavViewController *)tabCtrl.selectedViewController;
+                        if ([navCtrl.visibleViewController isKindOfClass:NSClassFromString(@"NotiferMessageViewController")]) {
+                            NotiferMessageViewController *ctrl = (NotiferMessageViewController *)navCtrl.visibleViewController;
+                            [ctrl refreshView];
+                        }
+                        else {
+                            [self.tabBarController tabBarSelectedWithIndex:0];
+                            CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                            NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
+                            [navCtrl pushViewController:ctrl animated:YES];
+                        }
+                    }
+                    else {
+                        [self.tabBarController tabBarSelectedWithIndex:0];
+                        CustomNavViewController *navCtrl = self.tabBarController.selectedViewController;
+                        NotiferMessageViewController *ctrl = [[NotiferMessageViewController alloc] init];
+                        [navCtrl pushViewController:ctrl animated:YES];
+                    }
+                }
             }
             else {
                 NSString *webUrl = [dict stringValueForKey:@"url"];

KulexiuForTeacher/KulexiuForTeacher/Common/Base/AuthDisplayView.xib

@@ -1,8 +1,6 @@
 <?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">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,7 +18,7 @@
                         <constraint firstAttribute="width" constant="260" id="ody-S9-lK6"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您还没有完成老师认证，认证后才可设置陪练课哦～" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ya2-qu-eeU">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您还没有完成达人认证，认证后才可设置陪练课哦～" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ya2-qu-eeU">
                     <rect key="frame" x="141" y="230" width="260" height="36"/>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>

KulexiuForTeacher/KulexiuForTeacher/Common/Define/UserKeyHeader.h

@@ -49,6 +49,7 @@
 #define GROUP_COURSE_LOGO (@"chat_group_Logo")
 
 #define USERDEFAULT_LOGO (@"user_default_avatal")
+#define USER_LOGO_RECTANGLE (@"user_avatarRectangle")
 
 #define GROUP_DEFAULT_LOGO (@"group_chatList")
 #define VIP_DEFAULT_LOGO (@"vip_chatList")

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/ChatViewController.m

@@ -36,7 +36,7 @@
     [self.view addSubview:self.navView];
     
     CGFloat topSpace = kNaviBarHeight;
-    self.myCategoryView.frame = CGRectMake(0, topSpace, kScreenWidth, 10);
+    self.myCategoryView.frame = CGRectMake(0, topSpace, KPortraitWidth, 10);
     self.myCategoryView.backgroundColor = HexRGB(0xf6f8f9);
     self.myCategoryView.titles = self.titles;
     self.myCategoryView.titleFont = [UIFont systemFontOfSize:16.0f];
@@ -135,7 +135,7 @@
 - (ChatNavView *)navView {
     if (!_navView) {
         _navView = [ChatNavView shareInstance];
-        _navView.frame = CGRectMake(0, 0, kScreenWidth, kNaviBarHeight);
+        _navView.frame = CGRectMake(0, 0, KPortraitWidth, kNaviBarHeight);
         MJWeakSelf;
         [_navView chatNavAction:^(CHATNAVACTION action) {
             [weakSelf navAction:action];

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

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

KulexiuForTeacher/KulexiuForTeacher/Module/Classroom/View/MemberList/MemberListCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="ojL-FB-WJJ">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_avatarRectangle" translatesAutoresizingMaskIntoConstraints="NO" id="ojL-FB-WJJ">
                         <rect key="frame" x="10" y="5" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="w92-Ae-u7g"/>
@@ -25,7 +25,7 @@
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="20"/>
+                                <real key="value" value="6"/>
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </imageView>
@@ -83,6 +83,6 @@
     <resources>
         <image name="handup_image" width="22" height="22"/>
         <image name="memberMic_on" width="22" height="22"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="user_avatarRectangle" width="44" height="44"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/Controller/MyMusicViewController.m

@@ -215,7 +215,7 @@
 }
 
 - (void)refreshHeadView {
-    // 刷新老师认证和音乐人认证状态
+    // 刷新达人认证和音乐人认证状态
     [self refreshAuthStatus];
 }
 

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

@@ -664,7 +664,7 @@
             return @"您已提交认证申请，请耐心等待审核结果～";
         }
         else {
-            return @"您还没有完成老师认证，认证后才可设置陪练课哦～";
+            return @"您还没有完成达人认证，认证后才可设置陪练课哦～";
         }
     }
     else { // 直播课
@@ -672,10 +672,10 @@
             return @"您已提交认证申请，请耐心等待审核结果～";
         }
         else {
-            if ([self.teaherStatus isEqualToString:@"PASS"] && self.liveFlag == NO) { // 如果老师认证通过
+            if ([self.teaherStatus isEqualToString:@"PASS"] && self.liveFlag == NO) { // 如果达人认证通过
                 return @"您尚未开通直播服务，开通后即可创建直播课程～";
             }
-            return @"您还没有完成老师认证，认证后才可创建直播课哦～";
+            return @"您还没有完成达人认证，认证后才可创建直播课哦～";
         }
     }
     

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

@@ -377,7 +377,7 @@
         return @"您已提交认证申请，请耐心等待审核结果～";
     }
     else {
-        return @"您还没有完成老师认证，认证后才可创建视频课哦～";
+        return @"您还没有完成达人认证，认证后才可创建视频课哦～";
     }
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.h

@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NotiferMessageViewController : KSBaseViewController
 
+- (void)refreshView;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m

@@ -32,6 +32,11 @@
 
 @implementation NotiferMessageViewController
 
+- (void)refreshView {
+    [self queryUnReadCount];
+    [self resetSourceAndRequest];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeHeadView.m

@@ -76,7 +76,7 @@
             self.authLabel.text = @"认证审核中";
         }
         else {
-            self.authLabel.text = @"认证老师";
+            self.authLabel.text = @"认证达人";
         }
     }
     if (infoMessage.starGrade > 0) {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeHeadView.xib

@@ -1,8 +1,6 @@
 <?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">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -196,7 +194,7 @@
                                         <constraint firstAttribute="height" constant="19" id="keJ-7t-glX"/>
                                     </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="FCe-w1-PSG">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="认证达人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FCe-w1-PSG">
                                     <rect key="frame" x="32" y="12.5" width="57.5" height="17"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="17" id="pL0-Bg-rgN"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Login/Model/UserInfoManager.m

@@ -148,7 +148,6 @@
             if ([NSString isEmptyString:rongToken]) {
                 needConnect = YES;
             }
-//            UserDefaultSet(@"dSsgaUKlbqW+AYMaW8A8tCQGSDdDZVN5@q4s7.cn.rongnav.com;q4s7.cn.rongcfg.com", RongTokenKey);
             UserDefaultSet(self.userInfo.imToken, RongTokenKey);
             UserDefaultSet(self.userInfo.username, NicknameKey);
             UserDefaultSet(self.userInfo.avatar, AvatarUrlKey);

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -125,7 +125,7 @@
 
 - (void)operationAction:(MINEVIEWTYPE)type {
     switch (type) {
-        case MINEVIEWTYPE_AUTH: // 老师认证
+        case MINEVIEWTYPE_AUTH: // 达人认证
         {
             KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
             webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherCert"];
@@ -166,7 +166,7 @@
             break;
         case MINEVIEWTYPE_ACCOMPANY: // 陪练课设置
         {
-            if (![self.mineInfo.entryStatus isEqualToString:@"PASS"]) { // 跳转老师认证
+            if (![self.mineInfo.entryStatus isEqualToString:@"PASS"]) { // 跳转达人认证
                 KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
                 webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherCert"];
                 [self.navigationController pushViewController:webCtrl animated:YES];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/Controller/MyLiveCourseViewController.m

@@ -104,7 +104,7 @@
         [self.navigationController pushViewController:webCtrl animated:YES];
     }
     else if (![self.teacherInfo.entryStatus isEqualToString:@"PASS"]) {
-        [self MBPShow:@"您还没有完成老师认证，认证后才可创建直播课哦～"];
+        [self MBPShow:@"您还没有完成达人认证，认证后才可创建直播课哦～"];
     }
     else if ([self.teacherInfo.entryStatus isEqualToString:@"PASS"] && [self.teacherInfo.liveFlag isEqualToString:@"0"]) {
         [self MBPShow:@"您尚未开通直播服务 开通后即可设置直播课~"];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m

@@ -396,10 +396,10 @@
         return @"您已提交认证申请，请耐心等待审核结果～";
     }
     else {
-        if ([self.teaherStatus isEqualToString:@"PASS"] && self.liveFlag == NO) { // 如果老师认证通过
+        if ([self.teaherStatus isEqualToString:@"PASS"] && self.liveFlag == NO) { // 如果达人认证通过
             return @"您尚未开通直播服务，开通后即可创建直播课程～";
         }
-        return @"您还没有完成老师认证，认证后才可创建直播课哦～";
+        return @"您还没有完成达人认证，认证后才可创建直播课哦～";
     }
 }
 

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

@@ -101,7 +101,7 @@
 
 - (void)refreshHeadView {
     [self.topView configSource:self.teacherInfo];
-    // 刷新老师认证和音乐人认证状态
+    // 刷新达人认证和音乐人认证状态
     [self refreshAuthStatus];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -704,7 +704,7 @@
             return @"您已提交认证申请，请耐心等待审核结果～";
         }
         else {
-            return @"您还没有完成老师认证，认证后才可设置陪练课哦～";
+            return @"您还没有完成达人认证，认证后才可设置陪练课哦～";
         }
     }
     else if (self.selectIndex == 2) { // 直播课
@@ -712,10 +712,10 @@
             return @"您已提交认证申请，请耐心等待审核结果～";
         }
         else {
-            if ([self.teaherStatus isEqualToString:@"PASS"] && self.liveFlag == NO) { // 如果老师认证通过
+            if ([self.teaherStatus isEqualToString:@"PASS"] && self.liveFlag == NO) { // 如果达人认证通过
                 return @"您尚未开通直播服务，开通后即可创建直播课程～";
             }
-            return @"您还没有完成老师认证，认证后才可创建直播课哦～";
+            return @"您还没有完成达人认证，认证后才可创建直播课哦～";
         }
     }
     else { // 曲谱

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageVideoView.m

@@ -275,7 +275,7 @@
         return @"您已提交认证申请，请耐心等待审核结果～";
     }
     else {
-        return @"您还没有完成老师认证，认证后才可创建视频课哦～";
+        return @"您还没有完成达人认证，认证后才可创建视频课哦～";
     }
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/Controller/VideoCourseViewController.m

@@ -103,7 +103,7 @@
         [self.navigationController pushViewController:webCtrl animated:YES];
     }
     else {
-        [self MBPShow:@"您还没有完成老师认证，认证后才可创建视频课哦～"];
+        [self MBPShow:@"您还没有完成达人认证，认证后才可创建视频课哦～"];
     }
     
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/VideoCourse/View/VideoListBodyView.m

@@ -320,7 +320,7 @@
         return @"您已提交认证申请，请耐心等待审核结果～";
     }
     else {
-        return @"您还没有完成老师认证，认证后才可创建视频课哦～";
+        return @"您还没有完成达人认证，认证后才可创建视频课哦～";
     }
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBodyView.h

@@ -9,7 +9,7 @@
 #import "TeacherInfo.h"
 
 typedef NS_ENUM(NSInteger, MINEVIEWTYPE) {
-    MINEVIEWTYPE_AUTH = 1001, //  认证老师
+    MINEVIEWTYPE_AUTH = 1001, //  认证达人
     MINEVIEWTYPE_HOMEPAGE, // 我的主页
     MINEVIEWTYPE_MIEN,     // 个人风采
     MINEVIEWTYPE_STARTBOARDCAST, // 开启直播

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBodyView.m

@@ -93,7 +93,7 @@
             self.authLabel.text = @"认证审核中";
         }
         else {
-            self.authLabel.text = @"认证老师";
+            self.authLabel.text = @"认证达人";
         }
     }
     

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBodyView.xib

@@ -1,8 +1,6 @@
 <?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">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -87,7 +85,7 @@
                                                 <constraint firstAttribute="height" constant="19" id="ZKQ-Vm-BP3"/>
                                             </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="xuX-rV-262">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="认证达人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xuX-rV-262">
                                             <rect key="frame" x="32" y="12.5" width="57.5" height="17"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="17" id="tAN-zO-bop"/>

KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Sections/Classroom/View/Chat/InputBar/InputBarControl.m

@@ -89,7 +89,7 @@
     
     [UIView animateWithDuration:0.2 animations:^{
         [UIView setAnimationCurve:curve];
-        self.frame = CGRectMake(-([UIScreen mainScreen].bounds.size.width-self.originalFrame.size.width), self.originalFrame.origin.y-keyboardBounds.size.height,[UIScreen mainScreen].bounds.size.width,HeighInputBar);
+        self.frame = CGRectMake(iPhoneXSafeBottomMargin-([UIScreen mainScreen].bounds.size.width-self.originalFrame.size.width), self.originalFrame.origin.y-keyboardBounds.size.height,[UIScreen mainScreen].bounds.size.width,HeighInputBar);
         [UIView commitAnimations];
     }];
     if ([self.delegate respondsToSelector:@selector(onInputBarControlContentSizeChanged:withAnimationDuration:andAnimationCurve:)]) {

KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Sections/Classroom/View/Chat/MessageManager/MessageCell/MessageCell.m

@@ -8,10 +8,10 @@
 
 #import "MessageCell.h"
 #import "Masonry.h"
-#import "RolePortraitView.h"
+
 #import "ClassroomService.h"
 @interface MessageCell()
-@property(nonatomic, strong) RolePortraitView *headerImage;
+@property (nonatomic, strong) UIImageView *headerImage;
 @property(nonatomic, strong) UILabel *nameLabel;
 @property (nonatomic, strong) UIView *sendStatusContentView;
 @property (nonatomic, strong) UIActivityIndicatorView *sendIndicatorView;
@@ -71,7 +71,7 @@
         member = [[RoomMember alloc] init];
     }
     member.name = self.nameLabel.text;
-    [self.headerImage addHeaderBackground:member];
+    [self.headerImage sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
 }
 
 - (void)showSendIndicatorView:(BOOL)show{
@@ -164,15 +164,16 @@
     return _messageContentView;
 }
 
-- (RolePortraitView *)headerImage{
+- (UIImageView *)headerImage {
     if (!_headerImage) {
-        _headerImage = [[RolePortraitView alloc] init];
+        _headerImage = [[UIImageView alloc] init];
         _headerImage.layer.masksToBounds = YES;
-        _headerImage.layer.cornerRadius = 20;
+        _headerImage.layer.cornerRadius = 6;
     }
     return _headerImage;
 }
 
+
 - (UILabel *)nameLabel{
     if (!_nameLabel) {
         _nameLabel = [[UILabel alloc] init];

KulexiuForTeacher/KulexiuForTeacher/Module/ShareInChat/Controller/KSShareChooseViewController.m

@@ -34,13 +34,13 @@
     [self.scrollView removeFromSuperview];
     self.view.backgroundColor = HexRGB(0xf6f8f9);
     [self.view addSubview:self.headView];
-    self.headView.frame = CGRectMake(0, 0, kScreenWidth, 100);
+    self.headView.frame = CGRectMake(0, 0, KPortraitWidth, 100);
     MJWeakSelf;
     [self.headView chatAddressbookAction:^(CHATADDRESSTYPE type, NSString * _Nullable searchKey) {
         [weakSelf topViewAction:type search:searchKey];
     }];
     
-    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, 100, kScreenWidth, 10)];
+    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, 100, KPortraitWidth, 10)];
     _categoryView.backgroundColor = HexRGB(0xf6f8f9);
     self.categoryView.titles = self.titles;
     self.categoryView.delegate = self;
@@ -51,7 +51,7 @@
     self.categoryView.titleColorGradientEnabled = YES;
     self.categoryView.hidden = YES;
     _pagerView = [self preferredPagingView];
-    self.pagerView.frame = CGRectMake(0, 100, kScreenWidth, kScreenHeight - kNaviBarHeight-100);
+    self.pagerView.frame = CGRectMake(0, 100, KPortraitWidth, KPortraitHeight - kNaviBarHeight-100);
     self.pagerView.listContainerView.categoryNestPagingEnabled = YES;
     self.pagerView.mainTableView.gestureDelegate = self;
     self.pagerView.backgroundColor = [UIColor clearColor];

KulexiuForTeacher/KulexiuForTeacher/Module/ShareInChat/Controller/KSShareGroupViewController.m

@@ -154,11 +154,11 @@
         _tableView.rowHeight = UITableViewAutomaticDimension;
         _tableView.rowHeight = 70;
         
-        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
+        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 10)];
         headView.backgroundColor = HexRGB(0xf3f4f8);
         _tableView.tableHeaderView = headView;
         
-        UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
+        UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 10)];
         bottomView.backgroundColor = HexRGB(0xf3f4f8);
         _tableView.tableFooterView = bottomView;
         

KulexiuForTeacher/KulexiuForTeacher/Module/ShareInChat/View/ShareChooseMainView.m

@@ -58,11 +58,11 @@
         [self addSubview:self.tableView];
         
         
-        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
+        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 10)];
         headView.backgroundColor = HexRGB(0xf6f8f9);
         self.tableView.tableHeaderView = headView;
         
-        UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
+        UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 10)];
         bottomView.backgroundColor = HexRGB(0xf6f8f9);
         self.tableView.tableFooterView = bottomView;
         
@@ -309,9 +309,9 @@
     if (self.selectIndex == 1) {
         return [UIView new];
     }
-    UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 30)];
+    UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 30)];
     view.backgroundColor = HexRGB(0xf6f8f9);
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(24, 0, kScreenWidth - 48, 30)];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(24, 0, KPortraitWidth - 48, 30)];
     label.textColor = HexRGB(0x999999);
     label.font = [UIFont systemFontOfSize:16.0f weight:UIFontWeightMedium];
     [view addSubview:label];
@@ -337,7 +337,7 @@
     }
     else {
         self.promptView = [[StateView alloc]init];
-        self.promptView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight - 300);
+        self.promptView.frame = CGRectMake(0, 0, KPortraitWidth, KPortraitHeight - 300);
     }
     _promptPlaceView = view;
     //当请求不到数据时 ，自定义提示view 将会出现；