Steven 11 mesi fa
parent
commit
4a5d748ea0
14 ha cambiato i file con 196 aggiunte e 46 eliminazioni
  1. 2 2
      KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme
  2. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/beat_title.imageset/Contents.json
  3. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/beat_title.imageset/beat_title@2x.png
  4. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/beat_title.imageset/beat_title@3x.png
  5. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/tuning_title.imageset/Contents.json
  6. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/tuning_title.imageset/tuning_title@2x.png
  7. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/tuning_title.imageset/tuning_title@3x.png
  8. 44 16
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/LoginManger/KSLoginManager.m
  9. 0 3
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/WebView/KSBaseWKWebViewController.m
  10. 25 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/SettingViewController.m
  11. 1 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/SettingBodyView.h
  12. 56 5
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/SettingBodyView.xib
  13. 12 10
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/Metronome/WidgetNavView.xib
  14. 12 10
      KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/TuningNavView.xib

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -52,7 +52,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "TEST"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -93,7 +93,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "TEST"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

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

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

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/beat_title.imageset/beat_title@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/beat_title.imageset/beat_title@3x.png


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

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

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/tuning_title.imageset/tuning_title@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/tuning_title.imageset/tuning_title@3x.png


+ 44 - 16
KulexiuForTeacher/KulexiuForTeacher/Common/Base/LoginManger/KSLoginManager.m

@@ -72,26 +72,54 @@
     if ([vc isKindOfClass:[UITabBarController class]]) {
         UITabBarController *tab = (UITabBarController *)[UIApplication sharedApplication].keyWindow.rootViewController;
         CustomNavViewController *ctrl = (CustomNavViewController *)tab.selectedViewController;
-        [ctrl popToRootViewControllerAnimated:NO];
-
-        LoginViewController *logonVC = [[LoginViewController alloc] init];
-        CustomNavViewController *navCtrl = [[CustomNavViewController alloc] initWithRootViewController:logonVC];
-        navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
-        [tab.selectedViewController presentViewController:navCtrl animated:YES completion:nil];
-        
-        // 切换到横屏
-        AppDelegate* delegate = [AppDelegate shareAppDelegate];
-        if (delegate.allowAutoRotate) {
-            delegate.allowAutoRotate = NO;
-            if (IS_IPAD) {
-                logonVC.zh_statusBarHidden = NO;
+        if (ctrl.presentedViewController) {
+            UIViewController *presentCtrl = ctrl.presentedViewController;
+            [presentCtrl dismissViewControllerAnimated:YES completion:^{
+                LoginViewController *logonVC = [[LoginViewController alloc] init];
+                CustomNavViewController *navCtrl = [[CustomNavViewController alloc] initWithRootViewController:logonVC];
+                [AppDelegate shareAppDelegate].window.rootViewController = navCtrl;
+                
+                // 切换到横屏
+                AppDelegate* delegate = [AppDelegate shareAppDelegate];
+                if (delegate.allowAutoRotate) {
+                    delegate.allowAutoRotate = NO;
+                    if (IS_IPAD) {
+                        logonVC.zh_statusBarHidden = NO;
+                    }
+                    [UIDevice switchNewOrientation:UIInterfaceOrientationPortrait inController:logonVC];
+                }
+            }];
+        }
+        else {
+            [ctrl popToRootViewControllerAnimated:NO];
+            [ctrl popToRootViewControllerAnimated:NO];
+            LoginViewController *logonVC = [[LoginViewController alloc] init];
+            CustomNavViewController *navCtrl = [[CustomNavViewController alloc] initWithRootViewController:logonVC];
+            [AppDelegate shareAppDelegate].window.rootViewController = navCtrl;
+            
+            // 切换到横屏
+            AppDelegate* delegate = [AppDelegate shareAppDelegate];
+            if (delegate.allowAutoRotate) {
+                delegate.allowAutoRotate = NO;
+                if (IS_IPAD) {
+                    logonVC.zh_statusBarHidden = NO;
+                }
+                [UIDevice switchNewOrientation:UIInterfaceOrientationPortrait inController:logonVC];
             }
-            [UIDevice switchNewOrientation:UIInterfaceOrientationPortrait inController:logonVC];
         }
     }
     else if ([vc isKindOfClass:NSClassFromString(@"CustomNavViewController")]) {
-        CustomNavViewController *ctrl = (CustomNavViewController *)vc;
-        [ctrl popToRootViewControllerAnimated:YES];
+        if (vc.presentedViewController) {
+            UIViewController *presentCtrl = vc.presentedViewController;
+            [presentCtrl dismissViewControllerAnimated:YES completion:^{
+                CustomNavViewController *ctrl = (CustomNavViewController *)vc;
+                [ctrl popToRootViewControllerAnimated:YES];
+            }];
+        }
+        else {
+            CustomNavViewController *ctrl = (CustomNavViewController *)vc;
+            [ctrl popToRootViewControllerAnimated:YES];
+        }
     }
 }
 

+ 0 - 3
KulexiuForTeacher/KulexiuForTeacher/Common/Base/WebView/KSBaseWKWebViewController.m

@@ -542,9 +542,6 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
                 [content setValue:status forKey:@"status"];
                 [sendParm setValue:content forKey:@"content"];
                 [self postMessage:sendParm];
-                if ([status isEqualToString:@"1"]) {
-                    [LOADING_MANAGER MBShowAUTOHidingInWindow:@"为了保证数据安全,请不要录屏"];
-                }
             });
         }
     }

+ 25 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/SettingViewController.m

@@ -133,10 +133,35 @@
             
         }
             break;
+        case SETTINGACTION_CLEARCACHE:
+        {
+            [self clearCache];
+        }
+            break;
         default:
             break;
     }
 }
+
+
+//
+
+- (void)clearCache {
+    NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
+    NSString *bundlePath = [documentsPath stringByAppendingPathComponent:@"CoursewarePath"];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    BOOL isExist = [fileManager fileExistsAtPath:bundlePath];
+    if (isExist) {
+        BOOL isSuccess =  [fileManager removeItemAtPath:bundlePath error:nil];
+        if (isSuccess) {
+            [LOADING_MANAGER MBShowAUTOHidingInWindow:@"清理完成"];
+        }
+    }
+    else {
+        [LOADING_MANAGER MBShowAUTOHidingInWindow:@"清理完成"];
+    }
+}
+
 /**
  
  

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/SettingBodyView.h

@@ -17,6 +17,7 @@ typedef NS_ENUM(NSInteger, SETTINGACTION) {
     SETTINGACTION_DELETEACCOUNT,  // 注销账号
     SETTINGACTION_MUSICCHECK,     // 曲谱审核
     SETTINGACTION_UNBIND,     // 解绑
+    SETTINGACTION_CLEARCACHE, // 清除缓存
 };
 
 typedef void(^SettingCallback)(SETTINGACTION type);

+ 56 - 5
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/SettingBodyView.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="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -15,7 +15,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bvI-vo-wNV">
-                    <rect key="frame" x="14" y="15" width="386" height="258"/>
+                    <rect key="frame" x="14" y="15" width="386" height="308"/>
                     <subviews>
                         <view tag="1007" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="66O-io-Yxa">
                             <rect key="frame" x="0.0" y="0.0" width="386" height="50"/>
@@ -239,10 +239,54 @@
                                 <outletCollection property="gestureRecognizers" destination="8vV-kI-Alx" appends="YES" id="R4p-Jg-oT7"/>
                             </connections>
                         </view>
+                        <view tag="1016" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6kz-VI-gdS">
+                            <rect key="frame" x="0.0" y="250" width="386" height="50"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="清除缓存" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="72F-YT-qhG">
+                                    <rect key="frame" x="12" y="15" width="75" height="20"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="75" id="8Ls-Kj-WA0"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                    <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jj8-KY-YXz">
+                                    <rect key="frame" x="11" y="0.0" width="366" height="1"/>
+                                    <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="mEM-7t-9m9"/>
+                                    </constraints>
+                                </view>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="setting_next" translatesAutoresizingMaskIntoConstraints="NO" id="ye0-qZ-q0o">
+                                    <rect key="frame" x="365" y="19.5" width="6" height="11"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="11" id="e4w-Qv-vL2"/>
+                                        <constraint firstAttribute="width" constant="6" id="pzE-Mi-TNk"/>
+                                    </constraints>
+                                </imageView>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstItem="72F-YT-qhG" firstAttribute="leading" secondItem="6kz-VI-gdS" secondAttribute="leading" constant="12" id="5UK-1N-N2h"/>
+                                <constraint firstAttribute="height" constant="50" id="Asc-2V-ZsW"/>
+                                <constraint firstAttribute="trailing" secondItem="ye0-qZ-q0o" secondAttribute="trailing" constant="15" id="KAu-lO-F44"/>
+                                <constraint firstItem="jj8-KY-YXz" firstAttribute="top" secondItem="6kz-VI-gdS" secondAttribute="top" id="ZvO-EO-era"/>
+                                <constraint firstItem="ye0-qZ-q0o" firstAttribute="centerY" secondItem="6kz-VI-gdS" secondAttribute="centerY" id="aOh-BS-IkM"/>
+                                <constraint firstAttribute="trailing" secondItem="jj8-KY-YXz" secondAttribute="trailing" constant="9" id="bVP-jJ-v3Y"/>
+                                <constraint firstItem="72F-YT-qhG" firstAttribute="centerY" secondItem="6kz-VI-gdS" secondAttribute="centerY" id="fuP-ja-JjN"/>
+                                <constraint firstItem="jj8-KY-YXz" firstAttribute="leading" secondItem="6kz-VI-gdS" secondAttribute="leading" constant="11" id="x1t-mo-Jcm"/>
+                            </constraints>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="AvS-kZ-8y1" appends="YES" id="OGE-bW-w6j"/>
+                            </connections>
+                        </view>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstItem="pDD-Rg-TN7" firstAttribute="leading" secondItem="bvI-vo-wNV" secondAttribute="leading" id="4co-Sv-71r"/>
+                        <constraint firstItem="6kz-VI-gdS" firstAttribute="top" secondItem="pDD-Rg-TN7" secondAttribute="bottom" id="5Um-sq-WFX"/>
                         <constraint firstAttribute="trailing" secondItem="l7Z-Gj-hWL" secondAttribute="trailing" id="7lq-jO-way"/>
                         <constraint firstAttribute="trailing" secondItem="fae-Ws-ND6" secondAttribute="trailing" id="9EJ-XW-BHg"/>
                         <constraint firstAttribute="trailing" secondItem="66O-io-Yxa" secondAttribute="trailing" id="Bu8-cb-AIo"/>
@@ -257,9 +301,11 @@
                         <constraint firstItem="l7Z-Gj-hWL" firstAttribute="leading" secondItem="bvI-vo-wNV" secondAttribute="leading" id="cfZ-dB-AYb"/>
                         <constraint firstItem="l7Z-Gj-hWL" firstAttribute="top" secondItem="IrL-hq-2eU" secondAttribute="bottom" id="due-IM-u9J"/>
                         <constraint firstAttribute="trailing" secondItem="l7Z-Gj-hWL" secondAttribute="trailing" id="l5Q-fq-1lq"/>
+                        <constraint firstItem="6kz-VI-gdS" firstAttribute="leading" secondItem="bvI-vo-wNV" secondAttribute="leading" id="nQ1-0R-hu9"/>
                         <constraint firstItem="66O-io-Yxa" firstAttribute="top" secondItem="bvI-vo-wNV" secondAttribute="top" id="rLL-bq-GJ9"/>
+                        <constraint firstAttribute="bottom" secondItem="6kz-VI-gdS" secondAttribute="bottom" constant="8" id="tAw-vx-PWj"/>
                         <constraint firstItem="fae-Ws-ND6" firstAttribute="leading" secondItem="bvI-vo-wNV" secondAttribute="leading" id="tpl-vX-6ey"/>
-                        <constraint firstAttribute="bottom" secondItem="pDD-Rg-TN7" secondAttribute="bottom" constant="8" id="xBU-Sm-kdr"/>
+                        <constraint firstAttribute="trailing" secondItem="6kz-VI-gdS" secondAttribute="trailing" id="zPp-e9-w9R"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -288,7 +334,7 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ati-b1-fi2">
-                    <rect key="frame" x="14" y="285" width="386" height="100"/>
+                    <rect key="frame" x="14" y="335" width="386" height="100"/>
                     <subviews>
                         <view tag="1013" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PIr-VF-ZVM">
                             <rect key="frame" x="0.0" y="0.0" width="386" height="50"/>
@@ -453,6 +499,11 @@
                 <action selector="tapAction:" destination="iN0-l3-epB" id="KhR-E1-CXV"/>
             </connections>
         </tapGestureRecognizer>
+        <tapGestureRecognizer id="AvS-kZ-8y1">
+            <connections>
+                <action selector="tapAction:" destination="iN0-l3-epB" id="NBg-oV-LqT"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="setting_next" width="6" height="11"/>

+ 12 - 10
KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/Metronome/WidgetNavView.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="32700.99.1234" 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="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -29,23 +29,24 @@
                                 <action selector="backAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="SpQ-th-fns"/>
                             </connections>
                         </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="节拍器" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yk0-dS-WZy">
-                            <rect key="frame" x="179" y="11" width="56" height="22"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="beat_title" translatesAutoresizingMaskIntoConstraints="NO" id="H5O-fk-BmU">
+                            <rect key="frame" x="180.5" y="13.5" width="53" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="URM-f7-zIL"/>
+                                <constraint firstAttribute="width" constant="53" id="ZS7-h5-RrE"/>
+                            </constraints>
+                        </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="yk0-dS-WZy" firstAttribute="centerX" secondItem="SUk-Ag-K6M" secondAttribute="centerX" id="0i1-EH-ueL"/>
                         <constraint firstItem="DDF-Ml-1qT" firstAttribute="centerY" secondItem="SUk-Ag-K6M" secondAttribute="centerY" id="9S9-KI-omf"/>
                         <constraint firstItem="yeM-eb-aeH" firstAttribute="leading" secondItem="SUk-Ag-K6M" secondAttribute="leading" id="MBb-cm-NxT"/>
-                        <constraint firstItem="yk0-dS-WZy" firstAttribute="centerY" secondItem="SUk-Ag-K6M" secondAttribute="centerY" id="MK3-Qc-twi"/>
                         <constraint firstItem="DDF-Ml-1qT" firstAttribute="leading" secondItem="SUk-Ag-K6M" secondAttribute="leading" constant="14" id="U6P-oC-62I"/>
                         <constraint firstAttribute="bottom" secondItem="yeM-eb-aeH" secondAttribute="bottom" id="VHC-dZ-gcV"/>
                         <constraint firstAttribute="height" constant="44" id="de5-7W-Mcn"/>
                         <constraint firstItem="yeM-eb-aeH" firstAttribute="top" secondItem="SUk-Ag-K6M" secondAttribute="top" id="gln-eQ-4h0"/>
+                        <constraint firstItem="H5O-fk-BmU" firstAttribute="centerX" secondItem="SUk-Ag-K6M" secondAttribute="centerX" id="hwS-9a-2S5"/>
+                        <constraint firstItem="H5O-fk-BmU" firstAttribute="centerY" secondItem="SUk-Ag-K6M" secondAttribute="centerY" id="wXA-cr-M2l"/>
                     </constraints>
                 </view>
             </subviews>
@@ -63,5 +64,6 @@
     </objects>
     <resources>
         <image name="back_black" width="12" height="20"/>
+        <image name="beat_title" width="53" height="17"/>
     </resources>
 </document>

+ 12 - 10
KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/TuningNavView.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="32700.99.1234" 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="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -29,12 +29,6 @@
                                 <action selector="backAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="O0M-F8-PQy"/>
                             </connections>
                         </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="调音器" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kAY-IQ-kPT">
-                            <rect key="frame" x="167" y="11" width="56" height="22"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tuning_setting" translatesAutoresizingMaskIntoConstraints="NO" id="YlL-14-R48">
                             <rect key="frame" x="344" y="10" width="24" height="24"/>
                         </imageView>
@@ -45,6 +39,13 @@
                                 <action selector="settingAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="10h-IE-KXJ"/>
                             </connections>
                         </button>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tuning_title" translatesAutoresizingMaskIntoConstraints="NO" id="s5i-PM-EcZ">
+                            <rect key="frame" x="168" y="13.666666666666664" width="54" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="54" id="Mh7-DE-lhX"/>
+                                <constraint firstAttribute="height" constant="17" id="OTD-Tf-ZlK"/>
+                            </constraints>
+                        </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
@@ -52,16 +53,16 @@
                         <constraint firstItem="pFx-8o-VCU" firstAttribute="leading" secondItem="XRC-8p-p4e" secondAttribute="leading" id="0la-07-HRD"/>
                         <constraint firstItem="BFU-Xz-2Xu" firstAttribute="top" secondItem="XRC-8p-p4e" secondAttribute="top" id="1ZM-4W-pkR"/>
                         <constraint firstAttribute="bottom" secondItem="BFU-Xz-2Xu" secondAttribute="bottom" id="MLk-Cq-pRw"/>
-                        <constraint firstItem="kAY-IQ-kPT" firstAttribute="centerX" secondItem="XRC-8p-p4e" secondAttribute="centerX" id="NyJ-R5-o14"/>
                         <constraint firstItem="BFU-Xz-2Xu" firstAttribute="leading" secondItem="YlL-14-R48" secondAttribute="leading" id="S7q-SJ-hjs"/>
+                        <constraint firstItem="s5i-PM-EcZ" firstAttribute="centerX" secondItem="XRC-8p-p4e" secondAttribute="centerX" id="Sd6-7T-9LB"/>
                         <constraint firstItem="YlL-14-R48" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="Zc8-0c-TcZ"/>
                         <constraint firstItem="EN2-WR-x5g" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="Zdd-20-X1y"/>
                         <constraint firstAttribute="height" constant="44" id="cm1-xm-D5Z"/>
                         <constraint firstAttribute="bottom" secondItem="pFx-8o-VCU" secondAttribute="bottom" id="dGQ-eq-OMp"/>
                         <constraint firstAttribute="trailing" secondItem="YlL-14-R48" secondAttribute="trailing" constant="22" id="jwl-X5-VvP"/>
+                        <constraint firstItem="s5i-PM-EcZ" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="n1Y-tb-R3z"/>
                         <constraint firstItem="EN2-WR-x5g" firstAttribute="leading" secondItem="XRC-8p-p4e" secondAttribute="leading" constant="14" id="p0O-O5-qtS"/>
                         <constraint firstItem="pFx-8o-VCU" firstAttribute="top" secondItem="XRC-8p-p4e" secondAttribute="top" id="u6y-gg-F2T"/>
-                        <constraint firstItem="kAY-IQ-kPT" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="wBj-40-9AW"/>
                     </constraints>
                 </view>
             </subviews>
@@ -80,5 +81,6 @@
     <resources>
         <image name="back_black" width="12" height="20"/>
         <image name="tuning_setting" width="24" height="24"/>
+        <image name="tuning_title" width="54" height="17"/>
     </resources>
 </document>