소스 검색

小工具padUI

Steven 1 년 전
부모
커밋
a0121d54a2
52개의 변경된 파일429개의 추가작업 그리고 336개의 파일을 삭제
  1. 3 3
      KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj
  2. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/insititution_MineBgPad.imageset/insititution_MineBgPad@2x.png
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/insititution_MineBgPad.imageset/insititution_MineBgPad@3x.png
  4. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_MemberImage.imageset/institution_MemberImage@2x.png
  5. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_MemberImage.imageset/institution_MemberImage@3x.png
  6. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@2x.png
  7. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@3x.png
  8. 22 0
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/TuningImage/forkButton_bg.imageset/Contents.json
  9. 24 2
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/TuningImage/playButton_bg.imageset/Contents.json
  10. 0 0
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/TuningImage/playButton_bg.imageset/playButton_bg@3x.png
  11. 22 0
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/metronome/metronome_bg_s.imageset/Contents.json
  12. 4 4
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/HotAlbum/TenantHotAlbumCell.xib
  13. 6 6
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCellView.xib
  14. 5 5
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantTicketAlert.xib
  15. 5 5
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib
  16. 5 5
      KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupMemberListCell.xib
  17. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.m
  18. 35 35
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.xib
  19. 5 5
      KulexiuForStudent/KulexiuForStudent/Module/Course/MusicRoom/View/MusicRoomCourseInfoCell.xib
  20. 12 12
      KulexiuForStudent/KulexiuForStudent/Module/Course/View/AccompanyCourseCell.xib
  21. 15 15
      KulexiuForStudent/KulexiuForStudent/Module/Course/View/CourseForLiveCell.xib
  22. 14 14
      KulexiuForStudent/KulexiuForStudent/Module/Course/View/MusicRoomCourseCell.xib
  23. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeCourseTipsView.xib
  24. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeInformationCell.xib
  25. 13 13
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.xib
  26. 12 12
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.xib
  27. 8 8
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotAlbum/HomeHotAlbumCell.xib
  28. 11 11
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotLiveCourse/HomeHotLiveCell.xib
  29. 9 9
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotMusic/HomeHotMusicCellView.xib
  30. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.xib
  31. 11 11
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotVideoCourse/HomeHotVideoCell.xib
  32. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/RecentCourse/HomeRecentCourseView.xib
  33. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherShowCell.xib
  34. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeHotStyleCell.xib
  35. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeTempLiveCell.xib
  36. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveSeatApplyCell.xib
  37. 6 6
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkSortView.xib
  38. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLessonSearchView.xib
  39. 12 12
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLiveCourseCell.xib
  40. 15 15
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.xib
  41. 2 2
      KulexiuForStudent/KulexiuForStudent/Module/Widget/Controller/WidgetViewController.m
  42. 5 3
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/KSGaugeView/KSGaugeColorView.m
  43. 4 1
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/KSGaugeView/KSGaugeView.m
  44. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/Metronome/WidgetDotView.m
  45. 4 0
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/Metronome/WidgetFunctionView.m
  46. 8 7
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/Metronome/WidgetFunctionView.xib
  47. 14 27
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/ToneTuningBodyView.m
  48. 56 35
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/ToneTuningBodyView.xib
  49. 6 2
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TunerSettingView.m
  50. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TunerSettingView.xib
  51. 4 0
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TuningForkSettingView.m
  52. 3 2
      KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TuningForkSettingView.xib

+ 3 - 3
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -5388,12 +5388,12 @@
 		BC31BED62B21925700F7D538 /* KSGaugeView */ = {
 			isa = PBXGroup;
 			children = (
-				BC31BED72B21925700F7D538 /* KSGaugeView.h */,
 				BC31BED82B21925700F7D538 /* KSGaugeColorView.h */,
-				BC31BED92B21925700F7D538 /* KSGaugeSectorView.h */,
-				BC31BEDA2B21925700F7D538 /* KSGaugeView.m */,
 				BC31BEDB2B21925700F7D538 /* KSGaugeColorView.m */,
+				BC31BED92B21925700F7D538 /* KSGaugeSectorView.h */,
 				BC31BEDC2B21925700F7D538 /* KSGaugeSectorView.m */,
+				BC31BED72B21925700F7D538 /* KSGaugeView.h */,
+				BC31BEDA2B21925700F7D538 /* KSGaugeView.m */,
 			);
 			path = KSGaugeView;
 			sourceTree = "<group>";

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/insititution_MineBgPad.imageset/insititution_MineBgPad@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/insititution_MineBgPad.imageset/insititution_MineBgPad@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_MemberImage.imageset/institution_MemberImage@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_MemberImage.imageset/institution_MemberImage@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@3x.png


+ 22 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/TuningImage/forkButton_bg.imageset/Contents.json

@@ -7,11 +7,33 @@
     {
       "filename" : "forkButton_bg@2x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 46,
+          "right" : 34
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "2x"
     },
     {
       "filename" : "forkButton_bg@3x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 69,
+          "right" : 51
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "3x"
     }
   ],

+ 24 - 2
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/TuningImage/playButton_bg.imageset/Contents.json

@@ -5,13 +5,35 @@
       "scale" : "1x"
     },
     {
-      "filename" : "playButton_bg@3x 1.png",
+      "filename" : "playButton_bg@2x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 34,
+          "right" : 46
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "2x"
     },
     {
-      "filename" : "playButton_bg@2x.png",
+      "filename" : "playButton_bg@3x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 51,
+          "right" : 69
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "3x"
     }
   ],

+ 0 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/TuningImage/playButton_bg.imageset/playButton_bg@3x 1.png → KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/TuningImage/playButton_bg.imageset/playButton_bg@3x.png


+ 22 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/metronome/metronome_bg_s.imageset/Contents.json

@@ -7,11 +7,33 @@
     {
       "filename" : "metronome_bg_s@2x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 72,
+          "right" : 72
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "2x"
     },
     {
       "filename" : "metronome_bg_s@3x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 107,
+          "right" : 107
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "3x"
     }
   ],

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/HotAlbum/TenantHotAlbumCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -36,8 +36,8 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="华语流行曲 | 一晃三四年,匆匆又..." textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9km-IN-CUR">
-                        <rect key="frame" x="0.0" y="106" width="98" height="31.333333333333343"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9km-IN-CUR">
+                        <rect key="frame" x="0.0" y="106" width="98" height="0.0"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCellView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -39,8 +39,8 @@
                                 <constraint firstAttribute="width" constant="20" id="vQg-Cc-EGV"/>
                             </constraints>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="山茶花读不懂白玫瑰" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jKe-5h-r2a">
-                            <rect key="frame" x="73" y="18" width="147" height="22"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jKe-5h-r2a">
+                            <rect key="frame" x="73" y="18" width="0.0" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="7PU-8o-kHd"/>
                             </constraints>
@@ -55,8 +55,8 @@
                                 <constraint firstAttribute="height" constant="16" id="vDl-E6-262"/>
                             </constraints>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="一把剑走天涯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HxH-qD-mNB">
-                            <rect key="frame" x="128" y="47.666666666666664" width="79.666666666666686" height="13"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HxH-qD-mNB">
+                            <rect key="frame" x="128" y="47.666666666666664" width="0.0" height="13"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="13" id="hUh-q6-jav"/>
                             </constraints>

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantTicketAlert.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -58,10 +58,10 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pyf-IZ-8Cw">
-                            <rect key="frame" x="96" y="126.00000000000003" width="78" height="28"/>
+                            <rect key="frame" x="119" y="126.00000000000003" width="32" height="28"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="共32个" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3bT-W4-k7D">
-                                    <rect key="frame" x="16" y="4" width="46" height="20"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3bT-W4-k7D">
+                                    <rect key="frame" x="16" y="4" width="0.0" height="20"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                                     <color key="textColor" red="0.94901960784313721" green="0.3411764705882353" blue="0.33725490196078434" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib

@@ -173,9 +173,9 @@
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolImage" translatesAutoresizingMaskIntoConstraints="NO" id="Vt5-8U-7eH">
-                            <rect key="frame" x="332.33333333333331" y="185" width="69.666666666666686" height="62"/>
+                            <rect key="frame" x="329" y="181" width="73" height="66"/>
                             <constraints>
-                                <constraint firstAttribute="width" secondItem="Vt5-8U-7eH" secondAttribute="height" multiplier="9:8" id="9Ej-7d-EJN"/>
+                                <constraint firstAttribute="width" secondItem="Vt5-8U-7eH" secondAttribute="height" multiplier="143:129" id="nRl-ov-rVf"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_topLayer" translatesAutoresizingMaskIntoConstraints="NO" id="98L-RE-L5b">
@@ -282,7 +282,6 @@
                         <constraint firstItem="Nlb-bG-jKG" firstAttribute="top" secondItem="LYR-lA-eEp" secondAttribute="top" constant="9" id="2Do-ed-2h8"/>
                         <constraint firstItem="x5p-j7-s1g" firstAttribute="trailing" secondItem="xUo-7q-bZ9" secondAttribute="trailing" constant="6" id="3C5-y9-zJO"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="height" secondItem="xUo-7q-bZ9" secondAttribute="height" id="5DA-7K-Qq8"/>
-                        <constraint firstItem="Mxr-u3-Zhb" firstAttribute="top" secondItem="Vt5-8U-7eH" secondAttribute="top" constant="-2" id="5GT-fh-y4e"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="trailing" constant="9" id="8zA-Aj-WPH"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="aWj-xg-N6w" secondAttribute="trailing" constant="12" id="CcR-b0-7sw"/>
                         <constraint firstItem="aWj-xg-N6w" firstAttribute="leading" secondItem="Nlb-bG-jKG" secondAttribute="trailing" constant="6" id="Eov-x6-O1P"/>
@@ -300,6 +299,7 @@
                         <constraint firstItem="j1E-FX-DSh" firstAttribute="centerX" secondItem="LYR-lA-eEp" secondAttribute="centerX" id="Yhk-1P-OHs"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="width" secondItem="xUo-7q-bZ9" secondAttribute="width" id="Zox-PL-Vig"/>
                         <constraint firstItem="uzc-nx-nAm" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" constant="19" id="Zqj-cL-ErZ"/>
+                        <constraint firstItem="Vt5-8U-7eH" firstAttribute="top" secondItem="Mxr-u3-Zhb" secondAttribute="top" constant="-2" id="acD-1j-GfW"/>
                         <constraint firstItem="j1E-FX-DSh" firstAttribute="centerY" secondItem="LYR-lA-eEp" secondAttribute="bottom" id="bsG-xq-JaU"/>
                         <constraint firstAttribute="height" constant="275" id="fPk-KI-PIk"/>
                         <constraint firstAttribute="trailing" secondItem="A30-6f-0Ca" secondAttribute="trailing" id="gSQ-A1-hjP"/>
@@ -697,9 +697,9 @@
         <image name="insititution_mine_topLayer" width="129" height="114"/>
         <image name="insititution_privacy" width="22" height="22"/>
         <image name="insititution_userAgreement" width="22" height="22"/>
-        <image name="institution_MemberImage" width="77" height="66"/>
+        <image name="institution_MemberImage" width="154" height="132"/>
         <image name="institution_MemberLabel" width="60" height="15"/>
-        <image name="institution_ToolImage" width="72" height="64"/>
+        <image name="institution_ToolImage" width="143" height="129"/>
         <image name="institution_ToolTitle" width="60" height="15"/>
         <image name="institution_detail" width="11" height="11"/>
         <image name="institution_mineMemberBg" width="71" height="76"/>

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupMemberListCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -33,8 +33,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vhp-Wi-YsA">
-                                <rect key="frame" x="69" y="21" width="33" height="22"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vhp-Wi-YsA">
+                                <rect key="frame" x="69" y="21" width="0.0" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="Js9-hD-GW8"/>
                                 </constraints>
@@ -78,7 +78,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="group_role_teacher" translatesAutoresizingMaskIntoConstraints="NO" id="2T3-oJ-zPX">
-                                <rect key="frame" x="105" y="22" width="41" height="20"/>
+                                <rect key="frame" x="72" y="22" width="41" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="DPH-1c-0ah"/>
                                     <constraint firstAttribute="width" constant="41" id="KLd-9O-eWg"/>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.m

@@ -54,7 +54,7 @@
         self.noticeTitle.text = [NSString returnNoNullStringWithString:model.title];
         NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
         [paragraphStyle setLineSpacing:4];//调整行间距
-        NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:[NSString returnNoNullStringWithString:model.content] attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:14.0f],NSForegroundColorAttributeName:HexRGB(0x777777)}];
+        NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:[NSString returnNoNullStringWithString:model.content] attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:16.0f],NSForegroundColorAttributeName:HexRGB(0x777777)}];
         self.noticeContent.attributedText = attrs;
         
         self.focusLabel.hidden = model.top ? NO : YES;

+ 35 - 35
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -22,10 +22,10 @@
                         <rect key="frame" x="13" y="12" width="333" height="171"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_avatarRectangle" translatesAutoresizingMaskIntoConstraints="NO" id="Gkn-L8-UCb">
-                                <rect key="frame" x="12" y="12" width="48" height="48"/>
+                                <rect key="frame" x="16" y="12" width="60" height="60"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="48" id="8bz-sK-gjT"/>
-                                    <constraint firstAttribute="width" constant="48" id="VaV-68-izM"/>
+                                    <constraint firstAttribute="height" constant="60" id="8bz-sK-gjT"/>
+                                    <constraint firstAttribute="width" constant="60" id="VaV-68-izM"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -33,17 +33,17 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vad-UL-yLE">
-                                <rect key="frame" x="70" y="40" width="0.0" height="18"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="8A8A8A" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vad-UL-yLE">
+                                <rect key="frame" x="86" y="47" width="54" height="20"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="G1H-uK-NYV"/>
+                                    <constraint firstAttribute="height" constant="20" id="G1H-uK-NYV"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="calibratedRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.54117647058823526" green="0.54117647058823526" blue="0.54117647058823526" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="置顶" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fse-Bd-Rui">
-                                <rect key="frame" x="76" y="39" width="40" height="20"/>
+                                <rect key="frame" x="146" y="47" width="40" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="eAd-Zt-CN7"/>
                                     <constraint firstAttribute="width" constant="40" id="gtu-Jt-duR"/>
@@ -64,7 +64,7 @@
                                 </userDefinedRuntimeAttributes>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gv9-px-E4j">
-                                <rect key="frame" x="285" y="0.0" width="40" height="40"/>
+                                <rect key="frame" x="285" y="12.5" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="40" id="0ay-Cx-fo8"/>
                                     <constraint firstAttribute="height" constant="40" id="v9h-3o-0Hd"/>
@@ -75,56 +75,56 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="038-4g-5JZ">
-                                <rect key="frame" x="12" y="72" width="309" height="1"/>
+                                <rect key="frame" x="16" y="88" width="301" height="1"/>
                                 <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="1" id="3Wh-Ue-Sj3"/>
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gxd-9e-9Xw">
-                                <rect key="frame" x="12" y="85" width="309" height="64"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                                <rect key="frame" x="16" y="105" width="301" height="38"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FWq-QF-ONl">
-                                <rect key="frame" x="12" y="155" width="309" height="0.0"/>
+                                <rect key="frame" x="16" y="156" width="301" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2c3-yX-YxS">
-                                <rect key="frame" x="70" y="14" width="203" height="22"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="sfsfasf" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2c3-yX-YxS">
+                                <rect key="frame" x="86" y="20" width="187" height="25"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="dMw-tJ-YFP"/>
+                                    <constraint firstAttribute="height" constant="25" id="dMw-tJ-YFP"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
-                                <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
+                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="Gv9-px-E4j" firstAttribute="top" secondItem="qWq-La-TpT" secondAttribute="top" id="2bt-UB-klh"/>
-                            <constraint firstAttribute="trailing" secondItem="038-4g-5JZ" secondAttribute="trailing" constant="12" id="ART-lR-s3C"/>
-                            <constraint firstItem="Gkn-L8-UCb" firstAttribute="leading" secondItem="qWq-La-TpT" secondAttribute="leading" constant="12" id="IYn-ew-2ea"/>
+                            <constraint firstAttribute="trailing" secondItem="038-4g-5JZ" secondAttribute="trailing" constant="16" id="ART-lR-s3C"/>
+                            <constraint firstItem="Gkn-L8-UCb" firstAttribute="leading" secondItem="qWq-La-TpT" secondAttribute="leading" constant="16" id="IYn-ew-2ea"/>
                             <constraint firstItem="Gv9-px-E4j" firstAttribute="leading" secondItem="2c3-yX-YxS" secondAttribute="trailing" constant="12" id="Izw-tV-fyQ"/>
                             <constraint firstItem="2c3-yX-YxS" firstAttribute="leading" secondItem="Gkn-L8-UCb" secondAttribute="trailing" constant="10" id="J3a-nQ-zqB"/>
                             <constraint firstItem="vad-UL-yLE" firstAttribute="leading" secondItem="2c3-yX-YxS" secondAttribute="leading" id="JDu-Se-aI6"/>
                             <constraint firstAttribute="trailing" secondItem="Gv9-px-E4j" secondAttribute="trailing" constant="8" id="N4A-xt-LAp"/>
-                            <constraint firstItem="vad-UL-yLE" firstAttribute="top" secondItem="2c3-yX-YxS" secondAttribute="bottom" constant="4" id="N7G-Ce-QIc"/>
-                            <constraint firstItem="gxd-9e-9Xw" firstAttribute="leading" secondItem="qWq-La-TpT" secondAttribute="leading" constant="12" id="NDs-Xr-hHO"/>
-                            <constraint firstItem="038-4g-5JZ" firstAttribute="top" secondItem="Gkn-L8-UCb" secondAttribute="bottom" constant="12" id="PH8-z7-60N"/>
-                            <constraint firstAttribute="trailing" secondItem="FWq-QF-ONl" secondAttribute="trailing" constant="12" id="RGL-31-rdK"/>
-                            <constraint firstAttribute="trailing" secondItem="gxd-9e-9Xw" secondAttribute="trailing" constant="12" id="S2d-pS-kaY"/>
-                            <constraint firstItem="FWq-QF-ONl" firstAttribute="top" secondItem="gxd-9e-9Xw" secondAttribute="bottom" constant="6" id="Vf4-jv-WpV"/>
-                            <constraint firstItem="gxd-9e-9Xw" firstAttribute="top" secondItem="038-4g-5JZ" secondAttribute="bottom" constant="12" id="WdV-Qv-AqI"/>
-                            <constraint firstAttribute="bottom" secondItem="FWq-QF-ONl" secondAttribute="bottom" constant="16" id="YVP-D4-aqo"/>
-                            <constraint firstItem="2c3-yX-YxS" firstAttribute="top" secondItem="Gkn-L8-UCb" secondAttribute="top" constant="2" id="ay7-jB-Ghd"/>
+                            <constraint firstItem="vad-UL-yLE" firstAttribute="top" secondItem="2c3-yX-YxS" secondAttribute="bottom" constant="2" id="N7G-Ce-QIc"/>
+                            <constraint firstItem="gxd-9e-9Xw" firstAttribute="leading" secondItem="qWq-La-TpT" secondAttribute="leading" constant="16" id="NDs-Xr-hHO"/>
+                            <constraint firstItem="038-4g-5JZ" firstAttribute="top" secondItem="Gkn-L8-UCb" secondAttribute="bottom" constant="16" id="PH8-z7-60N"/>
+                            <constraint firstAttribute="trailing" secondItem="gxd-9e-9Xw" secondAttribute="trailing" constant="16" id="S2d-pS-kaY"/>
+                            <constraint firstItem="FWq-QF-ONl" firstAttribute="top" secondItem="gxd-9e-9Xw" secondAttribute="bottom" constant="13" id="Vf4-jv-WpV"/>
+                            <constraint firstItem="gxd-9e-9Xw" firstAttribute="top" secondItem="038-4g-5JZ" secondAttribute="bottom" constant="16" id="WdV-Qv-AqI"/>
+                            <constraint firstAttribute="bottom" secondItem="FWq-QF-ONl" secondAttribute="bottom" constant="15" id="YVP-D4-aqo"/>
+                            <constraint firstItem="2c3-yX-YxS" firstAttribute="top" secondItem="Gkn-L8-UCb" secondAttribute="top" constant="8" id="ay7-jB-Ghd"/>
                             <constraint firstItem="Fse-Bd-Rui" firstAttribute="leading" secondItem="vad-UL-yLE" secondAttribute="trailing" constant="6" id="b7x-ei-t05"/>
-                            <constraint firstItem="038-4g-5JZ" firstAttribute="leading" secondItem="qWq-La-TpT" secondAttribute="leading" constant="12" id="bC8-ah-beD"/>
-                            <constraint firstItem="FWq-QF-ONl" firstAttribute="leading" secondItem="qWq-La-TpT" secondAttribute="leading" constant="12" id="jAC-st-q1t"/>
+                            <constraint firstItem="038-4g-5JZ" firstAttribute="leading" secondItem="qWq-La-TpT" secondAttribute="leading" constant="16" id="bC8-ah-beD"/>
+                            <constraint firstItem="FWq-QF-ONl" firstAttribute="trailing" secondItem="gxd-9e-9Xw" secondAttribute="trailing" id="bcZ-KL-EUb"/>
+                            <constraint firstItem="Gv9-px-E4j" firstAttribute="centerY" secondItem="2c3-yX-YxS" secondAttribute="centerY" id="g8r-p1-BL2"/>
                             <constraint firstItem="Fse-Bd-Rui" firstAttribute="centerY" secondItem="vad-UL-yLE" secondAttribute="centerY" id="lF9-xB-hfp"/>
+                            <constraint firstItem="FWq-QF-ONl" firstAttribute="leading" secondItem="gxd-9e-9Xw" secondAttribute="leading" id="mTh-u9-qZf"/>
                             <constraint firstItem="Gkn-L8-UCb" firstAttribute="top" secondItem="qWq-La-TpT" secondAttribute="top" constant="12" id="vJe-1d-d4U"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/Module/Course/MusicRoom/View/MusicRoomCourseInfoCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -53,8 +53,8 @@
                                 <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管第一期" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="09N-Zc-juN">
-                                <rect key="frame" x="68" y="51" width="98" height="28"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="09N-Zc-juN">
+                                <rect key="frame" x="68" y="51" width="0.0" height="28"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="28" id="0sK-eg-OVB"/>
                                 </constraints>
@@ -94,7 +94,7 @@
                                 </constraints>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WC4-RO-cvp">
-                                <rect key="frame" x="166" y="45" width="40" height="40"/>
+                                <rect key="frame" x="68" y="45" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="40" id="8bd-oD-mGh"/>
                                     <constraint firstAttribute="height" constant="40" id="rtv-FP-E11"/>

+ 12 - 12
KulexiuForStudent/KulexiuForStudent/Module/Course/View/AccompanyCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -35,14 +35,14 @@
                                     <constraint firstAttribute="height" constant="16" id="tQi-IQ-bdk"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021/09/17 14:00~14:25" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y3h-K3-zJ8">
-                                <rect key="frame" x="34" y="12" width="147" height="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y3h-K3-zJ8">
+                                <rect key="frame" x="34" y="20" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进行中" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKr-bP-maa">
-                                <rect key="frame" x="325" y="11.5" width="50" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKr-bP-maa">
+                                <rect key="frame" x="325" y="20" width="50" height="0.0"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="cYb-s7-ndU"/>
                                 </constraints>
@@ -62,8 +62,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张豆豆" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eJa-81-RrN">
-                                <rect key="frame" x="68" y="56" width="49" height="24"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eJa-81-RrN">
+                                <rect key="frame" x="68" y="56" width="0.0" height="24"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="24" id="u07-aD-Pru"/>
                                 </constraints>
@@ -72,10 +72,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dGh-TI-XLP">
-                                <rect key="frame" x="68" y="83" width="44" height="20"/>
+                                <rect key="frame" x="68" y="83" width="10" height="20"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mz9-eT-OVS">
-                                        <rect key="frame" x="5" y="0.0" width="34" height="20"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mz9-eT-OVS">
+                                        <rect key="frame" x="5" y="0.0" width="0.0" height="20"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="1" green="0.5490196078431373" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -96,7 +96,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NOA-EQ-Fjn">
-                                <rect key="frame" x="117" y="48" width="40" height="40"/>
+                                <rect key="frame" x="68" y="48" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="87u-cE-Y5V"/>
                                     <constraint firstAttribute="width" constant="40" id="gOV-9c-ibN"/>

+ 15 - 15
KulexiuForStudent/KulexiuForStudent/Module/Course/View/CourseForLiveCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -35,14 +35,14 @@
                                     <constraint firstAttribute="width" constant="16" id="xwh-Vf-z9n"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021/09/17 14:00~14:25" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T9A-D2-1YE">
-                                <rect key="frame" x="34" y="12" width="147" height="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T9A-D2-1YE">
+                                <rect key="frame" x="34" y="20" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进行中" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7HA-oy-GhL">
-                                <rect key="frame" x="305" y="11.5" width="50" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7HA-oy-GhL">
+                                <rect key="frame" x="305" y="20" width="50" height="0.0"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="Gc8-dU-wiy"/>
                                 </constraints>
@@ -57,8 +57,8 @@
                                     <constraint firstAttribute="height" constant="47" id="uww-MX-dub"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管直播课·第三课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dEp-ou-JBA">
-                                <rect key="frame" x="68" y="56" width="152" height="24"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dEp-ou-JBA">
+                                <rect key="frame" x="68" y="56" width="0.0" height="24"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="24" id="fXZ-Y5-AoA"/>
                                 </constraints>
@@ -67,10 +67,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EoV-cQ-MON">
-                                <rect key="frame" x="68" y="83" width="44" height="20"/>
+                                <rect key="frame" x="68" y="83" width="10" height="20"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EmG-Yo-nbA">
-                                        <rect key="frame" x="5" y="0.0" width="34" height="20"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EmG-Yo-nbA">
+                                        <rect key="frame" x="5" y="0.0" width="0.0" height="20"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="1" green="0.54901960780000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -91,7 +91,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2TM-qv-v7e">
-                                <rect key="frame" x="225" y="53" width="30" height="30"/>
+                                <rect key="frame" x="73" y="53" width="30" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="lbN-u0-SFA"/>
                                     <constraint firstAttribute="height" constant="30" id="x6Y-49-gGY"/>
@@ -122,7 +122,7 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MTB-cE-tDv">
-                                <rect key="frame" x="117" y="83" width="157" height="20"/>
+                                <rect key="frame" x="83" y="83" width="191" height="20"/>
                                 <subviews>
                                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nzy-gR-bLh">
                                         <rect key="frame" x="0.0" y="4.5" width="1" height="11"/>
@@ -132,8 +132,8 @@
                                             <constraint firstAttribute="height" constant="11" id="rQe-eX-5YW"/>
                                         </constraints>
                                     </view>
-                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="do8-lR-Cg5">
-                                        <rect key="frame" x="7" y="3.5" width="52.5" height="13.5"/>
+                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="do8-lR-Cg5">
+                                        <rect key="frame" x="7" y="10" width="0.0" height="0.0"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="0.41568627450000001" green="0.41568627450000001" blue="0.41568627450000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>

+ 14 - 14
KulexiuForStudent/KulexiuForStudent/Module/Course/View/MusicRoomCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -28,7 +28,7 @@
                                     <constraint firstAttribute="height" constant="16" id="Qqx-I0-2ob"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021/09/17 14:00~14:25" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UxS-Xs-zTk">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UxS-Xs-zTk">
                                 <rect key="frame" x="34" y="11" width="302" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" id="iT4-St-ibp"/>
@@ -44,8 +44,8 @@
                                     <constraint firstAttribute="height" constant="1" id="NEY-Lz-eiH"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管第一期" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l2B-EY-GWY">
-                                <rect key="frame" x="68" y="53" width="98" height="28"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l2B-EY-GWY">
+                                <rect key="frame" x="68" y="53" width="0.0" height="28"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="28" id="kAd-0f-k5x"/>
                                 </constraints>
@@ -54,10 +54,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dys-CR-rsC">
-                                <rect key="frame" x="68" y="81" width="44" height="20"/>
+                                <rect key="frame" x="68" y="81" width="10" height="20"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TPd-JA-v98">
-                                        <rect key="frame" x="5" y="0.0" width="34" height="20"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TPd-JA-v98">
+                                        <rect key="frame" x="5" y="0.0" width="0.0" height="20"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="1" green="0.54901960780000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -107,21 +107,21 @@
                                 </constraints>
                             </imageView>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sVq-IR-gIH">
-                                <rect key="frame" x="120" y="85" width="1" height="12"/>
+                                <rect key="frame" x="86" y="85" width="1" height="12"/>
                                 <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="12" id="Uhv-oB-NVg"/>
                                     <constraint firstAttribute="width" constant="1" id="yT2-GS-NWs"/>
                                 </constraints>
                             </view>
-                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W7K-ER-kaU">
-                                <rect key="frame" x="129" y="82.5" width="23.5" height="17"/>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W7K-ER-kaU">
+                                <rect key="frame" x="95" y="91" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="frc-dG-90z">
-                                <rect key="frame" x="166" y="47" width="40" height="40"/>
+                                <rect key="frame" x="68" y="47" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="uL1-Gj-W3y"/>
                                     <constraint firstAttribute="width" constant="40" id="yA6-mm-wkc"/>
@@ -132,8 +132,8 @@
                                     <action selector="chatAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="7L8-cN-1ko"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已结束" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iGm-1d-ScL">
-                                <rect key="frame" x="346" y="11.5" width="50" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iGm-1d-ScL">
+                                <rect key="frame" x="346" y="20" width="50" height="0.0"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="fm8-WM-ePb"/>
                                 </constraints>

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeCourseTipsView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" 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="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -38,14 +38,14 @@
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homeCourse_notice" translatesAutoresizingMaskIntoConstraints="NO" id="XLv-21-YKG">
                             <rect key="frame" x="43" y="33" width="20" height="21"/>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="竖笛直播课即将开始" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJw-9X-t4v">
-                            <rect key="frame" x="70" y="11" width="199" height="17"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJw-9X-t4v">
+                            <rect key="frame" x="70" y="11" width="199" height="0.0"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日 16:30-17:05" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o9U-Ig-hhv">
-                            <rect key="frame" x="70" y="39" width="97" height="15"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o9U-Ig-hhv">
+                            <rect key="frame" x="70" y="54" width="0.0" height="0.0"/>
                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                             <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeInformationCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -33,14 +33,14 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2月28日 19:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7QX-lI-BO2">
-                                <rect key="frame" x="125" y="66" width="76" height="14"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7QX-lI-BO2">
+                                <rect key="frame" x="125" y="80" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="音乐中考究竟是什么?多地真题盘点一起看!" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vYy-zu-7s3">
-                                <rect key="frame" x="125" y="10" width="275" height="33.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vYy-zu-7s3">
+                                <rect key="frame" x="125" y="10" width="275" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

+ 13 - 13
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -34,10 +34,10 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r6M-a2-FO8">
-                                <rect key="frame" x="18" y="16" width="24.5" height="13"/>
+                                <rect key="frame" x="18" y="16" width="6" height="13"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="scN-5q-NZR">
-                                        <rect key="frame" x="3" y="0.0" width="18.5" height="13"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="scN-5q-NZR">
+                                        <rect key="frame" x="3" y="0.0" width="0.0" height="13"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="13" id="RwG-hI-J4e"/>
                                         </constraints>
@@ -59,7 +59,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管基础入门单曲练习" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8ja-4v-aTz">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8ja-4v-aTz">
                                 <rect key="frame" x="188" y="14" width="149" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="US1-oc-Lb6"/>
@@ -68,8 +68,8 @@
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="李云磊" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H4s-4H-yh0">
-                                <rect key="frame" x="210" y="37.5" width="37" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H4s-4H-yh0">
+                                <rect key="frame" x="210" y="37.5" width="0.0" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="xfD-mK-47N"/>
                                 </constraints>
@@ -77,7 +77,7 @@
                                 <color key="textColor" red="0.41568627450980389" green="0.41568627450980389" blue="0.41568627450980389" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2月28日 19:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T3t-fA-cM4">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T3t-fA-cM4">
                                 <rect key="frame" x="209" y="61.5" width="128" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="l9V-6s-gu9"/>
@@ -86,8 +86,8 @@
                                 <color key="textColor" red="0.41568627450000001" green="0.41568627450000001" blue="0.41568627450000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rZn-jF-zsG">
-                                <rect key="frame" x="188" y="83" width="30" height="22"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rZn-jF-zsG">
+                                <rect key="frame" x="188" y="83" width="0.0" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="keb-BD-W5Z"/>
                                 </constraints>
@@ -95,8 +95,8 @@
                                 <color key="textColor" red="0.98039215686274506" green="0.39215686274509803" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iFI-xj-FYd">
-                                <rect key="frame" x="293.5" y="85.5" width="43.5" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iFI-xj-FYd">
+                                <rect key="frame" x="337" y="94" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

+ 12 - 12
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -34,10 +34,10 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XBM-bX-gza">
-                                <rect key="frame" x="18" y="16" width="24.5" height="13"/>
+                                <rect key="frame" x="18" y="16" width="6" height="13"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hXc-Gf-sP3">
-                                        <rect key="frame" x="3" y="0.0" width="18.5" height="13"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hXc-Gf-sP3">
+                                        <rect key="frame" x="3" y="0.0" width="0.0" height="13"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="13" id="c71-bQ-peo"/>
                                         </constraints>
@@ -59,7 +59,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管基础入门单曲练习" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p1L-Tc-1eC">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p1L-Tc-1eC">
                                 <rect key="frame" x="188" y="14" width="165" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="cVG-cS-SxM"/>
@@ -68,8 +68,8 @@
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥299" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JR5-GO-mSN">
-                                <rect key="frame" x="188" y="79" width="30.5" height="22"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JR5-GO-mSN">
+                                <rect key="frame" x="188" y="79" width="0.0" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="wdy-nF-fYp"/>
                                 </constraints>
@@ -77,8 +77,8 @@
                                 <color key="textColor" red="0.98039215690000003" green="0.3921568627" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wLP-Ow-uiD">
-                                <rect key="frame" x="309.5" y="81.5" width="43.5" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wLP-Ow-uiD">
+                                <rect key="frame" x="353" y="90" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -95,8 +95,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="李云磊" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KYe-PG-V9i">
-                                <rect key="frame" x="210" y="41" width="143" height="14.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KYe-PG-V9i">
+                                <rect key="frame" x="210" y="48" width="143" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.41568627450000001" green="0.41568627450000001" blue="0.41568627450000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

+ 8 - 8
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotAlbum/HomeHotAlbumCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -36,7 +36,7 @@
                             <constraint firstAttribute="width" constant="26" id="OT8-nr-3ZS"/>
                         </constraints>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="萨克斯新手…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bh-Zm-ov0">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bh-Zm-ov0">
                         <rect key="frame" x="3" y="114" width="94" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="s4H-Kv-zgp"/>
@@ -46,18 +46,18 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xPp-Kr-NCd">
-                        <rect key="frame" x="7" y="85" width="49.5" height="16"/>
+                        <rect key="frame" x="7" y="85" width="22" height="16"/>
                         <subviews>
                             <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HC6-WO-Sxq">
-                                <rect key="frame" x="0.0" y="0.0" width="49.5" height="16"/>
+                                <rect key="frame" x="0.0" y="0.0" width="22" height="16"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ulS-vz-oeq">
-                                    <rect key="frame" x="0.0" y="0.0" width="49.5" height="16"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="22" height="16"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 </view>
                                 <blurEffect style="light"/>
                             </visualEffectView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="365人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HyK-tc-JYn">
-                                <rect key="frame" x="15" y="3" width="27.5" height="9"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HyK-tc-JYn">
+                                <rect key="frame" x="15" y="3" width="0.0" height="9"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="9" id="QTs-RA-B2w"/>
                                 </constraints>

+ 11 - 11
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotLiveCourse/HomeHotLiveCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -28,10 +28,10 @@
                                 </constraints>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZPa-8U-6df">
-                                <rect key="frame" x="6" y="6" width="28.5" height="13"/>
+                                <rect key="frame" x="6" y="6" width="10" height="13"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X47-or-On0">
-                                        <rect key="frame" x="5" y="0.0" width="18.5" height="13"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X47-or-On0">
+                                        <rect key="frame" x="5" y="0.0" width="0.0" height="13"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="13" id="5J6-Su-Z2G"/>
                                         </constraints>
@@ -53,7 +53,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛入门教学" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMu-ha-W8x">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMu-ha-W8x">
                                 <rect key="frame" x="11" y="102" width="214" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="uED-yd-pUh"/>
@@ -62,8 +62,8 @@
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="小酷老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Xi-wQ-A7O">
-                                <rect key="frame" x="11" y="128" width="49.5" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Xi-wQ-A7O">
+                                <rect key="frame" x="11" y="128" width="0.0" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="ZXQ-Ji-6m5"/>
                                 </constraints>
@@ -72,7 +72,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tVF-Pj-Vlw">
-                                <rect key="frame" x="151" y="134.5" width="4" height="4"/>
+                                <rect key="frame" x="216" y="134.5" width="4" height="4"/>
                                 <color key="backgroundColor" red="1" green="0.53725490200000003" blue="0.0039215686269999999" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="4" id="dKn-jh-6Re"/>
@@ -84,8 +84,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1422人在学" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="inb-f4-5Eo">
-                                <rect key="frame" x="159" y="129" width="65" height="15"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="inb-f4-5Eo">
+                                <rect key="frame" x="224" y="136.5" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="1" green="0.53725490200000003" blue="0.0039215686269999999" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

+ 9 - 9
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotMusic/HomeHotMusicCellView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" 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="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,20 +13,20 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="80"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最伟大的作品" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7xw-r5-qc1">
-                    <rect key="frame" x="50" y="17.5" width="98" height="20"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7xw-r5-qc1">
+                    <rect key="frame" x="50" y="27.5" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                     <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-周杰伦" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jm2-P7-5K9">
-                    <rect key="frame" x="153" y="20" width="43" height="15"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jm2-P7-5K9">
+                    <rect key="frame" x="55" y="27.5" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上传者:一把剑走天涯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yx5-8B-fUi">
-                    <rect key="frame" x="11" y="49.5" width="123" height="15"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yx5-8B-fUi">
+                    <rect key="frame" x="11" y="39.5" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
@@ -39,7 +39,7 @@
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qrG-kH-VRz">
-                    <rect key="frame" x="146" y="49" width="220" height="16"/>
+                    <rect key="frame" x="23" y="31.5" width="343" height="16"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="16" id="Npf-cJ-8dW"/>

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -39,7 +39,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="月半二水" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PcD-yn-vxS">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PcD-yn-vxS">
                                 <rect key="frame" x="12" y="91" width="82" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="vjY-V4-Dql"/>

+ 11 - 11
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotVideoCourse/HomeHotVideoCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -28,10 +28,10 @@
                                 </constraints>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iEG-bR-UaR">
-                                <rect key="frame" x="6" y="6" width="28.5" height="13"/>
+                                <rect key="frame" x="6" y="6" width="10" height="13"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t7Q-dI-DuS">
-                                        <rect key="frame" x="5" y="0.0" width="18.5" height="13"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t7Q-dI-DuS">
+                                        <rect key="frame" x="5" y="0.0" width="0.0" height="13"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="13" id="X64-z5-Rol"/>
                                         </constraints>
@@ -53,7 +53,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛入门教学" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4KZ-pa-CpR">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4KZ-pa-CpR">
                                 <rect key="frame" x="11" y="102" width="142" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="lao-V8-wfX"/>
@@ -62,14 +62,14 @@
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="小酷老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Ny-Ee-haR">
-                                <rect key="frame" x="11" y="128" width="50" height="15"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Ny-Ee-haR">
+                                <rect key="frame" x="11" y="128" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NHm-Ob-jBe">
-                                <rect key="frame" x="79" y="133.5" width="4" height="4"/>
+                                <rect key="frame" x="144" y="126" width="4" height="4"/>
                                 <color key="backgroundColor" red="1" green="0.53725490196078429" blue="0.0039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="4" id="ZB8-4x-8jr"/>
@@ -81,8 +81,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1422人在学" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kAl-tc-ntC">
-                                <rect key="frame" x="87" y="128" width="65" height="15"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kAl-tc-ntC">
+                                <rect key="frame" x="152" y="128" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="1" green="0.53725490200000003" blue="0.0039215686269999999" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/RecentCourse/HomeRecentCourseView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" 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="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -28,8 +28,8 @@
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="course_tips" translatesAutoresizingMaskIntoConstraints="NO" id="pUs-nj-cKV">
                             <rect key="frame" x="128" y="42" width="15" height="14"/>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日 15:00-15:45" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebm-D0-ZwZ">
-                            <rect key="frame" x="148" y="41" width="105" height="16"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebm-D0-ZwZ">
+                            <rect key="frame" x="148" y="49" width="0.0" height="0.0"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" red="1" green="0.50196078431372548" blue="0.43529411764705883" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherShowCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -39,14 +39,14 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mwL-ai-act">
-                                <rect key="frame" x="32" y="105.5" width="37" height="15"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mwL-ai-act">
+                                <rect key="frame" x="32" y="113" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="120人观看" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h60-Mb-b5v">
-                                <rect key="frame" x="127" y="106.5" width="53" height="13.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h60-Mb-b5v">
+                                <rect key="frame" x="180" y="113" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeHotStyleCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -39,14 +39,14 @@
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="酷乐秀官方" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hHM-XF-ugi">
-                                        <rect key="frame" x="31" y="14" width="62" height="15"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hHM-XF-ugi">
+                                        <rect key="frame" x="31" y="21.5" width="0.0" height="0.0"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1112人观看" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qhl-Ee-eId">
-                                        <rect key="frame" x="299" y="14" width="61" height="15"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="人观看" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qhl-Ee-eId">
+                                        <rect key="frame" x="323" y="14" width="37" height="15"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeTempLiveCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -39,8 +39,8 @@
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="酷乐秀官方" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zw4-4b-hQf">
-                                        <rect key="frame" x="31" y="50.5" width="62" height="15"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zw4-4b-hQf">
+                                        <rect key="frame" x="31" y="58" width="0.0" height="0.0"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -51,8 +51,8 @@
                                         <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛练习过程中的小技巧-换气法" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="okN-QS-lDq">
-                                        <rect key="frame" x="11" y="7" width="193" height="33.5"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="okN-QS-lDq">
+                                        <rect key="frame" x="11" y="7" width="193" height="0.0"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Live/View/LiveSeatApplyCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -29,8 +29,8 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="zhangsn " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GCY-hn-Duv">
-                        <rect key="frame" x="72" y="21" width="63" height="28"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GCY-hn-Duv">
+                        <rect key="frame" x="72" y="21" width="0.0" height="28"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="28" id="OZJ-Lk-g6p"/>
                         </constraints>

+ 6 - 6
KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkSortView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" 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="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,8 +13,8 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="71"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021年9月" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t4D-yi-OH7">
-                    <rect key="frame" x="14" y="25.5" width="69" height="20"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="XXXX年X月" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t4D-yi-OH7">
+                    <rect key="frame" x="14" y="25.5" width="81" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="Wp2-fJ-Nhg"/>
                     </constraints>
@@ -23,10 +23,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="dxn-Em-1xD">
-                    <rect key="frame" x="86" y="32.5" width="8" height="6"/>
+                    <rect key="frame" x="98" y="32.5" width="8" height="6"/>
                 </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0zE-tr-Z1O">
-                    <rect key="frame" x="14" y="0.0" width="80" height="71"/>
+                    <rect key="frame" x="14" y="0.0" width="92" height="71"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                     <connections>
                         <action selector="sortButtonAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="rWv-0j-Xxb"/>

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLessonSearchView.xib

@@ -19,14 +19,14 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sav-8B-TD3">
                             <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2022年04月" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SZF-Nh-GLK">
-                                    <rect key="frame" x="19.5" y="35.5" width="84" height="17"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="XXXX年XX月" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SZF-Nh-GLK">
+                                    <rect key="frame" x="16.5" y="35.5" width="90" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="vSU-NS-Qou">
-                                    <rect key="frame" x="109.5" y="41" width="8" height="6"/>
+                                    <rect key="frame" x="112.5" y="41" width="8" height="6"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="6" id="L0G-Nt-hlU"/>
                                         <constraint firstAttribute="width" constant="8" id="nhm-Fv-ewC"/>

+ 12 - 12
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLiveCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -40,8 +40,8 @@
                                     <constraint firstAttribute="height" constant="1" id="h6v-qm-9HE"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛直播课" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9C1-zD-NKp">
-                                <rect key="frame" x="128" y="17" width="153" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9C1-zD-NKp">
+                                <rect key="frame" x="128" y="17" width="0.0" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="jZt-hb-zgs"/>
                                 </constraints>
@@ -49,8 +49,8 @@
                                 <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进行中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VrX-Hy-enc">
-                                <rect key="frame" x="314" y="111" width="43" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VrX-Hy-enc">
+                                <rect key="frame" x="357" y="111" width="0.0" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="nme-QD-dNX"/>
                                 </constraints>
@@ -65,17 +65,17 @@
                                     <constraint firstAttribute="width" constant="16" id="jJm-KX-qcy"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021/09/17 14:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QUH-rb-n4x">
-                                <rect key="frame" x="34" y="114" width="105" height="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QUH-rb-n4x">
+                                <rect key="frame" x="34" y="122" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8e5-WE-PwG">
-                                <rect key="frame" x="130" y="70" width="30.5" height="16"/>
+                                <rect key="frame" x="130" y="70" width="8" height="16"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GLH-rY-bmS">
-                                        <rect key="frame" x="4" y="1" width="22.5" height="13"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GLH-rY-bmS">
+                                        <rect key="frame" x="4" y="1" width="0.0" height="13"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <color key="textColor" red="1" green="0.5490196078431373" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -96,7 +96,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Kh-s4-xZJ">
-                                <rect key="frame" x="286" y="7" width="40" height="40"/>
+                                <rect key="frame" x="133" y="7" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="G8p-eG-zeE"/>
                                     <constraint firstAttribute="width" constant="40" id="W6r-uH-v7W"/>

+ 15 - 15
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -28,10 +28,10 @@
                                 </constraints>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pzA-yf-E6E">
-                                <rect key="frame" x="8" y="6" width="24.5" height="13"/>
+                                <rect key="frame" x="8" y="6" width="6" height="13"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZMN-zF-fWY">
-                                        <rect key="frame" x="3" y="0.0" width="18.5" height="13"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZMN-zF-fWY">
+                                        <rect key="frame" x="3" y="0.0" width="0.0" height="13"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="13" id="Sgn-de-gJc"/>
                                         </constraints>
@@ -53,14 +53,14 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛视频课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yCS-l4-WAt">
-                                <rect key="frame" x="11" y="117" width="146" height="17"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yCS-l4-WAt">
+                                <rect key="frame" x="11" y="117" width="146" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.10196078431372549" green="0.10196078431372549" blue="0.10196078431372549" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="免费/4课时" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yib-mA-6Ou">
-                                <rect key="frame" x="9" y="164" width="70.5" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yib-mA-6Ou">
+                                <rect key="frame" x="9" y="147" width="0.0" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="fo4-3I-tde"/>
                                 </constraints>
@@ -69,7 +69,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="3il-XM-fqj">
-                                <rect key="frame" x="11" y="139" width="20" height="20"/>
+                                <rect key="frame" x="11" y="122" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="20" id="1af-AW-k6Y"/>
                                     <constraint firstAttribute="height" constant="20" id="Y9m-cV-JYR"/>
@@ -80,14 +80,14 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wbK-Jo-ZbH">
-                                <rect key="frame" x="36" y="141.5" width="37" height="15"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wbK-Jo-ZbH">
+                                <rect key="frame" x="36" y="132" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bIp-3Q-l9m">
-                                <rect key="frame" x="79" y="139" width="79" height="20"/>
+                                <rect key="frame" x="42" y="122" width="116" height="20"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="00e-da-LHX">
                                         <rect key="frame" x="0.0" y="4.5" width="1" height="11"/>
@@ -97,8 +97,8 @@
                                             <constraint firstAttribute="height" constant="11" id="WC2-EJ-sEy"/>
                                         </constraints>
                                     </view>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Spj-bd-Syo">
-                                        <rect key="frame" x="7" y="2.5" width="57" height="15"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Spj-bd-Syo">
+                                        <rect key="frame" x="7" y="10" width="0.0" height="0.0"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                         <color key="textColor" red="1" green="0.50196078431372548" blue="0.17254901960784313" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Widget/Controller/WidgetViewController.m

@@ -83,11 +83,11 @@
         make.left.right.top.mas_equalTo(self.view);
         make.height.mas_equalTo(kNaviBarHeight);
     }];
-    
+    CGFloat topSpace = IS_IPAD ? 100 : 10;
     [self.view addSubview:self.dotView];
     [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.navView.mas_bottom).offset(10);
+        make.top.mas_equalTo(self.navView.mas_bottom).offset(topSpace);
         make.height.mas_equalTo(44);
     }];
     

+ 5 - 3
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/KSGaugeView/KSGaugeColorView.m

@@ -16,8 +16,9 @@
 
 - (void)drawRoundRect:(CGRect)rect context:(CGContextRef)context {
     // 1. 还是添加一个圆弧路径
+    CGFloat width = IS_IPAD ? 28 : 18;
     //设置线的宽度
-    CGContextSetLineWidth(context, 18.0f);
+    CGContextSetLineWidth(context, width);
     //设置圆环线条的两个端点做圆滑处理
     CGContextSetLineCap(context, kCGLineCapRound);
     //设置画笔颜色
@@ -26,7 +27,8 @@
     CGFloat originX = rect.size.width / 2.0f;
     CGFloat originY = (rect.size.height - 25);
     //计算半径
-    CGFloat radius = originY - 18 / 2.0f - 38-10; // 缩小半径-5
+//    CGFloat radius = originY - 18 / 2.0f - 38-10; // 缩小半径-5
+    CGFloat radius = (rect.size.height -25) / 3 * 2 - width / 2;
     //逆时针画一个圆弧
     CGContextAddArc(context, originX, originY, radius, 0, -M_PI, YES);
     
@@ -51,7 +53,7 @@
 //    //剪裁路径
     CGContextClip(context);
     CGPoint startPoint = CGPointMake(originX - radius, originY);
-    CGPoint endPoint = CGPointMake(originX + radius+18/2, originY);
+    CGPoint endPoint = CGPointMake(originX + radius + width/2, originY);
     //4.用渐变色填充,修改填充色的方向,_startPoint和_endPoint两个点的连线,就是颜色的分布方向
     CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 1);
 

+ 4 - 1
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/KSGaugeView/KSGaugeView.m

@@ -127,8 +127,11 @@
     needleLayer.fillColor = HexRGB(0x0082FF).CGColor;
     [rootNeedleLayer addSublayer:needleLayer];
     
+    CGFloat leftSpace = KPortraitWidth / 8.0f;
+    CGFloat width = IS_IPAD ? (KPortraitWidth - leftSpace * 2) / 4 + 50 : 130;
+
     CALayer *layerContent = [CALayer layer];
-    layerContent.position = CGPointMake(originX, originX - 120);
+    layerContent.position = CGPointMake(originX, originX - width);
     layerContent.bounds = CGRectMake(0, 0, 7, 8);
     [layerContent setContents:(id)[UIImage imageNamed:@"tuning_triangle"].CGImage];
     [rootNeedleLayer addSublayer:layerContent];

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/Metronome/WidgetDotView.m

@@ -7,7 +7,7 @@
 
 #import "WidgetDotView.h"
 
-#define SPOT_WHDTH (20)
+#define SPOT_WHDTH (IS_IPAD ? 24 : 20)
 
 @interface WidgetDotView ()
 

+ 4 - 0
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/Metronome/WidgetFunctionView.m

@@ -8,6 +8,7 @@
 #import "WidgetFunctionView.h"
 
 @interface WidgetFunctionView ()
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *signatureWidth;
 
 @property (weak, nonatomic) IBOutlet UIButton *speedMinusButton;
 
@@ -24,6 +25,9 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    if (IS_IPAD) {
+        self.signatureWidth.constant = 200;
+    }
     [self.volumeSlider setThumbImage:[UIImage imageNamed:@"slider_image"] forState:UIControlStateNormal];
     [self.volumeSlider setThumbImage:[UIImage imageNamed:@"slider_image"] forState:UIControlStateHighlighted];
     UIImage *image = [self getGradientImageWithColors:@[HexRGB(0x63DAFF),HexRGB(0x1798FF)] imgSize:CGSizeMake(240, 30)];

+ 8 - 7
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/Metronome/WidgetFunctionView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" 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="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -28,11 +28,11 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zZA-L2-xH3">
                     <rect key="frame" x="146" y="0.0" width="122" height="72"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_bg_s" translatesAutoresizingMaskIntoConstraints="NO" id="v7s-8y-OYT">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_bg_s" translatesAutoresizingMaskIntoConstraints="NO" id="v7s-8y-OYT">
                             <rect key="frame" x="0.0" y="0.0" width="122" height="72"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4/4" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="66c-wn-3Yr">
-                            <rect key="frame" x="38" y="20" width="30" height="26"/>
+                            <rect key="frame" x="34.5" y="20" width="30" height="26"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="26" id="2zH-gk-AQd"/>
                             </constraints>
@@ -41,17 +41,17 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_arrow_down" translatesAutoresizingMaskIntoConstraints="NO" id="a3Y-DI-8bc">
-                            <rect key="frame" x="80" y="29.5" width="11" height="7"/>
+                            <rect key="frame" x="76.5" y="29.5" width="11" height="7"/>
                         </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="bottom" secondItem="v7s-8y-OYT" secondAttribute="bottom" id="0FM-4N-k4y"/>
                         <constraint firstItem="a3Y-DI-8bc" firstAttribute="centerY" secondItem="66c-wn-3Yr" secondAttribute="centerY" id="44T-Kg-1Er"/>
-                        <constraint firstAttribute="trailing" secondItem="a3Y-DI-8bc" secondAttribute="trailing" constant="31" id="7RE-jn-se4"/>
                         <constraint firstItem="v7s-8y-OYT" firstAttribute="top" secondItem="zZA-L2-xH3" secondAttribute="top" id="7fU-EP-gxi"/>
                         <constraint firstAttribute="trailing" secondItem="v7s-8y-OYT" secondAttribute="trailing" id="JpM-Tc-Pn6"/>
                         <constraint firstItem="v7s-8y-OYT" firstAttribute="leading" secondItem="zZA-L2-xH3" secondAttribute="leading" id="VQ2-7f-v0j"/>
+                        <constraint firstItem="66c-wn-3Yr" firstAttribute="centerX" secondItem="zZA-L2-xH3" secondAttribute="centerX" constant="-11.5" id="aL4-i4-ytu"/>
                         <constraint firstItem="a3Y-DI-8bc" firstAttribute="centerY" secondItem="zZA-L2-xH3" secondAttribute="centerY" constant="-3" id="gHm-XH-BoZ"/>
                         <constraint firstItem="a3Y-DI-8bc" firstAttribute="leading" secondItem="66c-wn-3Yr" secondAttribute="trailing" constant="12" id="vVw-Ru-dAv"/>
                     </constraints>
@@ -124,6 +124,7 @@
             <connections>
                 <outlet property="signatureButton" destination="8S7-tR-fpt" id="Lic-ec-FEc"/>
                 <outlet property="signatureLabel" destination="66c-wn-3Yr" id="F08-yR-Wc4"/>
+                <outlet property="signatureWidth" destination="GvT-n8-eSh" id="CT4-C3-bEw"/>
                 <outlet property="speedAddButton" destination="xxw-kt-6aa" id="WQE-Gf-zIz"/>
                 <outlet property="speedMinusButton" destination="Vgr-v5-aHg" id="zux-FN-7kX"/>
                 <outlet property="valueLabel" destination="gL7-N0-yqf" id="yXG-GD-Kkd"/>
@@ -134,7 +135,7 @@
     </objects>
     <resources>
         <image name="metronome_arrow_down" width="11" height="7"/>
-        <image name="metronome_bg_s" width="122" height="72"/>
+        <image name="metronome_bg_s" width="72.5" height="72"/>
         <image name="metronome_volume" width="18" height="18"/>
         <image name="speed_add" width="72" height="72"/>
         <image name="speed_minus" width="72" height="72"/>

+ 14 - 27
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/ToneTuningBodyView.m

@@ -9,10 +9,10 @@
 
 @interface ToneTuningBodyView ()
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *leadingSpace;
 
-@property (weak, nonatomic) IBOutlet UIButton *minusButton;
-
-@property (weak, nonatomic) IBOutlet UIButton *addButton;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *plateWidth;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *plateMidWidth;
 
 @property (weak, nonatomic) IBOutlet UIButton *playButton;
 @property (weak, nonatomic) IBOutlet UILabel *distanceLabel;
@@ -31,6 +31,13 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    if (IS_IPAD) {
+        CGFloat leftSpace = KPortraitWidth / 8.0f;
+        self.leadingSpace.constant = leftSpace;
+        CGFloat width = (KPortraitWidth - leftSpace * 2);
+        self.plateWidth.constant = width / 4;
+        self.plateMidWidth.constant = self.plateWidth.constant + 50;
+    }
 }
 
 + (instancetype)shareInstance {
@@ -47,28 +54,6 @@
     }
 }
 
-- (IBAction)frequenceMinus:(id)sender {
-    NSInteger frequence = self.A4Frequence;
-    if (self.A4Frequence <= MINFREQUENCE) {
-        return;
-    }
-    self.A4Frequence = frequence - 1;
-    if (self.callback) {
-        self.callback(TUNINGACTION_FREQUENCE, self.A4Frequence);
-    }
-}
-
-- (IBAction)frequenceAdd:(id)sender {
-    NSInteger frequence = self.A4Frequence;
-    if (self.A4Frequence >= MAXFREQUENCE) {
-        return;
-    }
-    self.A4Frequence = frequence + 1;
-    if (self.callback) {
-        self.callback(TUNINGACTION_FREQUENCE, self.A4Frequence);
-    }
-}
-
 - (IBAction)chooseMetronomeSpeed:(id)sender {
     if (self.callback) {
         self.callback(TUNINGACTION_METRONOME, self.A4Frequence);
@@ -93,7 +78,7 @@
 - (void)setA4Frequence:(NSInteger)A4Frequence {
     _A4Frequence = A4Frequence;
     self.A4FrequenceLabel.text = [NSString stringWithFormat:@"A4=%zdHz",A4Frequence];
-    if (A4Frequence != DEFALUT_A4FREQUENCE) {
+    if (A4Frequence > 440) {
         self.warningImage.hidden = NO;
     }
     else {
@@ -162,7 +147,9 @@
 }
 
 + (CGFloat)getViewHeight {
-    return KPortraitWidth / 2 + 64 + 36 + 32 + 6 + 145 + 3 + 2 + 90 + 3 + 11 + 72 + 29+ 20;
+    CGFloat leftSpace = KPortraitWidth / 8.0f;
+    CGFloat plateHeight = IS_IPAD ? (KPortraitWidth - leftSpace * 2) / 2 : KPortraitWidth / 2;
+    return plateHeight + 64 + 36 + 32 + 6 + 145 + 3 + 2 + 84 + 3 + 11 + 72 + 29+ 20;
 }
 
 

+ 56 - 35
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/ToneTuningBodyView.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="ToneTuningBodyView">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="710"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="704"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PnS-Ku-vsa">
@@ -39,13 +39,17 @@
                     </constraints>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="plate_bg" translatesAutoresizingMaskIntoConstraints="NO" id="SXB-cz-Qdh">
-                    <rect key="frame" x="30" y="81.666666666666686" width="315" height="315"/>
+                    <rect key="frame" x="32.666666666666657" y="84" width="310" height="310"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="SXB-cz-Qdh" secondAttribute="height" id="lY4-T9-vt2"/>
                     </constraints>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="plate_mid" translatesAutoresizingMaskIntoConstraints="NO" id="RCj-O4-Iod">
                     <rect key="frame" x="123" y="171" width="129" height="129"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="129" id="58V-me-nNB"/>
+                        <constraint firstAttribute="width" secondItem="RCj-O4-Iod" secondAttribute="height" multiplier="1:1" id="gfI-6x-Gj0"/>
+                    </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zrx-Pe-2NT">
                     <rect key="frame" x="0.0" y="64" width="375" height="200"/>
@@ -75,14 +79,14 @@
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="97" id="EVn-sM-7ft"/>
                         <constraint firstItem="B2r-VK-RGz" firstAttribute="leading" secondItem="9aU-LL-Lsq" secondAttribute="leading" id="G9W-DI-8Zs"/>
                         <constraint firstItem="B2r-VK-RGz" firstAttribute="top" secondItem="9aU-LL-Lsq" secondAttribute="top" id="HPf-SV-ucs"/>
+                        <constraint firstAttribute="width" secondItem="9aU-LL-Lsq" secondAttribute="height" multiplier="1:1" id="Q1Z-bH-V4y"/>
                         <constraint firstAttribute="trailing" secondItem="B2r-VK-RGz" secondAttribute="trailing" id="bD8-fo-agi"/>
+                        <constraint firstItem="D7p-nE-fr1" firstAttribute="centerY" secondItem="9aU-LL-Lsq" secondAttribute="centerY" constant="5" id="c8B-pk-4Ee"/>
                         <constraint firstAttribute="bottom" secondItem="B2r-VK-RGz" secondAttribute="bottom" id="epV-K1-FXZ"/>
                         <constraint firstAttribute="width" constant="97" id="gV3-KZ-iAV"/>
                         <constraint firstItem="dOO-kx-vvP" firstAttribute="centerX" secondItem="9aU-LL-Lsq" secondAttribute="centerX" id="kcR-F9-yNF"/>
-                        <constraint firstAttribute="bottom" secondItem="D7p-nE-fr1" secondAttribute="bottom" constant="29" id="pX6-lJ-vAr"/>
                         <constraint firstItem="D7p-nE-fr1" firstAttribute="centerX" secondItem="9aU-LL-Lsq" secondAttribute="centerX" id="rVT-76-xxU"/>
                         <constraint firstItem="D7p-nE-fr1" firstAttribute="top" secondItem="dOO-kx-vvP" secondAttribute="bottom" constant="3" id="yva-cW-2fG"/>
                     </constraints>
@@ -216,30 +220,36 @@
                         <constraint firstAttribute="trailing" secondItem="6FP-hm-dfl" secondAttribute="trailing" constant="11" id="lZt-Ec-22l"/>
                     </constraints>
                 </view>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="forkButton_bg" translatesAutoresizingMaskIntoConstraints="NO" id="S4j-cQ-vqS">
+                    <rect key="frame" x="6" y="485" width="181.66666666666666" height="84"/>
+                </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tkl-Cw-Mdz">
-                    <rect key="frame" x="6" y="485" width="181.66666666666666" height="90"/>
+                    <rect key="frame" x="6" y="485" width="181.66666666666666" height="84"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="90" id="t6I-nJ-9Qd"/>
+                        <constraint firstAttribute="height" constant="84" id="t6I-nJ-9Qd"/>
                     </constraints>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" image="fork_unchoose" backgroundImage="forkButton_bg"/>
+                    <state key="normal" image="fork_unchoose"/>
                     <connections>
                         <action selector="forkSetting:" destination="iN0-l3-epB" eventType="touchUpInside" id="wcc-Y0-dc2"/>
                     </connections>
                 </button>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="playButton_bg" translatesAutoresizingMaskIntoConstraints="NO" id="5NQ-es-DAQ">
+                    <rect key="frame" x="187.66666666666663" y="485" width="181.33333333333337" height="84"/>
+                </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p0z-qL-bMm">
-                    <rect key="frame" x="187.66666666666663" y="485" width="181.33333333333337" height="90"/>
+                    <rect key="frame" x="187.66666666666663" y="485" width="181.33333333333337" height="84"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="90" id="D2z-en-N9g"/>
+                        <constraint firstAttribute="height" constant="84" id="D2z-en-N9g"/>
                     </constraints>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" image="fork_unPlay" backgroundImage="playButton_bg"/>
+                    <state key="normal" image="fork_unPlay"/>
                     <connections>
                         <action selector="playButtonAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="xnp-kV-r78"/>
                     </connections>
                 </button>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="toning_bottom" translatesAutoresizingMaskIntoConstraints="NO" id="IXi-hL-in1">
-                    <rect key="frame" x="18.666666666666657" y="661" width="338" height="29"/>
+                    <rect key="frame" x="18.666666666666657" y="655" width="338" height="29"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="338" id="Ohx-Sa-5XQ"/>
                         <constraint firstAttribute="height" constant="29" id="tsc-a8-bbh"/>
@@ -278,16 +288,16 @@
                     </constraints>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tuning_metronome_play" translatesAutoresizingMaskIntoConstraints="NO" id="kfM-1R-aby">
-                    <rect key="frame" x="132.66666666666666" y="559" width="110" height="110"/>
+                    <rect key="frame" x="132.66666666666666" y="553" width="110" height="110"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hjq-pN-uJq">
-                    <rect key="frame" x="233.66666666666663" y="578" width="135" height="72"/>
+                    <rect key="frame" x="233.66666666666663" y="572" width="128.33333333333337" height="72"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_bg_s" translatesAutoresizingMaskIntoConstraints="NO" id="o5o-uh-SPK">
-                            <rect key="frame" x="0.0" y="0.0" width="135" height="72"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_bg_s" translatesAutoresizingMaskIntoConstraints="NO" id="o5o-uh-SPK">
+                            <rect key="frame" x="0.0" y="0.0" width="128.33333333333334" height="72"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4/4" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MF9-mi-VE8">
-                            <rect key="frame" x="51.000000000000028" y="20" width="30" height="26"/>
+                            <rect key="frame" x="37.666666666666657" y="20" width="30" height="26"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="26" id="puI-cv-zSi"/>
                             </constraints>
@@ -296,10 +306,10 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_arrow_down" translatesAutoresizingMaskIntoConstraints="NO" id="rg7-hy-7Wr">
-                            <rect key="frame" x="93.000000000000028" y="29.666666666666629" width="11" height="7"/>
+                            <rect key="frame" x="79.666666666666657" y="29.666666666666629" width="11" height="7"/>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eQb-Ay-DFn">
-                            <rect key="frame" x="0.0" y="0.0" width="135" height="72"/>
+                            <rect key="frame" x="0.0" y="0.0" width="128.33333333333334" height="72"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal">
@@ -314,21 +324,20 @@
                     <constraints>
                         <constraint firstAttribute="bottom" secondItem="o5o-uh-SPK" secondAttribute="bottom" id="2U8-oI-yrN"/>
                         <constraint firstItem="o5o-uh-SPK" firstAttribute="leading" secondItem="Hjq-pN-uJq" secondAttribute="leading" id="2yi-V9-FHL"/>
-                        <constraint firstAttribute="trailing" secondItem="rg7-hy-7Wr" secondAttribute="trailing" constant="31" id="KGS-iq-q2D"/>
                         <constraint firstItem="rg7-hy-7Wr" firstAttribute="centerY" secondItem="MF9-mi-VE8" secondAttribute="centerY" id="Vc8-fw-HUF"/>
                         <constraint firstAttribute="trailing" secondItem="eQb-Ay-DFn" secondAttribute="trailing" id="YaW-Qa-hMC"/>
+                        <constraint firstItem="MF9-mi-VE8" firstAttribute="centerX" secondItem="Hjq-pN-uJq" secondAttribute="centerX" constant="-11.5" id="b87-mh-sJA"/>
                         <constraint firstItem="eQb-Ay-DFn" firstAttribute="top" secondItem="Hjq-pN-uJq" secondAttribute="top" id="dtg-ms-9dR"/>
                         <constraint firstItem="o5o-uh-SPK" firstAttribute="top" secondItem="Hjq-pN-uJq" secondAttribute="top" id="h3y-pC-Qce"/>
                         <constraint firstItem="rg7-hy-7Wr" firstAttribute="leading" secondItem="MF9-mi-VE8" secondAttribute="trailing" constant="12" id="mf1-Px-mJr"/>
                         <constraint firstItem="eQb-Ay-DFn" firstAttribute="leading" secondItem="Hjq-pN-uJq" secondAttribute="leading" id="mqQ-pi-VmJ"/>
                         <constraint firstAttribute="bottom" secondItem="eQb-Ay-DFn" secondAttribute="bottom" id="nsj-5H-8hH"/>
-                        <constraint firstAttribute="width" constant="135" id="rW0-Ak-URM"/>
                         <constraint firstItem="rg7-hy-7Wr" firstAttribute="centerY" secondItem="Hjq-pN-uJq" secondAttribute="centerY" constant="-3" id="rdR-58-aNl"/>
                         <constraint firstAttribute="trailing" secondItem="o5o-uh-SPK" secondAttribute="trailing" id="vsK-8i-ieQ"/>
                     </constraints>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mfr-Pq-edx">
-                    <rect key="frame" x="148.66666666666666" y="575" width="78" height="78"/>
+                    <rect key="frame" x="148.66666666666666" y="569" width="78" height="78"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="Mfr-Pq-edx" secondAttribute="height" multiplier="1:1" id="ly0-Mm-rzd"/>
                     </constraints>
@@ -338,16 +347,16 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8kr-5S-DeP">
-                    <rect key="frame" x="7.6666666666666714" y="578" width="135" height="72"/>
+                    <rect key="frame" x="14" y="572" width="128.66666666666666" height="72"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_bg_s" translatesAutoresizingMaskIntoConstraints="NO" id="VAF-j3-DWg">
-                            <rect key="frame" x="0.0" y="0.0" width="135" height="72"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="metronome_bg_s" translatesAutoresizingMaskIntoConstraints="NO" id="VAF-j3-DWg">
+                            <rect key="frame" x="0.0" y="0.0" width="128.66666666666666" height="72"/>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="beat_speed" translatesAutoresizingMaskIntoConstraints="NO" id="6kb-g0-vNj">
-                            <rect key="frame" x="37" y="23" width="19" height="20"/>
+                            <rect key="frame" x="36.666666666666664" y="23" width="19" height="20"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="90" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ewa-aA-r7P">
-                            <rect key="frame" x="68" y="20" width="24.333333333333329" height="26"/>
+                            <rect key="frame" x="67.666666666666671" y="20" width="24.333333333333329" height="26"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="26" id="cNr-h8-dg5"/>
                             </constraints>
@@ -356,7 +365,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pT0-rO-04P">
-                            <rect key="frame" x="0.0" y="0.0" width="135" height="72"/>
+                            <rect key="frame" x="0.0" y="0.0" width="128.66666666666666" height="72"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal">
@@ -370,6 +379,7 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstItem="Ewa-aA-r7P" firstAttribute="leading" secondItem="6kb-g0-vNj" secondAttribute="trailing" constant="12" id="2zh-7M-AJh"/>
+                        <constraint firstItem="Ewa-aA-r7P" firstAttribute="centerX" secondItem="8kr-5S-DeP" secondAttribute="centerX" constant="15.5" id="4Dk-3U-fki"/>
                         <constraint firstItem="pT0-rO-04P" firstAttribute="top" secondItem="8kr-5S-DeP" secondAttribute="top" id="Gp1-iO-AQM"/>
                         <constraint firstItem="6kb-g0-vNj" firstAttribute="top" secondItem="8kr-5S-DeP" secondAttribute="top" constant="23" id="J8e-q3-gt8"/>
                         <constraint firstItem="6kb-g0-vNj" firstAttribute="centerY" secondItem="8kr-5S-DeP" secondAttribute="centerY" constant="-3" id="LTb-Ou-zXL"/>
@@ -380,9 +390,7 @@
                         <constraint firstAttribute="height" constant="72" id="Upq-IX-582"/>
                         <constraint firstItem="pT0-rO-04P" firstAttribute="leading" secondItem="8kr-5S-DeP" secondAttribute="leading" id="UzJ-IH-swc"/>
                         <constraint firstItem="VAF-j3-DWg" firstAttribute="top" secondItem="8kr-5S-DeP" secondAttribute="top" id="VgU-OA-MnB"/>
-                        <constraint firstAttribute="width" constant="135" id="bpq-v6-DGH"/>
                         <constraint firstAttribute="trailing" secondItem="pT0-rO-04P" secondAttribute="trailing" id="btC-8J-4KW"/>
-                        <constraint firstItem="6kb-g0-vNj" firstAttribute="leading" secondItem="8kr-5S-DeP" secondAttribute="leading" constant="37" id="c9x-Kq-spM"/>
                         <constraint firstAttribute="trailing" secondItem="VAF-j3-DWg" secondAttribute="trailing" id="hhp-x9-tFZ"/>
                     </constraints>
                 </view>
@@ -391,7 +399,7 @@
             <constraints>
                 <constraint firstItem="9aU-LL-Lsq" firstAttribute="bottom" secondItem="Zrx-Pe-2NT" secondAttribute="bottom" constant="20" id="0pz-qw-7TT"/>
                 <constraint firstItem="7Em-FC-3EL" firstAttribute="leading" secondItem="ZeX-qM-LJD" secondAttribute="leading" id="1nv-ne-dbI"/>
-                <constraint firstItem="V2v-I8-jzm" firstAttribute="trailing" secondItem="Zrx-Pe-2NT" secondAttribute="trailing" constant="-17" id="2kc-xc-fY4"/>
+                <constraint firstItem="Hjq-pN-uJq" firstAttribute="width" secondItem="8kr-5S-DeP" secondAttribute="width" id="2QC-qe-u8H"/>
                 <constraint firstItem="Hjq-pN-uJq" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="centerX" constant="46" id="2ua-ao-xpw"/>
                 <constraint firstItem="p0z-qL-bMm" firstAttribute="top" secondItem="7Em-FC-3EL" secondAttribute="bottom" constant="2" id="4SR-6A-ipm"/>
                 <constraint firstItem="p0z-qL-bMm" firstAttribute="leading" secondItem="Tkl-Cw-Mdz" secondAttribute="trailing" id="5EB-Vw-dj2"/>
@@ -401,7 +409,9 @@
                 <constraint firstItem="Zrx-Pe-2NT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="9Os-5q-lL4"/>
                 <constraint firstItem="IXi-hL-in1" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="Au1-eF-R25"/>
                 <constraint firstItem="8kr-5S-DeP" firstAttribute="top" secondItem="Tkl-Cw-Mdz" secondAttribute="bottom" constant="3" id="B7O-8g-3V6"/>
+                <constraint firstItem="p0z-qL-bMm" firstAttribute="top" secondItem="5NQ-es-DAQ" secondAttribute="top" id="BCu-Wp-Bml"/>
                 <constraint firstItem="RCj-O4-Iod" firstAttribute="centerY" secondItem="9aU-LL-Lsq" secondAttribute="centerY" id="BLg-ir-ue5"/>
+                <constraint firstItem="p0z-qL-bMm" firstAttribute="trailing" secondItem="5NQ-es-DAQ" secondAttribute="trailing" id="BjT-z3-szW"/>
                 <constraint firstItem="Zrx-Pe-2NT" firstAttribute="top" secondItem="PnS-Ku-vsa" secondAttribute="bottom" constant="10" id="CQp-De-b4B"/>
                 <constraint firstItem="p0z-qL-bMm" firstAttribute="width" secondItem="Tkl-Cw-Mdz" secondAttribute="width" id="Dk9-Wv-4mD"/>
                 <constraint firstItem="Hjq-pN-uJq" firstAttribute="centerY" secondItem="kfM-1R-aby" secondAttribute="centerY" id="EO7-lL-J6P"/>
@@ -409,14 +419,20 @@
                 <constraint firstItem="7Em-FC-3EL" firstAttribute="top" secondItem="ZeX-qM-LJD" secondAttribute="top" id="FlV-cS-OgW"/>
                 <constraint firstItem="SXB-cz-Qdh" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="GEQ-uz-RN9"/>
                 <constraint firstItem="Hjq-pN-uJq" firstAttribute="centerY" secondItem="8kr-5S-DeP" secondAttribute="centerY" id="J92-q1-sFo"/>
+                <constraint firstItem="Tkl-Cw-Mdz" firstAttribute="top" secondItem="S4j-cQ-vqS" secondAttribute="top" id="K58-j2-Hjr"/>
                 <constraint firstItem="Mfr-Pq-edx" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="KYU-Zy-Ay1"/>
                 <constraint firstItem="Hjq-pN-uJq" firstAttribute="centerY" secondItem="Mfr-Pq-edx" secondAttribute="centerY" id="LxI-f0-zvC"/>
                 <constraint firstAttribute="bottom" secondItem="IXi-hL-in1" secondAttribute="bottom" constant="20" symbolic="YES" id="NHn-D1-HZo"/>
+                <constraint firstItem="v4Z-dA-iqI" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="17" id="Pbe-QF-W1P"/>
                 <constraint firstItem="Tkl-Cw-Mdz" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="6" id="Q9g-JT-4o6"/>
+                <constraint firstItem="Tkl-Cw-Mdz" firstAttribute="trailing" secondItem="S4j-cQ-vqS" secondAttribute="trailing" id="QiO-O2-ME0"/>
                 <constraint firstItem="9aU-LL-Lsq" firstAttribute="centerX" secondItem="Zrx-Pe-2NT" secondAttribute="centerX" id="RYl-V1-dyU"/>
                 <constraint firstAttribute="trailing" secondItem="p0z-qL-bMm" secondAttribute="trailing" constant="6" id="RoG-8u-1ap"/>
                 <constraint firstItem="RCj-O4-Iod" firstAttribute="centerX" secondItem="9aU-LL-Lsq" secondAttribute="centerX" id="Sti-US-Eml"/>
+                <constraint firstItem="Tkl-Cw-Mdz" firstAttribute="leading" secondItem="S4j-cQ-vqS" secondAttribute="leading" id="SyA-X8-uRD"/>
                 <constraint firstItem="Ke2-CX-K7G" firstAttribute="centerY" secondItem="5sT-Eb-2rJ" secondAttribute="centerY" id="Vh3-en-b6z"/>
+                <constraint firstItem="Tkl-Cw-Mdz" firstAttribute="bottom" secondItem="S4j-cQ-vqS" secondAttribute="bottom" id="WEJ-mB-WjP"/>
+                <constraint firstItem="p0z-qL-bMm" firstAttribute="leading" secondItem="5NQ-es-DAQ" secondAttribute="leading" id="XX7-zn-bGw"/>
                 <constraint firstItem="PnS-Ku-vsa" firstAttribute="top" secondItem="Sbe-L2-liH" secondAttribute="bottom" constant="7" id="Yk3-Tm-ano"/>
                 <constraint firstItem="Hjq-pN-uJq" firstAttribute="top" secondItem="p0z-qL-bMm" secondAttribute="bottom" constant="3" id="Za5-77-9gh"/>
                 <constraint firstAttribute="trailing" secondItem="7Em-FC-3EL" secondAttribute="trailing" constant="7" id="a3n-fN-euB"/>
@@ -426,8 +442,8 @@
                 <constraint firstItem="7Em-FC-3EL" firstAttribute="bottom" secondItem="ZeX-qM-LJD" secondAttribute="bottom" id="coV-Qi-RkQ"/>
                 <constraint firstItem="Ux8-2g-RqK" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="22" id="cwN-DO-wkV"/>
                 <constraint firstItem="5sT-Eb-2rJ" firstAttribute="leading" secondItem="Zrx-Pe-2NT" secondAttribute="leading" constant="60" id="eBI-aU-v4Z"/>
+                <constraint firstAttribute="trailing" secondItem="V2v-I8-jzm" secondAttribute="trailing" constant="17" id="eCV-rZ-FG1"/>
                 <constraint firstItem="Ux8-2g-RqK" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="ev8-FX-ve4"/>
-                <constraint firstItem="v4Z-dA-iqI" firstAttribute="leading" secondItem="Zrx-Pe-2NT" secondAttribute="leading" constant="17" id="fLG-Cw-hLj"/>
                 <constraint firstItem="8kr-5S-DeP" firstAttribute="trailing" secondItem="iN0-l3-epB" secondAttribute="centerX" constant="-45" id="hLP-iz-7JX"/>
                 <constraint firstItem="Mfr-Pq-edx" firstAttribute="top" secondItem="Tkl-Cw-Mdz" secondAttribute="bottom" id="ik4-Xj-XG6"/>
                 <constraint firstItem="5sT-Eb-2rJ" firstAttribute="top" secondItem="Zrx-Pe-2NT" secondAttribute="bottom" id="ixH-ow-czJ"/>
@@ -435,8 +451,10 @@
                 <constraint firstItem="Sbe-L2-liH" firstAttribute="leading" secondItem="Ux8-2g-RqK" secondAttribute="trailing" constant="5" id="meC-LK-DKS"/>
                 <constraint firstItem="7Em-FC-3EL" firstAttribute="trailing" secondItem="ZeX-qM-LJD" secondAttribute="trailing" id="oKn-54-J78"/>
                 <constraint firstItem="v4Z-dA-iqI" firstAttribute="top" secondItem="RCj-O4-Iod" secondAttribute="bottom" id="pXx-OT-1xd"/>
-                <constraint firstItem="SXB-cz-Qdh" firstAttribute="width" secondItem="Zrx-Pe-2NT" secondAttribute="width" constant="-60" id="qFh-B5-6Fw"/>
+                <constraint firstItem="SXB-cz-Qdh" firstAttribute="width" secondItem="Zrx-Pe-2NT" secondAttribute="height" multiplier="2" constant="-90" id="qFh-B5-6Fw"/>
                 <constraint firstItem="ZeX-qM-LJD" firstAttribute="top" secondItem="v4Z-dA-iqI" secondAttribute="bottom" constant="6" id="s9S-3a-jAr"/>
+                <constraint firstItem="p0z-qL-bMm" firstAttribute="bottom" secondItem="5NQ-es-DAQ" secondAttribute="bottom" id="tL4-y4-aFu"/>
+                <constraint firstItem="8kr-5S-DeP" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="tUS-DL-lqL"/>
                 <constraint firstItem="Zrx-Pe-2NT" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="wef-Xs-dNx"/>
                 <constraint firstItem="V2v-I8-jzm" firstAttribute="centerY" secondItem="v4Z-dA-iqI" secondAttribute="centerY" id="zSr-Gv-uIa"/>
             </constraints>
@@ -447,13 +465,16 @@
                 <outlet property="A4FrequenceLabel" destination="Ux8-2g-RqK" id="Jra-7M-iTB"/>
                 <outlet property="beatType" destination="MF9-mi-VE8" id="A4W-lJ-5Oa"/>
                 <outlet property="distanceLabel" destination="D7p-nE-fr1" id="36B-jL-Pga"/>
+                <outlet property="leadingSpace" destination="9Os-5q-lL4" id="AYl-Aq-kVL"/>
                 <outlet property="lineWidth" destination="Ndf-lc-KO2" id="njb-WP-esU"/>
                 <outlet property="metronomeStatus" destination="kfM-1R-aby" id="iSg-0c-sR7"/>
                 <outlet property="nextFrequence" destination="Ke2-CX-K7G" id="fQM-qB-mxv"/>
                 <outlet property="nomalPitch" destination="uIc-iL-EXg" id="i9k-OK-L2i"/>
                 <outlet property="pitchBgView" destination="7Em-FC-3EL" id="0rG-SE-app"/>
                 <outlet property="pitchFrequenceLabel" destination="PnS-Ku-vsa" id="LlJ-w5-az7"/>
+                <outlet property="plateMidWidth" destination="58V-me-nNB" id="eIK-kh-0dR"/>
                 <outlet property="plateView" destination="Zrx-Pe-2NT" id="ppk-X8-oX5"/>
+                <outlet property="plateWidth" destination="gV3-KZ-iAV" id="Ed8-6M-fxK"/>
                 <outlet property="playButton" destination="p0z-qL-bMm" id="DsB-sp-PJ7"/>
                 <outlet property="preFrequence" destination="5sT-Eb-2rJ" id="YqE-f3-IK2"/>
                 <outlet property="rightImage" destination="dOO-kx-vvP" id="qI5-na-huC"/>
@@ -470,17 +491,17 @@
     </objects>
     <resources>
         <image name="beat_speed" width="19" height="20"/>
-        <image name="forkButton_bg" width="177" height="84"/>
+        <image name="forkButton_bg" width="40.333332061767578" height="84"/>
         <image name="fork_unPlay" width="42" height="28"/>
         <image name="fork_unchoose" width="42" height="28"/>
         <image name="frequence_right" width="25" height="25"/>
         <image name="metronome_arrow_down" width="11" height="7"/>
-        <image name="metronome_bg_s" width="122" height="72"/>
+        <image name="metronome_bg_s" width="71.666664123535156" height="72"/>
         <image name="pitch_bg" width="89.333335876464844" height="145"/>
         <image name="plate_bg" width="286" height="287"/>
         <image name="plate_mid" width="129" height="129"/>
         <image name="plate_top" width="97" height="97"/>
-        <image name="playButton_bg" width="118" height="56"/>
+        <image name="playButton_bg" width="40.333332061767578" height="84"/>
         <image name="toning_bottom" width="328" height="19"/>
         <image name="tuning_decorate" width="48" height="32"/>
         <image name="tuning_metronome_play" width="110" height="110"/>

+ 6 - 2
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TunerSettingView.m

@@ -12,8 +12,10 @@
 #define MINFREQUENCE (415)
 
 @interface TunerSettingView ()<UIGestureRecognizerDelegate>
+
 @property (weak, nonatomic) IBOutlet UIView *containerView;
-@property (weak, nonatomic) IBOutlet UIButton *resetButton;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *containerWidth;
 
 @property (nonatomic, copy) TunerSettingCallback callback;
 
@@ -29,7 +31,9 @@
     UITapGestureRecognizer *tapGes = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGesture:)];
     [self addGestureRecognizer:tapGes];
     tapGes.delegate = self;
-    [self.resetButton setTitle:[NSString stringWithFormat:@"Reset:%dHz",DEFALUT_A4FREQUENCE] forState:UIControlStateNormal];
+    if (IS_IPAD) {
+        self.containerWidth.constant = 320;
+    }
 }
 
 - (void)tapGesture: (UITapGestureRecognizer *)tapGesture {

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TunerSettingView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -234,9 +234,9 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="containerView" destination="zvx-Af-NkA" id="mjX-0T-qrj"/>
+                <outlet property="containerWidth" destination="qqF-ug-lB6" id="1an-R4-quY"/>
                 <outlet property="frequenceLabel" destination="kAP-y9-pDd" id="N3x-Ni-VBp"/>
                 <outlet property="instrumentLabel" destination="EOf-Po-cpZ" id="5ou-au-uyX"/>
-                <outlet property="resetButton" destination="aNk-pq-Ual" id="5by-Ik-d99"/>
             </connections>
             <point key="canvasLocation" x="61.538461538461533" y="-11.374407582938389"/>
         </view>

+ 4 - 0
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TuningForkSettingView.m

@@ -10,6 +10,7 @@
 
 
 @interface TuningForkSettingView ()<UIGestureRecognizerDelegate>
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *containerWidth;
 
 @property (weak, nonatomic) IBOutlet UIView *containerView;
 
@@ -65,6 +66,9 @@
     UITapGestureRecognizer *tapGes = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGesture:)];
     [self addGestureRecognizer:tapGes];
     tapGes.delegate = self;
+    if (IS_IPAD) {
+        self.containerWidth.constant = 320;
+    }
 }
 
 - (void)tapGesture: (UITapGestureRecognizer *)tapGesture {

+ 3 - 2
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TuningForkSettingView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -728,6 +728,7 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="containerView" destination="ip2-Qv-Yar" id="iOQ-6O-7Zl"/>
+                <outlet property="containerWidth" destination="Amp-lt-7Eg" id="E5k-Yo-7Ev"/>
                 <outlet property="frequenceLabel" destination="Bhh-r7-n9J" id="pCN-eE-vqp"/>
                 <outlet property="musicalScaleLabel" destination="aKX-xG-USM" id="Kg6-4A-9Ut"/>
                 <outlet property="pitchAImage" destination="NVg-Ou-bSm" id="fbe-xA-p5t"/>