上传头像裁剪

KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -359,15 +359,63 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "CF01C9DB-69D3-403A-A67C-C93FA1CF2E4F"
+            uuid = "6AA351E3-A09F-4E07-A0C2-D5F6CE187CAE"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "417"
+            endingLineNumber = "417"
+            landmarkName = "-loadMIDIFileWithString:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "FCB14E61-608A-420C-8647-6FA260784A4F"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "678"
+            endingLineNumber = "678"
+            landmarkName = "-downloadMidiFile:success:faliure:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "FBA3868A-F678-432B-BABC-3F4821780F32"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "683"
+            endingLineNumber = "683"
+            landmarkName = "-downloadMidiFile:success:faliure:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "801AD973-7CD2-4005-847D-93636AD9E373"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "466"
-            endingLineNumber = "466"
+            startingLineNumber = "608"
+            endingLineNumber = "608"
             landmarkName = "-userContentController:didReceiveScriptMessage:"
             landmarkType = "7">
          </BreakpointContent>
@@ -375,48 +423,64 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "A42FEBAA-470F-4727-B0BA-60E636EF9574"
+            uuid = "75F943DB-9C2C-4A70-8678-630CCCC6C23F"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "612"
-            endingLineNumber = "612"
-            landmarkName = "-getTrackNumerFromName:"
+            startingLineNumber = "509"
+            endingLineNumber = "509"
+            landmarkName = "-iterate:TrackIndex:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "2FBC833B-DBFD-4A74-9D33-23A51A99793F"
+            uuid = "F8ECF62E-182B-4379-9A43-978F9DA94F6A"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
+            filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "599"
-            endingLineNumber = "599"
-            landmarkName = "-getSingleTrackNumByName:"
+            startingLineNumber = "529"
+            endingLineNumber = "529"
+            landmarkName = "-userContentController:didReceiveScriptMessage:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "AA5D573A-E0C7-44B8-A12B-94C8C02ADD0E"
+            uuid = "66C13A0E-B41B-4E37-8773-05C2C6EFDB6F"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "509"
-            endingLineNumber = "509"
-            landmarkName = "-iterate:TrackIndex:"
+            startingLineNumber = "720"
+            endingLineNumber = "720"
+            landmarkName = "-setMusicPlayerSpeed:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2A702666-CB57-4C17-85D4-CD5101A45F89"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "629"
+            endingLineNumber = "629"
+            landmarkName = "-userContentController:didReceiveScriptMessage:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

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

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

KulexiuForStudent/KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m

@@ -604,6 +604,7 @@
                          ]
                      }
                  */
+                NSLog(@"-cloudVolume -----%@",parm);
                 NSDictionary *content = [parm dictionaryValueForKey:@"content"];
                 for (NSDictionary *dic in [content arrayValueForKey:@"parts"]) {
                    NSInteger trackId = [self.playerEngine getSingleTrackNumByName:[dic stringValueForKey:@"name"]];

KulexiuForStudent/KulexiuForStudent/Common/Define/PrefixHeader.pch

@@ -117,24 +117,24 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/student")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (YES)
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/student")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (YES)
 
 
 //#else
 
-//#define hostURL (@"https://online.colexiu.com")
-//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://online.colexiu.com/student")
-//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"e5t4ouvpe42pa")
-//#define SUBMIT_UUID (YES)
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/student")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
 
 
 //#endif

KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatAddressHeaderView.xib

@@ -14,7 +14,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2e1-g7-DgM">
-                    <rect key="frame" x="14" y="18" width="439" height="35"/>
+                    <rect key="frame" x="14" y="17" width="439" height="35"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UZE-Fv-T2y">
                             <rect key="frame" x="0.0" y="0.0" width="216" height="35"/>
@@ -113,34 +113,34 @@
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KhN-lD-vcC">
-                    <rect key="frame" x="14" y="65" width="439" height="35"/>
+                    <rect key="frame" x="14" y="64" width="439" height="36"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="search_green" translatesAutoresizingMaskIntoConstraints="NO" id="8Ix-cN-Qnc">
-                            <rect key="frame" x="12" y="10" width="15" height="15"/>
+                            <rect key="frame" x="12" y="10.5" width="15" height="15"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="15" id="8A1-RN-dZ0"/>
                                 <constraint firstAttribute="height" constant="15" id="Ryq-hL-Hj7"/>
                             </constraints>
                         </imageView>
                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入群聊/老师名称" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ud0-St-B7w">
-                            <rect key="frame" x="38" y="0.0" width="324" height="35"/>
+                            <rect key="frame" x="38" y="0.0" width="331" height="36"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pVF-V1-s8f">
-                            <rect key="frame" x="372" y="4" width="56" height="27"/>
+                            <rect key="frame" x="379" y="4" width="56" height="28"/>
                             <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="56" id="0Yj-XR-Ors"/>
-                                <constraint firstAttribute="height" constant="27" id="g7h-sH-BIb"/>
+                                <constraint firstAttribute="height" constant="28" id="g7h-sH-BIb"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="搜索"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="13.5"/>
+                                    <real key="value" value="14"/>
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </button>
@@ -149,10 +149,10 @@
                     <constraints>
                         <constraint firstItem="Ud0-St-B7w" firstAttribute="leading" secondItem="8Ix-cN-Qnc" secondAttribute="trailing" constant="11" id="19I-Qa-Ids"/>
                         <constraint firstItem="Ud0-St-B7w" firstAttribute="top" secondItem="KhN-lD-vcC" secondAttribute="top" id="4EH-1U-Mbr"/>
-                        <constraint firstAttribute="trailing" secondItem="pVF-V1-s8f" secondAttribute="trailing" constant="11" id="KXH-NN-ULL"/>
+                        <constraint firstAttribute="trailing" secondItem="pVF-V1-s8f" secondAttribute="trailing" constant="4" id="KXH-NN-ULL"/>
                         <constraint firstItem="8Ix-cN-Qnc" firstAttribute="centerY" secondItem="KhN-lD-vcC" secondAttribute="centerY" id="Rae-R6-bAB"/>
                         <constraint firstAttribute="bottom" secondItem="Ud0-St-B7w" secondAttribute="bottom" id="U4Q-T0-AP1"/>
-                        <constraint firstAttribute="height" constant="35" id="VNE-zv-tx0"/>
+                        <constraint firstAttribute="height" constant="36" id="VNE-zv-tx0"/>
                         <constraint firstItem="pVF-V1-s8f" firstAttribute="leading" secondItem="Ud0-St-B7w" secondAttribute="trailing" constant="10" id="b2h-HJ-cfT"/>
                         <constraint firstItem="8Ix-cN-Qnc" firstAttribute="leading" secondItem="KhN-lD-vcC" secondAttribute="leading" constant="12" id="efb-gy-ndo"/>
                         <constraint firstItem="pVF-V1-s8f" firstAttribute="centerY" secondItem="KhN-lD-vcC" secondAttribute="centerY" id="fLd-LA-27D"/>

KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" 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="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

KulexiuForStudent/KulexiuForStudent/Module/Chat/View/KSChatListSearchView.xib

@@ -14,26 +14,26 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kx9-xj-kfl">
-                    <rect key="frame" x="14" y="30" width="386" height="35"/>
+                    <rect key="frame" x="14" y="29.5" width="386" height="36"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="search_green" translatesAutoresizingMaskIntoConstraints="NO" id="BoO-sd-jlY">
-                            <rect key="frame" x="12" y="10" width="15" height="15"/>
+                            <rect key="frame" x="12" y="10.5" width="15" height="15"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="15" id="Dql-bG-Ufd"/>
                                 <constraint firstAttribute="height" constant="15" id="MAI-oj-HQ7"/>
                             </constraints>
                         </imageView>
                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="查找聊天记录" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s9n-ZY-b4Y">
-                            <rect key="frame" x="38" y="0.0" width="271" height="35"/>
+                            <rect key="frame" x="38" y="0.0" width="274" height="36"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="va7-49-aYd">
-                            <rect key="frame" x="319" y="4" width="56" height="27"/>
+                            <rect key="frame" x="322" y="4" width="56" height="28"/>
                             <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="27" id="RD8-Dh-zm8"/>
+                                <constraint firstAttribute="height" constant="28" id="RD8-Dh-zm8"/>
                                 <constraint firstAttribute="width" constant="56" id="Y6A-KX-C1s"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
@@ -51,7 +51,7 @@
                     </subviews>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="35" id="FsK-2F-MNw"/>
+                        <constraint firstAttribute="height" constant="36" id="FsK-2F-MNw"/>
                         <constraint firstItem="s9n-ZY-b4Y" firstAttribute="leading" secondItem="BoO-sd-jlY" secondAttribute="trailing" constant="11" id="Pf8-lw-u40"/>
                         <constraint firstItem="va7-49-aYd" firstAttribute="centerY" secondItem="Kx9-xj-kfl" secondAttribute="centerY" id="Ph1-VY-Ex0"/>
                         <constraint firstItem="va7-49-aYd" firstAttribute="leading" secondItem="s9n-ZY-b4Y" secondAttribute="trailing" constant="10" id="RtE-vh-9R8"/>
@@ -59,11 +59,11 @@
                         <constraint firstItem="BoO-sd-jlY" firstAttribute="leading" secondItem="Kx9-xj-kfl" secondAttribute="leading" constant="12" id="jlr-KB-WGx"/>
                         <constraint firstAttribute="bottom" secondItem="s9n-ZY-b4Y" secondAttribute="bottom" id="nE7-ME-kcc"/>
                         <constraint firstItem="BoO-sd-jlY" firstAttribute="centerY" secondItem="Kx9-xj-kfl" secondAttribute="centerY" id="ttB-3o-wap"/>
-                        <constraint firstAttribute="trailing" secondItem="va7-49-aYd" secondAttribute="trailing" constant="11" id="zow-Ud-FXd"/>
+                        <constraint firstAttribute="trailing" secondItem="va7-49-aYd" secondAttribute="trailing" constant="8" id="zow-Ud-FXd"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="17.5"/>
+                            <real key="value" value="18"/>
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>

KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ShareLiveCellContentView.xib

@@ -116,7 +116,7 @@
                             <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="zel-fE-reB">
-                            <rect key="frame" x="91.5" y="118.5" width="77" height="21"/>
+                            <rect key="frame" x="91.5" y="126.5" width="77" height="21"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="21" id="fw0-Ob-WCC"/>
                             </constraints>
@@ -144,7 +144,7 @@
                         <constraint firstAttribute="width" constant="260" id="DcA-h7-TGL"/>
                         <constraint firstAttribute="trailing" secondItem="mG8-MH-eZ7" secondAttribute="trailing" constant="12" id="KHL-Xm-Tlh"/>
                         <constraint firstItem="uCK-Sj-epF" firstAttribute="top" secondItem="mG8-MH-eZ7" secondAttribute="bottom" constant="10" id="M2i-uI-GPi"/>
-                        <constraint firstItem="zel-fE-reB" firstAttribute="top" secondItem="uCK-Sj-epF" secondAttribute="bottom" constant="7" id="NeP-Gr-HjR"/>
+                        <constraint firstItem="zel-fE-reB" firstAttribute="top" secondItem="uCK-Sj-epF" secondAttribute="bottom" constant="15" id="NeP-Gr-HjR"/>
                         <constraint firstItem="i7L-q9-DkS" firstAttribute="leading" secondItem="yd2-ur-hRq" secondAttribute="leading" constant="14" id="Otc-aM-Gy0"/>
                         <constraint firstItem="nVS-My-ja2" firstAttribute="centerY" secondItem="i7L-q9-DkS" secondAttribute="bottom" id="OwT-5v-Cex"/>
                         <constraint firstItem="q2Q-aP-HCM" firstAttribute="leading" secondItem="lRu-JH-qsz" secondAttribute="leading" id="QD0-ob-6k3"/>

KulexiuForStudent/KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m

@@ -595,7 +595,7 @@
 
 /* 根据轨道名称获取单个轨道的编号*/
 - (NSInteger)getSingleTrackNumByName:(NSString *)trackName {
-    
+    NSLog(@"track name ----%@",self.instrumentTrackNameArray);
     for (NSInteger i = 0; i < self.instrumentTrackNameArray.count; i++) {
         NSString *instrumentTrackName = self.instrumentTrackNameArray[i];
         if ([trackName isEqualToString:instrumentTrackName]) {
@@ -608,7 +608,7 @@
 /* 通过轨道名称获取对应的轨道*/
 - (NSMutableArray *)getTrackNumerFromName:(NSArray *)trackNameArray {
     NSMutableArray *trackArray = [NSMutableArray array];
-    NSLog(@"%@",self.instrumentTrackNameArray);
+    NSLog(@"track name ----%@",self.instrumentTrackNameArray);
     for (NSString *name in trackNameArray) {
         for (NSInteger i = 0; i < self.instrumentTrackNameArray.count; i++) {
             NSString *instrumentTrackName = self.instrumentTrackNameArray[i];
@@ -732,8 +732,13 @@
     MusicTimeStamp currentStamp;
     CheckError(MusicSequenceGetBeatsForSeconds(self.musicSequence, self.currentTime, &currentStamp), "MusicSequenceGetBeatsForSeconds_SetCurrentStamp");
     CheckError(MusicPlayerSetTime(self.musicPlayer, currentStamp), "MusicPlayerSetTime_SetZero");
-    
-    [self stopPlayingMIDIFile];
+//    if (self.playing) {
+//        [self stopPlayingMIDIFile];
+//        [self playMIDIFile];
+//    }
+//    else {
+//        [self stopPlayingMIDIFile];
+//    }
 }
 
 - (void)setProgressTime:(MusicTimeStamp)startTime {
@@ -744,7 +749,13 @@
     MusicTimeStamp currentStamp;
     CheckError(MusicSequenceGetBeatsForSeconds(self.musicSequence, self.currentTime, &currentStamp), "MusicSequenceGetBeatsForSeconds_SetCurrentStamp");
     CheckError(MusicPlayerSetTime(self.musicPlayer, currentStamp), "MusicPlayerSetTime_SetZero");
-    [self stopPlayingMIDIFile];
+//    if (self.playing) {
+//        [self stopPlayingMIDIFile];
+//        [self playMIDIFile];
+//    }
+//    else {
+//        [self stopPlayingMIDIFile];
+//    }
 }
 
 - (void)muteWithInstrument:(UInt8)instrument {

KulexiuForStudent/KulexiuForStudent/Module/Course/View/CourseNavView.xib

@@ -13,7 +13,7 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="96"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_shade" translatesAutoresizingMaskIntoConstraints="NO" id="2Mn-lH-wbE">
+                <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_shade" translatesAutoresizingMaskIntoConstraints="NO" id="2Mn-lH-wbE">
                     <rect key="frame" x="0.0" y="0.0" width="414" height="96"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="39y-6W-6HN">
@@ -50,7 +50,7 @@
                     </connections>
                 </button>
             </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="2Mn-lH-wbE" secondAttribute="trailing" id="0Gu-Hc-JCq"/>
                 <constraint firstAttribute="trailing" secondItem="39y-6W-6HN" secondAttribute="trailing" id="0Sc-7V-pPL"/>

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

@@ -1350,7 +1350,7 @@
         _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
         _tableView.delegate = self;
         _tableView.dataSource = self;
-        _tableView.rowHeight = 108;
+        _tableView.rowHeight = 90;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.backgroundColor = [UIColor clearColor];
         _tableView.showsVerticalScrollIndicator = NO;

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeHotAlbumCell.m

@@ -27,10 +27,7 @@
 - (void)configWithAlbumModel:(HomeAlbumModel *)model {
     [self.albumImage sd_setImageWithURL:[NSURL URLWithString:[model.albumCoverUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     self.albumNameLabel.text = [NSString returnNoNullStringWithString:model.albumName];
-    NSString *collectString = [NSString stringWithFormat:@"%zd人收藏",model.albumFavoriteCount];
-    NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:collectString attributes:@{NSForegroundColorAttributeName:HexRGB(0x63ffe1),NSFontAttributeName:[UIFont systemFontOfSize:11.0f weight:UIFontWeightMedium]}];
-    [attr addAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]} range:[collectString rangeOfString:@"人收藏"]];
-    self.collectLabel.attributedText = attr;
+    self.collectLabel.text = [NSString stringWithFormat:@"%zd人",model.albumFavoriteCount];
 }
 
 @end

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeHotAlbumCell.xib

@@ -39,24 +39,41 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xPp-Kr-NCd">
-                        <rect key="frame" x="15" y="76" width="70" height="20"/>
+                        <rect key="frame" x="7" y="85" width="49.5" height="16"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="365人收藏" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HyK-tc-JYn">
-                                <rect key="frame" x="7" y="2" width="56" height="16"/>
+                            <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HC6-WO-Sxq">
+                                <rect key="frame" x="0.0" y="0.0" width="49.5" height="16"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ulS-vz-oeq">
+                                    <rect key="frame" x="0.0" y="0.0" width="49.5" height="16"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                </view>
+                                <blurEffect style="light"/>
+                            </visualEffectView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="365人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HyK-tc-JYn">
+                                <rect key="frame" x="15" y="3" width="27.5" height="9"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="16" id="QTs-RA-B2w"/>
+                                    <constraint firstAttribute="height" constant="9" id="QTs-RA-B2w"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="9"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="album_collect" translatesAutoresizingMaskIntoConstraints="NO" id="2m8-Or-9p5">
+                                <rect key="frame" x="3" y="4" width="8" height="8"/>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" red="0.2627450980392157" green="0.2627450980392157" blue="0.2627450980392157" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="HyK-tc-JYn" secondAttribute="trailing" constant="7" id="4Qh-GF-qUt"/>
-                            <constraint firstItem="HyK-tc-JYn" firstAttribute="top" secondItem="xPp-Kr-NCd" secondAttribute="top" constant="2" id="KDW-ks-TaU"/>
-                            <constraint firstItem="HyK-tc-JYn" firstAttribute="leading" secondItem="xPp-Kr-NCd" secondAttribute="leading" constant="7" id="oZX-c6-fga"/>
-                            <constraint firstAttribute="bottom" secondItem="HyK-tc-JYn" secondAttribute="bottom" constant="2" id="vLb-NQ-3ma"/>
+                            <constraint firstItem="2m8-Or-9p5" firstAttribute="leading" secondItem="xPp-Kr-NCd" secondAttribute="leading" constant="3" id="Bu0-hi-f51"/>
+                            <constraint firstItem="HyK-tc-JYn" firstAttribute="top" secondItem="xPp-Kr-NCd" secondAttribute="top" constant="3" id="KDW-ks-TaU"/>
+                            <constraint firstItem="HC6-WO-Sxq" firstAttribute="top" secondItem="xPp-Kr-NCd" secondAttribute="top" id="RqC-F1-1w0"/>
+                            <constraint firstItem="HyK-tc-JYn" firstAttribute="leading" secondItem="2m8-Or-9p5" secondAttribute="trailing" constant="4" id="YMi-j3-qq5"/>
+                            <constraint firstAttribute="bottom" secondItem="HC6-WO-Sxq" secondAttribute="bottom" id="cJY-mq-a6F"/>
+                            <constraint firstItem="HC6-WO-Sxq" firstAttribute="leading" secondItem="xPp-Kr-NCd" secondAttribute="leading" id="nmh-3Y-GZd"/>
+                            <constraint firstAttribute="trailing" secondItem="HC6-WO-Sxq" secondAttribute="trailing" id="qAV-RM-m9Z"/>
+                            <constraint firstItem="2m8-Or-9p5" firstAttribute="centerY" secondItem="xPp-Kr-NCd" secondAttribute="centerY" id="tae-j5-XEr"/>
+                            <constraint firstAttribute="bottom" secondItem="HyK-tc-JYn" secondAttribute="bottom" constant="4" id="vLb-NQ-3ma"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -71,10 +88,10 @@
                 <constraint firstItem="1bh-Zm-ov0" firstAttribute="top" secondItem="mkp-8k-Rld" secondAttribute="bottom" constant="10" id="8Ah-sJ-mEm"/>
                 <constraint firstItem="mkp-8k-Rld" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="Oca-f5-sam"/>
                 <constraint firstItem="mkp-8k-Rld" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="XeE-bJ-DC9"/>
-                <constraint firstItem="xPp-Kr-NCd" firstAttribute="centerX" secondItem="mkp-8k-Rld" secondAttribute="centerX" id="Z55-XZ-bW6"/>
                 <constraint firstItem="1bh-Zm-ov0" firstAttribute="trailing" secondItem="mkp-8k-Rld" secondAttribute="trailing" id="pJb-VN-R1q"/>
                 <constraint firstItem="1bh-Zm-ov0" firstAttribute="leading" secondItem="mkp-8k-Rld" secondAttribute="leading" id="swt-MU-p2E"/>
-                <constraint firstItem="xPp-Kr-NCd" firstAttribute="bottom" secondItem="mkp-8k-Rld" secondAttribute="bottom" constant="-8" id="vEg-aT-hU0"/>
+                <constraint firstItem="xPp-Kr-NCd" firstAttribute="bottom" secondItem="mkp-8k-Rld" secondAttribute="bottom" constant="-3" id="vEg-aT-hU0"/>
+                <constraint firstItem="xPp-Kr-NCd" firstAttribute="leading" secondItem="mkp-8k-Rld" secondAttribute="leading" constant="4" id="vpm-MK-zFL"/>
             </constraints>
             <size key="customSize" width="121" height="142"/>
             <connections>
@@ -86,6 +103,7 @@
         </collectionViewCell>
     </objects>
     <resources>
+        <image name="album_collect" width="8" height="8"/>
         <image name="video_placeholder" width="103" height="72"/>
     </resources>
 </document>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeInformationCell.m

@@ -32,28 +32,28 @@
     self.timeLabel.text = [model.createTime dateFormatString];
     [self.messageImage sd_setImageWithURL:[NSURL URLWithString:[model.coverImage getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     if (rowIndex == ROWINDEX_TOP) {
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 108) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 90) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
         maskLayer.frame = self.backView.bounds;
         maskLayer.path = maskPath.CGPath;
         self.backView.layer.mask = maskLayer;
     }
     else if (rowIndex == ROWINDEX_BOTTOM) {
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 108) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(8, 8)];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 90) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(8, 8)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
         maskLayer.frame = self.backView.bounds;
         maskLayer.path = maskPath.CGPath;
         self.backView.layer.mask = maskLayer;
     }
     else if (rowIndex == ROWINDEX_TOP_BOTTOM) {
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 108) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight|UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(8, 8)];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 90) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight|UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(8, 8)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
         maskLayer.frame = self.backView.bounds;
         maskLayer.path = maskPath.CGPath;
         self.backView.layer.mask = maskLayer;
     }
     else {
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 108) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(0, 0)];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, kScreenWidth - 28, 90) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(0, 0)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
         maskLayer.frame = self.backView.bounds;
         maskLayer.path = maskPath.CGPath;

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeInformationCell.xib

@@ -12,17 +12,17 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="HomeInformationCell">
-            <rect key="frame" x="0.0" y="0.0" width="442" height="108"/>
+            <rect key="frame" x="0.0" y="0.0" width="442" height="90"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="442" height="108"/>
+                <rect key="frame" x="0.0" y="0.0" width="442" height="90"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mV5-EQ-8aL">
-                        <rect key="frame" x="14" y="0.0" width="414" height="108"/>
+                        <rect key="frame" x="14" y="0.0" width="414" height="90"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="video_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="Z8V-5d-ftb">
-                                <rect key="frame" x="8" y="18" width="104" height="72"/>
+                                <rect key="frame" x="10" y="9" width="104" height="72"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="72" id="Ixx-fI-7pn"/>
                                     <constraint firstAttribute="width" constant="104" id="h7s-KS-fQD"/>
@@ -34,13 +34,13 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2月28日 19:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7QX-lI-BO2">
-                                <rect key="frame" x="123" y="75" width="76" height="14"/>
+                                <rect key="frame" x="125" y="66" width="76" height="14"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="音乐中考究竟是什么？多地真题盘点一起看！" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vYy-zu-7s3">
-                                <rect key="frame" x="123" y="19" width="277" height="33.5"/>
+                                <rect key="frame" x="125" y="10" width="275" height="33.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -50,7 +50,7 @@
                         <constraints>
                             <constraint firstItem="Z8V-5d-ftb" firstAttribute="centerY" secondItem="mV5-EQ-8aL" secondAttribute="centerY" id="65T-Vc-Xyh"/>
                             <constraint firstAttribute="trailing" secondItem="vYy-zu-7s3" secondAttribute="trailing" constant="14" id="7U3-xg-AYH"/>
-                            <constraint firstItem="Z8V-5d-ftb" firstAttribute="leading" secondItem="mV5-EQ-8aL" secondAttribute="leading" constant="8" id="AkI-85-N17"/>
+                            <constraint firstItem="Z8V-5d-ftb" firstAttribute="leading" secondItem="mV5-EQ-8aL" secondAttribute="leading" constant="10" id="AkI-85-N17"/>
                             <constraint firstItem="vYy-zu-7s3" firstAttribute="leading" secondItem="Z8V-5d-ftb" secondAttribute="trailing" constant="11" id="R3E-jc-iaM"/>
                             <constraint firstItem="vYy-zu-7s3" firstAttribute="top" secondItem="Z8V-5d-ftb" secondAttribute="top" constant="1" id="kdL-xJ-5iv"/>
                             <constraint firstItem="7QX-lI-BO2" firstAttribute="bottom" secondItem="Z8V-5d-ftb" secondAttribute="bottom" constant="-1" id="nvO-fK-ikj"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeLiveCouseCell.xib

@@ -148,7 +148,7 @@
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="8"/>
+                                <real key="value" value="14"/>
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </view>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeVideoCourseCell.xib

@@ -11,18 +11,18 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="151" id="KGk-i7-Jjw" customClass="HomeVideoCourseCell">
-            <rect key="frame" x="0.0" y="0.0" width="391" height="151"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="126" id="KGk-i7-Jjw" customClass="HomeVideoCourseCell">
+            <rect key="frame" x="0.0" y="0.0" width="391" height="126"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="391" height="151"/>
+                <rect key="frame" x="0.0" y="0.0" width="391" height="126"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hwe-zX-Dr8">
-                        <rect key="frame" x="14" y="0.0" width="363" height="141"/>
+                        <rect key="frame" x="14" y="0.0" width="363" height="116"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="video_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="knq-4v-R8V">
-                                <rect key="frame" x="10" y="22.5" width="170" height="96"/>
+                                <rect key="frame" x="10" y="10" width="170" height="96"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="170" id="HYT-fy-cHB"/>
                                     <constraint firstAttribute="height" constant="96" id="NoQ-gx-obg"/>
@@ -34,7 +34,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XBM-bX-gza">
-                                <rect key="frame" x="18" y="28.5" width="24.5" height="13"/>
+                                <rect key="frame" x="18" y="16" width="24.5" height="13"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hXc-Gf-sP3">
                                         <rect key="frame" x="3" y="0.0" width="18.5" height="13"/>
@@ -60,7 +60,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单簧管基础入门单曲练习" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p1L-Tc-1eC">
-                                <rect key="frame" x="188" y="26.5" width="165" height="20"/>
+                                <rect key="frame" x="188" y="14" width="165" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="cVG-cS-SxM"/>
                                 </constraints>
@@ -69,7 +69,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥299" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JR5-GO-mSN">
-                                <rect key="frame" x="188" y="91.5" width="37" height="22"/>
+                                <rect key="frame" x="188" y="79" width="37" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="wdy-nF-fYp"/>
                                 </constraints>
@@ -78,13 +78,13 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wLP-Ow-uiD">
-                                <rect key="frame" x="308.5" y="95" width="44.5" height="15"/>
+                                <rect key="frame" x="308.5" y="82.5" width="44.5" height="15"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="cqj-eK-gnE">
-                                <rect key="frame" x="188" y="51.5" width="18" height="18"/>
+                                <rect key="frame" x="188" y="39" width="18" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="18" id="0Vr-BO-kpU"/>
                                     <constraint firstAttribute="height" constant="18" id="tmu-do-ohi"/>
@@ -96,7 +96,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="李云磊" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KYe-PG-V9i">
-                                <rect key="frame" x="210" y="53.5" width="143" height="14.5"/>
+                                <rect key="frame" x="210" y="41" width="143" height="14.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.41568627450000001" green="0.41568627450000001" blue="0.41568627450000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -124,7 +124,7 @@
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="8"/>
+                                <real key="value" value="14"/>
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </view>

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/ModifyNameViewController.m

@@ -30,7 +30,9 @@
 - (void)configUI {
     [self rightButtonTitle:@"保存" color:THEMECOLOR];
     _bodyView = [ModifyNameBodyView shareInstance];
+    BOOL isModifyName = [NSString isEmptyString:self.groupId] ? YES : NO;
     _bodyView.nameField.text = [NSString returnNoNullStringWithString:self.preNickName];
+    _bodyView.isNameModify = isModifyName;
     [self.scrollView addSubview:_bodyView];
     [_bodyView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.scrollView.mas_top);

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/UserSettingViewController.m

@@ -236,7 +236,7 @@
     self.mediaManager.mediaType = MEDIATYPE_PHOTO;
     self.mediaManager.maxPhotoNumber = 1;
     self.mediaManager.baseCtrl = self;
-    self.mediaManager.needCropImage = NO;
+    self.mediaManager.needCropImage = YES;
     MJWeakSelf;
     [self.mediaManager noAlertCallback:^(NSString * _Nullable videoUrl, NSMutableArray * _Nullable imageArray, NSMutableArray * _Nullable imageAsset) {
         UIImage *sendImg = [imageArray lastObject];

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/ModifyNameBodyView.h

@@ -11,6 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ModifyNameBodyView : UIView
 
+@property (nonatomic, assign) BOOL isNameModify;
+
+
 @property (weak, nonatomic) IBOutlet UITextField *nameField;
 
 + (instancetype)shareInstance;

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/ModifyNameBodyView.m

@@ -7,7 +7,15 @@
 
 #import "ModifyNameBodyView.h"
 
+@interface ModifyNameBodyView ()<UITextFieldDelegate>
+
+@end
+
 @implementation ModifyNameBodyView
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    self.nameField.delegate = self;
+}
 
 + (instancetype)shareInstance {
     ModifyNameBodyView *view = [[[NSBundle mainBundle] loadNibNamed:@"ModifyNameBodyView" owner:nil options:nil] firstObject];
@@ -17,6 +25,19 @@
 - (IBAction)clearAction:(id)sender {
     self.nameField.text = @"";
 }
+
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+    if ([string isEqualToString:@"\n"]) {
+        [self endEditing:YES];
+        return YES;
+    }
+    // 输入控制
+    NSString *newString = [textField.text stringByReplacingCharactersInRange:range withString:string];
+    if (newString.length > 7 && self.isNameModify) {
+        return NO;
+    }
+    return YES;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.