暂时去掉曲目等回弹属性，处理iOS 18.1系统上会回弹到上一个cell

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -5484,9 +5484,9 @@
 				BC73547F2CEED28000C2B35C /* MyVipCourseGroupView.m */,
 			);
 			path = VIPCourseGroup;
-            sourceTree = "<group>";
-        };
-            BC7400E72CD1CB3D0056756A /* KSCloudPremissionAlert */ = {
+			sourceTree = "<group>";
+		};
+		BC7400E72CD1CB3D0056756A /* KSCloudPremissionAlert */ = {
 			isa = PBXGroup;
 			children = (
 				BC7400E42CD1CB3D0056756A /* KSCloudPremissionAlertView.h */,
@@ -6810,7 +6810,6 @@
 				BC71D2872888083B0010F14B /* tabbar4.json in Resources */,
 				BCC583C028A9EC6400BAB4CF /* cloud_animation_15.png in Resources */,
 				BC119280280FB10900A716F7 /* AccompanyRemarkCell.xib in Resources */,
-				BCC409012AFCE6B500C60249 /* MusicPublicContentView.xib in Resources */,
 				BC5A4B512CF40BF9008C2FDD /* ProgramCourseInfoView.xib in Resources */,
 				BC5A4B532CF40BF9008C2FDD /* VipCouseInfoCell.xib in Resources */,
 				BC7354992CEED2EB00C2B35C /* MyCourseGroupNavView.xib in Resources */,
@@ -6859,7 +6858,6 @@
 				BCFDA63828BCA1C60022B497 /* HomeRecentCourseView.xib in Resources */,
 				BC119270280FAF7D00A716F7 /* AccompanyCourseInfoCell.xib in Resources */,
 				BC2DFF5828BE143A0056105A /* HomeTempLiveCell.xib in Resources */,
-				BCFDA65528BCA2000022B497 /* accomapny_animation_0.png in Resources */,
 				BC9DA08D2CF9647300674ED9 /* delay_check_seaGrass_right.json in Resources */,
 				BC9DA08E2CF9647300674ED9 /* delay_check_ light.json in Resources */,
 				BC9DA08F2CF9647300674ED9 /* delay_check_seaGrass_left.json in Resources */,
@@ -6891,7 +6889,6 @@
 				BC86A2A52CD355E600A15A53 /* MusicCoverChooseView.xib in Resources */,
 				BC86A2A62CD355E600A15A53 /* MusicPublicContentView.xib in Resources */,
 				BC86A2A72CD355E600A15A53 /* VideoCoverChooseView.xib in Resources */,
-				BCFDA65628BCA2000022B497 /* accomapny_animation_1.png in Resources */,
 				BC38C3ED2AF893B400ABFCC2 /* KSMergeAudioControlView.xib in Resources */,
 				2723B66327F15CFC00E0B90B /* ModifyNameBodyView.xib in Resources */,
 				BC71D255288804CD0010F14B /* img_5.png in Resources */,
@@ -7048,8 +7045,7 @@
 				BCC5839228A9E8AF00BAB4CF /* AccompanyLoadingView.xib in Resources */,
 				BCB9FA37286D7C38005D766B /* GuideListView.xib in Resources */,
 				BC71D2882888083B0010F14B /* tabbar3.json in Resources */,
-				BCC409052AFCE6B500C60249 /* MusicPublistAlert.xib in Resources */,
-				BC71D2882888083B0010F14B /* tabbar2.json in Resources */,
+				BC71D2882888083B0010F14B /* tabbar3.json in Resources */,
 				BC50171727FC0D8E00F8BCBC /* SubjectChooseBodyView.xib in Resources */,
 				BC71D26F288804CD0010F14B /* img_24.png in Resources */,
 				BCCE95E92AB057C400AB6385 /* MorePageSearchView.xib in Resources */,
@@ -7448,7 +7444,6 @@
 				277935B427E324A90010E277 /* FSCalendarDelegationProxy.m in Sources */,
 				BCC0F6CA2A8CDDFE00C4EFA4 /* ClassroomService.m in Sources */,
 				BCC0F6C52A8CDDEB00C4EFA4 /* Classroom.m in Sources */,
-				BC7DECA02C2D571A00154524 /* AudioEnginePlayer.m in Sources */,
 				BCD160432CEC938400A78B43 /* ArrangeVideoCourseModel.m in Sources */,
 				BC106C502A9351DA000759A9 /* LiveModuleService.m in Sources */,
 				2723B5BB27F157B100E0B90B /* ChatAddressBodyView.m in Sources */,
@@ -8092,7 +8087,6 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
-					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/WXOpenSDK1.9.2",
 				);
 				MARKETING_VERSION = 1.7.6;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
@@ -8268,7 +8262,6 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
-					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/WXOpenSDK1.9.2",
 				);
 				MARKETING_VERSION = 1.7.6;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
@@ -8590,7 +8583,6 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
-					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/WXOpenSDK1.9.2",
 				);
 				MARKETING_VERSION = 1.7.6;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
@@ -8870,7 +8862,6 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
-					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/WXOpenSDK1.9.2",
 				);
 				MARKETING_VERSION = 1.7.6;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";

KulexiuForStudent/KulexiuForStudent/Module/Home/Controller/HomeViewController.m

@@ -279,6 +279,7 @@
     CGFloat headSpace = 12.0f;
     CGFloat bottomSpace = 0.0f;
     self.headViewHeight = headSpace + self.bannerViewHeight + self.countViewHeight + self.courseViewHeight + self.noticeViewHeight + self.buttonViewHeight + self.talentViewHeight + self.videoViewHeight + bottomSpace;
+    self.headView.frame = CGRectMake(0, 0, KPortraitWidth, self.headViewHeight);
     [self.pagerView resizeTableHeaderViewHeightWithAnimatable:NO duration:0.3f curve:UIViewAnimationCurveEaseInOut];
 }
 
@@ -1260,7 +1261,7 @@
 
 - (UIView *)headView {
     if (!_headView) {
-        _headView = [[UIView alloc] init];
+        _headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, CGFLOAT_MIN)];
         _headView.backgroundColor = [UIColor clearColor];
     }
     return _headView;

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeBanner/HomeBannerCell.xib

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -27,7 +26,6 @@
                     </imageView>
                 </subviews>
             </view>
-            <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="KRw-yx-PyP" secondAttribute="trailing" constant="14" id="E99-a0-3To"/>
                 <constraint firstItem="KRw-yx-PyP" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="k9u-re-YWc"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeBanner/HomeBannerView.xib

@@ -14,7 +14,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TxO-MH-UVa">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="173"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="185"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
             </subviews>
@@ -22,7 +22,7 @@
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="TxO-MH-UVa" secondAttribute="trailing" id="0r3-Rk-6nL"/>
                 <constraint firstItem="TxO-MH-UVa" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="BF3-AJ-S65"/>
-                <constraint firstAttribute="bottom" secondItem="TxO-MH-UVa" secondAttribute="bottom" constant="12" id="FoY-Yd-bSd"/>
+                <constraint firstAttribute="bottom" secondItem="TxO-MH-UVa" secondAttribute="bottom" id="FoY-Yd-bSd"/>
                 <constraint firstItem="TxO-MH-UVa" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="zwG-j0-akh"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeButton/HomeButtonView.xib

@@ -14,14 +14,14 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FDF-ZT-TJx">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="133"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="153"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="FDF-ZT-TJx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="D3O-sT-Grz"/>
-                <constraint firstAttribute="bottom" secondItem="FDF-ZT-TJx" secondAttribute="bottom" constant="20" id="Pl7-Yr-UlR"/>
+                <constraint firstAttribute="bottom" secondItem="FDF-ZT-TJx" secondAttribute="bottom" id="Pl7-Yr-UlR"/>
                 <constraint firstItem="FDF-ZT-TJx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="WkT-zx-U1t"/>
                 <constraint firstAttribute="trailing" secondItem="FDF-ZT-TJx" secondAttribute="trailing" id="vJG-sS-Gpn"/>
             </constraints>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeCount/HomeCountView.xib

@@ -18,9 +18,6 @@
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_train_bg" translatesAutoresizingMaskIntoConstraints="NO" id="yLw-P0-G2L">
                             <rect key="frame" x="0.0" y="0.0" width="169" height="67"/>
-                            <constraints>
-                                <constraint firstAttribute="width" secondItem="yLw-P0-G2L" secondAttribute="height" multiplier="169:67" id="sqn-9n-qkm"/>
-                            </constraints>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oDY-XN-D8Z">
                             <rect key="frame" x="0.0" y="10.666666666666664" width="169" height="46"/>
@@ -86,9 +83,6 @@
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_course_bg" translatesAutoresizingMaskIntoConstraints="NO" id="xl6-ZM-TM5">
                             <rect key="frame" x="0.0" y="0.0" width="169" height="67"/>
-                            <constraints>
-                                <constraint firstAttribute="width" secondItem="xl6-ZM-TM5" secondAttribute="height" multiplier="169:67" id="rSC-7w-f1r"/>
-                            </constraints>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cv0-0n-UBN">
                             <rect key="frame" x="0.0" y="10.666666666666664" width="169" height="46"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/RecentCourse/HomeRecentCourseView.xib

@@ -18,7 +18,7 @@
                     <rect key="frame" x="14" y="0.0" width="386" height="70"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您有新课程即将开始" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lrj-nH-46q">
-                            <rect key="frame" x="16" y="10" width="268" height="28"/>
+                            <rect key="frame" x="16" y="10" width="143" height="28"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="28" id="sH9-HN-Ism"/>
                             </constraints>
@@ -38,7 +38,7 @@
                             <color key="textColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nFt-Tj-nsV">
+                        <view contentMode="scaleToFill" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="nFt-Tj-nsV">
                             <rect key="frame" x="294" y="22" width="76" height="26"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="即将开始" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FPN-v9-q51">
@@ -73,7 +73,7 @@
                     <constraints>
                         <constraint firstItem="ebm-D0-ZwZ" firstAttribute="centerY" secondItem="pUs-nj-cKV" secondAttribute="centerY" id="9ce-nN-JeR"/>
                         <constraint firstItem="lrj-nH-46q" firstAttribute="top" secondItem="Jzj-07-uBu" secondAttribute="top" constant="10" id="Xw7-KT-WjY"/>
-                        <constraint firstItem="nFt-Tj-nsV" firstAttribute="leading" secondItem="lrj-nH-46q" secondAttribute="trailing" constant="10" id="XwQ-Yn-bi0"/>
+                        <constraint firstItem="nFt-Tj-nsV" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="lrj-nH-46q" secondAttribute="trailing" constant="10" id="XwQ-Yn-bi0"/>
                         <constraint firstAttribute="height" constant="70" id="bQc-MO-m30"/>
                         <constraint firstItem="nFt-Tj-nsV" firstAttribute="centerY" secondItem="Jzj-07-uBu" secondAttribute="centerY" id="daR-xM-DE0"/>
                         <constraint firstAttribute="trailing" secondItem="nFt-Tj-nsV" secondAttribute="trailing" constant="16" id="e4c-8z-JUt"/>

KulexiuForStudent/KulexiuForStudent/Module/MusicSquare/Controller/MusicSquareViewController.m

@@ -412,7 +412,7 @@
 - (UICollectionView *)albumCollectionView {
     if (!_albumCollectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionInset = UIEdgeInsetsMake(12, 14, 12, 14);
+        layout.sectionInset = UIEdgeInsetsMake(0, 14, 0, 14);
         layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
         _albumCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _albumCollectionView.backgroundColor = [UIColor clearColor];
@@ -467,6 +467,7 @@
         _recommendMusicCollectionView.dataSource = self;
         _recommendMusicCollectionView.showsVerticalScrollIndicator = NO;
         _recommendMusicCollectionView.showsHorizontalScrollIndicator = NO;
+        _recommendMusicCollectionView.bounces = NO;
         if (@available(iOS 11.0, *)) {
             _recommendMusicCollectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {
@@ -524,6 +525,7 @@
         _newestMusicCollectionView.dataSource = self;
         _newestMusicCollectionView.showsVerticalScrollIndicator = NO;
         _newestMusicCollectionView.showsHorizontalScrollIndicator = NO;
+        _newestMusicCollectionView.bounces = NO;
         if (@available(iOS 11.0, *)) {
             _newestMusicCollectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {
@@ -585,6 +587,7 @@
         _musicCollectionView.dataSource = self;
         _musicCollectionView.showsVerticalScrollIndicator = NO;
         _musicCollectionView.showsHorizontalScrollIndicator = NO;
+        _musicCollectionView.bounces = NO;
         if (@available(iOS 11.0, *)) {
             _musicCollectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {