上传版本

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -609,7 +609,6 @@
 		BC8B6E622856ED0600866917 /* libSocialQQ.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8B6E4B2856ED0600866917 /* libSocialQQ.a */; };
 		BC8B6E632856ED0700866917 /* TencentOpenApi_IOS_Bundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BC8B6E4D2856ED0600866917 /* TencentOpenApi_IOS_Bundle.bundle */; };
 		BC8B6E642856ED0700866917 /* TencentOpenAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8B6E4E2856ED0600866917 /* TencentOpenAPI.framework */; };
-		BC8B6E652856ED0700866917 /* libUMSocialCloudShare.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8B6E502856ED0600866917 /* libUMSocialCloudShare.a */; };
 		BC8B6E6828575DD200866917 /* MusicDisplayView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8B6E6728575DD200866917 /* MusicDisplayView.m */; };
 		BC8B6E6A28575DEE00866917 /* MusicDisplayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC8B6E6928575DED00866917 /* MusicDisplayView.xib */; };
 		BC8B6E6D285836B600866917 /* high_staff.png in Resources */ = {isa = PBXBuildFile; fileRef = BC8B6E6B285836B400866917 /* high_staff.png */; };
@@ -1961,7 +1960,6 @@
 		BC8B6E4B2856ED0600866917 /* libSocialQQ.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSocialQQ.a; sourceTree = "<group>"; };
 		BC8B6E4D2856ED0600866917 /* TencentOpenApi_IOS_Bundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TencentOpenApi_IOS_Bundle.bundle; sourceTree = "<group>"; };
 		BC8B6E4E2856ED0600866917 /* TencentOpenAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TencentOpenAPI.framework; sourceTree = "<group>"; };
-		BC8B6E502856ED0600866917 /* libUMSocialCloudShare.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libUMSocialCloudShare.a; sourceTree = "<group>"; };
 		BC8B6E6628575DD200866917 /* MusicDisplayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicDisplayView.h; sourceTree = "<group>"; };
 		BC8B6E6728575DD200866917 /* MusicDisplayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicDisplayView.m; sourceTree = "<group>"; };
 		BC8B6E6928575DED00866917 /* MusicDisplayView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicDisplayView.xib; sourceTree = "<group>"; };
@@ -2446,7 +2444,6 @@
 				2779333327E3140F0010E277 /* QuartzCore.framework in Frameworks */,
 				2779333127E314070010E277 /* SystemConfiguration.framework in Frameworks */,
 				BC8B6E5B2856ED0600866917 /* libSocialWeChat.a in Frameworks */,
-				BC8B6E652856ED0700866917 /* libUMSocialCloudShare.a in Frameworks */,
 				2779332F27E313FD0010E277 /* Photos.framework in Frameworks */,
 				BC8B6E5E2856ED0600866917 /* libWeChatSDK.a in Frameworks */,
 				2779332D27E313F50010E277 /* SafariServices.framework in Frameworks */,
@@ -5111,7 +5108,6 @@
 		BC8B6E4F2856ED0600866917 /* UMSocialSDKPlugin */ = {
 			isa = PBXGroup;
 			children = (
-				BC8B6E502856ED0600866917 /* libUMSocialCloudShare.a */,
 			);
 			path = UMSocialSDKPlugin;
 			sourceTree = "<group>";
@@ -7262,7 +7258,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 1.0.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7278,8 +7274,10 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = KulexiuForTeacher/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "酷乐秀学院";
+				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSAppleMusicUsageDescription = "App需要您的同意访问媒体资料库权限，用于播放媒体服务";
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，访问您的相机，以便您正常使用上传图片、视频课程等服务";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "App需要您的同意访问定位权限,用来记录签到信息";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "App需要您的同意访问麦克风权限，用于您的语音服务、视频教学";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "App需要您的同意访问您的相册权限，用于您的图片课件上传服务";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "App需要您的同意访问您的相册权限，用于您的图片课件上传服务";
@@ -7322,7 +7320,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 1.0.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7338,8 +7336,10 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = KulexiuForTeacher/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "酷乐秀学院";
+				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSAppleMusicUsageDescription = "App需要您的同意访问媒体资料库权限，用于播放媒体服务";
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，访问您的相机，以便您正常使用上传图片、视频课程等服务";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "App需要您的同意访问定位权限,用来记录签到信息";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "App需要您的同意访问麦克风权限，用于您的语音服务、视频教学";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "App需要您的同意访问您的相册权限，用于您的图片课件上传服务";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "App需要您的同意访问您的相册权限，用于您的图片课件上传服务";

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

@@ -58,8 +58,8 @@
             filePath = "KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "339"
-            endingLineNumber = "339"
+            startingLineNumber = "336"
+            endingLineNumber = "336"
             landmarkName = "-showAuthView"
             landmarkType = "7">
          </BreakpointContent>
@@ -438,8 +438,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1870"
-            endingLineNumber = "1870"
+            startingLineNumber = "1871"
+            endingLineNumber = "1871"
             landmarkName = "-showAnimationView:showMessag:"
             landmarkType = "7">
          </BreakpointContent>
@@ -569,8 +569,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "635"
-            endingLineNumber = "635"
+            startingLineNumber = "636"
+            endingLineNumber = "636"
             landmarkName = "-IMConnetedCallback"
             landmarkType = "7">
          </BreakpointContent>
@@ -665,13 +665,13 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1210"
-            endingLineNumber = "1210"
+            startingLineNumber = "1211"
+            endingLineNumber = "1211"
             landmarkName = "-didReceiveMessageNotification:"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "94CE73C4-2B00-4F52-83F1-11CEE46915D2 - ffb5e0723c52bcde"
+                  uuid = "94CE73C4-2B00-4F52-83F1-11CEE46915D2 - ffb5e0723c52bcff"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -681,12 +681,12 @@
                   urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1220"
-                  endingLineNumber = "1220"
+                  startingLineNumber = "1221"
+                  endingLineNumber = "1221"
                   offsetFromSymbolStart = "1104">
                </Location>
                <Location
-                  uuid = "94CE73C4-2B00-4F52-83F1-11CEE46915D2 - ffb5e0723c52bcde"
+                  uuid = "94CE73C4-2B00-4F52-83F1-11CEE46915D2 - ffb5e0723c52bcff"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -696,8 +696,8 @@
                   urlString = "file:///Users/wangzhi/DayaWorkspace/klx_teacher/KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1220"
-                  endingLineNumber = "1220"
+                  startingLineNumber = "1221"
+                  endingLineNumber = "1221"
                   offsetFromSymbolStart = "1108">
                </Location>
             </Locations>
@@ -713,8 +713,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1115"
-            endingLineNumber = "1115"
+            startingLineNumber = "1116"
+            endingLineNumber = "1116"
             landmarkName = "-didReceiveMessageNotification:"
             landmarkType = "7">
          </BreakpointContent>
@@ -729,8 +729,8 @@
             filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "688"
-            endingLineNumber = "688"
+            startingLineNumber = "689"
+            endingLineNumber = "689"
             landmarkName = "-liveroomQuit"
             landmarkType = "7">
          </BreakpointContent>
@@ -745,8 +745,8 @@
             filePath = "KulexiuForTeacher/AppDelegate.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "629"
-            endingLineNumber = "629"
+            startingLineNumber = "630"
+            endingLineNumber = "630"
             landmarkName = "-getVCUserInfoDict:"
             landmarkType = "7">
          </BreakpointContent>
@@ -777,8 +777,8 @@
             filePath = "KulexiuForTeacher/AppDelegate.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "612"
-            endingLineNumber = "612"
+            startingLineNumber = "613"
+            endingLineNumber = "613"
             landmarkName = "-getVCUserInfoDict:"
             landmarkType = "7">
          </BreakpointContent>
@@ -793,8 +793,8 @@
             filePath = "KulexiuForTeacher/AppDelegate.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "569"
-            endingLineNumber = "569"
+            startingLineNumber = "570"
+            endingLineNumber = "570"
             landmarkName = "-jpushNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1038,5 +1038,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2CE4F958-BC82-4B94-B003-CA6F197B6311"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1311"
+            endingLineNumber = "1311"
+            landmarkName = "-quitClassroomNotifer"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "451323DA-57B6-4068-B93A-B2EF3FD80E77"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "479"
+            endingLineNumber = "479"
+            landmarkName = "-judgeAutoClose"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A9C70FB1-D0B0-4589-BDEA-B52515FF7C15"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Live/Model/KSEnterLiveroomManager.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "20"
+            endingLineNumber = "20"
+            landmarkName = "+queryLiveroomConfig:callback:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DC9917E2-27CA-4C2C-9A51-17E4A16A3BA6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/AppDelegate.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "196"
+            endingLineNumber = "196"
+            landmarkName = "-configUM"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -192,7 +192,8 @@
     // 配置友盟分享
     // 微信、QQ、微博完整版会校验合法的universalLink，不设置会在初始化平台失败
        //配置微信Universal Link需注意 universalLinkDic的key是rawInt类型，不是枚举类型 ，即为 UMSocialPlatformType.wechatSession.rawInt
-    [UMSocialGlobal shareInstance].universalLinkDic = @{@(UMSocialPlatformType_WechatSession):@"https://dev.colexiu.com/teacherApp/",@(UMSocialPlatformType_Sina):@"https://dev.colexiu.com/teacherApp/"};
+    NSString *callbackUrl = [NSString stringWithFormat:@"%@%@",hostURL,@"/teacherApp/"];
+    [UMSocialGlobal shareInstance].universalLinkDic = @{@(UMSocialPlatformType_WechatSession):callbackUrl,@(UMSocialPlatformType_Sina):callbackUrl};
     /* 设置微信的appKey和appSecret */
     [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:@"wx149a928c415c137a" appSecret:@"d3f119b577ccacb262da153f4210174f" redirectURL:nil];
     /*

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_check.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_musicRoom.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -85,11 +85,15 @@
             
             if ([dic integerValueForKey:@"code"] == 403) { // token验证失败
                 [self logOutWithType:YES];
+                [dic setValue:@"请重新登录" forKey:@"msg"];
                 success(dic);
+                return;
             }
             else if ([dic integerValueForKey:@"code"] == 401) {
                 [self logOutWithType:NO];
+                [dic setValue:@"请重新登录" forKey:@"msg"];
                 success(dic);
+                return;
             }
             success(dic);
             return;
@@ -118,11 +122,13 @@
             
             if ([dic integerValueForKey:@"code"] == 403) { // token验证失败
                 [self logOutWithType:YES];
+                [dic setValue:@"请重新登录" forKey:@"msg"];
                 success(dic);
                 return;
             }
             else if ([dic integerValueForKey:@"code"] == 401) {
                 [self logOutWithType:NO];
+                [dic setValue:@"请重新登录" forKey:@"msg"];
                 success(dic);
                 return;
             }
@@ -1171,6 +1177,7 @@
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/liveRoom/queryPageRoom"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:@(liveState) forKey:@"liveState"];
+    [parm setValue:@"TEMP" forKey:@"roomType"];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];

KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch

@@ -116,23 +116,23 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/teacher")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (NO)
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/teacher")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (YES)
 
 //#else
 
-//#define hostURL (@"https://online.colexiu.com")
-//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://online.colexiu.com/teacher")
-//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"6tnym1br6pv07")
-//#define SUBMIT_UUID (YES)
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/teacher")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
 
 
 //#endif

KulexiuForTeacher/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/WeChat/WechatSDK/README.txt

@@ -17,11 +17,6 @@ SDK1.8.7
 2. 修复未安装微信的情况下, 适配了UIScene的App因为UIAlertView Crash
 3. 增加Universal Link检测函数
 
-SDK1.8.6.2
-1. 修改包含"UIWebView"字符的类名
-
-SDK1.8.6.1
-1.短信授权登录使用的UIWebview切换成WKWebview
 
 SDK1.8.6
 1. 支持Universal Link拉起微信以及返回App

KulexiuForTeacher/KulexiuForTeacher/Info.plist

@@ -74,7 +74,7 @@
 	</dict>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>remote-notification</string>
+		<string>voip</string>
 	</array>
 </dict>
 </plist>

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

@@ -49,7 +49,12 @@
     if ([source isKindOfClass:[GroupNoticeModel class]]) {
         GroupNoticeModel *model = source;
         self.userName.text = [NSString returnNoNullStringWithString:model.username];
-        [self.userLogo sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
+        BOOL isCourseGroup = [model.groupId containsString:@"COURSE"] ? YES : NO;
+        NSString *groupPlaceHolder = isCourseGroup ? GROUP_COURSE_LOGO : GROUP_FAN_LOGO;
+        [self.userLogo setImage:[UIImage imageNamed:groupPlaceHolder]];
+        
+        
+//        [self.userLogo sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
         self.noticeTitle.text = [NSString returnNoNullStringWithString:model.title];
         self.noticeContent.text = [NSString returnNoNullStringWithString:model.content];
         self.focusLabel.hidden = model.top ? NO : YES;

KulexiuForTeacher/KulexiuForTeacher/Module/Classroom/Controller/NewClassRoomViewController.m

@@ -1062,7 +1062,7 @@
 }
 
 - (void)quitClassroomNotifer {
-    // 课程结束后15分钟自动退出房间 连堂课不退出（对内）
+    // 课程结束后zd分钟自动退出房间 连堂课不退出（对内）
     if (self.isQuitRoom == NO) {
         self.isQuitRoom = YES;
         // 退出房间

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/Controller/MyCourseViewController.m

@@ -119,7 +119,7 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
-    [self requestTeachMessage];
+//    [self requestTeachMessage];
     [self requestSubjectList];
     if (self.listViewArray.count > self.categoryView.selectedIndex) {
         id value = self.listViewArray[self.categoryView.selectedIndex];
@@ -217,12 +217,12 @@
         [self.listViewArray replaceObjectAtIndex:index withObject:listView];
         self.listViewArray[index] = listView;
         listView.selectIndex = index;
-        if (self.teacherInfo) {
-            listView.teaherStatus = self.teacherInfo.entryStatus;
-        }
-        else {
+//        if (self.teacherInfo) {
+//            listView.teaherStatus = self.teacherInfo.entryStatus;
+//        }
+//        else {
             listView.teaherStatus = @"PASS";
-        }
+//        }
         if (self.subjectList) {
             listView.subjectList = [self.subjectList mutableCopy];
         }
@@ -238,12 +238,12 @@
         if (self.subjectList) {
             listView.subjectList = [self.subjectList mutableCopy];
         }
-        if (self.teacherInfo) {
-            listView.teaherStatus = self.teacherInfo.entryStatus;
-        }
-        else {
+//        if (self.teacherInfo) {
+//            listView.teaherStatus = self.teacherInfo.entryStatus;
+//        }
+//        else {
             listView.teaherStatus = @"PASS";
-        }
+//        }
         [listView beginFirstRefresh];
         return listView;
     }
@@ -253,14 +253,14 @@
         [self.listViewArray replaceObjectAtIndex:index withObject:listView];
         self.listViewArray[index] = listView;
         listView.selectIndex = index;
-        if (self.teacherInfo) {
-            listView.liveFlag = [self.teacherInfo.liveFlag isEqualToString:@"1"] ? YES : NO;
-            listView.teaherStatus = self.teacherInfo.entryStatus;
-        }
-        else {
+//        if (self.teacherInfo) {
+//            listView.liveFlag = [self.teacherInfo.liveFlag isEqualToString:@"1"] ? YES : NO;
+//            listView.teaherStatus = self.teacherInfo.entryStatus;
+//        }
+//        else {
             listView.liveFlag = YES;
             listView.teaherStatus = @"PASS";
-        }
+//        }
         if (self.subjectList) {
             listView.subjectList = [self.subjectList mutableCopy];
         }

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

@@ -11,7 +11,6 @@
 #import "KSBaseWKWebViewController.h"
 #import "AuthDisplayView.h"
 #import "MyVideoSearchView.h"
-#import "NewClassPopView.h"
 #import "KSChoosePicker.h"
 
 @interface MyVideoCourseBodyView ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
@@ -35,8 +34,6 @@
 
 @property (nonatomic, copy) MyVideoSearchView *sortView;
 
-@property (nonatomic, strong) NewClassPopView *popView;
-
 @property (nonatomic, assign) BOOL authStatus;
 
 @end

KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferMessageCell.m

@@ -92,7 +92,15 @@
     else if ([subType isEqualToString:@"VIP"]) {
         typeImg = @"notifer_vip";
     }
-    
+    else if ([subType isEqualToString:@"PIANO_ROOM"]) {
+        typeImg = @"notifer_musicRoom";
+    }
+    else if ([subType isEqualToString:@"STYLE"]) {
+        typeImg = @"notifer_check";
+    }
+    else if ([subType isEqualToString:@"NOTICE"]) {
+        typeImg = @"notifer_unknow";
+    }
     return typeImg;
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m

@@ -397,6 +397,7 @@ typedef NS_ENUM(NSInteger, LIVEPAGE) {
 }
 
 - (void)setupLiveroomConfig:(NSDictionary *)source {
+    NSLog(@"room config----- %@",source);
     self.liveRoleType = RCRTCLiveRoleTypeBroadcaster;
     self.createrId = [source stringValueForKey:@"speakerId"];
     self.createrName = [source stringValueForKey:@"speakerName"];

KulexiuForTeacher/KulexiuForTeacher/Module/Live/Model/LiveroomTimeManager.m

@@ -37,9 +37,9 @@
 - (void)timeFunction:(NSTimer *)timer {
     NSInteger durationInteger = self.duration;
     if (durationInteger <= 0) {
-        if (self.delegate && [self.delegate respondsToSelector:@selector(quitClassroomNotifer)]) {
-            [self.delegate quitClassroomNotifer];
-        }
+//        if (self.delegate && [self.delegate respondsToSelector:@selector(quitClassroomNotifer)]) {
+//            [self.delegate quitClassroomNotifer];
+//        }
         [self stopDurationTimer];
     }
     self.duration--;

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

@@ -255,7 +255,8 @@
     [view addSubview:self.promptView];
     [self.promptView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self);
-        make.top.bottom.mas_equalTo(self.tableView);
+        make.top.mas_equalTo(self.tableView);
+        make.height.mas_equalTo(self);
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveList/View/LiveListBodyView.m

@@ -91,7 +91,6 @@
 - (void)refreshAndRequestData {
     [self resetParamenter];
     [self requestData];
-    
 }
 
 - (void)resetParamenter {

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

@@ -239,7 +239,8 @@
     [view addSubview:self.promptView];
     [self.promptView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self);
-        make.top.bottom.mas_equalTo(self.collectionView);
+        make.top.mas_equalTo(self.collectionView);
+        make.height.mas_equalTo(self);
     }];
 }
 

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

@@ -67,11 +67,18 @@
             self.nameLabel.text = self.model.message.senderUserId;
         }
     }
+    if (![NSString isEmptyString:member.headUrl]) {
+        [self.headerImage sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
+    }
+    else {
+        NSString *avatal = self.model.message.content.senderUserInfo.portraitUri;
+        [self.headerImage sd_setImageWithURL:[NSURL URLWithString:[avatal getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
+    }
     if (!member) {
         member = [[RoomMember alloc] init];
+        member.headUrl = self.model.message.content.senderUserInfo.portraitUri;
     }
     member.name = self.nameLabel.text;
-    [self.headerImage sd_setImageWithURL:[NSURL URLWithString:[member.headUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USER_LOGO_RECTANGLE]];
 }
 
 - (void)showSendIndicatorView:(BOOL)show{

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

@@ -50,7 +50,12 @@
         }
     };
     RoomMember *currentMember = [ClassroomService sharedService].currentRoom.currentMember;
-    content.senderUserInfo = [[RCUserInfo alloc] initWithUserId:currentMember.userId name:currentMember.name portrait:nil];
+    if ([NSString isEmptyString:currentMember.headUrl]) {
+        content.senderUserInfo = [[RCUserInfo alloc] initWithUserId:currentMember.userId name:currentMember.name portrait:UserDefaultObjectForKey(AvatarUrlKey)];
+    }
+    else {
+        content.senderUserInfo = [[RCUserInfo alloc] initWithUserId:currentMember.userId name:currentMember.name portrait:currentMember.headUrl];
+    }
     message = [[RCIM sharedRCIM] sendMessage:conversationType targetId:targetId content:content pushContent:pushContent pushData:pushData success:success error:error];
     
 //    message = [IMClient