视频播放器关闭交互优化

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -7687,7 +7687,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.4.1;
+				CURRENT_PROJECT_VERSION = 1.4.2.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7743,7 +7743,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -7764,7 +7764,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.4.1;
+				CURRENT_PROJECT_VERSION = 1.4.2.1;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7820,7 +7820,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

KulexiuForStudent/KulexiuForStudent/Common/Base/KSUploadManager.m

@@ -48,15 +48,15 @@
         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];
 }
 
 - (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];
 }
 

KulexiuForStudent/KulexiuForStudent/Common/Define/PrefixHeader.pch

@@ -139,13 +139,13 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/student")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (YES)
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/student")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (YES)
 
 // 预生产环境
 
@@ -159,13 +159,13 @@ shouldPrevent = NO; \
 
 //#else
 
-//#define hostURL (@"https://online.colexiu.com")
-//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://online.colexiu.com/student")
-//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"e5t4ouvpe42pa")
-//#define SUBMIT_UUID (YES)
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/student")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
 
 //#endif
 

KulexiuForStudent/KulexiuForStudent/Common/ThirdPart/WMPlayer/WMPlayer.m

@@ -308,9 +308,9 @@ static void *PlayViewStatusObservationContext = &PlayViewStatusObservationContex
 }
 #pragma mark - Gesture Delegate
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
-        if ([touch.view isKindOfClass:[UIControl class]]) {
-            return NO;
-        }
+    if ([touch.view isKindOfClass:[UIControl class]] || [touch.view isDescendantOfView:self.topView]) {
+        return NO;
+    }
     return YES;
 }
 //添加控件的约束
@@ -319,45 +319,45 @@ 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);
-        make.trailing.equalTo(self.rightTimeLabel.mas_trailing).offset(-4);
-        make.centerY.equalTo(self.bottomView).offset(-1);
+        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).offset(-1);
         make.height.mas_equalTo(30);
     }];
     [self.bottomProgress mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -365,24 +365,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(12);
-        make.size.mas_equalTo(CGSizeMake(self.backBtn.currentImage.size.width+6, self.backBtn.currentImage.size.height+4));
-        make.centerY.equalTo(self.titleLabel);
+        make.leading.mas_equalTo(self.topView).offset(12);
+        make.size.mas_equalTo(CGSizeMake(40, 40));
+        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);