首页小工具

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/home_smallTool.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Module/Course/View/AccompanyCourseCell.xib

@@ -95,7 +95,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qQB-pf-JWg">
+                            <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="752" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qQB-pf-JWg">
                                 <rect key="frame" x="129" y="48" width="19" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="ST4-qt-b3I"/>

KulexiuForStudent/KulexiuForStudent/Module/Course/View/CourseForLiveCell.xib

@@ -95,7 +95,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2TM-qv-v7e">
+                            <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="752" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2TM-qv-v7e">
                                 <rect key="frame" x="80" y="53" width="30" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="lbN-u0-SFA"/>
@@ -213,7 +213,7 @@
     <resources>
         <image name="course_chat" width="19" height="18"/>
         <image name="course_time" width="16" height="16"/>
-        <image name="lesson_Live" width="47" height="51"/>
+        <image name="lesson_Live" width="56" height="56"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForStudent/KulexiuForStudent/Module/Course/View/VIPCourseCell.xib

@@ -95,7 +95,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0e3-fp-uAc">
+                            <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="752" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0e3-fp-uAc">
                                 <rect key="frame" x="129" y="48" width="19" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="jH6-a3-7S5"/>

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

@@ -149,7 +149,6 @@
 
 @property (nonatomic, assign) BOOL isCheck;
 
-
 @property (nonatomic, strong) HomeMessageModel *buttonModel;
 
 @property (nonatomic, strong) HomeDragButton *suspendButton;
@@ -1238,6 +1237,12 @@
             [self.navigationController pushViewController:ctrl animated:YES];
         }
             break;
+        case HOMENAV_TAG_SMALLTOOL: // 小工具
+        {
+            ToneTuningViewController *ctrl = [[ToneTuningViewController alloc] init];
+            [self.navigationController pushViewController:ctrl animated:YES];
+        }
+            break;
         default:
             break;
     }

KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/View/NotiferNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -37,20 +37,20 @@
                             </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="Mgr-dN-gvv">
-                            <rect key="frame" x="325" y="15" width="45" height="14"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                            <rect key="frame" x="316" y="13.5" width="56" height="17"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="byV-S5-B4F">
-                            <rect key="frame" x="325" y="0.0" width="69" height="44"/>
+                            <rect key="frame" x="316" y="0.0" width="78" height="44"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <connections>
                                 <action selector="clearAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="W2p-7R-Ipw"/>
                             </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="SoU-sN-Ahv">
-                            <rect key="frame" x="170" y="11" width="74" height="22"/>
+                            <rect key="frame" x="171.5" y="11" width="71.5" height="22"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -71,7 +71,7 @@
                         <constraint firstAttribute="height" constant="44" id="Nuj-AB-XNZ"/>
                         <constraint firstItem="SoU-sN-Ahv" firstAttribute="centerY" secondItem="84g-09-Gui" secondAttribute="centerY" id="Q5B-2o-dFA"/>
                         <constraint firstAttribute="trailing" secondItem="zOi-ek-4xE" secondAttribute="trailing" constant="20" id="WEG-ZZ-hEV"/>
-                        <constraint firstItem="zOi-ek-4xE" firstAttribute="leading" secondItem="Mgr-dN-gvv" secondAttribute="trailing" constant="4" id="miC-G4-rBh"/>
+                        <constraint firstItem="zOi-ek-4xE" firstAttribute="leading" secondItem="Mgr-dN-gvv" secondAttribute="trailing" constant="2" id="miC-G4-rBh"/>
                         <constraint firstItem="zOi-ek-4xE" firstAttribute="centerY" secondItem="84g-09-Gui" secondAttribute="centerY" id="oOd-1s-hwY"/>
                         <constraint firstItem="qaL-id-TnJ" firstAttribute="leading" secondItem="84g-09-Gui" secondAttribute="leading" id="vOB-8J-Nw7"/>
                     </constraints>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNav/HomeNavSearchView.h

@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 typedef NS_ENUM(NSInteger, HOMENAV_TAG) {
-    HOMENAV_TAG_SEARCH,      // 搜索
+    HOMENAV_TAG_SMALLTOOL,   // 小工具
     HOMENAV_TAG_MESSAGE,     // 消息
     HOMENAV_TAG_SCAN,        // 扫一扫
 };

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNav/HomeNavSearchView.m

@@ -40,7 +40,7 @@
 
 - (IBAction)searchAction:(id)sender {
     if (self.callback) {
-        self.callback(HOMENAV_TAG_SEARCH);
+        self.callback(HOMENAV_TAG_SMALLTOOL);
     }
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNav/HomeNavSearchView.xib

@@ -24,39 +24,6 @@
                                 <constraint firstAttribute="height" constant="35" id="LKm-hv-VhJ"/>
                             </constraints>
                         </imageView>
-                        <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ppo-1q-gi4">
-                            <rect key="frame" x="91" y="7" width="220" height="30"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_search" translatesAutoresizingMaskIntoConstraints="NO" id="13W-5h-GPV">
-                                    <rect key="frame" x="17" y="7" width="16" height="16"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="16" id="eMW-9v-Vsn"/>
-                                        <constraint firstAttribute="height" constant="16" id="pTU-Ek-vmG"/>
-                                    </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="ulN-Yy-Ry7">
-                                    <rect key="frame" x="49" y="7.5" width="95.5" height="15"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                    <color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                            <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <gestureRecognizers/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="30" id="7GW-0L-tNH"/>
-                                <constraint firstItem="13W-5h-GPV" firstAttribute="leading" secondItem="Ppo-1q-gi4" secondAttribute="leading" constant="17" id="9CM-jJ-mQG"/>
-                                <constraint firstItem="ulN-Yy-Ry7" firstAttribute="leading" secondItem="13W-5h-GPV" secondAttribute="trailing" constant="16" id="E6M-nx-D3S"/>
-                                <constraint firstItem="ulN-Yy-Ry7" firstAttribute="centerY" secondItem="13W-5h-GPV" secondAttribute="centerY" id="um3-UC-4yI"/>
-                                <constraint firstItem="13W-5h-GPV" firstAttribute="centerY" secondItem="Ppo-1q-gi4" secondAttribute="centerY" id="x8W-fN-uTW"/>
-                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ulN-Yy-Ry7" secondAttribute="trailing" constant="12" id="y5c-Qu-ywk"/>
-                            </constraints>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="15"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
-                        </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zhb-6r-b1M">
                             <rect key="frame" x="368" y="2" width="40" height="40"/>
                             <constraints>
@@ -109,6 +76,18 @@
                                 <action selector="scanAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="bLx-hp-jSo"/>
                             </connections>
                         </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t8x-4G-SI0">
+                            <rect key="frame" x="288" y="2" width="40" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="40" id="Nsk-ve-RIE"/>
+                                <constraint firstAttribute="height" constant="40" id="oBJ-oM-6PC"/>
+                            </constraints>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" image="home_smallTool"/>
+                            <connections>
+                                <action selector="searchAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="pdz-4w-Uz5"/>
+                            </connections>
+                        </button>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
@@ -116,14 +95,13 @@
                         <constraint firstItem="gIj-iP-RBu" firstAttribute="centerY" secondItem="XI3-oD-W6a" secondAttribute="centerY" id="5vS-LT-rE3"/>
                         <constraint firstItem="nBF-8h-DYQ" firstAttribute="top" secondItem="Zhb-6r-b1M" secondAttribute="top" constant="8" id="Bhp-LF-mpH"/>
                         <constraint firstAttribute="trailing" secondItem="Zhb-6r-b1M" secondAttribute="trailing" constant="6" id="IJS-Bm-9SX"/>
+                        <constraint firstItem="A0l-AI-PtC" firstAttribute="leading" secondItem="t8x-4G-SI0" secondAttribute="trailing" id="IXY-vl-sfd"/>
                         <constraint firstItem="Zhb-6r-b1M" firstAttribute="leading" secondItem="A0l-AI-PtC" secondAttribute="trailing" id="RQs-JZ-2ue"/>
+                        <constraint firstItem="A0l-AI-PtC" firstAttribute="centerY" secondItem="t8x-4G-SI0" secondAttribute="centerY" id="Xkp-qn-dSH"/>
                         <constraint firstAttribute="height" constant="44" id="Z8r-HU-xiE"/>
-                        <constraint firstItem="Ppo-1q-gi4" firstAttribute="leading" secondItem="gIj-iP-RBu" secondAttribute="trailing" constant="17" id="cfC-Id-hMF"/>
                         <constraint firstItem="Zhb-6r-b1M" firstAttribute="centerY" secondItem="XI3-oD-W6a" secondAttribute="centerY" id="fIO-9N-PEj"/>
-                        <constraint firstItem="A0l-AI-PtC" firstAttribute="leading" secondItem="Ppo-1q-gi4" secondAttribute="trailing" constant="17" id="hcE-Ab-cDk"/>
                         <constraint firstItem="A0l-AI-PtC" firstAttribute="centerY" secondItem="XI3-oD-W6a" secondAttribute="centerY" id="jLY-31-Anz"/>
                         <constraint firstItem="gIj-iP-RBu" firstAttribute="leading" secondItem="XI3-oD-W6a" secondAttribute="leading" constant="15" id="wpR-mb-itd"/>
-                        <constraint firstItem="A0l-AI-PtC" firstAttribute="centerY" secondItem="Ppo-1q-gi4" secondAttribute="centerY" id="xaz-h8-Ir1"/>
                     </constraints>
                 </view>
                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fSS-ji-8gy">
@@ -152,13 +130,12 @@
             </connections>
             <point key="canvasLocation" x="128.98550724637681" y="-172.43303571428569"/>
         </view>
-        <tapGestureRecognizer id="1L4-Pr-sIj"/>
     </objects>
     <resources>
         <image name="home_icon" width="59" height="35"/>
         <image name="home_message" width="23" height="23"/>
         <image name="home_scan" width="22" height="22"/>
-        <image name="home_search" width="16" height="16"/>
+        <image name="home_smallTool" width="22" height="22"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForStudent/KulexiuForStudent/Module/Mine/Controller/MineViewController.m

@@ -418,8 +418,9 @@
     }
     else {
         self.navView.lineView.hidden = YES;
-        CGFloat rate = space / kNaviBarHeight < 0 ? 0 : space / kNaviBarHeight;
-        self.navView.backgroundColor = HexRGBAlpha(0xffffff, rate);
+        self.navView.backgroundColor = [UIColor clearColor];
+//        CGFloat rate = space / kNaviBarHeight < 0 ? 0 : space / kNaviBarHeight;
+//        self.navView.backgroundColor = HexRGBAlpha(0xffffff, rate);
     }
 }