Browse Source

首页卡片样式修改

Steven 1 year ago
parent
commit
8562bba918
36 changed files with 165 additions and 54 deletions
  1. 9 1
      KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj
  2. 1 1
      KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/drag_smallTool.imageset/drag_smallTool@2x.png
  4. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/drag_smallTool.imageset/drag_smallTool@3x.png
  5. 9 0
      KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.h
  6. 15 0
      KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m
  7. 68 21
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Controller/TenantDarkViewController.m
  8. 19 0
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Model/TenantAlbumModel.h
  9. 12 0
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Model/TenantAlbumModel.m
  10. 2 2
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantDragView.h
  11. 5 4
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib
  12. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/AFNetworking.xcscheme
  13. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Bugly.xcscheme
  14. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/CHIPageControl.xcscheme
  15. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/IQKeyboardManager.xcscheme
  16. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JCore.xcscheme
  17. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JPush.xcscheme
  18. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXCategoryView.xcscheme
  19. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXPagingView.xcscheme
  20. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MBProgressHUD.xcscheme
  21. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJExtension.xcscheme
  22. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJRefresh.xcscheme
  23. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Masonry.xcscheme
  24. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudent-KulexiuForStudentUITests.xcscheme
  25. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudent.xcscheme
  26. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudentTests.xcscheme
  27. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RSKImageCropper.xcscheme
  28. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Reachability.xcscheme
  29. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RongCloudIM.xcscheme
  30. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RongCloudRTC.xcscheme
  31. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SDWebImage.xcscheme
  32. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SSZipArchive.xcscheme
  33. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SocketRocket.xcscheme
  34. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Whiteboard-Whiteboard.xcscheme
  35. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Whiteboard.xcscheme
  36. 1 1
      KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/YYModel.xcscheme

+ 9 - 1
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -1013,6 +1013,7 @@
 		BCF425DD2AB8665200BCD942 /* TenantHomeBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF425DC2AB8665200BCD942 /* TenantHomeBannerView.m */; };
 		BCF425DF2AB8665900BCD942 /* TenantHomeBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCF425DE2AB8665900BCD942 /* TenantHomeBannerView.xib */; };
 		BCF425E22AB8793400BCD942 /* NSDate+DateDetail.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF425E12AB8793400BCD942 /* NSDate+DateDetail.m */; };
+		BCF425F72AB991E600BCD942 /* TenantAlbumModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF425F62AB991E600BCD942 /* TenantAlbumModel.m */; };
 		BCF472E72AB019CD0032BE16 /* TenantDarkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF472E62AB019CD0032BE16 /* TenantDarkViewController.m */; };
 		BCF472EA2AB01AEB0032BE16 /* TenantMoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF472E92AB01AEB0032BE16 /* TenantMoreViewController.m */; };
 		BCFCE44E28DD5C000051FED8 /* Low.wav in Resources */ = {isa = PBXBuildFile; fileRef = BCFCE44C28DD5C000051FED8 /* Low.wav */; };
@@ -2815,6 +2816,8 @@
 		BCF425DE2AB8665900BCD942 /* TenantHomeBannerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TenantHomeBannerView.xib; sourceTree = "<group>"; };
 		BCF425E02AB8793400BCD942 /* NSDate+DateDetail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+DateDetail.h"; sourceTree = "<group>"; };
 		BCF425E12AB8793400BCD942 /* NSDate+DateDetail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+DateDetail.m"; sourceTree = "<group>"; };
+		BCF425F52AB991E600BCD942 /* TenantAlbumModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenantAlbumModel.h; sourceTree = "<group>"; };
+		BCF425F62AB991E600BCD942 /* TenantAlbumModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TenantAlbumModel.m; sourceTree = "<group>"; };
 		BCF472E52AB019CD0032BE16 /* TenantDarkViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenantDarkViewController.h; sourceTree = "<group>"; };
 		BCF472E62AB019CD0032BE16 /* TenantDarkViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TenantDarkViewController.m; sourceTree = "<group>"; };
 		BCF472E82AB01AEB0032BE16 /* TenantMoreViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenantMoreViewController.h; sourceTree = "<group>"; };
@@ -5072,6 +5075,8 @@
 				BCCE95D62AB043F900AB6385 /* subject_Ani.json */,
 				BCCE95D42AB043EF00AB6385 /* mutiMusic_Ani.json */,
 				BCCE95D22AB0410600AB6385 /* darkEmptyAnimation.json */,
+				BCF425F52AB991E600BCD942 /* TenantAlbumModel.h */,
+				BCF425F62AB991E600BCD942 /* TenantAlbumModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -6933,7 +6938,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastUpgradeCheck = 1420;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					275E8AA427E18F8800DD3F6E = {
 						CreatedOnToolsVersion = 13.2.1;
@@ -7549,6 +7554,7 @@
 				2723B68327F15D3D00E0B90B /* ModifyViewController.m in Sources */,
 				2779356327E324A70010E277 /* HomeButton.m in Sources */,
 				2779358227E324A80010E277 /* NSDate+KSBaseDatePicker.m in Sources */,
+				BCF425F72AB991E600BCD942 /* TenantAlbumModel.m in Sources */,
 				BC106C062A933829000759A9 /* TXLiveMessageStatSync.m in Sources */,
 				277935CD27E324A90010E277 /* ALCalendarCell.m in Sources */,
 				BC8A45BE283DCADE00094BBB /* NSObject+KeyWindow.m in Sources */,
@@ -8419,6 +8425,7 @@
 				);
 				MARKETING_VERSION = 1.5.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -8497,6 +8504,7 @@
 				);
 				MARKETING_VERSION = 1.5.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

+ 1 - 1
KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

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

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/drag_smallTool.imageset/drag_smallTool@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/drag_smallTool.imageset/drag_smallTool@3x.png


+ 9 - 0
KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.h

@@ -910,6 +910,15 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param success 成功
 /// @param faliure 失败
 + (void)tenantActivationCodeRequest:(NSString *)post success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
+
+// 查询机构专辑
+// api-student/student/userTenantAlbumRecord/detail
+
+/// 查询机构专辑
+/// @param post post
+/// @param success 成功
+/// @param faliure 失败
++ (void)userTenantAlbumRecordRequest:(NSString *)post success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 @end
 
 NS_ASSUME_NONNULL_END

+ 15 - 0
KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m

@@ -1755,4 +1755,19 @@
     [parm setValue:@(10) forKey:@"rows"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
+
+// 查询机构专辑
+// api-student/student/userTenantAlbumRecord/detail
+
+/// 查询机构专辑
+/// @param post post
+/// @param success 成功
+/// @param faliure 失败
++ (void)userTenantAlbumRecordRequest:(NSString *)post success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestMethodJSON];
+
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/userTenantAlbumRecord/detail"];
+    NSMutableDictionary *parm = [NSMutableDictionary dictionary];
+    [self request:post andWithUrl:url and:parm success:success faliure:faliure];
+}
 @end

+ 68 - 21
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Controller/TenantDarkViewController.m

@@ -17,6 +17,7 @@
 #import "UserInfoManager.h"
 #import "TenantTicketAlert.h"
 #import "AppDelegate+AppService.h"
+#import "TenantAlbumModel.h"
 
 @interface TenantDarkViewController ()<TYCyclePagerViewDelegate, TYCyclePagerViewDataSource>
 
@@ -44,6 +45,10 @@
 
 @property (nonatomic, assign) BOOL isFirstLoad;
 
+@property (nonatomic, assign) NSInteger tenantAlbumStatus; // 专辑状态
+
+@property (nonatomic, strong) NSMutableArray *sourceArray; // 分类数据
+
 @end
 
 @implementation TenantDarkViewController
@@ -68,9 +73,9 @@
         self.isFirstLoad = NO;
         [self requestTrackAuth];
     }
-
 }
 
+
 - (void)requestTrackAuth {
     
     AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
@@ -79,6 +84,7 @@
 
 
 - (void)requestSource {
+    [self requestUserInfo];
     [self requestData];
     [self requsetTicket];
     dispatch_group_notify(self.requestGroup, dispatch_get_main_queue(), ^{
@@ -86,8 +92,16 @@
     });
 }
 
+- (void)requestUserInfo {
+    dispatch_group_enter(self.requestGroup);
+    [USER_MANAGER queryUserInfoCallback:^(UserInfo * _Nonnull userInfo) {
+        dispatch_group_leave(self.requestGroup);
+        self.mineInfo = userInfo;
+    }];
+}
+
 - (void)ticketCheck:(NSInteger)count {
-    if (self.hasShowTipsView == NO) {
+    if (self.hasShowTipsView == YES) {
         return;
     }
     AppDelegate *appDelegate = [AppDelegate shareAppDelegate];
@@ -133,10 +147,46 @@
 }
 
 - (void)requestData {
+    
     dispatch_group_enter(self.requestGroup);
-    [USER_MANAGER queryUserInfoCallback:^(UserInfo * _Nonnull userInfo) {
+    [KSNetworkingManager userTenantAlbumRecordRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
         dispatch_group_leave(self.requestGroup);
-        self.mineInfo = userInfo;
+        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
+            NSDictionary *parm = [dic ks_dictionaryValueForKey:@"data"];
+            self.tenantAlbumStatus = [parm ks_integerValueForKey:@"tenantAlbumStatus"];
+            NSInteger subjectCount = [parm ks_integerValueForKey:@"subjectCounts"];
+            NSInteger musicCount = [parm ks_integerValueForKey:@"musicCounts"];
+            NSInteger ensembleCount = [parm ks_integerValueForKey:@"ensembleCounts"];
+            NSMutableArray *sourceArray = [NSMutableArray array];
+            NSMutableArray *aniArray = [NSMutableArray array];
+            if (subjectCount > 0) {
+                TenantAlbumModel *model = [[TenantAlbumModel alloc] init];
+                model.subjectType = @"SUBJECT";
+                [sourceArray addObject:model];
+                [aniArray addObject:@"subject_Ani.json"];
+            }
+            if (musicCount > 0) {
+                TenantAlbumModel *model = [[TenantAlbumModel alloc] init];
+                model.subjectType = @"MUSIC";
+                [sourceArray addObject:model];
+                [aniArray addObject:@"singleMusic_Ani.json"];
+            }
+            if (ensembleCount > 0) {
+                TenantAlbumModel *model = [[TenantAlbumModel alloc] init];
+                model.subjectType = @"ENSEMBLE";
+                [sourceArray addObject:model];
+                [aniArray addObject:@"mutiMusic_Ani.json"];
+            }
+            self.sourceArray = [NSMutableArray arrayWithArray:sourceArray];
+            self.animationNameArray = [NSMutableArray arrayWithArray:aniArray];
+        }
+        else {
+            
+            [self MBPShow:MESSAGEKEY];
+        }
+    } faliure:^(NSError * _Nonnull error) {
+        dispatch_group_leave(self.requestGroup);
+        
     }];
 }
 
@@ -151,7 +201,7 @@
 }
 - (void)refreshView {
     self.navView.tenantName.text = [NSString returnNoNullStringWithString:self.mineInfo.tenantName];
-    if (self.mineInfo.tenantAlbumStatus == 0) {
+    if (self.tenantAlbumStatus == 0) {
         [self showEmptyView];
     }
     else {
@@ -212,10 +262,12 @@
 
 #pragma mark ------ TYCyclePagerViewDataSource
 - (NSInteger)numberOfItemsInPagerView:(TYCyclePagerView *)pageView {
-    if (self.mineInfo && self.mineInfo.tenantAlbumStatus > 0) {
-        return 3;
+    if (self.tenantAlbumStatus > 0) {
+        return self.sourceArray.count;
+    }
+    else {
+        return 0;
     }
-    return 0;
 }
 
 - (__kindof UICollectionViewCell *)pagerView:(TYCyclePagerView *)pagerView cellForItemAtIndex:(NSInteger)index {
@@ -236,9 +288,11 @@
     CGFloat searchHeight = [TenantDarkSearhView getViewHeight];
     CGFloat height = (KPortraitHeight - navHeight - searchHeight - kTabBarHeight - 16);
     TYCyclePagerViewLayout *layout = [[TYCyclePagerViewLayout alloc] init];
+    CGFloat width = height / 571 * 296;
     layout.itemSize = CGSizeMake(height/571*296, height);
     layout.itemSpacing = 16.0f;
     layout.layoutType = TYCyclePagerTransformLayoutLinear;
+    layout.sectionInset = UIEdgeInsetsMake(0, (KPortraitWidth - width) / 2.0f, 0, (KPortraitWidth - width) / 2.0f);
     return layout;;
 }
 
@@ -250,16 +304,9 @@
         [self.navigationController pushViewController:ctrl animated:YES];
     }
     else { // 跳转到对应页面
-        NSString *subjectType = @"";
-        if (index == 0) {
-            subjectType = @"SUBJECT";
-        }
-        else if (index == 1) {
-            subjectType = @"MUSIC";
-        }
-        else {
-            subjectType = @"ENSEMBLE";
-        }
+        TenantAlbumModel *model = self.sourceArray[index];
+        NSString *subjectType = model.subjectType;
+        
         KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
         webCtrl.url = [NSString stringWithFormat:@"%@/#/train-list?subjectType=%@", TENANT_WEBHOST,subjectType];
         [self.navigationController pushViewController:webCtrl animated:YES];
@@ -279,7 +326,7 @@
 #pragma mark --- lazying
 - (NSMutableArray *)animationNameArray {
     if (!_animationNameArray) {
-        _animationNameArray = [NSMutableArray arrayWithArray:@[@"subject_Ani.json",@"singleMusic_Ani.json",@"mutiMusic_Ani.json"]];
+        _animationNameArray = [NSMutableArray array];
     }
     return _animationNameArray;
 }
@@ -287,9 +334,9 @@
     if (!_pagerView) {
         _pagerView = [[TYCyclePagerView alloc] init];
         _pagerView.backgroundColor = [UIColor clearColor];
-        _pagerView.isInfiniteLoop = YES;
+        _pagerView.isInfiniteLoop = NO;
         
-        _pagerView.reloadDataNeedResetIndex = YES;
+        _pagerView.reloadDataNeedResetIndex = NO;
         _pagerView.delegate = self;
         _pagerView.dataSource = self;
         [_pagerView registerNib:[UINib nibWithNibName:@"TenantHomeSubjectListCell" bundle:nil] forCellWithReuseIdentifier:@"TenantHomeSubjectListCell"];

+ 19 - 0
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Model/TenantAlbumModel.h

@@ -0,0 +1,19 @@
+//
+//  TenantAlbumModel.h
+//  KulexiuForStudent
+//
+//  Created by 王智 on 2023/9/19.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TenantAlbumModel : NSObject
+
+@property (nonatomic, strong) NSString *subjectType;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 12 - 0
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Model/TenantAlbumModel.m

@@ -0,0 +1,12 @@
+//
+//  TenantAlbumModel.m
+//  KulexiuForStudent
+//
+//  Created by 王智 on 2023/9/19.
+//
+
+#import "TenantAlbumModel.h"
+
+@implementation TenantAlbumModel
+
+@end

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/TenantDragView.h

@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#define DRAG_IMAGE_WIDTH (50.0)
-#define DRAG_IMAGE_HEIGHT (57.0)
+#define DRAG_IMAGE_WIDTH (62.0)
+#define DRAG_IMAGE_HEIGHT (62.0)
 #define TenantDragButtonRightSpace (0)
 
 #define TenantDragButtonWidth (DRAG_IMAGE_WIDTH + TenantDragButtonRightSpace * 2)

+ 5 - 4
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib

@@ -201,12 +201,12 @@
                             </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="Nlb-bG-jKG">
-                            <rect key="frame" x="108" y="91" width="52" height="28"/>
+                            <rect key="frame" x="107.99999999999999" y="91" width="61.333333333333329" height="28"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="28" id="KND-9T-wMM"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                            <nil key="textColor"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
+                            <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aWj-xg-N6w">
@@ -248,7 +248,7 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                         <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_mineMember_tag" translatesAutoresizingMaskIntoConstraints="NO" id="j1E-FX-DSh">
-                            <rect key="frame" x="166" y="96" width="44" height="17"/>
+                            <rect key="frame" x="175.33333333333334" y="96" width="44" height="17"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="44" id="F0Y-OI-vHn"/>
                                 <constraint firstAttribute="height" constant="17" id="iHY-he-VUA"/>
@@ -279,6 +279,7 @@
                         <constraint firstItem="uzc-nx-nAm" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" constant="19" id="Zqj-cL-ErZ"/>
                         <constraint firstAttribute="height" constant="275" id="fPk-KI-PIk"/>
                         <constraint firstAttribute="trailing" secondItem="A30-6f-0Ca" secondAttribute="trailing" id="gSQ-A1-hjP"/>
+                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="j1E-FX-DSh" secondAttribute="trailing" constant="12" id="kUX-hN-lvf"/>
                         <constraint firstAttribute="bottom" secondItem="Mxr-u3-Zhb" secondAttribute="bottom" constant="16" id="l7Z-BD-Yt1"/>
                         <constraint firstItem="j1E-FX-DSh" firstAttribute="top" secondItem="Nlb-bG-jKG" secondAttribute="top" constant="5" id="oxk-oM-jZs"/>
                         <constraint firstItem="A30-6f-0Ca" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" id="pce-4x-814"/>

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/AFNetworking.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Bugly.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/CHIPageControl.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/IQKeyboardManager.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JCore.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JPush.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXCategoryView.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXPagingView.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MBProgressHUD.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJExtension.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJRefresh.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Masonry.xcscheme

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

+ 1 - 1
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 = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

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

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

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RSKImageCropper.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Reachability.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RongCloudIM.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RongCloudRTC.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SDWebImage.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SSZipArchive.xcscheme

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SocketRocket.xcscheme

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

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

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

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

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

+ 1 - 1
KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/YYModel.xcscheme

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