Steven 2 年之前
父节点
当前提交
85a0f04b8d

二进制
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


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

@@ -180,5 +180,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "10FBB1E8-BEA4-4CD3-A012-327C025BBB37"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Home/Music/View/MyMusicBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "118"
+            endingLineNumber = "118"
+            landmarkName = "-requestData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/quality_tag.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "quality_tag@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "quality_tag@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

二进制
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/quality_tag.imageset/quality_tag@2x.png


二进制
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/quality_tag.imageset/quality_tag@3x.png


+ 6 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -1069,8 +1069,8 @@
         return self.albumArray.count;
     }
     else if (collectionView == self.qualityMusicCollectionView) { // 精品曲目
-        NSInteger lastRowCount = (self.qualityMusicArray.count % 3) > 0 ? 1 : 0;
-        NSInteger count = self.qualityMusicArray.count / 3 + lastRowCount;
+        NSInteger lastRowCount = (self.qualityMusicArray.count % 4) > 0 ? 1 : 0;
+        NSInteger count = self.qualityMusicArray.count / 4 + lastRowCount;
         return count;
     }
     else {
@@ -1089,8 +1089,8 @@
     }
     else if (collectionView == self.qualityMusicCollectionView) {
         NSMutableArray *songArray = [NSMutableArray array];
-        NSInteger length = indexPath.item * 3 + 3 > self.qualityMusicArray.count ? self.qualityMusicArray.count - indexPath.item * 3: 3;
-        NSRange range = NSMakeRange(indexPath.item * 3, length);
+        NSInteger length = indexPath.item * 4 + 4 > self.qualityMusicArray.count ? self.qualityMusicArray.count - indexPath.item * 4: 4;
+        NSRange range = NSMakeRange(indexPath.item * 4, length);
         
         songArray = [NSMutableArray arrayWithArray:[self.qualityMusicArray subarrayWithRange:range]];
         HomeQualityMusicCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"HomeQualityMusicCollectionCell" forIndexPath:indexPath];
@@ -1132,7 +1132,7 @@
 
     }
     else if (collectionView == self.qualityMusicCollectionView) {
-        return CGSizeMake(KPortraitWidth * 0.83, 240);
+        return CGSizeMake(KPortraitWidth * 0.83, 320);
     }
     else {
         return CGSizeMake(KPortraitWidth * 0.83, 320);
@@ -1254,7 +1254,7 @@
 
 
 - (void)moreHotMusic:(BOOL)isQuality {
-    NSString *type = isQuality ? @"?type=fine " : @"?type=list";
+    NSString *type = isQuality ? @"?type=fine" : @"?type=list";
     KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
     ctrl.url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/music-list",type];
     [self.navigationController pushViewController:ctrl animated:YES];

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeMusic/HomeHotMusicView.xib

@@ -101,7 +101,7 @@
             <connections>
                 <outlet property="musicContentView" destination="HAn-QD-Jml" id="OmN-U9-Q3Z"/>
             </connections>
-            <point key="canvasLocation" x="131.8840579710145" y="131.91964285714286"/>
+            <point key="canvasLocation" x="131.8840579710145" y="105.13392857142857"/>
         </view>
     </objects>
     <resources>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeQuality/HomeQualityMusic.m

@@ -33,7 +33,7 @@
 }
 
 + (CGFloat)getViewHeight {
-    return 304;
+    return 384;
 }
 
 /*

+ 4 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeQuality/HomeQualityMusic.xib

@@ -10,7 +10,7 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeQualityMusic">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="304"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="384"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lPT-H8-gYH">
@@ -68,10 +68,10 @@
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fx6-Fa-y4K">
-                    <rect key="frame" x="0.0" y="64" width="414" height="240"/>
+                    <rect key="frame" x="0.0" y="64" width="414" height="320"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="240" id="iKE-PR-OQe"/>
+                        <constraint firstAttribute="height" constant="320" id="iKE-PR-OQe"/>
                     </constraints>
                 </view>
             </subviews>
@@ -105,7 +105,7 @@
         </view>
     </objects>
     <resources>
-        <image name="home_left" width="4" height="12"/>
+        <image name="home_left" width="4" height="18"/>
         <image name="home_more" width="6" height="8"/>
     </resources>
 </document>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeQuality/HomeQualityMusicCollectionCell.m

@@ -21,7 +21,7 @@
     [super awakeFromNib];
     // Initialization code
     
-    CAGradientLayer *layer = [self createGradientLayerFromColor:HexRGB(0xFFF4EC) startPoint:CGPointMake(0.5, 0) endColor:HexRGB(0xFFFDFB) endPoint:CGPointMake(0.5, 1) bounds:CGRectMake(0, 0, KPortraitWidth * 0.83, 240)];
+    CAGradientLayer *layer = [self createGradientLayerFromColor:HexRGB(0xFFF4EC) startPoint:CGPointMake(0.5, 0) endColor:HexRGB(0xFFFDFB) endPoint:CGPointMake(0.5, 1) bounds:CGRectMake(0, 0, KPortraitWidth * 0.83, 320)];
     layer.cornerRadius = 10.0f;
     layer.masksToBounds = YES;
     [self.containerView.layer addSublayer:layer];