Browse Source

陪练课设置如何

Steven 3 years ago
parent
commit
d9f62736b8

BIN
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 69 - 5
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -99,16 +99,80 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "397E29CA-AC60-489C-95F7-43A59279D769"
+            uuid = "3872C421-C200-41D2-9DA8-F85ABDD5D283"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m"
+            filePath = "KulexiuForTeacher/Module/Mine/LiveCourse/Controller/MyLiveCourseViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "133"
-            endingLineNumber = "133"
-            landmarkName = "-requestData"
+            startingLineNumber = "71"
+            endingLineNumber = "71"
+            landmarkName = "-requestTeachMessage"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "FC22CBA4-3941-4BE6-ADC3-AC97A1FA514A"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "79"
+            endingLineNumber = "79"
+            landmarkName = "-configRequestStatus"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8B74891D-F7CA-41CE-A8E6-514D39EBD4B9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "82"
+            endingLineNumber = "82"
+            landmarkName = "-configRequestStatus"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A64BD3AB-71A2-4C29-8788-4F007A4EF6DB"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "85"
+            endingLineNumber = "85"
+            landmarkName = "-configRequestStatus"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "34406921-8388-4BDB-976A-B462E12787E6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "88"
+            endingLineNumber = "88"
+            landmarkName = "-configRequestStatus"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 3 - 3
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h

@@ -521,7 +521,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)courseRepliedListRequest:(NSString *)post classMonth:(NSString *)classMonth replied:(NSInteger)replied studentName:(NSString *)studentName page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /teacher-server/courseReplied/selectReplied
+// /api-teacher/courseReplied/selectReplied
 
 /// 查询评价详情
 /// @param post post
@@ -532,7 +532,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)selectRepliedRequest:(NSString *)post courseGroupId:(NSString *)courseGroupId courseScheduleId:(NSString *)courseScheduleId studentId:(NSString *)studentId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /teacher-server/courseReplied/replied
+// /api-teacher/courseReplied/replied
 
 /// 评价陪练课
 /// @param post post
@@ -557,7 +557,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)homeworkListRequest:(NSString *)post date:(NSString *)date decorate:(NSInteger)decorate page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
-// /teacher-server/homework/detail/{courseId}
+// /api-teacher/homework/detail/{courseId}
 
 /// 陪练课课后作业信息详情
 /// @param get get

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch

@@ -111,8 +111,8 @@ shouldPrevent = NO; \
 
 #define hostURL (@"http://dev.colexiu.com")
 #define SEALCLASSHOST (@"http://dev.colexiu.com/api-im")
-//#define WEBHOST (@"http://dev.colexiu.com/teacher")
-#define WEBHOST (@"http://192.168.3.63:5000/teacher")
+#define WEBHOST (@"http://dev.colexiu.com/teacher")
+//#define WEBHOST (@"http://192.168.3.63:5000/teacher")
 #define SOCKET_URL (@"ws://mteadev.colexiu.com/audioAnalysis")
 #define JSPUSH_ENVIRONMENT (NO)
 #define RCIM_KEY (@"0vnjpoad0jbdz")

+ 1 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/Controller/AccompanyDetailViewController.m

@@ -416,8 +416,7 @@
 }
 
 - (void)tryJoinRoom {
-    [self joinClassRoom];
-    return;
+    
     NSDateFormatter *dateFormatter = [NSObject getDateformatter];
     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
     NSDate *beginDate = [dateFormatter dateFromString:self.homeworkModel.startTime];

+ 4 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/Controller/HomeworkDetailViewController.m

@@ -126,7 +126,6 @@
     else { // 老师点评
         AccompanyRemarkCell *cell = [tableView dequeueReusableCellWithIdentifier:@"AccompanyRemarkCell"];
         BOOL hasEvaluate = self.detailModel.reviewHomework == 1? YES : NO;
-//        hasEvaluate = NO;
         MJWeakSelf;
         [cell configWithRemarkMessage:self.detailModel.teacherReplied hasEvaluate:hasEvaluate callback:^{
             [weakSelf evaluateHomework];
@@ -157,6 +156,10 @@
 
 // 评价作业
 - (void)evaluateHomework {
+    if (self.detailModel.submitHomework == 0) {
+        [self MBPShow:@"学生暂未提交作业"];
+        return;
+    }
     self.alertView = [AccompanyAlertView shareInstance];
     self.alertView.alertTitle.text = @"作业点评";
     self.alertView.tipsLabel.text = @"请输入您对本次作业的点评";

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkSortView.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void(^TimeSortCallback)();
+typedef void(^TimeSortCallback)(void);
 
 @interface HomeworkSortView : UIView
 

+ 4 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -154,8 +154,10 @@
                 webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherCert"];
                 [self.navigationController pushViewController:webCtrl animated:YES];
             }
-            else {
-                
+            else { // 设置页面
+                KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
+                webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/practiceSetting"];
+                [self.navigationController pushViewController:webCtrl animated:YES];
             }
         }
             break;

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/LiveCourse/View/MyLiveCourseBodyView.m

@@ -69,11 +69,11 @@
                 [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
             }
         }];
-        [self configRequestStatus];
     }
     return self;
 }
 
+
 - (void)configRequestStatus {
     if (self.selectIndex == 0) {
         self.groupStatus = @"ING";
@@ -105,7 +105,7 @@
     self.isLoadMore = YES;
     self.pages = 1;
     self.rows = 10;
-    
+    [self configRequestStatus];
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
     [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];

+ 4 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -456,7 +456,10 @@
     switch (type) {
         case MINEPAGETYPE_ACCOMPANY:  // 陪练课设置
         {
-            
+            KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
+            webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/practiceSetting"];
+            [self.naviController pushViewController:webCtrl animated:YES];
+
         }
             break;
         case MINEPAGETYPE_LIVE:  // 直播课设置