pad UI 改造

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -601,7 +601,6 @@
 		BC494A7C286958EC00CCD343 /* MusicRoomCourseInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC494A7A286958EC00CCD343 /* MusicRoomCourseInfoCell.m */; };
 		BC494A7D286958EC00CCD343 /* MusicRoomCourseInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC494A7B286958EC00CCD343 /* MusicRoomCourseInfoCell.xib */; };
 		BC494A8028696BC300CCD343 /* MusicRoomListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC494A7F28696BC300CCD343 /* MusicRoomListModel.m */; };
-		BC4CC417288FD689004AD8EC /* LaunchAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC4CC416288FD689004AD8EC /* LaunchAnimationView.m */; };
 		BC50171527FC0D8300F8BCBC /* SubjectChooseBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC50171427FC0D8300F8BCBC /* SubjectChooseBodyView.m */; };
 		BC50171727FC0D8E00F8BCBC /* SubjectChooseBodyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC50171627FC0D8D00F8BCBC /* SubjectChooseBodyView.xib */; };
 		BC5367C2283F6D4D008428E8 /* HomeLiveCourseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC5367C1283F6D4C008428E8 /* HomeLiveCourseView.m */; };
@@ -2249,8 +2248,6 @@
 		BC494A7B286958EC00CCD343 /* MusicRoomCourseInfoCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicRoomCourseInfoCell.xib; sourceTree = "<group>"; };
 		BC494A7E28696BC300CCD343 /* MusicRoomListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicRoomListModel.h; sourceTree = "<group>"; };
 		BC494A7F28696BC300CCD343 /* MusicRoomListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MusicRoomListModel.m; sourceTree = "<group>"; };
-		BC4CC415288FD689004AD8EC /* LaunchAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LaunchAnimationView.h; sourceTree = "<group>"; };
-		BC4CC416288FD689004AD8EC /* LaunchAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchAnimationView.m; sourceTree = "<group>"; };
 		BC50171327FC0D8300F8BCBC /* SubjectChooseBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SubjectChooseBodyView.h; sourceTree = "<group>"; };
 		BC50171427FC0D8300F8BCBC /* SubjectChooseBodyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SubjectChooseBodyView.m; sourceTree = "<group>"; };
 		BC50171627FC0D8D00F8BCBC /* SubjectChooseBodyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubjectChooseBodyView.xib; sourceTree = "<group>"; };
@@ -5960,8 +5957,6 @@
 			children = (
 				BC71D1382887CEB70010F14B /* LaunchAnimationViewController.h */,
 				BC71D1392887CEB70010F14B /* LaunchAnimationViewController.m */,
-				BC4CC415288FD689004AD8EC /* LaunchAnimationView.h */,
-				BC4CC416288FD689004AD8EC /* LaunchAnimationView.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -7303,7 +7298,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1520;
 				TargetAttributes = {
 					275E8AA427E18F8800DD3F6E = {
 						CreatedOnToolsVersion = 13.2.1;
@@ -8546,7 +8541,6 @@
 				277935C427E324A90010E277 /* SDCycleScrollView.m in Sources */,
 				BC31BF302B21925700F7D538 /* IACircularSlider.m in Sources */,
 				BC119293280FBC1100A716F7 /* HomeworkAddView.m in Sources */,
-				BC4CC417288FD689004AD8EC /* LaunchAnimationView.m in Sources */,
 				BC106BFF2A933829000759A9 /* TXLiveMessageCardMessage.m in Sources */,
 				BC38C4A12AFA4F6600ABFCC2 /* TenantMineFunctionView.m in Sources */,
 				277935C627E324A90010E277 /* SDQWMaskCustomModel.m in Sources */,
@@ -8717,7 +8711,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -8771,7 +8765,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -8789,7 +8783,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.5.7.1;
+				CURRENT_PROJECT_VERSION = 1.5.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8975,7 +8969,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.5.7.1;
+				CURRENT_PROJECT_VERSION = 1.5.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;

KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/KulexiuForStudent/AppDelegate.m

@@ -215,7 +215,7 @@
     // 配置友盟分享
     // 微信、QQ、微博完整版会校验合法的universalLink，不设置会在初始化平台失败
        //配置微信Universal Link需注意 universalLinkDic的key是rawInt类型，不是枚举类型 ，即为 UMSocialPlatformType.wechatSession.rawInt
-    NSString *callbackUrl = [NSString stringWithFormat:@"%@%@",hostURL,@"/studentApp/"];
+    NSString *callbackUrl = [NSString stringWithFormat:@"%@%@",@"https://online.colexiu.com",@"/studentApp/"];
     [UMSocialGlobal shareInstance].universalLinkDic = @{@(UMSocialPlatformType_WechatSession):callbackUrl,@(UMSocialPlatformType_Sina):callbackUrl};
     /* 设置微信的appKey和appSecret */
     [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:@"wx97408cd22c879ff7" appSecret:@"d3f119b577ccacb262da153f4210174f" redirectURL:nil];

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/insititution_MineBgPad.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/member_bg.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mineWorks_bgPad.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_navBgPad.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Common/Define/KSDomain.h

@@ -33,17 +33,17 @@
 
 // 测试环境
 
-//#define hostURL (@"https://test.colexiu.com")
-//#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://test.colexiu.com/student")
-//#define TENANT_WEBHOST (@"https://test.colexiu.com/tenant")
-//#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (NO)
-//#define RCIM_KEY (@"0vnjpoad0jbdz")
-//#define SUBMIT_UUID (NO)
-//#define CONFIG_TXSDKAPPID (1400805079)
-//#define TXOfflinePushCertificateIDForAPNS (39557)
-//#define WhiteBoardHostURL (@"https://test.dayaedu.com")
+#define hostURL (@"https://test.colexiu.com")
+#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
+#define WEBHOST (@"https://test.colexiu.com/student")
+#define TENANT_WEBHOST (@"https://test.colexiu.com/tenant")
+#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (NO)
+#define RCIM_KEY (@"0vnjpoad0jbdz")
+#define SUBMIT_UUID (NO)
+#define CONFIG_TXSDKAPPID (1400805079)
+#define TXOfflinePushCertificateIDForAPNS (39557)
+#define WhiteBoardHostURL (@"https://test.dayaedu.com")
 
 // 预生产
 //#define hostURL (@"https://ponline.colexiu.com")
@@ -61,17 +61,17 @@
 
 //#else
 
-#define hostURL (@"https://online.colexiu.com")
-#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-#define WEBHOST (@"https://online.colexiu.com/student")
-#define TENANT_WEBHOST (@"https://online.colexiu.com//tenant")
-#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (YES)
-#define RCIM_KEY (@"e5t4ouvpe42pa")
-#define SUBMIT_UUID (YES)
-#define CONFIG_TXSDKAPPID (1400799837)
-#define TXOfflinePushCertificateIDForAPNS (39560)
-#define WhiteBoardHostURL (@"https://online.dayaedu.com")
+//#define hostURL (@"https://online.colexiu.com")
+//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://online.colexiu.com/student")
+//#define TENANT_WEBHOST (@"https://online.colexiu.com//tenant")
+//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (YES)
+//#define RCIM_KEY (@"e5t4ouvpe42pa")
+//#define SUBMIT_UUID (YES)
+//#define CONFIG_TXSDKAPPID (1400799837)
+//#define TXOfflinePushCertificateIDForAPNS (39560)
+//#define WhiteBoardHostURL (@"https://online.dayaedu.com")
 
 
 //#endif

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Controller/TenantMoreViewController.m

@@ -34,7 +34,7 @@
 #import "ToneTuningViewController.h"
 #import "HomeMusicSheetLayout.h"
 
-#define COLLECTION_WIDTH ((NSInteger)(KPortraitWidth * 0.83))
+#define COLLECTION_WIDTH ((NSInteger)(IS_IPAD ? KPortraitWidth * 0.7 : KPortraitWidth * 0.83))
 #define COLLECTION_HEIGHT (243)
 
 @interface TenantMoreViewController ()<UICollectionViewDelegate, UICollectionViewDelegateFlowLayout,UICollectionViewDataSource,TYCyclePagerViewDataSource,TYCyclePagerViewDelegate>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/MorePageSearchView.m

@@ -55,7 +55,7 @@
 }
 
 + (CGFloat)getViewHeight {
-    return 58.0f;
+    return 55.0f;
 }
 /*
 // Only override drawRect: if you perform custom drawing.

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/MorePageSearchView.xib

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MorePageSearchView">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="66"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="393" height="55"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eCa-KK-SiZ">
-                    <rect key="frame" x="13" y="16" width="367" height="34"/>
+                    <rect key="frame" x="13" y="5" width="367" height="34"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tenant_sortDown" translatesAutoresizingMaskIntoConstraints="NO" id="No0-5i-GfE">
                             <rect key="frame" x="0.0" y="14.666666666666668" width="0.0" height="5"/>
@@ -105,7 +105,7 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="eCa-KK-SiZ" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="WZX-g3-JYH"/>
+                <constraint firstAttribute="bottom" secondItem="eCa-KK-SiZ" secondAttribute="bottom" constant="16" id="27m-Bv-Pzb"/>
                 <constraint firstItem="eCa-KK-SiZ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="Wtf-mQ-1d6"/>
                 <constraint firstAttribute="trailing" secondItem="eCa-KK-SiZ" secondAttribute="trailing" constant="13" id="oqN-gs-pKI"/>
             </constraints>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.m

@@ -10,10 +10,23 @@
 #import "TYPageControl.h"
 #import "TenantMineFunctionView.h"
 
+#define MAX_FUNCROWCOUNT (IS_IPAD ? 6 : 4)
+
 @interface InstitutionMineBodyView ()<UIScrollViewDelegate>
 
+@property (weak, nonatomic) IBOutlet UIImageView *bgImageView;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bgImageWidth;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bgImageHeight;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *memberHeight;
+
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *userNameTop;
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *firstTitleLeft;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *secondTitleLeft;
+
 @property (weak, nonatomic) IBOutlet UIImageView *userAvatar;
 @property (weak, nonatomic) IBOutlet UILabel *userName;
 @property (weak, nonatomic) IBOutlet UIImageView *memberImg;
@@ -47,16 +60,35 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    [self.functionView addSubview:self.pageControl];
-    self.pageControl.currentPage = 0;
+    
+    if (IS_IPAD) {
+        self.functionScrollView.contentSize = CGSizeMake((KPortraitWidth - 26), 74);
+    }
+    else {
+        self.functionScrollView.contentSize = CGSizeMake((KPortraitWidth - 26)*2, 74);
+        [self.functionView addSubview:self.pageControl];
+        self.pageControl.currentPage = 0;
+    }
+    
     
     [self.functionView addSubview:self.functionScrollView];
     [self.functionScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(self.functionView);
     }];
     self.functionScrollView.delegate = self;
-    self.functionScrollView.contentSize = CGSizeMake((KPortraitWidth - 26)*2, 74);
     [self configFunctionView];
+    NSString *bgName = IS_IPAD ? @"insititution_MineBgPad" : @"insititution_MineBg";
+    UIImage *bgImage = [UIImage imageNamed:bgName];
+    [self.bgImageView setImage:bgImage];
+    CGFloat height = bgImage.size.height / bgImage.size.width * KPortraitWidth;
+    self.bgImageWidth.constant = KPortraitWidth;
+    self.bgImageHeight.constant = height;
+    if (IS_IPAD) {
+        self.memberHeight.constant = 124.0f;
+        self.firstTitleLeft.constant = 24.0f;
+        self.secondTitleLeft.constant = 24.0f;
+    }
+    
 }
 
 + (instancetype)shareInstance {
@@ -146,7 +178,8 @@
 
 - (void)configFunctionView {
     [self.functionScrollView removeAllSubViews];
-    CGFloat width = (KPortraitWidth - 26) / 4;
+   
+    CGFloat width = (KPortraitWidth - 26) / MAX_FUNCROWCOUNT;
     for (NSInteger index = 0; index < self.imageArray.count; index++) {
         TenantMineFunctionView *functionButton = [TenantMineFunctionView shareInstance];
         NSNumber *tagValue = self.tagArray[index];

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,29 +11,33 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="InstitutionMineBodyView">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="750"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="750"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nbm-ze-ouR">
-                    <rect key="frame" x="0.0" y="0.0" width="393" height="275"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="275"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_MineBg" translatesAutoresizingMaskIntoConstraints="NO" id="A30-6f-0Ca">
-                            <rect key="frame" x="0.0" y="0.0" width="393" height="393"/>
+                            <rect key="frame" x="0.0" y="0.0" width="414" height="414"/>
                             <constraints>
-                                <constraint firstAttribute="width" secondItem="A30-6f-0Ca" secondAttribute="height" multiplier="1:1" id="W8q-R7-hrr"/>
+                                <constraint firstAttribute="width" constant="414" id="HAe-7J-lwa"/>
+                                <constraint firstAttribute="height" constant="414" id="NsE-ha-gB2"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_header" translatesAutoresizingMaskIntoConstraints="NO" id="uzc-nx-nAm">
                             <rect key="frame" x="0.0" y="19" width="58" height="50"/>
                         </imageView>
                         <view tag="1001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xUo-7q-bZ9">
-                            <rect key="frame" x="13" y="183" width="179" height="76"/>
+                            <rect key="frame" x="13" y="183" width="189.66666666666666" height="76"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_mineMemberBg" translatesAutoresizingMaskIntoConstraints="NO" id="eMm-hR-8Jd">
-                                    <rect key="frame" x="108" y="0.0" width="71" height="76"/>
+                                    <rect key="frame" x="118.66666666666666" y="0.0" width="71" height="76"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" secondItem="eMm-hR-8Jd" secondAttribute="height" multiplier="71:76" id="jbS-f1-v2j"/>
+                                    </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="wqN-QT-Cza">
-                                    <rect key="frame" x="10" y="43" width="0.0" height="17"/>
+                                    <rect key="frame" x="10" y="41" width="0.0" height="17"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="17" id="iU7-Lx-WNZ"/>
                                     </constraints>
@@ -42,14 +46,14 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_MemberLabel" translatesAutoresizingMaskIntoConstraints="NO" id="ulF-FE-zms">
-                                    <rect key="frame" x="10" y="19" width="60" height="15"/>
+                                    <rect key="frame" x="10" y="18" width="60" height="15"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="15" id="LJB-Wy-aXz"/>
                                         <constraint firstAttribute="width" constant="60" id="le1-LY-y63"/>
                                     </constraints>
                                 </imageView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gzv-B6-KMx">
-                                    <rect key="frame" x="75" y="19.666666666666657" width="14" height="14"/>
+                                    <rect key="frame" x="75" y="18.666666666666657" width="14" height="14"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_detail" translatesAutoresizingMaskIntoConstraints="NO" id="gPw-Ft-Q1L">
                                             <rect key="frame" x="2" y="1" width="11" height="11"/>
@@ -73,15 +77,15 @@
                             <gestureRecognizers/>
                             <constraints>
                                 <constraint firstItem="ulF-FE-zms" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="leading" constant="10" id="1qw-mA-PfF"/>
+                                <constraint firstItem="wqN-QT-Cza" firstAttribute="top" secondItem="ulF-FE-zms" secondAttribute="bottom" constant="8" id="95h-25-bem"/>
                                 <constraint firstAttribute="height" constant="76" id="JXQ-rr-Pif"/>
                                 <constraint firstItem="gzv-B6-KMx" firstAttribute="leading" secondItem="ulF-FE-zms" secondAttribute="trailing" constant="5" id="MhK-Gc-Hgs"/>
                                 <constraint firstAttribute="bottom" secondItem="eMm-hR-8Jd" secondAttribute="bottom" id="RIX-Mx-KX8"/>
                                 <constraint firstItem="eMm-hR-8Jd" firstAttribute="top" secondItem="xUo-7q-bZ9" secondAttribute="top" id="UQA-LY-oIg"/>
-                                <constraint firstItem="wqN-QT-Cza" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="leading" constant="10" id="Ucn-jL-ZRb"/>
-                                <constraint firstItem="ulF-FE-zms" firstAttribute="top" secondItem="xUo-7q-bZ9" secondAttribute="top" constant="19" id="dia-fO-5ph"/>
+                                <constraint firstItem="wqN-QT-Cza" firstAttribute="leading" secondItem="ulF-FE-zms" secondAttribute="leading" id="Yt0-KZ-osA"/>
+                                <constraint firstItem="ulF-FE-zms" firstAttribute="centerY" secondItem="xUo-7q-bZ9" secondAttribute="centerY" constant="-12.5" id="ePQ-Ho-rqZ"/>
                                 <constraint firstItem="gzv-B6-KMx" firstAttribute="centerY" secondItem="ulF-FE-zms" secondAttribute="centerY" id="fkg-g9-ZoY"/>
                                 <constraint firstAttribute="trailing" secondItem="eMm-hR-8Jd" secondAttribute="trailing" id="vfg-r9-fen"/>
-                                <constraint firstAttribute="bottom" secondItem="wqN-QT-Cza" secondAttribute="bottom" constant="16" id="wjM-N7-X0C"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -93,24 +97,25 @@
                             </connections>
                         </view>
                         <view tag="1002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mxr-u3-Zhb">
-                            <rect key="frame" x="201" y="183" width="179" height="76"/>
+                            <rect key="frame" x="211.66666666666663" y="183" width="189.33333333333337" height="76"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_mineToolBg" translatesAutoresizingMaskIntoConstraints="NO" id="gzb-kF-p1c">
-                                    <rect key="frame" x="108" y="0.0" width="71" height="76"/>
+                                    <rect key="frame" x="118.33333333333334" y="0.0" width="71" height="76"/>
                                     <constraints>
+                                        <constraint firstAttribute="width" secondItem="gzb-kF-p1c" secondAttribute="height" multiplier="71:76" id="93h-Vi-ae4"/>
                                         <constraint firstAttribute="width" constant="71" id="ZXy-xl-WNs"/>
                                         <constraint firstAttribute="height" constant="76" id="u7D-m9-NQa"/>
                                     </constraints>
                                 </imageView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2tE-BT-KvU">
-                                    <rect key="frame" x="8" y="19" width="60" height="15"/>
+                                    <rect key="frame" x="10" y="18" width="60" height="15"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="60" id="oCm-Do-F6Q"/>
                                         <constraint firstAttribute="height" constant="15" id="vTb-dr-nak"/>
                                     </constraints>
                                 </imageView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J15-HR-2eh">
-                                    <rect key="frame" x="73" y="19.666666666666657" width="14" height="14"/>
+                                    <rect key="frame" x="75.000000000000028" y="18.666666666666657" width="14" height="14"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_detail" translatesAutoresizingMaskIntoConstraints="NO" id="Ac9-PU-LTL">
                                             <rect key="frame" x="2" y="1" width="11" height="11"/>
@@ -130,7 +135,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="6jm-cm-okg">
-                                    <rect key="frame" x="8" y="43" width="0.0" height="17"/>
+                                    <rect key="frame" x="10" y="41" width="0.0" height="17"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="17" id="rEb-rX-P4l"/>
                                     </constraints>
@@ -142,13 +147,12 @@
                             <color key="backgroundColor" red="1" green="0.94901960784313721" blue="0.88627450980392153" alpha="1" colorSpace="calibratedRGB"/>
                             <gestureRecognizers/>
                             <constraints>
-                                <constraint firstItem="2tE-BT-KvU" firstAttribute="top" secondItem="Mxr-u3-Zhb" secondAttribute="top" constant="19" id="2oQ-iJ-06l"/>
-                                <constraint firstAttribute="height" constant="76" id="3ch-ml-Hn0"/>
-                                <constraint firstItem="2tE-BT-KvU" firstAttribute="leading" secondItem="Mxr-u3-Zhb" secondAttribute="leading" constant="8" id="BZH-3x-xH4"/>
+                                <constraint firstItem="2tE-BT-KvU" firstAttribute="leading" secondItem="Mxr-u3-Zhb" secondAttribute="leading" constant="10" id="BZH-3x-xH4"/>
                                 <constraint firstAttribute="trailing" secondItem="gzb-kF-p1c" secondAttribute="trailing" id="ESk-qr-fYg"/>
+                                <constraint firstItem="6jm-cm-okg" firstAttribute="top" secondItem="2tE-BT-KvU" secondAttribute="bottom" constant="8" id="IR0-uQ-34a"/>
                                 <constraint firstItem="J15-HR-2eh" firstAttribute="centerY" secondItem="2tE-BT-KvU" secondAttribute="centerY" id="IYN-vi-0W1"/>
-                                <constraint firstItem="6jm-cm-okg" firstAttribute="leading" secondItem="Mxr-u3-Zhb" secondAttribute="leading" constant="8" id="LxC-7Q-e6O"/>
-                                <constraint firstAttribute="bottom" secondItem="6jm-cm-okg" secondAttribute="bottom" constant="16" id="Rqr-cF-Z5M"/>
+                                <constraint firstItem="6jm-cm-okg" firstAttribute="leading" secondItem="2tE-BT-KvU" secondAttribute="leading" id="MAC-Qx-y6j"/>
+                                <constraint firstItem="2tE-BT-KvU" firstAttribute="centerY" secondItem="Mxr-u3-Zhb" secondAttribute="centerY" constant="-12.5" id="P97-gC-SHb"/>
                                 <constraint firstItem="gzb-kF-p1c" firstAttribute="top" secondItem="Mxr-u3-Zhb" secondAttribute="top" id="eym-Nu-zMb"/>
                                 <constraint firstItem="J15-HR-2eh" firstAttribute="leading" secondItem="2tE-BT-KvU" secondAttribute="trailing" constant="5" id="mvC-7N-cR4"/>
                                 <constraint firstAttribute="bottom" secondItem="gzb-kF-p1c" secondAttribute="bottom" id="oe7-sm-PW4"/>
@@ -163,13 +167,19 @@
                             </connections>
                         </view>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_MemberImage" translatesAutoresizingMaskIntoConstraints="NO" id="x5p-j7-s1g">
-                            <rect key="frame" x="121" y="179" width="77" height="66"/>
+                            <rect key="frame" x="131.66666666666666" y="179" width="77" height="66"/>
+                            <constraints>
+                                <constraint firstAttribute="width" secondItem="x5p-j7-s1g" secondAttribute="height" multiplier="7:6" id="vu0-su-xVB"/>
+                            </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolImage" translatesAutoresizingMaskIntoConstraints="NO" id="Vt5-8U-7eH">
-                            <rect key="frame" x="309" y="185" width="72" height="64"/>
+                            <rect key="frame" x="332.33333333333331" y="185" width="69.666666666666686" height="62"/>
+                            <constraints>
+                                <constraint firstAttribute="width" secondItem="Vt5-8U-7eH" secondAttribute="height" multiplier="9:8" id="9Ej-7d-EJN"/>
+                            </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_topLayer" translatesAutoresizingMaskIntoConstraints="NO" id="98L-RE-L5b">
-                            <rect key="frame" x="264" y="0.0" width="129" height="114"/>
+                            <rect key="frame" x="285" y="0.0" width="129" height="114"/>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LYR-lA-eEp">
                             <rect key="frame" x="24" y="86" width="72" height="72"/>
@@ -271,6 +281,7 @@
                         <constraint firstItem="A30-6f-0Ca" firstAttribute="leading" secondItem="Nbm-ze-ouR" secondAttribute="leading" id="1yA-Tt-Ebf"/>
                         <constraint firstItem="Nlb-bG-jKG" firstAttribute="top" secondItem="LYR-lA-eEp" secondAttribute="top" constant="9" id="2Do-ed-2h8"/>
                         <constraint firstItem="x5p-j7-s1g" firstAttribute="trailing" secondItem="xUo-7q-bZ9" secondAttribute="trailing" constant="6" id="3C5-y9-zJO"/>
+                        <constraint firstItem="Mxr-u3-Zhb" firstAttribute="height" secondItem="xUo-7q-bZ9" secondAttribute="height" id="5DA-7K-Qq8"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="top" secondItem="Vt5-8U-7eH" secondAttribute="top" constant="-2" id="5GT-fh-y4e"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="trailing" constant="9" id="8zA-Aj-WPH"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="aWj-xg-N6w" secondAttribute="trailing" constant="12" id="CcR-b0-7sw"/>
@@ -292,17 +303,19 @@
                         <constraint firstItem="j1E-FX-DSh" firstAttribute="centerY" secondItem="LYR-lA-eEp" secondAttribute="bottom" id="bsG-xq-JaU"/>
                         <constraint firstAttribute="height" constant="275" id="fPk-KI-PIk"/>
                         <constraint firstAttribute="trailing" secondItem="A30-6f-0Ca" secondAttribute="trailing" id="gSQ-A1-hjP"/>
+                        <constraint firstItem="x5p-j7-s1g" firstAttribute="bottom" secondItem="xUo-7q-bZ9" secondAttribute="bottom" constant="-14" id="jq3-eD-J5D"/>
                         <constraint firstAttribute="bottom" secondItem="Mxr-u3-Zhb" secondAttribute="bottom" constant="16" id="l7Z-BD-Yt1"/>
                         <constraint firstItem="A30-6f-0Ca" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" id="pce-4x-814"/>
+                        <constraint firstItem="Vt5-8U-7eH" firstAttribute="bottom" secondItem="Mxr-u3-Zhb" secondAttribute="bottom" constant="-12" id="qMY-gb-AD0"/>
                         <constraint firstItem="xUo-7q-bZ9" firstAttribute="leading" secondItem="Nbm-ze-ouR" secondAttribute="leading" constant="13" id="rgr-bo-Yk0"/>
                         <constraint firstAttribute="trailing" secondItem="Mxr-u3-Zhb" secondAttribute="trailing" constant="13" id="s7x-po-Vg7"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iE8-e2-07v">
-                    <rect key="frame" x="13" y="287" width="367" height="130"/>
+                    <rect key="frame" x="13" y="287" width="388" height="130"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Akl-gJ-5NJ">
-                            <rect key="frame" x="0.0" y="51" width="367" height="74"/>
+                            <rect key="frame" x="0.0" y="51" width="388" height="74"/>
                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="常用功能" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QIe-vg-wc9">
@@ -332,10 +345,10 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3KY-c7-2Hr">
-                    <rect key="frame" x="13" y="429" width="367" height="290"/>
+                    <rect key="frame" x="13" y="429" width="388" height="290"/>
                     <subviews>
                         <view tag="1008" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YoI-Ul-U7N">
-                            <rect key="frame" x="0.0" y="0.0" width="367" height="58"/>
+                            <rect key="frame" x="0.0" y="0.0" width="388" height="58"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帮助中心" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fWv-5K-YGR">
                                     <rect key="frame" x="51.999999999999993" y="19.333333333333314" width="65.333333333333314" height="19.333333333333329"/>
@@ -344,13 +357,13 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="d9j-jy-TPj">
-                                    <rect key="frame" x="346" y="21.666666666666686" width="8" height="15"/>
+                                    <rect key="frame" x="367" y="21.666666666666686" width="8" height="15"/>
                                 </imageView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_help" translatesAutoresizingMaskIntoConstraints="NO" id="6fY-qz-U6i">
                                     <rect key="frame" x="20" y="18" width="22" height="22"/>
                                 </imageView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mpM-n3-GBP">
-                                    <rect key="frame" x="15" y="57" width="337" height="1"/>
+                                    <rect key="frame" x="15" y="57" width="358" height="1"/>
                                     <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="1" id="QMP-6T-uGc"/>
@@ -376,7 +389,7 @@
                             </connections>
                         </view>
                         <view tag="1009" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LNk-Hh-S11">
-                            <rect key="frame" x="0.0" y="58" width="367" height="58"/>
+                            <rect key="frame" x="0.0" y="58" width="388" height="58"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="意见反馈" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dnv-60-hyW">
                                     <rect key="frame" x="51.999999999999993" y="19.666666666666686" width="65.333333333333314" height="19"/>
@@ -385,13 +398,13 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="sOz-fa-02f">
-                                    <rect key="frame" x="346" y="21.666666666666686" width="8" height="15"/>
+                                    <rect key="frame" x="367" y="21.666666666666686" width="8" height="15"/>
                                 </imageView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_feedback" translatesAutoresizingMaskIntoConstraints="NO" id="6bB-bB-Vix">
                                     <rect key="frame" x="20" y="18" width="22" height="22"/>
                                 </imageView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SdN-Dw-8RX">
-                                    <rect key="frame" x="15" y="57" width="337" height="1"/>
+                                    <rect key="frame" x="15" y="57" width="358" height="1"/>
                                     <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="1" id="vRU-NH-r05"/>
@@ -417,7 +430,7 @@
                             </connections>
                         </view>
                         <view tag="1010" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="92r-es-QMt">
-                            <rect key="frame" x="0.0" y="116" width="367" height="58"/>
+                            <rect key="frame" x="0.0" y="116" width="388" height="58"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户协议" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8mD-vY-M3T">
                                     <rect key="frame" x="51.999999999999993" y="19.666666666666629" width="65.333333333333314" height="19"/>
@@ -426,13 +439,13 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="8Xe-aG-eBm">
-                                    <rect key="frame" x="346" y="21.666666666666629" width="8" height="15"/>
+                                    <rect key="frame" x="367" y="21.666666666666629" width="8" height="15"/>
                                 </imageView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_userAgreement" translatesAutoresizingMaskIntoConstraints="NO" id="qzD-bY-PuR">
                                     <rect key="frame" x="20" y="18" width="22" height="22"/>
                                 </imageView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NCi-zu-M1q">
-                                    <rect key="frame" x="15" y="57" width="337" height="1"/>
+                                    <rect key="frame" x="15" y="57" width="358" height="1"/>
                                     <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="1" id="JNr-bH-Up9"/>
@@ -458,7 +471,7 @@
                             </connections>
                         </view>
                         <view tag="1011" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NTm-jn-Mpl">
-                            <rect key="frame" x="0.0" y="174" width="367" height="58"/>
+                            <rect key="frame" x="0.0" y="174" width="388" height="58"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="隐私协议" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8We-Tk-Xu4">
                                     <rect key="frame" x="51.999999999999993" y="19.666666666666629" width="65.333333333333314" height="19"/>
@@ -467,13 +480,13 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="FSm-3Y-APU">
-                                    <rect key="frame" x="346" y="21.666666666666629" width="8" height="15"/>
+                                    <rect key="frame" x="367" y="21.666666666666629" width="8" height="15"/>
                                 </imageView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_privacy" translatesAutoresizingMaskIntoConstraints="NO" id="q1c-8S-Ylf">
                                     <rect key="frame" x="20" y="18" width="22" height="22"/>
                                 </imageView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sFb-lH-ZkS">
-                                    <rect key="frame" x="15" y="57" width="337" height="1"/>
+                                    <rect key="frame" x="15" y="57" width="358" height="1"/>
                                     <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="1" id="9LE-1R-rTP"/>
@@ -499,7 +512,7 @@
                             </connections>
                         </view>
                         <view tag="1012" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wt3-dk-1gA">
-                            <rect key="frame" x="0.0" y="232" width="367" height="58"/>
+                            <rect key="frame" x="0.0" y="232" width="388" height="58"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="关于我们" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ojF-qm-wBA">
                                     <rect key="frame" x="51.999999999999993" y="19.666666666666629" width="65.333333333333314" height="19"/>
@@ -508,13 +521,13 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="av3-YG-dxn">
-                                    <rect key="frame" x="346" y="21.666666666666629" width="8" height="15"/>
+                                    <rect key="frame" x="367" y="21.666666666666629" width="8" height="15"/>
                                 </imageView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_about" translatesAutoresizingMaskIntoConstraints="NO" id="VLa-B4-4Ht">
                                     <rect key="frame" x="20" y="18" width="22" height="22"/>
                                 </imageView>
                                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dSf-QJ-hbD">
-                                    <rect key="frame" x="15" y="57" width="337" height="1"/>
+                                    <rect key="frame" x="15" y="57" width="358" height="1"/>
                                     <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="1" id="o85-eH-Fv9"/>
@@ -594,9 +607,15 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="bgImageHeight" destination="NsE-ha-gB2" id="tgE-6b-AmN"/>
+                <outlet property="bgImageView" destination="A30-6f-0Ca" id="AA9-Qa-ipk"/>
+                <outlet property="bgImageWidth" destination="HAe-7J-lwa" id="CWe-6R-yNH"/>
+                <outlet property="firstTitleLeft" destination="1qw-mA-PfF" id="fDH-Cr-PrS"/>
                 <outlet property="functionView" destination="Akl-gJ-5NJ" id="aPS-KN-edW"/>
                 <outlet property="memberDesc" destination="wqN-QT-Cza" id="V4p-qw-nCy"/>
+                <outlet property="memberHeight" destination="JXQ-rr-Pif" id="XtP-tC-1Cw"/>
                 <outlet property="memberImg" destination="j1E-FX-DSh" id="Qcd-Se-bsQ"/>
+                <outlet property="secondTitleLeft" destination="BZH-3x-xH4" id="EM4-kk-oz9"/>
                 <outlet property="subjectLabel" destination="k3g-g1-liB" id="4om-GC-86Z"/>
                 <outlet property="subjectView" destination="aWj-xg-N6w" id="LbY-EU-yem"/>
                 <outlet property="tenantName" destination="v4r-I2-0Uz" id="WSa-2L-Hzv"/>
@@ -605,7 +624,7 @@
                 <outlet property="userName" destination="Nlb-bG-jKG" id="gQI-V1-EYx"/>
                 <outlet property="userNameTop" destination="2Do-ed-2h8" id="scI-hM-fzo"/>
             </connections>
-            <point key="canvasLocation" x="336.64122137404581" y="-228.16901408450704"/>
+            <point key="canvasLocation" x="335.87786259541986" y="-228.16901408450704"/>
         </view>
         <tapGestureRecognizer id="gEi-US-rfA">
             <connections>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/TenantNotiferMessageCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -74,15 +74,15 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="yv6-Zy-niG" firstAttribute="centerY" secondItem="4hp-bA-Hl4" secondAttribute="centerY" id="8a6-g0-Zp0"/>
+                            <constraint firstItem="4hp-bA-Hl4" firstAttribute="top" secondItem="sXQ-qt-Apo" secondAttribute="top" constant="16" id="9F0-ec-n7Q"/>
                             <constraint firstItem="VaQ-F3-F4D" firstAttribute="leading" secondItem="4hp-bA-Hl4" secondAttribute="leading" id="AWh-41-mxE"/>
-                            <constraint firstItem="4hp-bA-Hl4" firstAttribute="top" secondItem="enL-C5-C4b" secondAttribute="top" id="C8K-ei-ZIZ"/>
                             <constraint firstItem="enL-C5-C4b" firstAttribute="leading" secondItem="sXQ-qt-Apo" secondAttribute="leading" constant="13" id="Lxm-H6-WF7"/>
                             <constraint firstAttribute="trailing" secondItem="yv6-Zy-niG" secondAttribute="trailing" constant="13" id="Ua4-8b-grZ"/>
                             <constraint firstItem="DUl-Lh-1pe" firstAttribute="top" secondItem="enL-C5-C4b" secondAttribute="top" id="a7v-8v-T9t"/>
                             <constraint firstItem="yv6-Zy-niG" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="4hp-bA-Hl4" secondAttribute="trailing" constant="10" id="bB4-7H-0wV"/>
                             <constraint firstAttribute="bottom" secondItem="VaQ-F3-F4D" secondAttribute="bottom" constant="16" id="biJ-km-wLb"/>
                             <constraint firstItem="DUl-Lh-1pe" firstAttribute="trailing" secondItem="enL-C5-C4b" secondAttribute="trailing" id="eJ9-uX-ODl"/>
-                            <constraint firstItem="enL-C5-C4b" firstAttribute="centerY" secondItem="sXQ-qt-Apo" secondAttribute="centerY" id="j56-5l-eTD"/>
+                            <constraint firstItem="enL-C5-C4b" firstAttribute="top" secondItem="sXQ-qt-Apo" secondAttribute="top" constant="16" id="gUN-XK-NpD"/>
                             <constraint firstItem="VaQ-F3-F4D" firstAttribute="top" secondItem="4hp-bA-Hl4" secondAttribute="bottom" constant="2" id="s4z-0X-1DW"/>
                             <constraint firstItem="4hp-bA-Hl4" firstAttribute="leading" secondItem="enL-C5-C4b" secondAttribute="trailing" constant="10" id="sxe-xL-JHx"/>
                             <constraint firstAttribute="trailing" secondItem="VaQ-F3-F4D" secondAttribute="trailing" constant="13" id="tJx-9I-eP0"/>

KulexiuForStudent/KulexiuForStudent/Module/AnimationLaunch/Controller/LaunchAnimationView.h

@@ -1,23 +0,0 @@
-//
-//  LaunchAnimationView.h
-//  KulexiuForStudent
-//
-//  Created by 王智 on 2022/7/26.
-//
-
-#import <UIKit/UIKit.h>
-
-
-typedef void(^LaunchFinishCallback)(void);
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface LaunchAnimationView : UIView
-
-- (void)configUI;
-// 结束的回调
-- (void)launchAnimationFinish:(LaunchFinishCallback)callback;
-
-@end
-
-NS_ASSUME_NONNULL_END

KulexiuForStudent/KulexiuForStudent/Module/AnimationLaunch/Controller/LaunchAnimationView.m

@@ -1,78 +0,0 @@
-//
-//  LaunchAnimationView.m
-//  KulexiuForStudent
-//
-//  Created by 王智 on 2022/7/26.
-//
-
-#import "LaunchAnimationView.h"
-#import <Lottie/Lottie.h>
-
-@interface LaunchAnimationView ()
-
-@property (nonatomic, strong) LOTAnimationView *loadingView;
-
-@property (nonatomic, strong) NSString *jsonString;
-
-@property (nonatomic, copy) LaunchFinishCallback callback;
-
-@end
-
-@implementation LaunchAnimationView
-- (void)launchAnimationFinish:(LaunchFinishCallback)callback {
-    if (callback) {
-        self.callback = callback;
-    }
-}
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-    }
-    return self;
-}
-
-- (void)configUI {
-    self.backgroundColor = [UIColor whiteColor];
-    
-    [self setJsonName:@"launchAni.json"];
-}
-
-- (void)setJsonName:(NSString *)jsonName {
-    self.jsonString = jsonName;
-    [self addSubview:self.loadingView];
-    MJWeakSelf;
-    [self.loadingView playWithCompletion:^(BOOL animationFinished) {
-        [weakSelf successBack];
-    }];
-}
-
-- (void)successBack {
-    if (self.callback) {
-        self.callback();
-    }
-}
-
-- (LOTAnimationView *)loadingView {
-    if(_loadingView == nil) {
-        //1.加载本地json
-        _loadingView = [LOTAnimationView animationNamed:self.jsonString];
-        //2.加载后台给的json(url)
-        _loadingView.frame = CGRectMake(0, 0, KPortraitWidth, KPortraitHeight);
-        _loadingView.loopAnimation = YES;
-        _loadingView.contentMode = UIViewContentModeScaleAspectFill;
-        _loadingView.animationSpeed = 1.0;
-        _loadingView.loopAnimation = NO;
-    }
-    return _loadingView;
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

KulexiuForStudent/KulexiuForStudent/Module/AnimationLaunch/Controller/LaunchAnimationViewController.m

@@ -40,6 +40,18 @@
 - (void)setJsonName:(NSString *)jsonName {
     self.jsonString = jsonName;
     [self.view addSubview:self.loadingView];
+    CGFloat width = KPortraitWidth;
+    CGFloat height = width / 1125 * 2436;
+    if (height > KPortraitHeight) {
+        height = KPortraitHeight;
+        width = height / 2436 * 1125;
+    }
+    [self.loadingView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.view.mas_centerX);
+        make.centerY.mas_equalTo(self.view.mas_centerY);
+        make.width.mas_equalTo(width);
+        make.height.mas_equalTo(height);
+    }];
     MJWeakSelf;
     [self.loadingView playWithCompletion:^(BOOL animationFinished) {
         [weakSelf successBack];
@@ -57,7 +69,6 @@
         //1.加载本地json
         _loadingView = [LOTAnimationView animationNamed:self.jsonString];
         //2.加载后台给的json(url)
-        _loadingView.frame = CGRectMake(0, 0, KPortraitWidth, KPortraitHeight);
         _loadingView.loopAnimation = YES;
         _loadingView.contentMode = UIViewContentModeScaleAspectFill;
         _loadingView.animationSpeed = 1.0;

KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/Controller/KSChatComplainController.m

@@ -9,19 +9,21 @@
 #import "KSChatComplainController.h"
 #import "ChatComplainBodyView.h"
 #import "LLPhotoBrowser.h"
-#import "KSImageDisplayView.h"
-#import "KSPhotoChooseView.h"
 #import "KSMediaManager.h"
 
+#import "CourseFileDisplayView.h"
 #import "UIImage+ResizeImage.h"
 #import "MSSBrowseDefine.h"
+
 #import "ChatComplainBottomView.h"
 
+
 #define MAXBIGPHOTONUMBER (3)
 #define MAXPHOTONUMBER (3)
 #define COLUMNNUMBER (3)
-#define BUTTONWIDTH  (101)
-#define BUTTONHEIGHT (101)
+
+
+#define ROWCOUNT (IS_IPAD ? 5 : 3)
 
 @interface KSChatComplainController ()<LLPhotoBrowserDelegate>
 
@@ -132,63 +134,67 @@
     for (UIView *subView in self.bodyView.imageContentView.subviews) {
         [subView removeFromSuperview];
     }
-    CGFloat space = 12;
-
-    CGFloat midSpace = (KPortraitWidth - 26 - space * 2 - BUTTONWIDTH * 3) / 2.0f;
+    CGFloat midSpace = 10;
+    CGFloat leftSpace = 12;
+    CGFloat buttonWidth = IS_IPAD ? 112 : (KPortraitWidth - leftSpace * 2 - leftSpace * 2 - midSpace * 2) / 3;
+    CGFloat buttonHeight = buttonWidth;
     
-    NSInteger section = self.imageArray.count/3 + 1;
-    if (self.imageArray.count==MAXPHOTONUMBER) {
-        section = MAXPHOTONUMBER / 3;
-    }
-    CGFloat topSpace = 0.0f;
     CGFloat currentX = 0;
     CGFloat currentY = 0;
     for (NSInteger index = 0; index < self.imageArray.count; index++) {
-        currentX = (index) % 3 * (BUTTONWIDTH + midSpace) + space;
-        currentY = (index) / 3 * (BUTTONHEIGHT + topSpace);
+        currentX = index % ROWCOUNT * (buttonWidth + midSpace);
+        currentY = index / ROWCOUNT * (buttonHeight + midSpace);
         UIImage *image = self.imageArray [index];
-        
-        CGRect frame = CGRectMake(currentX, currentY, BUTTONWIDTH, BUTTONHEIGHT);
-        KSImageDisplayView *displayView = [KSImageDisplayView shareInstance];
-        displayView.frame = frame;
-        displayView.tag = 1000 + index;
+        CGRect frame = CGRectMake(currentX, currentY, buttonWidth, buttonHeight);
         MJWeakSelf;
-        [displayView displayImage:image callback:^(BOOL isShow, NSInteger viewIndex) {
-            if (isShow) {
-                [weakSelf displayImage:viewIndex];
+        CourseFileDisplayView *displayView = [CourseFileDisplayView shareInstance];
+        displayView.tag = 1000+index;
+        displayView.frame = frame;
+        [displayView displayImage:image callback:^(FILETYPE fileType, BOOL isPlay, NSInteger viewIndex) {
+            if (isPlay) {
+                LLPhotoBrowser *photoBrowser = [[LLPhotoBrowser alloc] initWithImages:weakSelf.imageArray currentIndex:viewIndex];
+                photoBrowser.delegate = weakSelf;
+                photoBrowser.modalPresentationStyle = UIModalPresentationFullScreen;
+                [weakSelf presentViewController:photoBrowser animated:YES completion:nil];
             }
             else {
-                [weakSelf removeImage:viewIndex];
+                [weakSelf deleteImageWithIndex:viewIndex];
             }
         }];
         [self.bodyView.imageContentView addSubview:displayView];
     }
+    currentX = self.imageArray .count % ROWCOUNT * (buttonWidth + midSpace);
     
     if (self.imageArray.count != MAXPHOTONUMBER) {
         //计算下一个添加按钮位置
-        currentX = (self.imageArray.count) % 3 * (BUTTONWIDTH + midSpace) + space;
-        currentY = (self.imageArray.count) / 3 * (BUTTONHEIGHT + topSpace);
-
-        KSPhotoChooseView *button = [KSPhotoChooseView shareInstance];
-        button.frame = CGRectMake(currentX, currentY, BUTTONWIDTH, BUTTONHEIGHT);
+        if (self.imageArray.count % ROWCOUNT == 0) {
+            currentY = (self.imageArray.count + 1) / ROWCOUNT * (buttonHeight + midSpace);
+        }
+        UIButton *cameraButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        cameraButton.frame = CGRectMake(currentX, currentY, buttonWidth, buttonHeight);
+        
+        NSString *imgName = @"choose_photo_green";
+        if ([UserDefault(TENANT_ID) integerValue] > 0) {
+            imgName = @"choose_photo_red";
+        }
+        [cameraButton setBackgroundImage:[UIImage imageNamed:imgName] forState:UIControlStateNormal];
+        [cameraButton setBackgroundImage:[UIImage imageNamed:imgName] forState:UIControlStateHighlighted];
+        [cameraButton addTarget:self action:@selector(chooseImageAction) forControlEvents:UIControlEventTouchUpInside];
+        [self.bodyView.imageContentView addSubview:cameraButton];
+        
         CAShapeLayer *border = [CAShapeLayer layer];
         border.strokeColor = HexRGB(0xCFCFCF).CGColor;
         border.fillColor = nil;
-        border.path = [UIBezierPath bezierPathWithRoundedRect:button.bounds cornerRadius:10.0f].CGPath;
-        border.frame = button.bounds;
+        border.path = [UIBezierPath bezierPathWithRoundedRect:cameraButton.bounds cornerRadius:10.0f].CGPath;
+        border.frame = cameraButton.bounds;
         border.lineWidth = 1.f;
         border.lineCap = @"square";
         border.lineDashPattern = @[@4, @4];
-        [button.imagePlace.layer addSublayer:border];
-        MJWeakSelf;
-        [button chooseCallback:^{
-            [weakSelf chooseImageAction];
-        }];
-        [self.bodyView.imageContentView addSubview:button];
+        [cameraButton.layer addSublayer:border];
     }
-    
     // 刷新scroll contentsize
-    CGFloat imageContentHeight =  101;
+    CGFloat imageContentHeight = buttonHeight;
+    self.bodyView.imgContainerHeight.constant = imageContentHeight;
     CGFloat height = kScreenHeight - kNaviBarHeight - iPhoneXSafeBottomMargin > 590 + imageContentHeight ? kScreenHeight - kNaviBarHeight - iPhoneXSafeBottomMargin : 590 + imageContentHeight;
     CGRect frame = self.bodyView.frame;
     frame.size.height = height;

KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/ChatComplainBodyView.h

@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ChatComplainBodyView : UIView
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *imgContainerHeight;
+
 @property (weak, nonatomic) IBOutlet UITextView *inputText;
 
 @property (weak, nonatomic) IBOutlet UIView *imageContentView;

KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/ChatComplainBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -98,7 +98,7 @@
                             </constraints>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xrg-7V-2Sn">
-                            <rect key="frame" x="0.0" y="50" width="388" height="101"/>
+                            <rect key="frame" x="12" y="50" width="364" height="101"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="101" id="CP8-UI-leD"/>
@@ -116,9 +116,9 @@
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
-                        <constraint firstItem="Xrg-7V-2Sn" firstAttribute="leading" secondItem="KDf-B7-emx" secondAttribute="leading" id="7kS-7l-Yby"/>
+                        <constraint firstItem="Xrg-7V-2Sn" firstAttribute="leading" secondItem="KDf-B7-emx" secondAttribute="leading" constant="12" id="7kS-7l-Yby"/>
                         <constraint firstAttribute="bottom" secondItem="Xrg-7V-2Sn" secondAttribute="bottom" constant="20" id="SZb-Bg-QcY"/>
-                        <constraint firstAttribute="trailing" secondItem="Xrg-7V-2Sn" secondAttribute="trailing" id="ULU-7z-6TL"/>
+                        <constraint firstAttribute="trailing" secondItem="Xrg-7V-2Sn" secondAttribute="trailing" constant="12" id="ULU-7z-6TL"/>
                         <constraint firstItem="oi4-ac-uGd" firstAttribute="centerY" secondItem="jQb-YZ-Bxc" secondAttribute="centerY" id="jGL-jc-yAb"/>
                         <constraint firstItem="jQb-YZ-Bxc" firstAttribute="leading" secondItem="KDf-B7-emx" secondAttribute="leading" constant="12" id="lGC-0s-boz"/>
                         <constraint firstItem="Xrg-7V-2Sn" firstAttribute="top" secondItem="jQb-YZ-Bxc" secondAttribute="bottom" constant="12" id="mtG-2e-17R"/>
@@ -148,6 +148,7 @@
                 <outlet property="countLabel" destination="4V1-a5-eUe" id="n8K-Oq-Dzh"/>
                 <outlet property="imageContentView" destination="Xrg-7V-2Sn" id="lbn-Qq-aTP"/>
                 <outlet property="imageIcon" destination="jQb-YZ-Bxc" id="jnG-Q4-Suo"/>
+                <outlet property="imgContainerHeight" destination="CP8-UI-leD" id="z7U-wZ-2wc"/>
                 <outlet property="inputText" destination="ANC-BC-e3J" id="cCy-c9-2tK"/>
                 <outlet property="tipsLabel" destination="srl-cR-tfi" id="FNb-fb-8Rv"/>
                 <outlet property="titleIcon" destination="6Ye-5V-vW1" id="7k5-a9-p6O"/>

KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupSettingBodyView.m

@@ -119,6 +119,8 @@ typedef void(^ChooseMemberCallback)(NSString *targetId);
 @property (weak, nonatomic) IBOutlet UIButton *sureButton;
 @property (nonatomic, copy) GroupSettingBlock callback;
 
+@property (nonatomic, strong) UIScrollView *memberScrollView;
+
 @end
 
 @implementation GroupSettingBodyView
@@ -126,6 +128,10 @@ typedef void(^ChooseMemberCallback)(NSString *targetId);
     [super awakeFromNib];
     self.isOn = NO;
     [self.sureButton setBackgroundColor:CLIENT_THEMECOLOR];
+    [self.memberView addSubview:self.memberScrollView];
+    [self.memberScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.bottom.mas_equalTo(self.memberView);
+    }];
 }
 
 + (instancetype)shareInstance  {
@@ -167,14 +173,13 @@ typedef void(^ChooseMemberCallback)(NSString *targetId);
         self.memberCount.text = [NSString stringWithFormat:@"查看%zd名群成员", studentArray.count];
     }
     
-    [self removeAllSubviews:self.memberView];
-    CGFloat width = kScreenWidth / 5;
-    NSInteger count = 0;
-    if (studentArray.count < 5) {
-        count = studentArray.count;
-    }
-    else {
-        count = 5;
+    [self removeAllSubviews:self.memberScrollView];
+    NSInteger maxCount = IS_IPAD ? 9 : 5;
+    CGFloat width = KPortraitWidth / maxCount;
+    NSInteger count = studentArray.count;
+    // 最多显示max count
+    if (count  > maxCount) {
+        count = maxCount;
     }
     for (NSInteger i = 0; i < count; i++) {
         CGRect frame = CGRectMake(width * i, 0, width, 100);
@@ -183,7 +188,16 @@ typedef void(^ChooseMemberCallback)(NSString *targetId);
         [view configMemberWithUrl:model.avatar name:model.nickname targetId:model.imUserId isOwner:model.isAdmin callback:^(NSString *targetId) {
                     
         }];
-        [self.memberView addSubview:view];
+        [self.memberScrollView addSubview:view];
+        [view mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.bottom.mas_equalTo(self.memberScrollView);
+            make.left.mas_equalTo(self.memberScrollView.mas_left).offset(width * i);
+            make.width.mas_equalTo(width);
+            make.height.mas_equalTo(100);
+            if (i == count -1) {
+                make.right.mas_equalTo(self.memberScrollView.mas_right);
+            }
+        }];
     }
     
 }
@@ -253,6 +267,13 @@ typedef void(^ChooseMemberCallback)(NSString *targetId);
     NSString *imageName = isOn ? CLIENT_SWITCH_ON : @"switch_off";
     [self.switchButton setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
 }
+
+- (UIScrollView *)memberScrollView {
+    if (!_memberScrollView) {
+        _memberScrollView = [[UIScrollView alloc] init];
+    }
+    return _memberScrollView;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForStudent/KulexiuForStudent/Module/Course/AccompanyCourse/Controller/AccompanyDetailViewController.m

@@ -407,7 +407,7 @@
 
 #pragma mark ------ WMPlayer
 - (void)playVideoWithUrl:(NSString *)fileUrl {
-    fileUrl = [fileUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+    fileUrl = [fileUrl getUrlEndcodeString];
     _playerFrame = CGRectMake(0, iPhoneXSafeTopMargin, kScreenWidth, kScreenHeight - iPhoneXSafeTopMargin - iPhoneXSafeBottomMargin);
     _wmPlayer = [[WMPlayer alloc] initWithFrame:_playerFrame];
     WMPlayerModel *playModel = [[WMPlayerModel alloc] init];

KulexiuForStudent/KulexiuForStudent/Module/Course/AccompanyCourse/View/AccompanyDetailBottomView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,10 +14,9 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oRU-Dt-UTR">
-                    <rect key="frame" x="113.5" y="15" width="187" height="44"/>
+                    <rect key="frame" x="25" y="15" width="364" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="187" id="8p2-Gl-Is8"/>
                         <constraint firstAttribute="height" constant="44" id="kXD-lh-kn0"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
@@ -35,6 +34,7 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
+                <constraint firstItem="oRU-Dt-UTR" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="WJY-zy-oub"/>
                 <constraint firstItem="oRU-Dt-UTR" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="gJa-gF-SIm"/>
                 <constraint firstItem="oRU-Dt-UTR" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15" id="neC-CL-OHA"/>
             </constraints>

KulexiuForStudent/KulexiuForStudent/Module/Course/MusicRoom/Controller/MusicRoomDetailViewController.m

@@ -335,7 +335,7 @@
 
 #pragma mark ------ WMPlayer
 - (void)playVideoWithUrl:(NSString *)fileUrl {
-    fileUrl = [fileUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+    fileUrl = [fileUrl getUrlEndcodeString];
     _playerFrame = CGRectMake(0, iPhoneXSafeTopMargin, kScreenWidth, kScreenHeight - iPhoneXSafeTopMargin - iPhoneXSafeBottomMargin);
     _wmPlayer = [[WMPlayer alloc] initWithFrame:_playerFrame];
     WMPlayerModel *playModel = [[WMPlayerModel alloc] init];

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

@@ -73,11 +73,14 @@
 #import "HomeDragButton.h"
 #import "HomeMusicSheetLayout.h"
 
-#define COLLECTION_WIDTH ((NSInteger)(KPortraitWidth * 0.83))
+#define COLLECTION_WIDTH ((NSInteger)(IS_IPAD ? KPortraitWidth * 0.7 : KPortraitWidth * 0.83))
 #define COLLECTION_HEIGHT (320)
 #define BUTTONWIDTH (65)
 #define BUTTONHEIGHT (80)
 
+#define BUTTON_ROWCOUNT (IS_IPAD ? 7 : 5)
+
+
 @interface HomeViewController ()<JXPagerViewDelegate, JXPagerMainTableViewGestureDelegate,JXCategoryViewDelegate,SDCycleScrollViewDelegate,UIScrollViewDelegate,UICollectionViewDelegate, UICollectionViewDelegateFlowLayout,UICollectionViewDataSource,TYCyclePagerViewDataSource,TYCyclePagerViewDelegate>
 
 @property (nonatomic, strong) UserInfo *mineInfo;
@@ -343,7 +346,7 @@
 - (void)configUI {
     [self configHeadView];
     
-    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, kNaviBarHeight, kScreenWidth, 44)];
+    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, kNaviBarHeight, KPortraitWidth, 44)];
     self.categoryView.backgroundColor = [UIColor clearColor];
     self.categoryView.titles = self.titles;
     self.categoryView.delegate = self;
@@ -948,7 +951,7 @@
 
 - (void)refreshViewLocation {
     // 如果有课程和公告 且有按钮
-    CGFloat buttonViewDefaultHeight = self.buttonArray.count > 5 ? [HomeButtonView getViewHeight] : [HomeButtonView getViewHeight] - 20;
+    CGFloat buttonViewDefaultHeight = self.buttonArray.count > BUTTON_ROWCOUNT ? [HomeButtonView getViewHeight] : [HomeButtonView getViewHeight] - 20;
     
     if (self.noticeTitleArray.count && self.recentCourseModel && self.buttonArray.count) {
         self.noticeViewHeight = [PublicNoticeView getViewHeight];
@@ -1030,37 +1033,37 @@
     // 添加按钮
     if (self.buttonArray.count) {
         self.buttonContainer.hidden = NO;
-        if (self.buttonArray.count > 5) { // 大于4个显示底部滚动视图
+        if (self.buttonArray.count > BUTTON_ROWCOUNT) { // 大于4个显示底部滚动视图
             self.buttonContainer.buttonPageCtrl.hidden = NO;
             self.buttonContainer.buttonDotLeft.constant = 0;
-            NSInteger addPage = (self.buttonArray.count % 5) > 0 ? 1 : 0;
-            NSInteger pageCount = self.buttonArray.count / 5 + addPage;
+            NSInteger addPage = (self.buttonArray.count % BUTTON_ROWCOUNT) > 0 ? 1 : 0;
+            NSInteger pageCount = self.buttonArray.count / BUTTON_ROWCOUNT + addPage;
             self.buttonDotWidth = 36 / pageCount;
             self.buttonContainer.buttonDotWidth.constant = self.buttonDotWidth;
-            self.buttonScrollView.contentSize = CGSizeMake(kScreenWidth * pageCount, BUTTONHEIGHT);
+            self.buttonScrollView.contentSize = CGSizeMake(KPortraitWidth * pageCount, BUTTONHEIGHT);
         }
         else {
             self.buttonContainer.buttonPageCtrl.hidden = YES;
-            self.buttonScrollView.contentSize = CGSizeMake(kScreenWidth, BUTTONHEIGHT);
+            self.buttonScrollView.contentSize = CGSizeMake(KPortraitWidth, BUTTONHEIGHT);
         }
     }
     else {
         self.buttonContainer.hidden = YES;
         self.buttonContainer.buttonPageCtrl.hidden = YES;
-        self.buttonScrollView.contentSize = CGSizeMake(kScreenWidth, CGFLOAT_MIN);
+        self.buttonScrollView.contentSize = CGSizeMake(KPortraitWidth, CGFLOAT_MIN);
     }
     
         
     self.buttonScrollView.contentOffset = CGPointMake(0, 0);
     [self.buttonScrollView removeAllSubViews];
-    CGFloat buttonSpace = (kScreenWidth - 5 * BUTTONWIDTH) / 6;
+    CGFloat buttonSpace = (KPortraitWidth - BUTTON_ROWCOUNT * BUTTONWIDTH) / (BUTTON_ROWCOUNT + 1);
     for (NSInteger i = 0; i < self.buttonArray.count; i++) {
         HomeMessageModel *model = self.buttonArray[i];
         KSHomeButton *buttonView = [KSHomeButton shareInstance];
         
         [buttonView.buttonImage sd_setImageWithURL:[NSURL URLWithString:[model.coverImage getUrlEndcodeString]]];
         buttonView.buttonTitle.text = model.title;
-        buttonView.frame = CGRectMake(buttonSpace + (i % 5) * (BUTTONWIDTH + buttonSpace) + (i / 5) * KPortraitWidth, 0, BUTTONWIDTH, BUTTONHEIGHT);
+        buttonView.frame = CGRectMake(buttonSpace + (i % BUTTON_ROWCOUNT) * (BUTTONWIDTH + buttonSpace) + (i / BUTTON_ROWCOUNT) * KPortraitWidth, 0, BUTTONWIDTH, BUTTONHEIGHT);
         buttonView.actionButton.tag = 3000 + i;
         [buttonView.actionButton addTarget:self action:@selector(HomeTopButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         [self.buttonScrollView addSubview:buttonView];
@@ -1300,7 +1303,7 @@
 
 - (TYCyclePagerViewLayout *)layoutForPagerView:(TYCyclePagerView *)pageView {
     TYCyclePagerViewLayout *layout = [[TYCyclePagerViewLayout alloc]init];
-    layout.itemSize = CGSizeMake(kScreenWidth - 28, (kScreenWidth - 28) / 347 * 132);
+    layout.itemSize = CGSizeMake(KPortraitWidth - 28, (KPortraitWidth - 28) / 347 * 132);
     layout.itemSpacing = 0;
     return layout;
     
@@ -1519,9 +1522,15 @@
         return CGSizeMake(COLLECTION_WIDTH, COLLECTION_HEIGHT);
     }
     else if (collectionView == self.talentCollectionView) {
+        if (IS_IPAD) {
+            return CGSizeMake(134, 178);
+        }
         return CGSizeMake(110, 178);
     }
     else if (collectionView == self.videoCollectionView) {
+        if (IS_IPAD) {
+            return CGSizeMake(205, 157);
+        }
         return CGSizeMake(168, 157);
     }
     else {
@@ -1626,7 +1635,7 @@
     if (!_bannerScroll) {
         _bannerScroll = [[TYCyclePagerView alloc] init];
         _bannerScroll.backgroundColor = [UIColor clearColor];
-        _bannerScroll.frame = CGRectMake(0, 0, kScreenWidth - 28, (kScreenWidth - 28) / 347 * 132);
+        _bannerScroll.frame = CGRectMake(0, 0, KPortraitWidth - 28, (KPortraitWidth - 28) / 347 * 132);
         _bannerScroll.isInfiniteLoop = YES;
         _bannerScroll.autoScrollInterval = 3.0f;
         _bannerScroll.reloadDataNeedResetIndex = YES;
@@ -1652,7 +1661,7 @@
         _pageControl = [[TYPageControl alloc] init];
         _pageControl.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
         _pageControl.pageIndicatorSpaing = 4.0f;
-        _pageControl.frame = CGRectMake(0, (kScreenWidth - 28) * 132 / 347 - 20, kScreenWidth-28 - 12, 12);
+        _pageControl.frame = CGRectMake(0, (KPortraitWidth - 28) * 132 / 347 - 20, KPortraitWidth-28 - 12, 12);
         _pageControl.currentPageIndicatorTintColor = HexRGB(0xffffff);
         _pageControl.pageIndicatorTintColor = HexRGB(0xffffff);
         _pageControl.pageIndicatorSize = CGSizeMake(5, 5);

KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/View/NotiferMessageCell.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="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,7 +17,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="notifer_unknow" translatesAutoresizingMaskIntoConstraints="NO" id="3FS-75-ZgU">
-                        <rect key="frame" x="16" y="32" width="44" height="44"/>
+                        <rect key="frame" x="16" y="22" width="44" height="44"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="44" id="Abw-Pq-4OW"/>
                             <constraint firstAttribute="width" constant="44" id="cte-lB-Tzl"/>
@@ -70,9 +70,9 @@
                     <constraint firstAttribute="bottom" secondItem="aCp-hw-uSQ" secondAttribute="bottom" constant="22" id="0DI-6H-dc0"/>
                     <constraint firstItem="dWN-rA-dKm" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="22" id="0gk-xb-9OT"/>
                     <constraint firstItem="PnY-EC-LkF" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="dWN-rA-dKm" secondAttribute="trailing" constant="10" id="9xN-aV-SK3"/>
+                    <constraint firstItem="dWN-rA-dKm" firstAttribute="top" secondItem="3FS-75-ZgU" secondAttribute="top" id="BCS-5z-wma"/>
                     <constraint firstItem="dWN-rA-dKm" firstAttribute="leading" secondItem="3FS-75-ZgU" secondAttribute="trailing" constant="10" id="FNS-ca-wiG"/>
                     <constraint firstItem="aCp-hw-uSQ" firstAttribute="leading" secondItem="dWN-rA-dKm" secondAttribute="leading" id="GSa-tm-lZr"/>
-                    <constraint firstItem="3FS-75-ZgU" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="Lvw-p8-dTf"/>
                     <constraint firstItem="heX-9o-hn0" firstAttribute="leading" secondItem="dWN-rA-dKm" secondAttribute="trailing" constant="5" id="Pz3-5h-Y3h"/>
                     <constraint firstItem="heX-9o-hn0" firstAttribute="centerY" secondItem="dWN-rA-dKm" secondAttribute="top" id="Rcd-NR-oK0"/>
                     <constraint firstItem="PnY-EC-LkF" firstAttribute="centerY" secondItem="dWN-rA-dKm" secondAttribute="centerY" id="U2W-vQ-SXe"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomePageView/HomePageBodyView.m

@@ -195,27 +195,51 @@
 
 - (CGFloat)waterFlowLayout:(TeacherStyleFlowLayout *)waterFlowLayout heightForWidth:(CGFloat)width andIndexPath:(NSIndexPath *)indexPath {
     id source = self.sourceArray[indexPath.item];
-    if (indexPath.row == 0) { // 第一排
-        if ([source isKindOfClass:[HomeTeacherLiveModel class]]) {
-            return 302;
+    if (IS_IPAD) {
+        if (indexPath.row == 0) { // 第一排
+            if ([source isKindOfClass:[HomeTeacherLiveModel class]]) {
+                return 302;
+            }
+            else {
+                if (indexPath.item % 3 == 1) {
+                    return 211.0f;
+                }
+                return 265.0f;
+            }
         }
         else {
-            return 265.0f;
+            if ([source isKindOfClass:[HomeTeacherLiveModel class]]) {  // 进入直播间
+                return 248.0f;
+            }
+            else {
+                if (indexPath.item % 3 == 1) {
+                    return 211.0f;
+                }
+                return 248.0f;
+            }
         }
     }
-    else { 
-        if ([source isKindOfClass:[HomeTeacherLiveModel class]]) {  // 进入直播间
-            return 248.0f;
+    else {
+        if (indexPath.row == 0) { // 第一排
+            if ([source isKindOfClass:[HomeTeacherLiveModel class]]) {
+                return 302;
+            }
+            else {
+                return 265.0f;
+            }
         }
         else {
-            return 211.0f;
+            if ([source isKindOfClass:[HomeTeacherLiveModel class]]) {  // 进入直播间
+                return 248.0f;
+            }
+            else {
+                return 211.0f;
+            }
         }
     }
+    
 }
 
-//- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
-//    return 11.0f;
-//}
 
 /*
 // Only override drawRect: if you perform custom drawing.

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomePageView/TeacherStyleFlowLayout.m

@@ -22,7 +22,12 @@
     if (self = [super init]){
         self.columnMargin = 12;
         self.rowMargin = 11;
-        self.columnCount = 2;
+        if (IS_IPAD) {
+            self.columnCount = 3;
+        }
+        else {
+            self.columnCount = 2;
+        }
     }
     return self;
 }

KulexiuForStudent/KulexiuForStudent/Module/Login/Controller/InstrumentChooseViewController.m

@@ -11,6 +11,8 @@
 #import "InstrumentChooseBottonView.h"
 #import "InstrumentHeaderView.h"
 
+#define INSTRUMENT_ROWCOUNT (IS_IPAD ? 5 : 3)
+
 @interface InstrumentChooseViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
 
 @property (nonatomic, copy) ChooseInstrumentCallback callback;
@@ -34,6 +36,7 @@
 - (void)chooseCallback:(ChooseInstrumentCallback)callback {
     if (callback) {
         self.callback = callback;
+        
     }
 }
 
@@ -70,14 +73,6 @@
         make.height.mas_equalTo(36.0f);
     }];
     
-    
-    CAGradientLayer * gradientLayer = [CAGradientLayer layer];
-    gradientLayer.colors = @[(__bridge id)HexRGB(0xFFF6EE).CGColor,(__bridge id)HexRGB(0xFFECDD).CGColor];
-    gradientLayer.startPoint = CGPointMake(0.04, 0);
-    gradientLayer.endPoint = CGPointMake(0.97, 1.07);
-    gradientLayer.frame = CGRectMake(0, 0, kScreenWidth - 28, 36);
-    gradientLayer.locations = @[@(0),@(1)];
-    [headView.layer addSublayer:gradientLayer];
     headView.layer.cornerRadius = 10.0f;
     headView.layer.masksToBounds = YES;
     
@@ -219,7 +214,8 @@
 - (UICollectionView *)collectionView {
     if (!_collectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        CGFloat width = (NSInteger)((KPortraitWidth - 15 * 2 - 20) / 3);
+        
+        CGFloat width = (NSInteger)((KPortraitWidth - 15 * 2 - (INSTRUMENT_ROWCOUNT-1)* 10) / INSTRUMENT_ROWCOUNT);
         CGFloat height = width;
         layout.itemSize = CGSizeMake(width, height);
         layout.headerReferenceSize = CGSizeMake(KPortraitWidth - 30, 40);

KulexiuForStudent/KulexiuForStudent/Module/Login/Guide/Controller/GuideViewController.m

@@ -47,12 +47,7 @@
     [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(self.view);
     }];
-    if (@available(iOS 11.0, *)) {
-        self.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        // Fallback on earlier versions
-        self.automaticallyAdjustsScrollViewInsets = NO;
-    }
+    self.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     
     [self createListView];
     [self.view addSubview:self.pageControl];

KulexiuForStudent/KulexiuForStudent/Module/Login/Guide/View/GuideListView.m

@@ -8,6 +8,9 @@
 #import "GuideListView.h"
 
 @interface GuideListView ()
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *imageLeft;
+
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *imageTopConstraint;
 
 @property (weak, nonatomic) IBOutlet UIView *colorView;
@@ -48,7 +51,15 @@
         self.imageTopConstraint.constant = 174.0f;
     }
     else {
-        self.imageTopConstraint.constant = 104.0f;
+        if (IS_IPAD) {
+            self.imageTopConstraint.constant = 220.0f;
+        }
+        else {
+            self.imageTopConstraint.constant = 104.0f;
+        }
+    }
+    if (IS_IPAD) {
+        self.imageLeft.constant = 140;
     }
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Login/Guide/View/GuideListView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -67,13 +67,13 @@
             <constraints>
                 <constraint firstItem="40p-7F-M6I" firstAttribute="top" secondItem="5BZ-aV-ZqC" secondAttribute="bottom" constant="10" id="2v3-3C-ylP"/>
                 <constraint firstItem="V0F-XR-LOW" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="EMN-a8-r6N"/>
-                <constraint firstAttribute="trailing" secondItem="yUN-KZ-L1M" secondAttribute="trailing" constant="14" id="Fzi-Wu-PNu"/>
                 <constraint firstAttribute="trailing" secondItem="V0F-XR-LOW" secondAttribute="trailing" id="OIe-Jn-wBV"/>
                 <constraint firstItem="yUN-KZ-L1M" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="174" id="Op6-Wp-jtd"/>
                 <constraint firstItem="yUN-KZ-L1M" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="XsY-jo-nmn"/>
                 <constraint firstItem="V0F-XR-LOW" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Xul-rB-VdW"/>
                 <constraint firstItem="5BZ-aV-ZqC" firstAttribute="top" secondItem="yUN-KZ-L1M" secondAttribute="bottom" constant="24" id="ZEA-Cz-g9B"/>
                 <constraint firstItem="40p-7F-M6I" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="bAT-LT-afE"/>
+                <constraint firstItem="yUN-KZ-L1M" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="eAx-NJ-acA"/>
                 <constraint firstItem="5BZ-aV-ZqC" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="fBJ-c2-scA"/>
                 <constraint firstAttribute="trailing" secondItem="40p-7F-M6I" secondAttribute="trailing" constant="10" id="vgd-eT-UZy"/>
                 <constraint firstItem="ykp-ax-0bg" firstAttribute="top" secondItem="40p-7F-M6I" secondAttribute="bottom" constant="26" id="wLg-9o-nU5"/>
@@ -87,6 +87,7 @@
                 <outlet property="descLabel" destination="40p-7F-M6I" id="wCM-U9-TPH"/>
                 <outlet property="enterButton" destination="ykp-ax-0bg" id="zla-N1-sVW"/>
                 <outlet property="headTitle" destination="5BZ-aV-ZqC" id="83k-rz-XwT"/>
+                <outlet property="imageLeft" destination="XsY-jo-nmn" id="XDE-Rn-00V"/>
                 <outlet property="imageTopConstraint" destination="Op6-Wp-jtd" id="xld-jX-pGe"/>
                 <outlet property="imageView" destination="yUN-KZ-L1M" id="Mpv-wD-FBe"/>
             </connections>

KulexiuForStudent/KulexiuForStudent/Module/Login/View/InstrumentDescView.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="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -27,13 +27,13 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VTf-p4-xWE">
-                            <rect key="frame" x="34" y="65" width="259" height="74.5"/>
+                            <rect key="frame" x="34" y="65" width="259" height="79"/>
                             <attributedString key="attributedText">
                                 <fragment content="音色具有铜管的特色，但又温和高雅，带有哀愁和诗意，在铜管和木管乐器之间起到媒介作用，表现力极其丰富，是铜管乐器中音域最宽，应用最广泛的乐器。">
                                     <attributes>
                                         <color key="NSBackgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         <color key="NSColor" red="0.47843137254901957" green="0.47843137254901957" blue="0.47843137254901957" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <font key="NSFont" size="14" name=".PingFangSC-Regular"/>
+                                        <font key="NSFont" metaFont="system" size="14"/>
                                         <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                     </attributes>
                                 </fragment>

KulexiuForStudent/KulexiuForStudent/Module/Login/View/VefiBodyView.m

@@ -9,6 +9,8 @@
 
 @interface VefiBodyView ()<UITextFieldDelegate>
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *codeViewWidth;
+
 @property (nonatomic, copy) VefiCallback callback;
 
 ///设置验证码位数 默认 6 位
@@ -23,6 +25,9 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    if (IS_IPAD) {
+        self.codeViewWidth.constant = 400;
+    }
     [self config];
 }
 - (void)config {

KulexiuForStudent/KulexiuForStudent/Module/Login/View/VefiBodyView.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="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -23,6 +23,9 @@
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_head" translatesAutoresizingMaskIntoConstraints="NO" id="D4i-ti-d70">
                     <rect key="frame" x="0.0" y="0.0" width="414" height="336.5"/>
+                    <constraints>
+                        <constraint firstAttribute="width" secondItem="D4i-ti-d70" secondAttribute="height" multiplier="375:305" id="Sid-39-Vqy"/>
+                    </constraints>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_black" translatesAutoresizingMaskIntoConstraints="NO" id="yTV-Gq-AWW">
                     <rect key="frame" x="17" y="59" width="12" height="20"/>
@@ -52,29 +55,29 @@
                     <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="ACC-QJ-tEK">
-                    <rect key="frame" x="35" y="206" width="140.5" height="19.5"/>
+                    <rect key="frame" x="35" y="206" width="144.5" height="19.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QLn-uF-0pA">
-                    <rect key="frame" x="181.5" y="216" width="0.0" height="0.0"/>
+                    <rect key="frame" x="185.5" y="216" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="APb-fr-rES">
-                    <rect key="frame" x="42" y="255.5" width="330" height="80"/>
+                    <rect key="frame" x="47" y="255.5" width="320" height="80"/>
                     <subviews>
                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ecZ-di-AWs">
-                            <rect key="frame" x="0.0" y="0.0" width="330" height="80"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                             <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <color key="textColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
                         <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="rsP-JE-rXf">
-                            <rect key="frame" x="0.0" y="0.0" width="330" height="80"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                             <subviews>
                                 <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qPd-JT-IRj">
                                     <rect key="frame" x="0.0" y="20" width="38" height="40"/>
@@ -112,7 +115,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NsP-dc-Mqc">
-                                    <rect key="frame" x="58.5" y="20" width="38" height="40"/>
+                                    <rect key="frame" x="56.5" y="20" width="38" height="40"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" tag="1002" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m5R-11-XxQ">
                                             <rect key="frame" x="0.0" y="0.0" width="38" height="40"/>
@@ -147,7 +150,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dX8-IM-ogY">
-                                    <rect key="frame" x="117" y="20" width="38" height="40"/>
+                                    <rect key="frame" x="113" y="20" width="38" height="40"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" tag="1003" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xKi-If-kn0">
                                             <rect key="frame" x="0.0" y="0.0" width="38" height="40"/>
@@ -182,7 +185,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IwE-wJ-SdW">
-                                    <rect key="frame" x="175" y="20" width="38" height="40"/>
+                                    <rect key="frame" x="169" y="20" width="38" height="40"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" tag="1004" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xqX-5L-OmT">
                                             <rect key="frame" x="0.0" y="0.0" width="38" height="40"/>
@@ -217,7 +220,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c7p-XH-121">
-                                    <rect key="frame" x="233.5" y="20" width="38" height="40"/>
+                                    <rect key="frame" x="225.5" y="20" width="38" height="40"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" tag="1005" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yBI-JY-iGJ">
                                             <rect key="frame" x="0.0" y="0.0" width="38" height="40"/>
@@ -252,7 +255,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oIi-0Z-NDh">
-                                    <rect key="frame" x="292" y="20" width="38" height="40"/>
+                                    <rect key="frame" x="282" y="20" width="38" height="40"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" tag="1006" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TgR-sX-cLq">
                                             <rect key="frame" x="0.0" y="0.0" width="38" height="40"/>
@@ -303,6 +306,7 @@
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="rsP-JE-rXf" secondAttribute="trailing" id="07n-qx-SXV"/>
                         <constraint firstItem="rsP-JE-rXf" firstAttribute="leading" secondItem="APb-fr-rES" secondAttribute="leading" id="4Ya-nY-Wni"/>
+                        <constraint firstAttribute="width" constant="320" id="AAi-A5-NJz"/>
                         <constraint firstAttribute="bottom" secondItem="ecZ-di-AWs" secondAttribute="bottom" id="BSo-Zl-RbI"/>
                         <constraint firstItem="rsP-JE-rXf" firstAttribute="top" secondItem="APb-fr-rES" secondAttribute="top" id="CDn-2L-wj6"/>
                         <constraint firstAttribute="height" constant="80" id="NcU-c7-hDF"/>
@@ -336,15 +340,14 @@
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
+                <constraint firstItem="APb-fr-rES" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="3dG-i6-OGK"/>
                 <constraint firstItem="yTV-Gq-AWW" firstAttribute="centerY" secondItem="h3s-bI-j5B" secondAttribute="centerY" id="5fp-Se-Lme"/>
                 <constraint firstItem="yTV-Gq-AWW" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="17" id="7Gp-wl-lnP"/>
                 <constraint firstItem="N0p-t8-Ync" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="DI5-5e-fVc"/>
                 <constraint firstItem="ACC-QJ-tEK" firstAttribute="leading" secondItem="8pp-v2-csB" secondAttribute="leading" id="Eul-X9-cbW"/>
                 <constraint firstAttribute="trailing" secondItem="N0p-t8-Ync" secondAttribute="trailing" id="I9u-dZ-Lji"/>
-                <constraint firstItem="APb-fr-rES" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="42" id="N9F-NY-6MA"/>
                 <constraint firstItem="t6R-nu-bBh" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="NAW-Ta-nYI"/>
                 <constraint firstItem="QLn-uF-0pA" firstAttribute="centerY" secondItem="ACC-QJ-tEK" secondAttribute="centerY" id="RGf-uR-Xb1"/>
-                <constraint firstItem="D4i-ti-d70" firstAttribute="width" secondItem="D4i-ti-d70" secondAttribute="height" multiplier="375:305" id="Sid-39-Vqy"/>
                 <constraint firstItem="D4i-ti-d70" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="X3l-Nh-qsc"/>
                 <constraint firstItem="8pp-v2-csB" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="35" id="Zdg-6H-P9H"/>
                 <constraint firstAttribute="trailing" secondItem="D4i-ti-d70" secondAttribute="trailing" id="Zqo-dx-oIu"/>
@@ -354,7 +357,6 @@
                 <constraint firstItem="h3s-bI-j5B" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="imv-0J-7lZ"/>
                 <constraint firstItem="t6R-nu-bBh" firstAttribute="top" secondItem="APb-fr-rES" secondAttribute="bottom" constant="30" id="l43-O2-aNN"/>
                 <constraint firstItem="APb-fr-rES" firstAttribute="top" secondItem="ACC-QJ-tEK" secondAttribute="bottom" constant="30" id="mrY-Wz-yVi"/>
-                <constraint firstAttribute="trailing" secondItem="APb-fr-rES" secondAttribute="trailing" constant="42" id="mtR-HL-TYC"/>
                 <constraint firstAttribute="bottom" secondItem="N0p-t8-Ync" secondAttribute="bottom" id="nUf-4H-kig"/>
                 <constraint firstItem="8pp-v2-csB" firstAttribute="top" secondItem="h3s-bI-j5B" secondAttribute="bottom" constant="65" id="tBO-2A-yYB"/>
                 <constraint firstItem="ACC-QJ-tEK" firstAttribute="top" secondItem="8pp-v2-csB" secondAttribute="bottom" constant="15" id="yVZ-gV-TBm"/>
@@ -364,6 +366,7 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="backField" destination="ecZ-di-AWs" id="PvK-vs-hSx"/>
+                <outlet property="codeViewWidth" destination="AAi-A5-NJz" id="d13-7Y-6dn"/>
                 <outlet property="phoneText" destination="QLn-uF-0pA" id="MEj-6V-KeS"/>
                 <outlet property="vefiButton" destination="t6R-nu-bBh" id="mcL-4l-YOX"/>
             </connections>

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

@@ -47,10 +47,12 @@
 }
 
 - (void)configUI {
-    UIImage *bgImage = [UIImage imageNamed:@"mine_navBg"];
-    CGFloat height = bgImage.size.height / bgImage.size.width * kScreenWidth;
+    NSString *bgName = IS_IPAD ? @"mine_navBgPad" : @"mine_navBg";
+
+    UIImage *bgImage = [UIImage imageNamed:bgName];
+    CGFloat height = bgImage.size.height / bgImage.size.width * KPortraitWidth;
     UIImageView *imageView = [[UIImageView alloc] initWithImage:bgImage];
-    imageView.frame = CGRectMake(0, 0, kScreenWidth, height);
+    imageView.frame = CGRectMake(0, 0, KPortraitWidth, height);
     [self.view addSubview:imageView];
     self.scrollView.backgroundColor = [UIColor clearColor];
     self.scrollView.delegate = self;

KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/Controller/HomeworkDetailViewController.m

@@ -289,7 +289,7 @@
 
 #pragma mark ------ WMPlayer
 - (void)playVideoWithUrl:(NSString *)fileUrl {
-    fileUrl = [fileUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+    fileUrl = [fileUrl getUrlEndcodeString];
     _playerFrame = CGRectMake(0, iPhoneXSafeTopMargin, kScreenWidth, kScreenHeight - iPhoneXSafeTopMargin - iPhoneXSafeBottomMargin);
     _wmPlayer = [[WMPlayer alloc] initWithFrame:_playerFrame];
     WMPlayerModel *playModel = [[WMPlayerModel alloc] init];

KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/AccompanyAlertView.m

@@ -10,6 +10,8 @@
 
 @interface AccompanyAlertView ()<UITextViewDelegate>
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *viewLeft;
+
 @property (weak, nonatomic) IBOutlet KSStarView *starView;
 
 @property (nonatomic, copy) AccompanyAlertCallback callback;
@@ -23,6 +25,9 @@
     self.inputView.delegate = self;
     self.starView.hidden = YES;
     self.starView.allowMark = YES;
+    if (IS_IPAD) {
+        self.viewLeft.constant = KPortraitWidth / 4;
+    }
 }
 
 + (instancetype)shareInstance {

KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/AccompanyAlertView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,23 +11,23 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AccompanyAlertView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="896"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kJz-jy-Enw">
-                    <rect key="frame" x="32" y="322" width="350" height="252"/>
+                    <rect key="frame" x="32" y="322" width="311" height="252"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="accell_left" translatesAutoresizingMaskIntoConstraints="NO" id="g5U-zt-jhG">
-                            <rect key="frame" x="19" y="27" width="4" height="14"/>
+                            <rect key="frame" x="19" y="27" width="4" height="18"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评价学员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Biv-dK-fGb">
-                            <rect key="frame" x="29" y="23" width="74" height="22"/>
+                            <rect key="frame" x="29" y="25" width="74" 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="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sjo-db-uX7">
-                            <rect key="frame" x="310" y="0.0" width="40" height="40"/>
+                            <rect key="frame" x="271" y="0.0" width="40" height="40"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="TQQ-uo-INP"/>
                                 <constraint firstAttribute="width" constant="40" id="mp9-0N-gC4"/>
@@ -39,7 +39,7 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pIM-1F-iXG" customClass="KSStarView">
-                            <rect key="frame" x="111" y="24.5" width="90" height="19"/>
+                            <rect key="frame" x="111" y="26.5" width="90" height="19"/>
                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="90" id="VfG-pE-0iO"/>
@@ -47,7 +47,7 @@
                             </constraints>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G0I-PQ-FQA">
-                            <rect key="frame" x="26" y="193" width="298" height="44"/>
+                            <rect key="frame" x="26" y="193" width="259" height="44"/>
                             <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="E0O-u9-1AP"/>
@@ -65,17 +65,17 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MLc-UI-hJt">
-                            <rect key="frame" x="18" y="63" width="314" height="115"/>
+                            <rect key="frame" x="18" y="65" width="275" height="113"/>
                             <subviews>
                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="7gT-5S-Mnm">
-                                    <rect key="frame" x="0.0" y="0.0" width="314" height="115"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="275" height="113"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                 </textView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请输入您对本次课程学员表现的评价" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Yk-u1-WFH">
-                                    <rect key="frame" x="11" y="11" width="292" height="17"/>
+                                    <rect key="frame" x="11" y="11" width="253" 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"/>
@@ -126,8 +126,8 @@
             </subviews>
             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="kJz-jy-Enw" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="OcC-Mh-hMs"/>
                 <constraint firstItem="kJz-jy-Enw" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="Yh6-BB-9g3"/>
-                <constraint firstAttribute="trailing" secondItem="kJz-jy-Enw" secondAttribute="trailing" constant="32" id="nGG-8u-ImK"/>
                 <constraint firstItem="kJz-jy-Enw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="32" id="wiJ-hM-0Kt"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
@@ -138,12 +138,13 @@
                 <outlet property="inputView" destination="7gT-5S-Mnm" id="cmg-Lm-Mx1"/>
                 <outlet property="starView" destination="pIM-1F-iXG" id="Ezw-4e-Vew"/>
                 <outlet property="tipsLabel" destination="4Yk-u1-WFH" id="Tbg-vh-eGE"/>
+                <outlet property="viewLeft" destination="wiJ-hM-0Kt" id="sSV-Dj-gtd"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="75.669642857142847"/>
         </view>
     </objects>
     <resources>
-        <image name="accell_left" width="4" height="14"/>
+        <image name="accell_left" width="4" height="18"/>
         <image name="check_cancle" width="14" height="14"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLessonBodyView.m

@@ -254,7 +254,7 @@
         }];
         [self.dateFormatter setDateFormat:@"yyyy年MM月"];
         NSDate *currentDate = [NSDate date];
-        [self.sortView.firstButton setTitle:[self.dateFormatter stringFromDate:currentDate] forState:UIControlStateNormal];
+        [self.sortView.firstLabel setText:[self.dateFormatter stringFromDate:currentDate]];
         [self addSubview:self.sortView];
     }
 }
@@ -277,11 +277,11 @@
             MJWeakSelf;
             KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部筛选" sourceData:nameArray  lastChooseIndex:0 chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
                 if (chooseIndex == 0) {
-                    [weakSelf.sortView.thirdButton setTitle:@"全部声部" forState:UIControlStateNormal];
+                    [weakSelf.sortView.thirdLabel setText:@"全部声部"];
                     weakSelf.subjectId = nil;
                 }
                 else {
-                    [weakSelf.sortView.thirdButton setTitle:returnValue forState:UIControlStateNormal];
+                    [weakSelf.sortView.thirdLabel setText:returnValue];
                     NSDictionary *parm = self.subjectList[chooseIndex-1];
                     weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
                 }
@@ -308,7 +308,7 @@
 
         self.classDate = date;
         NSString *displayTime = [self getTimeDisplay:date];
-        [self.sortView.firstButton setTitle:displayTime forState:UIControlStateNormal];
+        [self.sortView.firstLabel setText:displayTime];
         [self resetPickerStatus];
         // 请求数据
         [self refreshAndRequestData];
@@ -350,12 +350,12 @@
     else if (item == 1) { // 课程状态
         self.secondChooseIndex = chooseIndex;
         self.thirdChooseIndex = 0;
-        [self.sortView.secondButton setTitle:title forState:UIControlStateNormal];
+        [self.sortView.secondLabel setText:title];
         switch (chooseIndex) {
             case 1:
             {
                 self.status = nil;
-                [self.sortView.secondButton setTitle:@"课程状态" forState:UIControlStateNormal];
+                [self.sortView.secondLabel setText:@"课程状态"];
             }
                 break;
             case 2:
@@ -380,10 +380,11 @@
     }
     else if (item == 2) { // 声部筛选
         self.thirdChooseIndex = chooseIndex;
-        [self.sortView.thirdButton setTitle:title forState:UIControlStateNormal];
+        [self.sortView.thirdLabel setText:title];
+
         if (chooseIndex == 1) {
             self.subjectId = nil;
-            [self.sortView.thirdButton setTitle:@"全部声部" forState:UIControlStateNormal];
+            [self.sortView.thirdLabel setText:@"全部声部"];
         }
         else {
             NSDictionary *parm = self.subjectMessageArray[chooseIndex-1];

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLessonSearchView.h

@@ -20,9 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MyLessonSearchView : UIView
 
-@property (weak, nonatomic) IBOutlet UIButton *firstButton;
-@property (weak, nonatomic) IBOutlet UIButton *secondButton;
-@property (weak, nonatomic) IBOutlet UIButton *thirdButton;
+@property (weak, nonatomic) IBOutlet UILabel *firstLabel;
+@property (weak, nonatomic) IBOutlet UILabel *secondLabel;
+@property (weak, nonatomic) IBOutlet UILabel *thirdLabel;
 
 @property (nonatomic, assign) BOOL firstArrowUp;
 

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLessonSearchView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -19,8 +19,14 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sav-8B-TD3">
                             <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
                             <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2022年04月" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SZF-Nh-GLK">
+                                    <rect key="frame" x="19.5" y="35.5" width="84" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="vSU-NS-Qou">
-                                    <rect key="frame" x="113.5" y="41" width="8" height="6"/>
+                                    <rect key="frame" x="109.5" y="41" width="8" height="6"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="6" id="L0G-Nt-hlU"/>
                                         <constraint firstAttribute="width" constant="8" id="nhm-Fv-ewC"/>
@@ -29,7 +35,7 @@
                                 <button opaque="NO" tag="1001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CSP-VE-Q55">
                                     <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                    <state key="normal" title="2022年04月">
+                                    <state key="normal">
                                         <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <connections>
@@ -41,8 +47,10 @@
                             <constraints>
                                 <constraint firstAttribute="trailing" secondItem="CSP-VE-Q55" secondAttribute="trailing" id="0bd-hm-rCy"/>
                                 <constraint firstAttribute="bottom" secondItem="CSP-VE-Q55" secondAttribute="bottom" id="5ye-zJ-qJd"/>
-                                <constraint firstAttribute="trailing" secondItem="vSU-NS-Qou" secondAttribute="trailing" constant="10" id="g2D-zv-qIp"/>
+                                <constraint firstItem="SZF-Nh-GLK" firstAttribute="centerX" secondItem="sav-8B-TD3" secondAttribute="centerX" constant="-4" id="Alx-tT-2ei"/>
+                                <constraint firstItem="vSU-NS-Qou" firstAttribute="leading" secondItem="SZF-Nh-GLK" secondAttribute="trailing" constant="6" id="gzf-kV-Yq4"/>
                                 <constraint firstItem="CSP-VE-Q55" firstAttribute="top" secondItem="sav-8B-TD3" secondAttribute="top" id="lqg-EV-zPD"/>
+                                <constraint firstItem="SZF-Nh-GLK" firstAttribute="centerY" secondItem="sav-8B-TD3" secondAttribute="centerY" id="nyN-Qr-ZM8"/>
                                 <constraint firstItem="vSU-NS-Qou" firstAttribute="centerY" secondItem="sav-8B-TD3" secondAttribute="centerY" id="vSN-3Z-GaR"/>
                                 <constraint firstItem="CSP-VE-Q55" firstAttribute="leading" secondItem="sav-8B-TD3" secondAttribute="leading" id="zIY-Ko-K7m"/>
                             </constraints>
@@ -50,8 +58,14 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EXN-FR-v0M">
                             <rect key="frame" x="141.5" y="0.0" width="131" height="88"/>
                             <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课程状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6ns-hS-Kd7">
+                                    <rect key="frame" x="33" y="35.5" width="57.5" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="OTv-DP-LWv">
-                                    <rect key="frame" x="103" y="41" width="8" height="6"/>
+                                    <rect key="frame" x="96.5" y="41" width="8" height="6"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="8" id="5Xg-pv-7Nq"/>
                                         <constraint firstAttribute="height" constant="6" id="z2o-1V-B1s"/>
@@ -60,7 +74,7 @@
                                 <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ob-Ur-wiA">
                                     <rect key="frame" x="0.0" y="0.0" width="131" height="88"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                    <state key="normal" title="课程状态">
+                                    <state key="normal">
                                         <color key="titleColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <connections>
@@ -70,9 +84,11 @@
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
-                                <constraint firstAttribute="trailing" secondItem="OTv-DP-LWv" secondAttribute="trailing" constant="20" id="Agt-B1-juL"/>
+                                <constraint firstItem="6ns-hS-Kd7" firstAttribute="centerY" secondItem="EXN-FR-v0M" secondAttribute="centerY" id="AzD-bE-066"/>
                                 <constraint firstItem="4ob-Ur-wiA" firstAttribute="leading" secondItem="EXN-FR-v0M" secondAttribute="leading" id="GtX-9e-ehq"/>
+                                <constraint firstItem="OTv-DP-LWv" firstAttribute="leading" secondItem="6ns-hS-Kd7" secondAttribute="trailing" constant="6" id="I7T-xV-JF7"/>
                                 <constraint firstAttribute="trailing" secondItem="4ob-Ur-wiA" secondAttribute="trailing" id="YNZ-vD-gf4"/>
+                                <constraint firstItem="6ns-hS-Kd7" firstAttribute="centerX" secondItem="EXN-FR-v0M" secondAttribute="centerX" constant="-4" id="YbI-hY-Ult"/>
                                 <constraint firstItem="OTv-DP-LWv" firstAttribute="centerY" secondItem="EXN-FR-v0M" secondAttribute="centerY" id="b3Z-oq-v2w"/>
                                 <constraint firstAttribute="bottom" secondItem="4ob-Ur-wiA" secondAttribute="bottom" id="jwa-36-Cbd"/>
                                 <constraint firstItem="4ob-Ur-wiA" firstAttribute="top" secondItem="EXN-FR-v0M" secondAttribute="top" id="ljE-Zk-4Wc"/>
@@ -81,8 +97,14 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tfS-Rc-iEN">
                             <rect key="frame" x="282.5" y="0.0" width="131.5" height="88"/>
                             <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部声部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o6O-VM-5uU">
+                                    <rect key="frame" x="33" y="35.5" width="57.5" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="2nN-nP-Pcx">
-                                    <rect key="frame" x="103.5" y="41" width="8" height="6"/>
+                                    <rect key="frame" x="96.5" y="41" width="8" height="6"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="6" id="Hqu-N6-YGq"/>
                                         <constraint firstAttribute="width" constant="8" id="RHc-EF-HM2"/>
@@ -91,7 +113,7 @@
                                 <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cgC-dL-lRH">
                                     <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                    <state key="normal" title="全部声部">
+                                    <state key="normal">
                                         <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <connections>
@@ -101,10 +123,12 @@
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
+                                <constraint firstItem="2nN-nP-Pcx" firstAttribute="leading" secondItem="o6O-VM-5uU" secondAttribute="trailing" constant="6" id="0n4-YK-n4D"/>
                                 <constraint firstItem="2nN-nP-Pcx" firstAttribute="centerY" secondItem="tfS-Rc-iEN" secondAttribute="centerY" id="5EQ-2B-7AS"/>
                                 <constraint firstAttribute="trailing" secondItem="cgC-dL-lRH" secondAttribute="trailing" id="736-JC-2Pv"/>
+                                <constraint firstItem="o6O-VM-5uU" firstAttribute="centerX" secondItem="tfS-Rc-iEN" secondAttribute="centerX" constant="-4" id="7M7-x1-FfN"/>
+                                <constraint firstItem="o6O-VM-5uU" firstAttribute="centerY" secondItem="tfS-Rc-iEN" secondAttribute="centerY" id="FMB-rn-9RF"/>
                                 <constraint firstItem="cgC-dL-lRH" firstAttribute="top" secondItem="tfS-Rc-iEN" secondAttribute="top" id="Jda-N3-CeP"/>
-                                <constraint firstAttribute="trailing" secondItem="2nN-nP-Pcx" secondAttribute="trailing" constant="20" id="fhr-tv-oYh"/>
                                 <constraint firstAttribute="bottom" secondItem="cgC-dL-lRH" secondAttribute="bottom" id="i38-qz-i66"/>
                                 <constraint firstItem="cgC-dL-lRH" firstAttribute="leading" secondItem="tfS-Rc-iEN" secondAttribute="leading" id="zXE-H5-6j1"/>
                             </constraints>
@@ -153,11 +177,11 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="firstArrow" destination="vSU-NS-Qou" id="Kv5-mp-IhS"/>
-                <outlet property="firstButton" destination="CSP-VE-Q55" id="Lyn-Ga-7zx"/>
+                <outlet property="firstLabel" destination="SZF-Nh-GLK" id="tEx-TG-3F3"/>
                 <outlet property="secondArrow" destination="OTv-DP-LWv" id="t4Z-hT-MB6"/>
-                <outlet property="secondButton" destination="4ob-Ur-wiA" id="DiD-8c-xf0"/>
+                <outlet property="secondLabel" destination="6ns-hS-Kd7" id="5aW-zc-XWs"/>
                 <outlet property="thirdArrow" destination="2nN-nP-Pcx" id="VyH-DI-YOp"/>
-                <outlet property="thirdButton" destination="cgC-dL-lRH" id="ct4-B7-EIj"/>
+                <outlet property="thirdLabel" destination="o6O-VM-5uU" id="4Qy-Qr-D3o"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="-33.482142857142854"/>
         </view>

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyVideoCourseBodyView.m

@@ -142,7 +142,7 @@
     self.collectionView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
     if (!_sortView) {
         _sortView = [MyVideoSearchView shareInstance];
-        _sortView.frame = CGRectMake(0, 0, kScreenWidth, 50);
+        _sortView.frame = CGRectMake(0, 0, KPortraitWidth, 50);
         MJWeakSelf;
         [_sortView sortAction:^{
             [weakSelf showSortView];
@@ -214,7 +214,10 @@
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    return CGSizeMake((kScreenWidth - 28 - 11) / 2.0f, 200);
+//    if (IS_IPAD) {
+//        return CGSizeMake((NSInteger)(KPortraitWidth - 28 - 11 *2) / 3, 200);;
+//    }
+    return CGSizeMake((NSInteger)(KPortraitWidth - 28 - 11) / 2, 200);
 }
 /**
  设置没有数据时的显示
@@ -229,7 +232,7 @@
     }
     else {
         self.promptView = [[StateView alloc]init];
-        self.promptView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight - 300);
+        self.promptView.frame = CGRectMake(0, 0, KPortraitWidth, KPortraitHeight - 300);
     }
     _promptPlaceView = view;
     //当请求不到数据时 ，自定义提示view 将会出现；

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

@@ -36,25 +36,25 @@
 + (instancetype)shareInstanceShowInView:(UIView *)mountView {
     
     CGFloat viewHeight = CGRectGetHeight(mountView.bounds);
-    CGFloat yPosition = viewHeight < kScreen_Height ? kNaviBarHeight : 0;
-    VeriCheckView *checkView = [[VeriCheckView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, viewHeight)];
+    CGFloat yPosition = viewHeight < KPortraitHeight ? kNaviBarHeight : 0;
+    VeriCheckView *checkView = [[VeriCheckView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, viewHeight)];
     checkView.mountView = mountView;
-    checkView.backView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, viewHeight)];
+    checkView.backView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, viewHeight)];
     checkView.backView.backgroundColor = HexRGBAlpha(0x000000, 0.5f);
     [checkView addSubview:checkView.backView];
     // 手势
     UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:checkView action:@selector(tapAction:)];
     tapGesture.delegate = checkView;
     [checkView.backView addGestureRecognizer:tapGesture];
-
+    CGFloat viewWidth = 300.0f;
     // display view
-    checkView.displayView = [[UIView alloc] initWithFrame:CGRectMake(20, (viewHeight - 166 - yPosition) / 2.0f, kScreen_Width - 40, 166)];
+    checkView.displayView = [[UIView alloc] initWithFrame:CGRectMake((KPortraitWidth - viewWidth)/2, (viewHeight - 166 - yPosition) / 2.0f, viewWidth, 166)];
     checkView.displayView.backgroundColor = [UIColor whiteColor];
     checkView.displayView.layer.cornerRadius = 5.0f;
     [checkView addSubview:checkView.displayView];
     
     UIButton *cancleButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    cancleButton.frame = CGRectMake(kScreen_Width - 25 - 20, CGRectGetMinY(checkView.displayView.frame) - 25 - 12, 25, 25);
+    cancleButton.frame = CGRectMake(CGRectGetMaxX(checkView.displayView.frame) - 25, CGRectGetMinY(checkView.displayView.frame) - 25 - 12, 25, 25);
     [cancleButton setImage:[UIImage imageNamed:@"cancleButton"] forState:UIControlStateNormal];
     [cancleButton addTarget:checkView action:@selector(hiddView) forControlEvents:UIControlEventTouchUpInside];
     [checkView addSubview:cancleButton];
@@ -62,7 +62,7 @@
     
     
     // titleLabel
-    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 20, kScreen_Width - 40, 22)];
+    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 20, viewWidth, 22)];
     [titleLabel setText:@"输入图片验证码"];
     [titleLabel setTextColor:HexRGB(0x4f4f4f)];
     [titleLabel setFont:[UIFont systemFontOfSize:16.0f weight:UIFontWeightMedium]];

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.m

@@ -9,6 +9,7 @@
 #import "UIImageView+DisplayImage.h"
 
 @interface MineBodyView ()
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *avatarWidth;
 
 @property (weak, nonatomic) IBOutlet UIView *subjectView;
 
@@ -51,6 +52,10 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.isMember = NO;
+    if (IS_IPAD) {
+        self.avatarWidth.constant = 72.0f;
+        self.userAvatar.layer.cornerRadius = 36.0f;
+    }
 }
 
 + (instancetype)shareInstance {

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -290,8 +290,8 @@
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="0Xj-Pq-GsW">
                             <rect key="frame" x="334" y="14" width="52" height="52"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="52" id="5Ah-gr-ees"/>
                                 <constraint firstAttribute="width" constant="52" id="HpZ-zd-ch0"/>
+                                <constraint firstAttribute="width" secondItem="0Xj-Pq-GsW" secondAttribute="height" multiplier="1:1" id="ro1-kW-wOK"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -934,6 +934,7 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="avatarWidth" destination="HpZ-zd-ch0" id="O5n-hf-POC"/>
                 <outlet property="awardView" destination="A9g-HO-Cfh" id="IKa-fq-2C9"/>
                 <outlet property="finishCourseLabel" destination="lLR-pZ-jam" id="cVd-kH-5uJ"/>
                 <outlet property="followTeacherLabel" destination="gfo-ED-EEb" id="Fn2-TG-zkD"/>
@@ -1040,7 +1041,7 @@
     </objects>
     <resources>
         <image name="activity_award" width="42" height="42"/>
-        <image name="member_bg" width="334" height="82"/>
+        <image name="member_bg" width="176.5" height="82"/>
         <image name="member_center" width="74" height="26"/>
         <image name="member_logo" width="19" height="18"/>
         <image name="mine_course" width="33" height="33"/>

KulexiuForStudent/KulexiuForStudent/Module/Mine/Works/Controller/MineWorksViewController.m

@@ -40,8 +40,8 @@
 - (void)configUI {
     self.ks_prefersNavigationBarHidden = YES;
     [self.scrollView removeFromSuperview];
-    
-    UIImage *bgImage = [UIImage imageNamed:@"mineWorks_bg"];
+    NSString *bgName = IS_IPAD ? @"mineWorks_bgPad" : @"mineWorks_bg";
+    UIImage *bgImage = [UIImage imageNamed:bgName];
     NSInteger height = (NSInteger)(bgImage.size.height / bgImage.size.width * KPortraitWidth);
     UIImageView *imageView = [[UIImageView alloc] initWithImage:bgImage];
     imageView.frame = CGRectMake(0, 0, KPortraitWidth, height);

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Controller/TXClassroomViewController.m

@@ -264,6 +264,7 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:@"backLoginView" object:nil];
 }
 
+
 - (void)quitRoomAction {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         self.isQuitRoom = YES;

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/AFNetworking.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Bugly.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/CHIPageControl.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/IQKeyboardManager.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JCore.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JPush.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXCategoryView.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXPagingView.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MBProgressHUD.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJExtension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJRefresh.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Masonry.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudent-KulexiuForStudentUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudent.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudentTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RSKImageCropper.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Reachability.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SDWebImage.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SSZipArchive.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SocketRocket.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Whiteboard-Whiteboard.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Whiteboard.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/YYModel.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"