视频播放器关闭交互优化

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -8377,7 +8377,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.4.2;
+				CURRENT_PROJECT_VERSION = 1.4.2.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8443,7 +8443,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.4.2;
+				CURRENT_PROJECT_VERSION = 1.4.2.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

KulexiuForTeacher/KulexiuForTeacher/Common/ThirdPart/WMPlayer/WMPlayer.m

@@ -310,12 +310,9 @@ static void *PlayViewStatusObservationContext = &PlayViewStatusObservationContex
 }
 #pragma mark - Gesture Delegate
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
-    if ([touch.view isKindOfClass:[UIButton class]]) {
+    if ([touch.view isKindOfClass:[UIControl class]] || [touch.view isDescendantOfView:self.topView]) {
         return NO;
     }
-        if ([touch.view isKindOfClass:[UIControl class]]) {
-            return NO;
-        }
     return YES;
 }
 //添加控件的约束
@@ -324,40 +321,40 @@ static void *PlayViewStatusObservationContext = &PlayViewStatusObservationContex
         make.edges.mas_equalTo(UIEdgeInsetsMake(0, 0, 0, 0));
     }];
     [self.FF_View mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.center.equalTo(self.contentView);
+        make.center.mas_equalTo(self.contentView);
         make.size.mas_equalTo(CGSizeMake(120, 70));
     }];
     [self.loadingView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.center.equalTo(self.contentView);
+        make.center.mas_equalTo(self.contentView);
     }];
     [self.topView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.trailing.top.equalTo(self.contentView);
-        make.height.mas_equalTo([WMPlayer IsiPhoneX]?50:90);
+        make.leading.trailing.top.mas_equalTo(self.contentView);
+        make.height.mas_equalTo(kNaviBarHeight);
     }];
     [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.trailing.bottom.equalTo(self.contentView);
+        make.leading.trailing.bottom.mas_equalTo(self.contentView);
         make.height.mas_equalTo(50);
     }];
     [self.lockBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.contentView).offset(15);
+        make.leading.mas_equalTo(self.contentView).offset(15);
         make.centerY.mas_equalTo(self.contentView);
     }];
     [self.playOrPauseBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.equalTo(self.bottomView);
-        make.leading.equalTo(self.bottomView).offset(10);
+        make.centerY.mas_equalTo(self.bottomView);
+        make.leading.mas_equalTo(self.bottomView).offset(10);
     }];
     [self.leftTimeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.bottomView).offset(50);
-        make.top.equalTo(self.bottomView.mas_centerY).with.offset(8);
+        make.leading.mas_equalTo(self.bottomView).offset(50);
+        make.top.mas_equalTo(self.bottomView.mas_centerY).with.offset(8);
     }];
     [self.rightTimeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.trailing.equalTo(self.bottomView).offset(-50);
-        make.top.equalTo(self.bottomView.mas_centerY).with.offset(8);
+        make.trailing.mas_equalTo(self.bottomView).offset(-50);
+        make.top.mas_equalTo(self.bottomView.mas_centerY).with.offset(8);
     }];
     [self.loadingProgress mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.leftTimeLabel.mas_leading).offset(4);
-        make.trailing.equalTo(self.rightTimeLabel.mas_trailing).offset(-4);
-        make.centerY.equalTo(self.bottomView);
+        make.leading.mas_equalTo(self.leftTimeLabel.mas_leading).offset(4);
+        make.trailing.mas_equalTo(self.rightTimeLabel.mas_trailing).offset(-4);
+        make.centerY.mas_equalTo(self.bottomView);
     }];
     [self.progressSlider mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.equalTo(self.leftTimeLabel.mas_leading).offset(4);
@@ -370,24 +367,23 @@ static void *PlayViewStatusObservationContext = &PlayViewStatusObservationContex
         make.bottom.mas_offset(0);
     }];
     [self.fullScreenBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.equalTo(self.bottomView);
-        make.trailing.equalTo(self.bottomView).offset(-10);
+        make.centerY.mas_equalTo(self.bottomView);
+        make.trailing.mas_equalTo(self.bottomView).offset(-10);
     }];
     [self.rateBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.equalTo(self.topView);
-        make.trailing.equalTo(self.topView).offset(-10);
+        make.centerY.mas_equalTo(self.topView);
+        make.trailing.mas_equalTo(self.topView).offset(-10);
         make.size.mas_equalTo(CGSizeMake(60, 30));
     }];
     [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.topView).offset(16);
+        make.leading.mas_equalTo(self.topView).offset(16);
         make.size.mas_equalTo(CGSizeMake(40, 40));
-        make.centerY.equalTo(self.titleLabel);
+        make.centerY.mas_equalTo(self.titleLabel);
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(self.backBtn.mas_trailing).offset(50);
-        make.trailing.equalTo(self.topView).offset(-50);
-        make.center.equalTo(self.topView);
-        make.top.equalTo(self.topView);
+        make.leading.mas_equalTo(self.backBtn.mas_trailing).offset(10);
+        make.size.mas_equalTo(CGSizeMake(44, 44));
+        make.bottom.mas_equalTo(self.topView.mas_bottom).offset(-10);
     }];
     [self.loadFailedLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.center.equalTo(self.contentView);

KulexiuForTeacher/KulexiuForTeacher/Common/Tools/KSUploadManager.m

@@ -46,8 +46,8 @@
 // 默认配置
 - (void)configCilentBucket {
     self.bucketName = @"daya";
-    self.uploadBucket = @"ks3-cn-beijing.ksyuncs.com/daya";
-    self.receiveBucket = [NSString stringWithFormat:@"daya.ks3-cn-beijing.ksyuncs.com"];
+    self.uploadBucket = @"daya.ks3-cn-beijing.ksyuncs.com";
+    self.receiveBucket = @"daya.ks3-cn-beijing.ksyuncs.com";
     [[KS3Client initialize] setBucketDomain:self.uploadBucket];
 }
 
@@ -56,7 +56,7 @@
         bucketName = @"daya";
     }
     self.bucketName = bucketName;
-    self.uploadBucket = [NSString stringWithFormat:@"ks3-cn-beijing.ksyuncs.com/%@",bucketName];
+    self.uploadBucket = [NSString stringWithFormat:@"%@.ks3-cn-beijing.ksyuncs.com",bucketName];
     self.receiveBucket = [NSString stringWithFormat:@"%@.ks3-cn-beijing.ksyuncs.com",bucketName];
     [[KS3Client initialize] setBucketDomain:self.uploadBucket];
 }