Pārlūkot izejas kodu

老师端文案

Steven 7 mēneši atpakaļ
vecāks
revīzija
e9153e0085

+ 2 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h

@@ -795,11 +795,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param classDate 月份 yyyy-MM
 /// @param status 课程状态(NOT_START:未开始 ING:进行中 COMPLETE:已完成 CANCEL:已取消)
 /// @param subjectId 声部id
+/// @param search 搜索
 /// @param page 页数
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)queryTeacherLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)queryTeacherLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId search:(NSString *)search page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 #pragma mark ----- 琴房课
 // /teacher-server/courseSchedule/selectCourseList

+ 3 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -1591,17 +1591,19 @@
 /// @param classDate 月份 yyyy-MM
 /// @param status 课程状态(NOT_START:未开始 ING:进行中 COMPLETE:已完成 CANCEL:已取消)
 /// @param subjectId 声部id
+/// @param search 搜索
 /// @param page 页数
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)queryTeacherLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)queryTeacherLiveCourse:(NSString *)post classDate:(NSString *)classDate status:(NSString *)status subjectId:(NSString *)subjectId search:(NSString *)search page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodJSON];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/courseSchedule/queryTeacherLiveCourse"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:classDate forKey:@"classDate"];
     [parm setValue:status forKey:@"status"];
     [parm setValue:subjectId forKey:@"subjectId"];
+    [parm setValue:search forKey:@"search"];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
     [parm setValue:UserDefault(UIDKey) forKey:@"teacherId"];

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/CourseGroupAlertView/CourseDescAlertView.m


+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupView.m

@@ -108,7 +108,7 @@
 }
 
 - (void)requestData {
-    [KSNetworkingManager queryTeacherLiveCourse:KS_POST classDate:self.classDate status:self.status subjectId:self.subjectId page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager queryTeacherLiveCourse:KS_POST classDate:self.classDate status:self.status subjectId:self.subjectId search:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];

+ 62 - 20
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/AccompanyCourse/MinePageAccompanyCourseView.m

@@ -54,7 +54,8 @@
         self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         [self addSubview:self.tableView];
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-        
+        [self.tableView registerNib:[UINib nibWithNibName:@"MinePageVipProgramCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MinePageVipProgramCell"];
+
         UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
         bottomView.backgroundColor = HexRGB(0xf8f9fc);
         self.tableView.tableFooterView = bottomView;
@@ -106,8 +107,30 @@
 }
 
 - (void)requestData {
-    [self endRefresh];
-    [self changePromptLabelStateWithArray:self.dataArray];
+    [KSNetworkingManager teacherSubjectPriceRequest:KS_POST courseType:@"PRACTICE" page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+        [self endRefresh];
+        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
+            NSArray *sourceArray = [dic ks_arrayValueForKey:@"data"];
+            for (NSDictionary *parm in sourceArray) {
+                CoursePargramListModel *model = [[CoursePargramListModel alloc] initWithDictionary:parm];
+                [self.dataArray addObject:model];
+            }
+        }
+        else {
+            [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
+        }
+        [self.tableView reloadData];
+        [self changePromptLabelStateWithArray:self.dataArray];
+    } faliure:^(NSError * _Nonnull error) {
+        [self endRefresh];
+        if (self.networkAvaiable == NO) {
+            [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
+        }
+        [self.dataArray removeAllObjects];
+        [self.tableView reloadData];
+        [self changePromptLabelStateWithArray:self.dataArray];
+    }];
+    
 }
 
 - (void)beginRefreshImmediately {
@@ -203,14 +226,48 @@
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 88.0f;
+    return 86.0f;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    CoursePargramListModel *model = self.dataArray[indexPath.row];
     MinePageVipProgramCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MinePageVipProgramCell"];
+    MJWeakSelf;
+    [cell configWithSource:model callback:^(NSString * _Nonnull programId) {
+        [weakSelf showAlert:programId];
+    }];
     return cell;
 }
 
+- (void)showAlert:(NSString *)programId {
+    KSConfirmAlertView *alert = [KSConfirmAlertView shareInstance];
+    [alert configWithTitle:@"提示" subTitle:@"确认删除该课程方案吗?"];
+    [alert configLeftTitle:@"取消" rightTitle:@"确认"];
+    MJWeakSelf;
+    [alert opreationSure:^{
+        [weakSelf removeProgram:programId];
+    } cancel:^{
+        
+    }];
+    [alert showAlert];
+}
+
+- (void)removeProgram:(NSString *)programId {
+    [LOADING_MANAGER showHUD];
+    [KSNetworkingManager teacherSubjectPriceDeleteRequest:KS_POST programId:programId success:^(NSDictionary * _Nonnull dic) {
+        [LOADING_MANAGER removeHUD];
+        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
+            [self refreshAndRequestData];
+        }
+        else {
+            [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
+        }
+    } faliure:^(NSError * _Nonnull error) {
+        [LOADING_MANAGER removeHUD];
+    }];
+}
+
+
 #pragma mark ----- lazying
 - (UIView *)headView {
     if (!_headView) {
@@ -223,7 +280,7 @@
     if (!_tipsView) {
         _tipsView = [MinePageCourseTipsView shareIntance];
         MJWeakSelf;
-        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是趣纠课?" descMsg:@"趣纠课是老师在您的练习过程中提供的个性化指导服务,旨在纠正错误并帮助您更好地理解和掌握所学内容。上课形式为1v1线上课程。" callback:^(COURSE_TIPS_ACTION action) {
+        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是趣纠课?" descMsg:@"趣纠课以一对一专属、高度针对性的形式进行,每次课程时长为25分钟。本课程专为解决学生日常练习中的疑问与误区设计,尤其适合那些在自我练习后感到困惑或不确定自己方法是否正确的学生。不同于传统的教学模式,趣纠课不侧重于新知识或新技能的传授,而是全心全意致力于检查学生现有的练习成果,并及时纠正其中出现的问题。这种方式不仅有助于学生巩固已掌握的知识和技能,还能有效防止错误习惯的形成和发展,为他们今后的学习打下更加坚实的基础。" callback:^(COURSE_TIPS_ACTION action) {
             [weakSelf courseTipsAction:action];
         }];
     }
@@ -330,21 +387,6 @@
     return isExistenceNetwork;
 }
 
-- (void)showAlert:(NSString *)programId {
-    KSConfirmAlertView *alert = [KSConfirmAlertView shareInstance];
-    MJWeakSelf;
-    [alert configWithTitle:@"提示" subTitle:@"确认删除该课程方案吗?"];
-    [alert opreationSure:^{
-        [weakSelf deleteProgram:programId];
-    } cancel:^{
-        
-    }];
-    [alert showAlert];
-}
-
-- (void)deleteProgram:(NSString *)programId {
-    
-}
 
 /*
 // Only override drawRect: if you perform custom drawing.

+ 6 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupAlertCell.xib

@@ -18,10 +18,10 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="76n-GO-SJx">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="83"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chat_fansGroup_logo" translatesAutoresizingMaskIntoConstraints="NO" id="cOU-Gd-KLn">
-                                <rect key="frame" x="20" y="20.666666666666671" width="42" height="42"/>
+                                <rect key="frame" x="20" y="10.666666666666664" width="42" height="42"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="42" id="GO6-9I-49O"/>
                                     <constraint firstAttribute="width" constant="42" id="UbU-XM-x44"/>
@@ -33,7 +33,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛群" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u61-Cw-ZNy">
-                                <rect key="frame" x="72" y="21.666666666666671" width="211" height="21"/>
+                                <rect key="frame" x="72" y="11.666666666666664" width="211" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="uoW-G1-qle"/>
                                 </constraints>
@@ -42,14 +42,14 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="setting_next" translatesAutoresizingMaskIntoConstraints="NO" id="WIW-Z6-7Kf">
-                                <rect key="frame" x="293" y="36" width="6" height="11"/>
+                                <rect key="frame" x="293" y="26" width="6" height="11"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="11" id="gr9-85-q6L"/>
                                     <constraint firstAttribute="width" constant="6" id="q2R-yv-rq7"/>
                                 </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="9Qg-fN-QGW">
-                                <rect key="frame" x="72" y="44.666666666666664" width="211" height="17"/>
+                                <rect key="frame" x="72" y="34.666666666666664" width="211" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="hPL-vc-xSY"/>
                                 </constraints>
@@ -77,7 +77,7 @@
                     <constraint firstAttribute="trailing" secondItem="76n-GO-SJx" secondAttribute="trailing" id="6hE-Rl-Wxq"/>
                     <constraint firstItem="76n-GO-SJx" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="La4-FW-6ag"/>
                     <constraint firstItem="76n-GO-SJx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="caU-el-hi7"/>
-                    <constraint firstAttribute="bottom" secondItem="76n-GO-SJx" secondAttribute="bottom" id="dei-xP-eEf"/>
+                    <constraint firstAttribute="bottom" secondItem="76n-GO-SJx" secondAttribute="bottom" constant="20" id="dei-xP-eEf"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupAlertView.m

@@ -41,7 +41,6 @@
 }
 
 - (void)configWithSource:(NSMutableArray *)fansGroupArray {
-    
     if ([self.tableContainer.subviews containsObject:self.emptyView]) {
         [self.emptyView removeFromSuperview];
     }

+ 3 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupAlertView.xib

@@ -14,13 +14,13 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sqT-l2-2xZ">
-                    <rect key="frame" x="46.666666666666657" y="338.66666666666669" width="300" height="175.00000000000006"/>
+                    <rect key="frame" x="46.666666666666657" y="328.66666666666669" width="300" height="195.00000000000006"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fansGroup_alert_top" translatesAutoresizingMaskIntoConstraints="NO" id="2UF-fm-A6l">
                             <rect key="frame" x="0.0" y="0.0" width="300" height="113"/>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yue-SE-dsU">
-                            <rect key="frame" x="0.0" y="113" width="300" height="62"/>
+                            <rect key="frame" x="0.0" y="133" width="300" height="62"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="62" id="rff-qF-IJm"/>
@@ -47,7 +47,7 @@
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="Yue-SE-dsU" firstAttribute="top" secondItem="2UF-fm-A6l" secondAttribute="bottom" id="4CQ-22-Cns"/>
+                        <constraint firstItem="Yue-SE-dsU" firstAttribute="top" secondItem="2UF-fm-A6l" secondAttribute="bottom" constant="20" id="4CQ-22-Cns"/>
                         <constraint firstAttribute="trailing" secondItem="vb1-ly-0S5" secondAttribute="trailing" constant="13" id="78Z-MM-r6O"/>
                         <constraint firstAttribute="width" constant="300" id="7q4-Wf-OUU"/>
                         <constraint firstAttribute="trailing" secondItem="2UF-fm-A6l" secondAttribute="trailing" id="DUz-5t-U1V"/>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageLiveCourse/MinePageLiveCourseView.m

@@ -286,7 +286,7 @@
     if (!_tipsView) {
         _tipsView = [MinePageCourseTipsView shareIntance];
         MJWeakSelf;
-        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是直播课?" descMsg:@"直播课是老师根据教学目的精心编排的课程,按照固定时间进行直播授课。您可根据老师开放的课程内容,选择自己感兴趣的课程进行学习。如果您错过了直播,也不必担心,可以随时观看直播回放。" callback:^(COURSE_TIPS_ACTION action) {
+        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是直播课?" descMsg:@"直播课是现代教育领域中一种广受欢迎的课程形式,它集实时互动、多媒体展示和高度便利性于一体,为学习者带来了独特且丰富的学习体验。特别是在管乐直播课中,教师可以通过播放经典音乐作品,加深学生对音乐之美的感知与理解。对于那些需要具体操作演示的教学内容,直播课能够提供清晰直观的视角,让教师的每一个动作细节都展现在学生面前,确保学习效果。直播课程的内容围绕特定主题精心设计,旨在满足不同学习者的需求,促进知识与技能的有效传递。" callback:^(COURSE_TIPS_ACTION action) {
             [weakSelf courseTipsAction:action];
         }];
     }

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageTipsView/MineCourseSettingView.m

@@ -57,7 +57,7 @@
         case COURSE_TYPE_ACCOMPANY:
         {
             imgName = @"mine_info_setting_accompany";
-            descTitle = @"设置VIP定制课";
+            descTitle = @"设置趣纠课";
         }
             break;
         case COURSE_TYPE_LIVE:

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineVideoCourse/MinePageVideoCourseView.m

@@ -255,7 +255,7 @@
     if (!_tipsView) {
         _tipsView = [MinePageCourseTipsView shareIntance];
         MJWeakSelf;
-        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是视频课?" descMsg:@"视频课是由老师根据教学内容精心录制的课程,购买后永久有效,您可以随时观看学习。" callback:^(COURSE_TIPS_ACTION action) {
+        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是视频课?" descMsg:@"视频课是由教师事先精心准备并录制的课程内容。教师依据教学大纲和目标,系统规划每一节视频的主题与内容,确保教学的连贯性和完整性。在录制过程中,采用专业设备如高清摄像机和录屏软件,保障视频画质清晰、音频质量优良。视频课为学生提供了极大的学习灵活性,他们可以依据个人的时间安排自由选择学习时间,不受地点限制。特别适用于系统化学习体系的内容,视频课能够帮助学生按部就班地掌握知识,实现自主高效学习。" callback:^(COURSE_TIPS_ACTION action) {
             [weakSelf courseTipsAction:action];
         }];
     }

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/VipCourse/MinePageVIPCourseView.m

@@ -268,7 +268,7 @@
     if (!_tipsView) {
         _tipsView = [MinePageCourseTipsView shareIntance];
         MJWeakSelf;
-        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是VIP定制课程?" descMsg:@"VIP定制课是专为每位学员量身打造的1v1线上课程。老师将根据您的学习需求和希望达到的成果,定制专属的教学内容。为了确保最佳的上课体验,建议您在约课前与老师充分沟通,达成一致后,根据老师的空闲时间安排上课时间。" callback:^(COURSE_TIPS_ACTION action) {
+        [_tipsView configWithTypeImage:@"minePage_course_introduce" headTitle:@"什么是VIP定制课程?" descMsg:@"VIP定制课程采用一对一专属授课模式,每节课时长为45分钟。课程内容根据学生的具体需求量身打造,旨在全面提升学生的个人技能与表现。不论是希望在乐器演奏技巧上取得突破,如提高指法精准度、气息控制能力或节奏掌握等;还是为即将到来的重要活动、比赛或考级做充分准备,我们都能提供高度匹配的教学方案。此外,教学进度将根据每位学员的学习吸收情况灵活调整,确保每个人都能在最适合自己的节奏中稳步前进,扎实提升个人能力。" callback:^(COURSE_TIPS_ACTION action) {
             [weakSelf courseTipsAction:action];
         }];
     }

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineActionView.h

@@ -45,7 +45,7 @@ typedef NS_ENUM(NSInteger, MINEVIEWTYPE) {
 
 #define FUNCTIONVIEW_WIDTH (80)
 #define FUNCTIONVIEW_HEIGHT (60)
-#define FUNCTIONVIEW_SPACE (14)
+#define FUNCTIONVIEW_SPACE (18)
 
 typedef void(^MineViewCallback)(MINEVIEWTYPE type);
 

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels