Steven %!s(int64=3) %!d(string=hai) anos
pai
achega
8baefb8b36
Modificáronse 20 ficheiros con 266 adicións e 46 borrados
  1. 4 4
      KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj
  2. BIN=BIN
      KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate
  3. 80 0
      KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  4. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m
  5. 14 1
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h
  6. 21 1
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m
  7. 7 2
      KulexiuForTeacher/KulexiuForTeacher/Common/ThirdPart/WMPlayer/WMPlayer.m
  8. 3 3
      KulexiuForTeacher/KulexiuForTeacher/KulexiuForTeacher.entitlements
  9. 31 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m
  10. 22 3
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/View/CourseForLiveCell.m
  11. 1 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m
  12. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m
  13. 4 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Login/View/FirstSettingBodyView.m
  14. 3 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Login/View/PasswordBodyView.m
  15. 2 2
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/MyStyleViewController.m
  16. 33 16
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleIntroduceCell.m
  17. 32 10
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m
  18. 3 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/ModifyBodyView.m
  19. 3 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/PhoneCheckBodyView.m
  20. 1 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBodyView.m

+ 4 - 4
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -5411,7 +5411,7 @@
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.0;
-				DEVELOPMENT_TEAM = P664H7S5LL;
+				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KulexiuForTeacher/Common/Define/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -5436,7 +5436,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.JingMing.KulexiuForTeacher;
+				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -5452,7 +5452,7 @@
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.0;
-				DEVELOPMENT_TEAM = P664H7S5LL;
+				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/KulexiuForTeacher/Common/Define/PrefixHeader.pch";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -5477,7 +5477,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.JingMing.KulexiuForTeacher;
+				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";

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


+ 80 - 0
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -176,5 +176,85 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1F8151AC-690A-4AEA-AD47-C6A8F3578210"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/MinePage/Controller/MinePageViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "105"
+            endingLineNumber = "105"
+            landmarkName = "-refreshAuthStatus"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "34F8CABD-0EB7-4F2F-850F-C8AD4B4FC932"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "452"
+            endingLineNumber = "452"
+            landmarkName = "-setMusicianAuthStatus:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0F1EC942-2759-4667-8F29-9F899408473E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Login/Controller/PasswordLoginController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "58"
+            endingLineNumber = "58"
+            landmarkName = "-operationAction:parm:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C29CA973-9C0E-43CF-8C97-72452E222E9C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "452"
+            endingLineNumber = "452"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "171D4790-A23B-400B-989E-D34F5ACA1295"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Course/Controller/CourseViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "448"
+            endingLineNumber = "448"
+            landmarkName = "-adjustCourseWithSource:time:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m

@@ -175,7 +175,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
         [_myWebView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.right.mas_equalTo(self.view);
             make.top.mas_equalTo(self.view.mas_top).offset(topHeight);
-            make.bottom.mas_equalTo(self.view.mas_bottom);
+            make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
         }];
         if (@available(iOS 11.0, *)) {
             _myWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;

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

@@ -184,7 +184,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark ---- 验证码服务
 
-// /api-teacher/code/sendSms
+// /api-teacher/code/sendSmsCode
 
 /**
  发送短信验证码
@@ -603,5 +603,18 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryCourseForDay:(NSString *)post classDate:(NSString *)classDate success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
+
+
+// /api-teacher/courseSchedule/courseAdjust
+
+/// 课时调整
+/// @param post post
+/// @param courseId 课程编号
+/// @param classDate 上课日期
+/// @param startTime 开始时间
+/// @param endTime 结束时间
+/// @param success 成功
+/// @param faliure 失败
++ (void)courseAdjustRequst:(NSString *)post courseId:(NSString *)courseId classDate:(NSString *)classDate startTime:(NSString *)startTime endTime:(NSString *)endTime success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 @end
 NS_ASSUME_NONNULL_END

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

@@ -543,7 +543,7 @@
 
 #pragma mark ---- 验证码服务
 
-// /api-teacher/code/sendSms
+// /api-teacher/code/sendSmsCode
 
 /**
  发送短信验证码
@@ -1244,4 +1244,24 @@
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
 
+// /api-teacher/courseSchedule/courseAdjust
+
+/// 课时调整
+/// @param post post
+/// @param courseId 课程编号
+/// @param classDate 上课日期
+/// @param startTime 开始时间
+/// @param endTime 结束时间
+/// @param success 成功
+/// @param faliure 失败
++ (void)courseAdjustRequst:(NSString *)post courseId:(NSString *)courseId classDate:(NSString *)classDate startTime:(NSString *)startTime endTime:(NSString *)endTime success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestMethodJSON];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/courseSchedule/courseAdjust"];
+    NSMutableDictionary *parm = [NSMutableDictionary dictionary];
+    [parm setValue:courseId forKey:@"courseId"];
+    [parm setValue:classDate forKey:@"classDate"];
+    [parm setValue:startTime forKey:@"startTime"];
+    [parm setValue:endTime forKey:@"endTime"];
+    [self request:post andWithUrl:url and:parm success:success faliure:faliure];
+}
 @end

+ 7 - 2
KulexiuForTeacher/KulexiuForTeacher/Common/ThirdPart/WMPlayer/WMPlayer.m

@@ -14,6 +14,7 @@
 
 #import "WMPlayer.h"
 #import "Masonry.h"
+#import "UIButton+EnlargeEdge.h"
 
 //****************************宏*********************************
 #define WMPlayerSrcName(file) [@"WMPlayer.bundle" stringByAppendingPathComponent:file]
@@ -261,6 +262,7 @@ static void *PlayViewStatusObservationContext = &PlayViewStatusObservationContex
     [self.backBtn setImage:[UIImage imageNamed:@"cancle_button"] forState:UIControlStateNormal];
     [self.backBtn setImage:[UIImage imageNamed:@"cancle_button"] forState:UIControlStateSelected];
     [self.backBtn addTarget:self action:@selector(colseTheVideo:) forControlEvents:UIControlEventTouchUpInside];
+    [self.backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:5];
     [self.topView addSubview:self.backBtn];
     
     //rateBtn
@@ -308,6 +310,9 @@ static void *PlayViewStatusObservationContext = &PlayViewStatusObservationContex
 }
 #pragma mark - Gesture Delegate
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
+    if ([touch.view isKindOfClass:[UIButton class]]) {
+        return NO;
+    }
         if ([touch.view isKindOfClass:[UIControl class]]) {
             return NO;
         }
@@ -374,8 +379,8 @@ static void *PlayViewStatusObservationContext = &PlayViewStatusObservationContex
         make.size.mas_equalTo(CGSizeMake(60, 30));
     }];
     [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.topView).offset(12);
-        make.size.mas_equalTo(CGSizeMake(self.backBtn.currentImage.size.width+6, self.backBtn.currentImage.size.height+4));
+        make.leading.equalTo(self.topView).offset(16);
+        make.size.mas_equalTo(CGSizeMake(40, 40));
         make.centerY.equalTo(self.titleLabel);
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {

+ 3 - 3
KulexiuForTeacher/KulexiuForTeacher/KulexiuForTeacher.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.example.vlc-iosasdd</string>
+		<string>iCloud.com.Colexiu.KulexiuForTeacher</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -14,11 +14,11 @@
 	</array>
 	<key>com.apple.developer.ubiquity-container-identifiers</key>
 	<array>
-		<string>iCloud.com.example.vlc-iosasdd</string>
+		<string>iCloud.com.Colexiu.KulexiuForTeacher</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.JingMing.Kulexiu</string>
+		<string>$(AppIdentifierPrefix)com.Colexiu.Kulexiu</string>
 	</array>
 </dict>
 </plist>

+ 31 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m

@@ -17,6 +17,7 @@
 #import "KSEnterLiveroomManager.h"
 #import "KSBaseWKWebViewController.h"
 #import "AccompanyDetailViewController.h"
+#import "NSDate+Transform.h"
 
 @interface CourseViewController ()<UITableViewDataSource,UITableViewDelegate,FSCalendarDataSource,FSCalendarDelegate,UIGestureRecognizerDelegate>
 {
@@ -426,13 +427,42 @@
 
 - (void)adjustCourseAction:(TableCourseModel *)source {
     KSFullDatePicker *adjustPicker = [[KSFullDatePicker alloc] initWithTitle:@"课程调整" date:[NSDate date] pickMode:KSDATEPICKER_MODE_DAY_TIME selectDateBlock:^(NSString *date) {
-        
+        NSString *timeString = [NSString stringWithFormat:@"%@:00", date];
+        [self adjustCourseWithSource:source time:timeString];
     } cancleBlock:^{
         
     }];
     [adjustPicker show];
 }
 
+- (void)adjustCourseWithSource:(TableCourseModel *)model  time:(NSString *)chooseTime {
+    NSString *formatString = @"yyyy-MM-dd HH:mm:ss";
+    NSTimeInterval courseDuration = [NSDate countTimesTampWithBeginTime:model.startTime endTime:model.endTime format:formatString];
+    NSDate *endDate = [NSDate dateWithTimeInterval:courseDuration sinceDate:[NSDate dateFromString:chooseTime format:formatString]];
+    NSString *endTime = [endDate stringDateWithFormat:formatString];
+    NSString *classDate = [NSString stringWithFormat:@"%@ 00:00:00", [[chooseTime componentsSeparatedByString:@" "] firstObject]];
+    
+    [self showhud];
+    [KSNetworkingManager courseAdjustRequst:KS_POST courseId:model.courseId classDate:classDate startTime:chooseTime endTime:endTime success:^(NSDictionary * _Nonnull dic) {
+        [self removehub];
+        if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
+            MJWeakSelf;
+            [self KSShowMsg:@"调整成功" promptCompletion:^{
+                [weakSelf loadMonthCourse:weakSelf.chooseMonth];
+                if (![NSString isEmptyString:weakSelf.chooseDay]) {
+                    [weakSelf getCourseByDate:weakSelf.chooseDay];
+                }
+            }];
+        }
+        else {
+            [self MBPShow:MESSAGEKEY];
+        }
+    } faliure:^(NSError * _Nonnull error) {
+        [self removehub];
+    }];
+}
+
+
 - (void)showAccompanyDetailAction:(TableCourseModel *)source {
     AccompanyDetailViewController *detailVC = [[AccompanyDetailViewController alloc] init];
     detailVC.courseId = source.courseId;

+ 22 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Course/View/CourseForLiveCell.m

@@ -46,20 +46,39 @@
     if ([model.status isEqualToString:@"NOT_START"]) { // 未开始
         self.courseStatusLabel.text = @"未开始";
         self.courseStatusLabel.textColor = HexRGB(0xff802C);
-        
+        // 判断按钮显示调课还是进入教室
+        NSDate *currentDate = [NSDate date];
+        NSDate *beginDate = [self getCourseBeginDate:model.startTime];
+        NSTimeInterval beginTimeInterval = [beginDate timeIntervalSinceDate:currentDate];
+        if (beginTimeInterval < beforeTime * 60) {
+            self.operationButton.userInteractionEnabled = YES;
+            self.operationButton.hidden = NO;
+        }
+        else {
+            self.operationButton.userInteractionEnabled = NO;
+            self.operationButton.hidden = YES;
+        }
     }
     else if ([model.status isEqualToString:@"ING"]) { // 进行中
         self.courseStatusLabel.text = @"进行中";
         self.courseStatusLabel.textColor = THEMECOLOR;
-        
+        self.operationButton.userInteractionEnabled = YES;
+        self.operationButton.hidden = NO;
     }
     else if ([model.status isEqualToString:@"COMPLETE"]) { // 已结束
         self.courseStatusLabel.text = @"已结束";
         self.courseStatusLabel.textColor = HexRGB(0x999999);
-        
+        self.operationButton.userInteractionEnabled = NO;
+        self.operationButton.hidden = YES;
     }
 }
 
+- (NSDate *)getCourseBeginDate:(NSString *)beginTime {
+    NSDateFormatter *dateFormatter = [NSObject getDateformatter];
+    [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+    NSDate *beginDate = [dateFormatter dateFromString:beginTime];
+    return beginDate;
+}
 - (void)evaluateTimeLabelWithBeginTime:(NSString *)beginTime endTime:(NSString *)endTime {
     // 时间
     NSDateFormatter *dateFormatter = [NSObject getDateformatter];

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -96,6 +96,7 @@
     [self.navigationController pushViewController:messageCenter animated:YES];
     
 //    NSString *url = @"alipays://platformapi/startapp?saId=10000007&qrcode=https://qr.alipay.com/bax08845x232iacmrtdc251b";
+//    NSString *url = @"alipays://platformapi/startapp?saId=10000007&qrcode=https://qr.alipay.com/bax03961j5dgt0vyjycb0014";
 //    [[UIApplication sharedApplication] openURL:[NSURL URLWithString: url]];
 }
 

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m

@@ -440,7 +440,7 @@
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (indexPath.row == 0) { // 进入陪练课详情
+    if (self.selectIndex == 0) { // 进入陪练课详情
         AccompanyLessonModel *model = self.dataArray[indexPath.row];
         [self showAccompanyDetail:model];
     }

+ 4 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Login/View/FirstSettingBodyView.m

@@ -27,7 +27,10 @@
         self.firstField.textContentType = UITextContentTypeName;
         self.secondField.textContentType = UITextContentTypeName;
     }
-    
+    if (@available(iOS 12.0, *)) {
+        self.firstField.textContentType = UITextContentTypeOneTimeCode;
+        self.secondField.textContentType = UITextContentTypeOneTimeCode;
+    }
 }
 + (instancetype)shareInstance {
     FirstSettingBodyView *view = [[[NSBundle mainBundle] loadNibNamed:@"FirstSettingBodyView" owner:nil options:nil] firstObject];

+ 3 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Login/View/PasswordBodyView.m

@@ -26,6 +26,9 @@
     if (@available(iOS 10.0, *)) {
         _passwordField.textContentType = UITextContentTypeName;
     }
+    if (@available(iOS 12.0, *)) {
+        _passwordField.textContentType = UITextContentTypeOneTimeCode;
+    }
 }
 
 + (instancetype)shareInstance {

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Controller/MyStyleViewController.m

@@ -146,7 +146,7 @@
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             MJWeakSelf;
             [self KSShowMsg:@"保存成功" promptCompletion:^{
-                [weakSelf requestMyStyle];
+                [weakSelf backAction];
             }];
         }
         else {
@@ -358,7 +358,7 @@
         _tableView.showsHorizontalScrollIndicator = NO;
         _tableView.showsVerticalScrollIndicator = NO;
         _tableView.rowHeight = UITableViewAutomaticDimension;
-        _tableView.estimatedRowHeight = 200.0f;
+        _tableView.estimatedRowHeight = 150.0f;
         [_tableView registerNib:[UINib nibWithNibName:@"MyStyleInstrumentCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MyStyleInstrumentCell"];
         [_tableView registerNib:[UINib nibWithNibName:@"MyStyleIntroduceCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MyStyleIntroduceCell"];
         [_tableView registerNib:[UINib nibWithNibName:@"MyStyleVideoCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MyStyleVideoCell"];

+ 33 - 16
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleIntroduceCell.m

@@ -50,6 +50,7 @@
 - (void)textViewDidBeginEditing:(UITextView *)textView {
     self.tipsLabel.hidden = YES;
 }
+
 - (void)textViewDidEndEditing:(UITextView *)textView {
     if ([NSString isEmptyString:textView.text]) {
         self.tipsLabel.hidden = NO;
@@ -94,26 +95,42 @@
     UITextRange *selectedRange = [textView markedTextRange];
     NSString * newText = [textView textInRange:selectedRange]; //获取高亮部分
     if (newText.length>0) {
+        UITableView *tableView = [self tableView];
+        if (@available(iOS 11.0, *)) {
+            [UIView performWithoutAnimation:^{
+                [tableView performBatchUpdates:nil completion:nil];
+                [tableView sizeToFit];
+            }];
+        }
+        else {
+            [UIView performWithoutAnimation:^{
+                [tableView beginUpdates];
+                [tableView endUpdates];
+            }];
+        }
         return;
     }
-    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-    [paragraphStyle setLineSpacing:4];//调整行间距
-    NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:textView.text attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x666666)}];
-    textView.attributedText = attrs;
-    
-    UITableView *tableView = [self tableView];
-    if (@available(iOS 11.0, *)) {
-        [UIView performWithoutAnimation:^{
-            [tableView performBatchUpdates:nil completion:nil];
-            [tableView sizeToFit];
-        }];
-    }
     else {
-        [UIView performWithoutAnimation:^{
-            [tableView beginUpdates];
-            [tableView endUpdates];
-        }];
+        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+        [paragraphStyle setLineSpacing:4];//调整行间距
+        NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:textView.text attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x666666)}];
+        textView.attributedText = attrs;
+        
+        UITableView *tableView = [self tableView];
+        if (@available(iOS 11.0, *)) {
+            [UIView performWithoutAnimation:^{
+                [tableView performBatchUpdates:nil completion:nil];
+                [tableView sizeToFit];
+            }];
+        }
+        else {
+            [UIView performWithoutAnimation:^{
+                [tableView beginUpdates];
+                [tableView endUpdates];
+            }];
+        }
     }
+    
 }
 - (UITableView *)tableView {
     UIView *tableView = self.superview;

+ 32 - 10
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -223,11 +223,21 @@
     self.tableView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
     if (![self.subviews containsObject:self.uploadView]) {
         [self addSubview:self.uploadView];
-        if (self.teaherAuth == NO) {
-            [self showAuthView];
+        if (self.selectIndex == 1 || self.selectIndex == 2) {
+            if (self.teaherAuth == NO) {
+                [self showAuthView];
+            }
+            else {
+                [self hideAuthView];
+            }
         }
-        else {
-            [self hideAuthView];
+        else if (self.selectIndex == 4) {
+            if (self.musicianAuthStatus == NO) {
+                [self showAuthView];
+            }
+            else {
+                [self hideAuthView];
+            }
         }
     }
 }
@@ -396,6 +406,7 @@
     }
     return isExistenceNetwork;
 }
+
 #pragma mark ----- lazying
 - (void)setTeaherAuth:(BOOL)teaherAuth {
     _teaherAuth = teaherAuth;
@@ -403,13 +414,15 @@
         self.uploadView.type = MINEPAGETYPE_ACCOMPANY;
     }
     else if (self.selectIndex == 2) {
-        self.uploadView.type =MINEPAGETYPE_LIVE;
+        self.uploadView.type = MINEPAGETYPE_LIVE;
     }
-    if (teaherAuth == NO) {
-        [self showAuthView];
-    }
-    else {
-        [self hideAuthView];
+    if (self.selectIndex == 1 || self.selectIndex == 2) {
+        if (teaherAuth == NO) {
+            [self showAuthView];
+        }
+        else {
+            [self hideAuthView];
+        }
     }
 }
 
@@ -425,6 +438,7 @@
     }
 }
 
+
 - (void)hideAuthView {
     if ([self.subviews containsObject:self.authView]) {
         [self.authView removeFromSuperview];
@@ -437,6 +451,14 @@
     if (self.selectIndex == 4) {
         self.uploadView.type = MINEPAGETYPE_MUSIC;
     }
+    if (self.selectIndex == 4) {
+        if (musicianAuthStatus == NO) {
+            [self showAuthView];
+        }
+        else {
+            [self hideAuthView];
+        }
+    }
 }
 
 - (MinePageSubmitView *)uploadView {

+ 3 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/ModifyBodyView.m

@@ -26,6 +26,9 @@
     if (@available(iOS 10.0, *)) {
         _pwdField.textContentType = UITextContentTypeName;
     }
+    if (@available(iOS 12.0, *)) {
+        _pwdField.textContentType = UITextContentTypeOneTimeCode;
+    }
     self.pwdField.delegate = self;
     self.codeField.delegate = self;
     NSString *phoneStr = UserDefault(PHONEKEY);

+ 3 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/PhoneCheckBodyView.m

@@ -21,6 +21,9 @@
     if (@available(iOS 10.0, *)) {
         _passwordField.textContentType = UITextContentTypeName;
     }
+    if (@available(iOS 12.0, *)) {
+        _passwordField.textContentType = UITextContentTypeOneTimeCode;
+    }
     self.phoneField.delegate = self;
     self.passwordField.delegate = self;
 }

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBodyView.m

@@ -64,6 +64,7 @@
         self.authView.hidden = NO;
         self.descView.hidden = YES;
         self.tipsButton.hidden = NO;
+        
     }
     self.starView.rate = infoMessage.starGrade / 5.0f;
     if (![NSString isEmptyString:infoMessage.heardUrl]) {