Steven 1 год назад
Родитель
Сommit
638a501a3f
25 измененных файлов с 249 добавлено и 165 удалено
  1. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/TuningImage/forkButton_bg.imageset/Contents.json
  2. 24 2
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/TuningImage/playButton_bg.imageset/Contents.json
  3. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/TuningImage/playButton_bg.imageset/playButton_bg@3x.png
  4. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/metronome/metronome_bg_s.imageset/Contents.json
  5. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/View/GroupNoticeCell.m
  6. 13 13
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/View/GroupNoticeCell.xib
  7. 4 4
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyRemarkCell.xib
  8. 9 9
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/View/MusicRoomStudentCell.xib
  9. 17 17
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/View/MyIncomeListCell.xib
  10. 4 4
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeRecentCourseView.xib
  11. 10 10
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MinePageTopView.xib
  12. 3 11
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineIntroduceCell.xib
  13. 10 10
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/TenantMineHeadView.xib
  14. 2 2
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/Controller/WidgetViewController.m
  15. 5 3
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/KSGaugeView/KSGaugeColorView.m
  16. 4 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/KSGaugeView/KSGaugeView.m
  17. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/Metronome/WidgetDotView.m
  18. 4 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/Metronome/WidgetFunctionView.m
  19. 8 7
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/Metronome/WidgetFunctionView.xib
  20. 14 27
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/ToneTuningBodyView.m
  21. 56 35
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/ToneTuningBodyView.xib
  22. 6 3
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/TunerSettingView.m
  23. 3 3
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/TunerSettingView.xib
  24. 4 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/TuningForkSettingView.m
  25. 3 2
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/TuningForkSettingView.xib

+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/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
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/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
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/TuningImage/playButton_bg.imageset/playButton_bg@3x 1.png → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/TuningImage/playButton_bg.imageset/playButton_bg@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/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"
     }
   ],

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

@@ -55,7 +55,7 @@
         
         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;

+ 13 - 13
KulexiuForTeacher/KulexiuForTeacher/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"/>
@@ -38,8 +38,8 @@
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" 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">
@@ -75,22 +75,22 @@
                                 </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="12" y="76" width="309" 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="87"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                                <rect key="frame" x="12" y="93" width="309" height="79"/>
+                                <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="178" width="309" 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"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" 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">
@@ -98,8 +98,8 @@
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" 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>
@@ -114,11 +114,11 @@
                             <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 firstItem="038-4g-5JZ" firstAttribute="top" secondItem="Gkn-L8-UCb" secondAttribute="bottom" constant="16" 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 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="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="Fse-Bd-Rui" firstAttribute="leading" secondItem="vad-UL-yLE" secondAttribute="trailing" constant="6" id="b7x-ei-t05"/>

+ 4 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyRemarkCell.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"/>
@@ -45,7 +45,7 @@
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W9z-ye-Ww2">
                                         <rect key="frame" x="0.0" y="0.0" width="327" height="161"/>
                                         <subviews>
-                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homework_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="44c-14-lXI">
+                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homework_eva" translatesAutoresizingMaskIntoConstraints="NO" id="44c-14-lXI">
                                                 <rect key="frame" x="33" y="41.5" width="79" height="78"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="78" id="3IW-Vv-GOP"/>
@@ -166,7 +166,7 @@
     <resources>
         <image name="accell_left" width="4" height="14"/>
         <image name="accompany_edit" width="12" height="12"/>
-        <image name="homework_placeholder" width="79" height="78"/>
+        <image name="homework_eva" width="79" height="78"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 9 - 9
KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/View/MusicRoomStudentCell.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>
@@ -32,8 +32,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="6av-dX-iJM">
-                                <rect key="frame" x="69" y="15" width="46" 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="6av-dX-iJM">
+                                <rect key="frame" x="69" y="15" width="0.0" height="28"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="28" id="7q6-e6-Bd6"/>
                                 </constraints>
@@ -42,10 +42,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="92R-m4-gJp">
-                                <rect key="frame" x="69" y="43" width="44" height="20"/>
+                                <rect key="frame" x="69" y="43" 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="Z9W-Cn-SVh">
-                                        <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="Z9W-Cn-SVh">
+                                        <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"/>
@@ -65,8 +65,8 @@
                                     </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="R0f-XO-tQM">
-                                <rect key="frame" x="214" y="29.5" width="43" 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="R0f-XO-tQM">
+                                <rect key="frame" x="257" y="38" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

+ 17 - 17
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/View/MyIncomeListCell.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,30 +33,30 @@
                                     </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="kS8-LB-QVW">
-                                <rect key="frame" x="68" y="16" width="49" height="28"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="28" id="Jyx-1N-Unw"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
-                                <color key="textColor" red="0.10196078431372549" green="0.10196078431372549" blue="0.10196078431372549" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="course_time" translatesAutoresizingMaskIntoConstraints="NO" id="egb-TU-4Uf">
                                 <rect key="frame" x="68" y="46" width="16" height="16"/>
                             </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="WBq-ZP-ehT">
-                                <rect key="frame" x="91" y="46" 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="WBq-ZP-ehT">
+                                <rect key="frame" x="91" y="54" 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" horizontalCompressionResistancePriority="751" text="¥20" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uKk-JC-tKp">
-                                <rect key="frame" x="352.5" y="19" width="40.5" height="22"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uKk-JC-tKp">
+                                <rect key="frame" x="393" y="30" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                 <color key="textColor" red="1" green="0.30588235294117649" blue="0.098039215686274508" 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="kS8-LB-QVW">
+                                <rect key="frame" x="68" y="16" width="0.0" height="28"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="28" id="Jyx-1N-Unw"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                                <color key="textColor" red="0.10196078431372549" green="0.10196078431372549" blue="0.10196078431372549" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
@@ -80,8 +80,8 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="04-13" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ODu-Td-Ufa">
-                        <rect key="frame" x="14" y="10" width="39" 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="ODu-Td-Ufa">
+                        <rect key="frame" x="14" y="10" width="0.0" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="h84-He-cJc"/>
                         </constraints>

+ 4 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/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"/>

+ 10 - 10
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MinePageTopView.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>
@@ -18,7 +18,7 @@
                     <rect key="frame" x="14" y="39" width="386" height="240"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j04-k1-RIV">
-                            <rect key="frame" x="186" y="96" width="90" height="19"/>
+                            <rect key="frame" x="174" y="96" width="90" height="19"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7YI-eG-JcD" customClass="KSStarView">
                                     <rect key="frame" x="0.0" y="0.0" width="90" height="19"/>
@@ -36,21 +36,21 @@
                             </constraints>
                         </view>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="education_icon" translatesAutoresizingMaskIntoConstraints="NO" id="HE2-vS-rZC">
-                            <rect key="frame" x="62" y="57.5" width="39" height="16"/>
+                            <rect key="frame" x="21" y="57.5" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="16" id="89i-Zb-0oV"/>
                                 <constraint firstAttribute="width" constant="39" id="eqp-Dk-Zah"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qualification_icon" translatesAutoresizingMaskIntoConstraints="NO" id="V1i-h1-rXV">
-                            <rect key="frame" x="107" y="57.5" width="39" height="16"/>
+                            <rect key="frame" x="66" y="57.5" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="16" id="73J-NP-LJJ"/>
                                 <constraint firstAttribute="width" constant="39" id="MJP-a5-PaL"/>
                             </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="LhQ-B1-N8g">
-                            <rect key="frame" x="11" y="53" width="41" height="25"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LhQ-B1-N8g">
+                            <rect key="frame" x="11" y="53" width="0.0" height="25"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="25" id="ttJ-dx-kxO"/>
                             </constraints>
@@ -87,13 +87,13 @@
                             </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="vZ2-QD-d8h">
-                            <rect key="frame" x="11" y="98" width="37" height="15"/>
+                            <rect key="frame" x="11" y="98" width="31" height="15"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nhJ-jg-o1N">
-                            <rect key="frame" x="48" y="93.5" width="76" height="24"/>
+                            <rect key="frame" x="42" y="93.5" width="76" height="24"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineStyle_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="lc6-oJ-H90">
                                     <rect key="frame" x="0.0" y="4" width="16" height="16"/>
@@ -137,7 +137,7 @@
                             </connections>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评分:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8kd-Ti-hHu">
-                            <rect key="frame" x="149" y="98" width="37" height="15"/>
+                            <rect key="frame" x="143" y="98" width="31" height="15"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>

+ 3 - 11
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineIntroduceCell.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"/>
@@ -32,15 +32,7 @@
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sg2-Sp-iC5">
                                 <rect key="frame" x="12" y="59" width="341" height="89"/>
-                                <attributedString key="attributedText">
-                                    <fragment content="毕业于中央音乐学员长笛专业,师从央音长笛系曾获2016年锦绣杯长笛大赛冠军自2018年起研究长笛启蒙、考级到专业考试教育总结出一套适合各个阶段需要的教学方式所教学员考级通过率100%,专业院校复试率92%">
-                                        <attributes>
-                                            <color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
-                                            <font key="NSFont" metaFont="system"/>
-                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="8" tighteningFactorForTruncation="0.0"/>
-                                        </attributes>
-                                    </fragment>
-                                </attributedString>
+                                <attributedString key="attributedText"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>

+ 10 - 10
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/TenantMineHeadView.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>
@@ -35,7 +35,7 @@
                             </userDefinedRuntimeAttributes>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vFq-5f-Squ">
-                            <rect key="frame" x="83" y="45" width="10" height="18"/>
+                            <rect key="frame" x="83" y="21" width="10" height="18"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fa1-iw-aks">
                                     <rect key="frame" x="5" y="0.0" width="0.0" height="18"/>
@@ -64,14 +64,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="J7V-BY-Z3E">
-                            <rect key="frame" x="85" y="11" width="41" 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="J7V-BY-Z3E">
+                            <rect key="frame" x="85" y="11" width="0.0" height="0.0"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" 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="rk5-S8-fb2">
-                            <rect key="frame" x="224" y="88.666666666666671" width="37" height="15"/>
+                            <rect key="frame" x="230" y="88.666666666666671" width="31" height="15"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                             <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -102,7 +102,7 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OIG-vb-9aR">
-                            <rect key="frame" x="60" y="84" width="84" height="24"/>
+                            <rect key="frame" x="54" y="84" width="84" height="24"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineStyle_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="y0K-rg-5qe">
                                     <rect key="frame" x="4" y="4" width="16" height="16"/>
@@ -146,20 +146,20 @@
                             </connections>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="勋章:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pug-lS-V28">
-                            <rect key="frame" x="23" y="88.666666666666671" width="37" height="15"/>
+                            <rect key="frame" x="23" y="88.666666666666671" width="31" height="15"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                             <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QHb-w1-1yi">
-                            <rect key="frame" x="135" y="15" width="39" height="16"/>
+                            <rect key="frame" x="94" y="3" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="39" id="dmt-FK-O3O"/>
                                 <constraint firstAttribute="height" constant="16" id="oKJ-9H-jHo"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Pf0-fO-g6q">
-                            <rect key="frame" x="180" y="15" width="39" height="16"/>
+                            <rect key="frame" x="139" y="3" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="39" id="0jU-Yr-iab"/>
                                 <constraint firstAttribute="height" constant="16" id="WMh-DL-Rcf"/>

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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 - 3
KulexiuForTeacher/KulexiuForTeacher/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,8 +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
KulexiuForTeacher/KulexiuForTeacher/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="UY4-ul-yyS"/>
             </connections>
             <point key="canvasLocation" x="61.538461538461533" y="-11.374407582938389"/>
         </view>

+ 4 - 0
KulexiuForTeacher/KulexiuForTeacher/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
KulexiuForTeacher/KulexiuForTeacher/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"/>